r3596 - in trunk/kernel/source/linux-2.6-2.6.12/debian: . arch/i386
templates
Andres Salomon
dilinger at costa.debian.org
Wed Jul 20 20:05:30 UTC 2005
Author: dilinger
Date: 2005-07-20 20:05:29 +0000 (Wed, 20 Jul 2005)
New Revision: 3596
Modified:
trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile
trunk/kernel/source/linux-2.6-2.6.12/debian/README
trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/desc.686
trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/desc.686-smp
trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/desc.k7
trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/desc.k7-smp
trunk/kernel/source/linux-2.6-2.6.12/debian/rules
trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.headers.flavour.in
trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.image.in
Log:
drop @shortsmpflavour@ and @smpflavour@, and replace with @class at . Also
add @desc at .
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile 2005-07-20 19:27:24 UTC (rev 3595)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/Makefile 2005-07-20 20:05:29 UTC (rev 3596)
@@ -184,12 +184,17 @@
cp changelog $(tkdir)/debian
cp copyright $(tkdir)/debian
substitute() { \
+ class="$$2"; \
+ desc=""; \
+ [ -f "debian/arch/$(karch)/$(append)/desc.$$2" ] && . "debian/arch/$(karch)/$(append)/desc.$$2"; \
cat templates/control.$$1 | \
sed -e 's/@version@/$(version)/g' \
-e 's/@major@/$(major)/g' \
-e "s/@arch@/$(karch)/g" \
-e "s/@subarch@/$(append)/g" \
-e "s/@flavour@/$$2/g" \
+ -e "s/@class@/$$class/g" \
+ -e "s/@desc@/$$desc/g" \
-e 's/@ltver@/$(ltver)/g' \
-e 's/@srcver@/$(srcver)/g' \
-e 's/@lt_depends@/$(lt_depends)/g' \
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/README
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/README 2005-07-20 19:27:24 UTC (rev 3595)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/README 2005-07-20 20:05:29 UTC (rev 3596)
@@ -51,8 +51,9 @@
@arch@ The Debian arch name, such as powerpc or i386.
@subarch@ The subarch - only used by powerpc right now.
@flavour@ The build flavour, such as 686 or k7-smp.
- at smpflavour@ Same as flavour, but turns k7-smp into "multiprocessor k7".
- at shortsmpflavour@ Same as smpflavour, but turns k7-smp into "SMP k7".
+ at class@ The CPU/architecture class; displayed in descriptions.
+ at desc@ (Potentially) multi-line verbiage that's appended to
+ -image descriptions.
@ltver@ linux-tree version, a single digit.
@srcver@ Source version, extracted from the changelog.
This is normally @version at -@ltver at .
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/desc.686
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/desc.686 2005-07-20 19:27:24 UTC (rev 3595)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/desc.686 2005-07-20 20:05:29 UTC (rev 3596)
@@ -1 +1 @@
-class = PPro/Celeron/PII/PIII/P4
+class="PPro/Celeron/PII/PIII/P4"
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/desc.686-smp
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/desc.686-smp 2005-07-20 19:27:24 UTC (rev 3595)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/desc.686-smp 2005-07-20 20:05:29 UTC (rev 3596)
@@ -1 +1 @@
-class = multi-processor PPro/Celeron/PII/PIII/P4
+class="multi-processor PPro/Celeron/PII/PIII/P4"
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/desc.k7
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/desc.k7 2005-07-20 19:27:24 UTC (rev 3595)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/desc.k7 2005-07-20 20:05:29 UTC (rev 3596)
@@ -1 +1 @@
-class = AMD Duron/Athlon/AthlonXP
+class="AMD Duron/Athlon/AthlonXP"
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/desc.k7-smp
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/desc.k7-smp 2005-07-20 19:27:24 UTC (rev 3595)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/arch/i386/desc.k7-smp 2005-07-20 20:05:29 UTC (rev 3596)
@@ -1 +1 @@
-class = multi-processor AMD Duron/Athlon/AthlonXP
+class="multi-processor AMD Duron/Athlon/AthlonXP"
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/rules
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/rules 2005-07-20 19:27:24 UTC (rev 3595)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/rules 2005-07-20 20:05:29 UTC (rev 3596)
@@ -259,22 +259,17 @@
sa=""; \
[ -f $$sa_tmp ] && sa=$$(basename $$(dirname $$sa_tmp))-; \
all_headers_pkgs=`get_all_headers_pkgs $$2 $$sa`; \
- if expr "$$3" : '.*-smp$$' > /dev/null; then \
- smp="multi"; \
- shortsmp="SMP"; \
- else \
- smp="uni" ;\
- shortsmp="UP"; \
- fi; \
- flavour=`echo $$3| sed 's/-smp//'`; \
+ class="$$3"; \
+ desc=""; \
+ [ -f "debian/arch/$$2/$$sa/desc.$$3" ] && . "debian/arch/$$2/$$sa/desc.$$3"; \
cat debian/templates/control.$$1 | \
sed -e 's/@version@/$(version)/g' \
-e 's/@major@/$(major)/g' \
-e "s/@arch@/$$2/g" \
-e "s/@subarch@/$$sa/g" \
-e "s/@flavour@/$$3/g" \
- -e "s/@smpflavour@/$${smp}processor $${flavour}/g" \
- -e "s/@shortsmpflavour@/$${shortsmp} $${flavour}/g" \
+ -e "s/@class@/$$class/g" \
+ -e "s/@desc@/$$desc/g" \
-e 's/@ltver@/$(ltver)/g' \
-e 's/@srcver@/$(srcver)/g' \
-e 's/@lt_depends@/$(lt_depends)/g' \
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.headers.flavour.in
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.headers.flavour.in 2005-07-20 19:27:24 UTC (rev 3595)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.headers.flavour.in 2005-07-20 20:05:29 UTC (rev 3596)
@@ -4,9 +4,9 @@
Priority: optional
Depends: coreutils | fileutils (>= 4.0), linux-headers- at subarch@@version at -@abiname@
Provides: linux-headers, linux-headers- at major@
-Description: Architecture-specific header files for Linux kernel @version@ on @shortsmpflavour@
+Description: Architecture-specific header files for Linux kernel @version@ on @class@
This package provides the architecture-specific kernel header files
- for Linux kernel @version@ on @smpflavour at -class machines, generally
+ for Linux kernel @version@ on @class@ class machines, generally
used for building out-of-tree kernel modules. These files are going to be
installed into /usr/src/linux-headers- at subarch@@version at -@abiname at -@flavour@, and can
be used for building modules that load into the kernel provided by the
Modified: trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.image.in
===================================================================
--- trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.image.in 2005-07-20 19:27:24 UTC (rev 3595)
+++ trunk/kernel/source/linux-2.6-2.6.12/debian/templates/control.image.in 2005-07-20 20:05:29 UTC (rev 3596)
@@ -7,6 +7,7 @@
Conflicts: hotplug (<< 0.0.20040105-1)
Suggests: aboot [alpha], lilo (>= 19.1) | grub [amd64 i386], elilo [ia64], vmelilo [m68k], arcboot (>= 0.3.8) [mips], colo [mipsel], delo [mipsel], s390-tools [s390], silo [sparc], fdutils, linux-doc- at version@ | linux-source- at version@
Recommends: irqbalance [i386]
-Description: Linux kernel @version@ image on @shortsmpflavour@
+Description: Linux kernel @version@ image on @class@
This package provides the binary image and pre-built loadable modules for
- Linux kernel @version@ on @smpflavour at -class machines.
+ Linux kernel @version@ on @class@ class machines.
+ @desc@
More information about the Kernel-svn-changes
mailing list