From 3cd3f2f5338c71b19dfa217f960adf30dda32933 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Frederik=20Sch=C3=BCler?= Date: Wed, 18 May 2005 11:57:59 +0000 Subject: [PATCH] fix i386 and ppc control.in files. svn path=/branches/kernel-image-2.6.11/; revision=3144 --- arch/i386/control.in | 90 +++++++------- arch/powerpc/control.in | 260 ++++++++++++++++------------------------ 2 files changed, 147 insertions(+), 203 deletions(-) diff --git a/arch/i386/control.in b/arch/i386/control.in index 8b659e89b..d14d0eec8 100644 --- a/arch/i386/control.in +++ b/arch/i386/control.in @@ -1,24 +1,24 @@ -Package: kernel-headers-2.6.11-1-386 +Package: kernel-headers-@version@-@abiname@-386 Architecture: i386 Section: devel Priority: optional -Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.11-1 +Depends: coreutils | fileutils (>= 4.0), kernel-headers-@version@-@abiname@ Provides: kernel-headers, kernel-headers-2.6 -Description: Linux kernel headers 2.6.11 on 386 - This package provides kernel header files for version 2.6.11 on 386. - Please read /usr/share/doc/kernel-headers-2.6.11-1/debian.README.gz for +Description: Linux kernel headers @version@ on 386 + This package provides kernel header files for version @version@ on 386. + Please read /usr/share/doc/kernel-headers-@version@-@abiname@/debian.README.gz for details -Package: kernel-image-2.6.11-1-386 +Package: kernel-image-@version@-@abiname@-386 Architecture: i386 Section: base Priority: optional Provides: kernel-image, kernel-image-2.6 Depends: initrd-tools (>= 0.1.76), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13) Conflicts: hotplug (<< 0.0.20040105-1) -Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-2.6.11 | kernel-source-2.6.11 -Description: Linux kernel image for version 2.6.11 on 386. - This package contains the Linux kernel image for version 2.6.11 on 386, +Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-@version@ | kernel-source-@version@ +Description: Linux kernel image for version @version@ on 386. + This package contains the Linux kernel image for version @version@ on 386, the corresponding System.map file, and the modules built by the packager. It also contains scripts that try to ensure that the system is not left in a unbootable state after an update. @@ -32,28 +32,28 @@ Description: Linux kernel image for version 2.6.11 on 386. and it is suggested that you install that package if you wish to create a custom kernel from the sources. -Package: kernel-headers-2.6.11-1-686 +Package: kernel-headers-@version@-@abiname@-686 Architecture: i386 Section: devel Priority: optional -Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.11-1 +Depends: coreutils | fileutils (>= 4.0), kernel-headers-@version@-@abiname@ Provides: kernel-headers, kernel-headers-2.6 -Description: Linux kernel headers 2.6.11 on PPro/Celeron/PII/PIII/P4 - This package provides kernel header files for version 2.6.11 on +Description: Linux kernel headers @version@ on PPro/Celeron/PII/PIII/P4 + This package provides kernel header files for version @version@ on Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4. - Please read /usr/share/doc/kernel-headers-2.6.11-1/debian.README.gz for + Please read /usr/share/doc/kernel-headers-@version@-@abiname@/debian.README.gz for details -Package: kernel-image-2.6.11-1-686 +Package: kernel-image-@version@-@abiname@-686 Architecture: i386 Section: base Priority: optional Provides: kernel-image, kernel-image-2.6 Depends: initrd-tools (>= 0.1.76), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13) Conflicts: hotplug (<< 0.0.20040105-1) -Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-2.6.11 | kernel-source-2.6.11 -Description: Linux kernel image for version 2.6.11 on PPro/Celeron/PII/PIII/P4. - This package contains the Linux kernel image for version 2.6.11 on +Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-@version@ | kernel-source-@version@ +Description: Linux kernel image for version @version@ on PPro/Celeron/PII/PIII/P4. + This package contains the Linux kernel image for version @version@ on Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4, the corresponding System.map file, and the modules built by the packager. It also contains scripts that try to ensure that the system is not left in @@ -68,20 +68,20 @@ Description: Linux kernel image for version 2.6.11 on PPro/Celeron/PII/PIII/P4. and it is suggested that you install that package if you wish to create a custom kernel from the sources. -Package: kernel-headers-2.6.11-1-686-smp +Package: kernel-headers-@version@-@abiname@-686-smp Architecture: i386 Section: devel Priority: optional -Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.11-1 +Depends: coreutils | fileutils (>= 4.0), kernel-headers-@version@-@abiname@ Provides: kernel-headers, kernel-headers-2.6 -Description: Linux kernel headers 2.6.11 on PPro/Celeron/PII/PIII/P4 SMP - This package provides kernel header files for version 2.6.11 on +Description: Linux kernel headers @version@ on PPro/Celeron/PII/PIII/P4 SMP + This package provides kernel header files for version @version@ on Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with SMP support. SMP (symmetric multi-processing) is needed if you have multiple processors. - Please read /usr/share/doc/kernel-headers-2.6.11-1/debian.README.gz for + Please read /usr/share/doc/kernel-headers-@version@-@abiname@/debian.README.gz for details -Package: kernel-image-2.6.11-1-686-smp +Package: kernel-image-@version@-@abiname@-686-smp Architecture: i386 Section: base Priority: optional @@ -89,9 +89,9 @@ Provides: kernel-image, kernel-image-2.6 Depends: initrd-tools (>= 0.1.76), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: irqbalance -Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-2.6.11 | kernel-source-2.6.11 -Description: Linux kernel image for version 2.6.11 on PPro/Celeron/PII/PIII/P4 SMP. - This package contains the Linux kernel image for version 2.6.11 on +Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-@version@ | kernel-source-@version@ +Description: Linux kernel image for version @version@ on PPro/Celeron/PII/PIII/P4 SMP. + This package contains the Linux kernel image for version @version@ on Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with SMP support, the corresponding System.map file, and the modules built by the packager. SMP (symmetric multi-processing) is needed if you have multiple processors. @@ -107,28 +107,28 @@ Description: Linux kernel image for version 2.6.11 on PPro/Celeron/PII/PIII/P4 S and it is suggested that you install that package if you wish to create a custom kernel from the sources. -Package: kernel-headers-2.6.11-1-k7 +Package: kernel-headers-@version@-@abiname@-k7 Architecture: i386 Section: devel Priority: optional -Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.11-1 +Depends: coreutils | fileutils (>= 4.0), kernel-headers-@version@-@abiname@ Provides: kernel-headers, kernel-headers-2.6 -Description: Linux kernel headers 2.6.11 on AMD K7 - This package provides kernel header files for version 2.6.11 on +Description: Linux kernel headers @version@ on AMD K7 + This package provides kernel header files for version @version@ on 32bit AMD Duron/Athlon/AthlonXP. - Please read /usr/share/doc/kernel-headers-2.6.11-1/debian.README.gz for + Please read /usr/share/doc/kernel-headers-@version@-@abiname@/debian.README.gz for details -Package: kernel-image-2.6.11-1-k7 +Package: kernel-image-@version@-@abiname@-k7 Architecture: i386 Section: base Priority: optional Provides: kernel-image, kernel-image-2.6 Depends: initrd-tools (>= 0.1.76), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13) Conflicts: hotplug (<< 0.0.20040105-1) -Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-2.6.11 | kernel-source-2.6.11 -Description: Linux kernel image for version 2.6.11 on AMD K7. - This package contains the Linux kernel image for version 2.6.11 on +Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-@version@ | kernel-source-@version@ +Description: Linux kernel image for version @version@ on AMD K7. + This package contains the Linux kernel image for version @version@ on 32bit AMD Duron/Athlon/AthlonXP, the corresponding System.map file, and the modules built by the packager. It also contains scripts that try to ensure that the system is not left in @@ -143,20 +143,20 @@ Description: Linux kernel image for version 2.6.11 on AMD K7. and it is suggested that you install that package if you wish to create a custom kernel from the sources. -Package: kernel-headers-2.6.11-1-k7-smp +Package: kernel-headers-@version@-@abiname@-k7-smp Architecture: i386 Section: devel Priority: optional -Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.11-1 +Depends: coreutils | fileutils (>= 4.0), kernel-headers-@version@-@abiname@ Provides: kernel-headers, kernel-headers-2.6 -Description: Linux kernel headers 2.6.11 on AMD K7 SMP - This package provides kernel header files for version 2.6.11 on +Description: Linux kernel headers @version@ on AMD K7 SMP + This package provides kernel header files for version @version@ on 32bit AMD Duron/Athlon/AthlonXP with SMP support. SMP (symmetric multi-processing) is needed if you have multiple processors. - Please read /usr/share/doc/kernel-headers-2.6.11-1/debian.README.gz for + Please read /usr/share/doc/kernel-headers-@version@-@abiname@/debian.README.gz for details -Package: kernel-image-2.6.11-1-k7-smp +Package: kernel-image-@version@-@abiname@-k7-smp Architecture: i386 Section: base Priority: optional @@ -164,9 +164,9 @@ Provides: kernel-image, kernel-image-2.6 Depends: initrd-tools (>= 0.1.76), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13) Conflicts: hotplug (<< 0.0.20040105-1) Recommends: irqbalance -Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-2.6.11 | kernel-source-2.6.11 -Description: Linux kernel image for version 2.6.11 on AMD K7 SMP. - This package contains the Linux kernel image for version 2.6.11 on +Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-@version@ | kernel-source-@version@ +Description: Linux kernel image for version @version@ on AMD K7 SMP. + This package contains the Linux kernel image for version @version@ on 32bit AMD Duron/Athlon/AthlonXP with SMP support, the corresponding System.map file, and the modules built by the packager. SMP (symmetric multi-processing) is needed if you have multiple processors. diff --git a/arch/powerpc/control.in b/arch/powerpc/control.in index 8b659e89b..0e2d3bc02 100644 --- a/arch/powerpc/control.in +++ b/arch/powerpc/control.in @@ -1,183 +1,127 @@ -Package: kernel-headers-2.6.11-1-386 -Architecture: i386 -Section: devel -Priority: optional -Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.11-1 -Provides: kernel-headers, kernel-headers-2.6 -Description: Linux kernel headers 2.6.11 on 386 - This package provides kernel header files for version 2.6.11 on 386. - Please read /usr/share/doc/kernel-headers-2.6.11-1/debian.README.gz for - details +Package: kernel-headers-@version@-powerpc +Architecture: powerpc +Description: header files for the Linux kernel version @version@ + . + This package provides kernel headers files for @version@. -Package: kernel-image-2.6.11-1-386 -Architecture: i386 +Package: kernel-build-@version@-power3 +Architecture: powerpc +Depends: kernel-headers-@version@-powerpc +Description: build infrastructure for kernel version @version@-power3 + . + Together with kernel-headers-@version@-powerpc, this package provides the + infrastructure for building additional modules for @version@-power3. + +Package: kernel-image-@version@-power3 Section: base -Priority: optional +Architecture: powerpc +Depends: initrd-tools (>= 0.1.65), module-init-tools, mkvmlinuz +Recommends: hotplug Provides: kernel-image, kernel-image-2.6 -Depends: initrd-tools (>= 0.1.76), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13) -Conflicts: hotplug (<< 0.0.20040105-1) -Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-2.6.11 | kernel-source-2.6.11 -Description: Linux kernel image for version 2.6.11 on 386. - This package contains the Linux kernel image for version 2.6.11 on 386, - the corresponding System.map file, and the modules built by the packager. - It also contains scripts that try to ensure that the system is not left in - a unbootable state after an update. +Description: Linux kernel image for @version@-power3 . - If you wish to update a bootdisk, or to use a bootloader to make - installing and using the image easier, we suggest you install the latest - fdutils (for formatting a floppy to be used as boot disk), and LILO, for a - powerful bootloader. Of course, both these are optional. + This package contains the Linux kernel for version @version@-power3. + It is intended to be run on PowerPC machines with a single Power3 + processor. + +Package: kernel-build-@version@-power3-smp +Architecture: powerpc +Depends: kernel-headers-@version@-powerpc +Description: build infrastructure for kernel version @version@-power3-smp . - Kernel image packages are generally produced using kernel-package, - and it is suggested that you install that package if you wish to - create a custom kernel from the sources. + Together with kernel-headers-@version@-powerpc, this package provides the + infrastructure for building additional modules for @version@-power3-smp. -Package: kernel-headers-2.6.11-1-686 -Architecture: i386 -Section: devel -Priority: optional -Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.11-1 -Provides: kernel-headers, kernel-headers-2.6 -Description: Linux kernel headers 2.6.11 on PPro/Celeron/PII/PIII/P4 - This package provides kernel header files for version 2.6.11 on - Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4. - Please read /usr/share/doc/kernel-headers-2.6.11-1/debian.README.gz for - details - -Package: kernel-image-2.6.11-1-686 -Architecture: i386 +Package: kernel-image-@version@-power3-smp Section: base -Priority: optional +Architecture: powerpc +Depends: initrd-tools (>= 0.1.65), module-init-tools, mkvmlinuz +Recommends: hotplug Provides: kernel-image, kernel-image-2.6 -Depends: initrd-tools (>= 0.1.76), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13) -Conflicts: hotplug (<< 0.0.20040105-1) -Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-2.6.11 | kernel-source-2.6.11 -Description: Linux kernel image for version 2.6.11 on PPro/Celeron/PII/PIII/P4. - This package contains the Linux kernel image for version 2.6.11 on - Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4, - the corresponding System.map file, and the modules built by the packager. - It also contains scripts that try to ensure that the system is not left in - a unbootable state after an update. +Description: Linux kernel image for @version@-power3-smp . - If you wish to update a bootdisk, or to use a bootloader to make - installing and using the image easier, we suggest you install the latest - fdutils (for formatting a floppy to be used as boot disk), and LILO, for a - powerful bootloader. Of course, both these are optional. + This package contains the Linux kernel for version @version@-power3-smp. + It is intended to be run on PowerPC machines with two or more + Power3 processors, like some IBM RS/6000 boxen. + +Package: kernel-build-@version@-power4 +Architecture: powerpc +Depends: kernel-headers-@version@-powerpc +Description: build infrastructure for kernel version @version@-power4 . - Kernel image packages are generally produced using kernel-package, - and it is suggested that you install that package if you wish to - create a custom kernel from the sources. + Together with kernel-headers-@version@-powerpc, this package provides the + infrastructure for building additional modules for @version@-power4. -Package: kernel-headers-2.6.11-1-686-smp -Architecture: i386 -Section: devel -Priority: optional -Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.11-1 -Provides: kernel-headers, kernel-headers-2.6 -Description: Linux kernel headers 2.6.11 on PPro/Celeron/PII/PIII/P4 SMP - This package provides kernel header files for version 2.6.11 on - Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with SMP support. - SMP (symmetric multi-processing) is needed if you have multiple processors. - Please read /usr/share/doc/kernel-headers-2.6.11-1/debian.README.gz for - details - -Package: kernel-image-2.6.11-1-686-smp -Architecture: i386 +Package: kernel-image-@version@-power4 Section: base -Priority: optional +Architecture: powerpc +Depends: initrd-tools (>= 0.1.65), module-init-tools, mkvmlinuz +Recommends: hotplug Provides: kernel-image, kernel-image-2.6 -Depends: initrd-tools (>= 0.1.76), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13) -Conflicts: hotplug (<< 0.0.20040105-1) -Recommends: irqbalance -Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-2.6.11 | kernel-source-2.6.11 -Description: Linux kernel image for version 2.6.11 on PPro/Celeron/PII/PIII/P4 SMP. - This package contains the Linux kernel image for version 2.6.11 on - Pentium Pro/Celeron/Pentium II/Pentium III/Pentium 4 with SMP support, - the corresponding System.map file, and the modules built by the packager. - SMP (symmetric multi-processing) is needed if you have multiple processors. - It also contains scripts that try to ensure that the system is not left in - a unbootable state after an update. +Description: Linux kernel image for @version@-power4 . - If you wish to update a bootdisk, or to use a bootloader to make - installing and using the image easier, we suggest you install the latest - fdutils (for formatting a floppy to be used as boot disk), and LILO, for a - powerful bootloader. Of course, both these are optional. + This package contains the Linux kernel for version @version@-power4. + It is intended to be run on PowerPC machines with a single Power4 + processor, the most prominent example being the G5 PowerMac by Apple. + +Package: kernel-build-@version@-power4-smp +Architecture: powerpc +Depends: kernel-headers-@version@-powerpc +Description: build infrastructure for kernel version @version@-power4-smp . - Kernel image packages are generally produced using kernel-package, - and it is suggested that you install that package if you wish to - create a custom kernel from the sources. + Together with kernel-headers-@version@-powerpc, this package provides the + infrastructure for building additional modules for @version@-power4-smp. -Package: kernel-headers-2.6.11-1-k7 -Architecture: i386 -Section: devel -Priority: optional -Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.11-1 -Provides: kernel-headers, kernel-headers-2.6 -Description: Linux kernel headers 2.6.11 on AMD K7 - This package provides kernel header files for version 2.6.11 on - 32bit AMD Duron/Athlon/AthlonXP. - Please read /usr/share/doc/kernel-headers-2.6.11-1/debian.README.gz for - details - -Package: kernel-image-2.6.11-1-k7 -Architecture: i386 +Package: kernel-image-@version@-power4-smp Section: base -Priority: optional +Architecture: powerpc +Depends: initrd-tools (>= 0.1.65), module-init-tools, mkvmlinuz +Recommends: hotplug Provides: kernel-image, kernel-image-2.6 -Depends: initrd-tools (>= 0.1.76), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13) -Conflicts: hotplug (<< 0.0.20040105-1) -Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-2.6.11 | kernel-source-2.6.11 -Description: Linux kernel image for version 2.6.11 on AMD K7. - This package contains the Linux kernel image for version 2.6.11 on - 32bit AMD Duron/Athlon/AthlonXP, the corresponding System.map file, - and the modules built by the packager. - It also contains scripts that try to ensure that the system is not left in - a unbootable state after an update. +Description: Linux kernel image for @version@-power4-smp . - If you wish to update a bootdisk, or to use a bootloader to make - installing and using the image easier, we suggest you install the latest - fdutils (for formatting a floppy to be used as boot disk), and LILO, for a - powerful bootloader. Of course, both these are optional. + This package contains the Linux kernel for version @version@-power4-smp. + It is intended to be run on PowerPC machines with two or more Power4 + processors. This setup can be found in Apple's dual G5 PowerMacs, as + well as in a number of IBM RS/6000 boxen, such as the iSeries and + pSeries machines. + +Package: kernel-build-@version@-powerpc +Architecture: powerpc +Depends: kernel-headers-@version@-powerpc +Description: build infrastructure for kernel version @version@-powerpc . - Kernel image packages are generally produced using kernel-package, - and it is suggested that you install that package if you wish to - create a custom kernel from the sources. + Together with kernel-headers-@version@-powerpc, this package provides the + infrastructure for building additional modules for @version@-powerpc. -Package: kernel-headers-2.6.11-1-k7-smp -Architecture: i386 -Section: devel -Priority: optional -Depends: coreutils | fileutils (>= 4.0), kernel-headers-2.6.11-1 -Provides: kernel-headers, kernel-headers-2.6 -Description: Linux kernel headers 2.6.11 on AMD K7 SMP - This package provides kernel header files for version 2.6.11 on - 32bit AMD Duron/Athlon/AthlonXP with SMP support. - SMP (symmetric multi-processing) is needed if you have multiple processors. - Please read /usr/share/doc/kernel-headers-2.6.11-1/debian.README.gz for - details - -Package: kernel-image-2.6.11-1-k7-smp -Architecture: i386 +Package: kernel-image-@version@-powerpc Section: base -Priority: optional +Architecture: powerpc +Depends: initrd-tools (>= 0.1.65), module-init-tools, mkvmlinuz +Recommends: hotplug Provides: kernel-image, kernel-image-2.6 -Depends: initrd-tools (>= 0.1.76), coreutils | fileutils (>= 4.0), module-init-tools (>= 0.9.13) -Conflicts: hotplug (<< 0.0.20040105-1) -Recommends: irqbalance -Suggests: lilo (>= 19.1) | grub, fdutils, kernel-doc-2.6.11 | kernel-source-2.6.11 -Description: Linux kernel image for version 2.6.11 on AMD K7 SMP. - This package contains the Linux kernel image for version 2.6.11 on - 32bit AMD Duron/Athlon/AthlonXP with SMP support, the corresponding - System.map file, and the modules built by the packager. - SMP (symmetric multi-processing) is needed if you have multiple processors. - It also contains scripts that try to ensure that the system is not left in - a unbootable state after an update. +Description: Linux kernel image for @version@-powerpc . - If you wish to update a bootdisk, or to use a bootloader to make - installing and using the image easier, we suggest you install the latest - fdutils (for formatting a floppy to be used as boot disk), and LILO, for a - powerful bootloader. Of course, both these are optional. + This package contains the Linux kernel for version @version@-powerpc. + It is intended to be run on single-processor PowerPC machines, + including all G3 and G4 models by Apple, as well as older PowerMacs. + +Package: kernel-build-@version@-powerpc-smp +Architecture: powerpc +Depends: kernel-headers-@version@-powerpc +Description: build infrastructure for kernel version @version@-powerpc-smp . - Kernel image packages are generally produced using kernel-package, - and it is suggested that you install that package if you wish to - create a custom kernel from the sources. + Together with kernel-headers-@version@-powerpc, this package provides the + infrastructure for building additional modules for @version@-powerpc-smp. + +Package: kernel-image-@version@-powerpc-smp +Section: base +Architecture: powerpc +Depends: initrd-tools (>= 0.1.65), module-init-tools, mkvmlinuz +Recommends: hotplug +Provides: kernel-image, kernel-image-2.6 +Description: Linux kernel image for @version@-powerpc-smp + . + This package contains the Linux kernel for version @version@-powerpc-smp. + It is intended to be run on most dual-processor PowerPC machines, + most notably the Dual G4 PowerMacs by Apple.