[RFC][PATCH] Move from kernel-image-*-di package name to linux-image-*-di
From: Otavio Salvador <otavio@ossystems.com.br>
To follow the linux kernel package name scheme the Debian Installer
linux kernel package had to change its name to linux-image-*-di.
The installer pkg-lists has been change to use those new packages and
also the building system to ignore them while selecting the standard
packages.
Affected packages:
- kernel-wedge
- linux-kernel-di-alpha-2.6
- linux-kernel-di-amd64-2.6
- linux-kernel-di-arm-2.6
- linux-kernel-di-armel-2.6
- linux-kernel-di-hppa-2.6
- linux-kernel-di-i386-2.6
- linux-kernel-di-ia64-2.6
- linux-kernel-di-m68k-2.6
- linux-kernel-di-mips-2.6
- linux-kernel-di-mipsel-2.6
- linux-kernel-di-powerpc-2.6
- linux-kernel-di-s390-2.6
- linux-kernel-di-sparc-2.6
P.S.: No changelog entries has been include yet. It'll be done before
commiting it depending of the comments from the mailing list.
---
installer/build/Makefile | 1
installer/build/pkg-lists/kernel | 2
.../kernel/kernel-wedge/commands/install-files | 20 ++--
packages/kernel/kernel-wedge/debian/changelog | 1
packages/kernel/kernel-wedge/package-list | 116 ++++++++++----------
.../kernel/linux-kernel-di-alpha-2.6/package-list | 8 +-
.../kernel/linux-kernel-di-amd64-2.6/package-list | 16 ++-
.../kernel/linux-kernel-di-arm-2.6/package-list | 4 -
.../kernel/linux-kernel-di-armel-2.6/package-list | 2
.../kernel/linux-kernel-di-hppa-2.6/package-list | 2
.../kernel/linux-kernel-di-i386-2.6/package-list | 12 +-
.../kernel/linux-kernel-di-ia64-2.6/package-list | 12 +-
.../kernel/linux-kernel-di-m68k-2.6/package-list | 2
.../kernel/linux-kernel-di-mips-2.6/package-list | 2
.../kernel/linux-kernel-di-mipsel-2.6/package-list | 2
.../modules/powerpc-powerpc-miboot/kernel-image | 2
.../modules/powerpc-powerpc64/kernel-image | 2
.../modules/ppc64/kernel-image | 2
.../linux-kernel-di-powerpc-2.6/package-list | 24 ++---
.../kernel/linux-kernel-di-s390-2.6/package-list | 4 -
.../kernel/linux-kernel-di-sparc-2.6/package-list | 4 -
21 files changed, 121 insertions(+), 119 deletions(-)
diff --git a/installer/build/Makefile b/installer/build/Makefile
index 39ef42c..904c541 100644
--- a/installer/build/Makefile
+++ b/installer/build/Makefile
@@ -713,6 +713,7 @@ pkg-lists/standard-udebs:
grep-dctrl -FPriority -e 'required|standard|important' \
-sPackage apt.udeb/state/lists/*_Packages* | \
grep -v kernel-image | grep -v -- -modules | \
+ grep -v linux-image | grep -v -- -modules | \
cut -d " " -f 2 > $@
# Get a list of all kernel modules matching the kernel version.
diff --git a/installer/build/pkg-lists/kernel b/installer/build/pkg-lists/kernel
index 0f106b7..d173a6a 100644
--- a/installer/build/pkg-lists/kernel
+++ b/installer/build/pkg-lists/kernel
@@ -1,3 +1,3 @@
# Just the kernel of right version. Included on all images that are
# bootable.
-kernel-image-${kernel:Version}
+linux-image-${kernel:Version}
diff --git a/packages/kernel/kernel-wedge/commands/install-files b/packages/kernel/kernel-wedge/commands/install-files
index bb13a17..001db44 100755
--- a/packages/kernel/kernel-wedge/commands/install-files
+++ b/packages/kernel/kernel-wedge/commands/install-files
@@ -50,49 +50,49 @@ while (<KVERS>) {
$modlistdir="modules/$arch";
}
- if (! -e "$modlistdir/kernel-image") {
+ if (! -e "$modlistdir/linux-image") {
# copy no kernel
}
elsif (-e "$sourcedir/boot/vmlinux-$installedname") {
doit("install", "-D", "-m", 644,
"$sourcedir/boot/vmlinux-$installedname",
- "debian/kernel-image-$kernelversion-$flavour-di/boot/vmlinux$extraname");
+ "debian/linux-image-$kernelversion-$flavour-di/boot/vmlinux$extraname");
}
elsif (-e "$sourcedir/boot/vmlinuz-$installedname") {
doit("install", "-D", "-m", 644,
"$sourcedir/boot/vmlinuz-$installedname",
- "debian/kernel-image-$kernelversion-$flavour-di/boot/vmlinuz$extraname");
+ "debian/linux-image-$kernelversion-$flavour-di/boot/vmlinuz$extraname");
}
elsif (-e "$sourcedir/boot/kfreebsd-$installedname.gz") {
doit("install", "-D", "-m", 644,
"$sourcedir/boot/kfreebsd-$installedname.gz",
- "debian/kernel-image-$kernelversion-$flavour-di/boot/kfreebsd$extraname.gz");
+ "debian/linux-image-$kernelversion-$flavour-di/boot/kfreebsd$extraname.gz");
}
else {
die "could not find kernel image";
}
doit("install", "-D", "-m", 644,
"$sourcedir/boot/System.map-$installedname",
- "debian/kernel-image-$kernelversion-$flavour-di/boot/System.map$extraname")
+ "debian/linux-image-$kernelversion-$flavour-di/boot/System.map$extraname")
if -e "$sourcedir/boot/System.map-$installedname" &&
- -e "$modlistdir/kernel-image";
+ -e "$modlistdir/linux-image";
# Include extra files to help the d-i build process build kernels
# for certain subarchitectures. This is powerpc-specific at the
# moment.
my $libdir;
- if (-d "$sourcedir/usr/lib/kernel-image-$kernelversion-$flavour") {
- $libdir = "kernel-image";
+ if (-d "$sourcedir/usr/lib/linux-image-$kernelversion-$flavour") {
+ $libdir = "linux-image";
} elsif (-d "$sourcedir/usr/lib/linux-image-$kernelversion-$flavour") {
$libdir = "linux-image";
}
if (defined $libdir) {
doit("install", "-d",
- "debian/kernel-image-$kernelversion-$flavour-di/usr/lib");
+ "debian/linux-image-$kernelversion-$flavour-di/usr/lib");
doit("cp", "-a",
"$sourcedir/usr/lib/$libdir-$kernelversion-$flavour",
- "debian/kernel-image-$kernelversion-$flavour-di/usr/lib/$libdir-$installedname");
+ "debian/linux-image-$kernelversion-$flavour-di/usr/lib/$libdir-$installedname");
}
doit("kernel-wedge", "copy-modules", $kernelversion, $flavour, $installedname);
diff --git a/packages/kernel/kernel-wedge/debian/changelog b/packages/kernel/kernel-wedge/debian/changelog
index 644a70a..3b7e64d 100644
--- a/packages/kernel/kernel-wedge/debian/changelog
+++ b/packages/kernel/kernel-wedge/debian/changelog
@@ -14,6 +14,7 @@ kernel-wedge (2.38) UNRELEASED; urgency=low
[ Otavio Salvador ]
* Add squashfs-modules definition.
+ * Move from kernel-image to linux-image package name.
-- Otavio Salvador <otavio@ossystems.com.br> Mon, 18 Jun 2007 16:18:30 -0300
diff --git a/packages/kernel/kernel-wedge/package-list b/packages/kernel/kernel-wedge/package-list
index 69b8ff3..c26d30d 100644
--- a/packages/kernel/kernel-wedge/package-list
+++ b/packages/kernel/kernel-wedge/package-list
@@ -2,7 +2,7 @@
# "-di" are appended to the package names. Section can be left out. So can
# architecture, which is derived from the files in the modules directory.
#
-Package: kernel-image
+Package: linux-image
Priority: extra
Description: Linux kernel binary image for the Debian installer
This package contains the Linux kernel image for the Debian installer
@@ -10,56 +10,56 @@ Description: Linux kernel binary image for the Debian installer
Debian system.
Package: nic-modules
-Depends: kernel-image, nic-shared-modules, core-modules
+Depends: linux-image, nic-shared-modules, core-modules
Priority: standard
Description: Common NIC drivers
This package contains common NIC drivers for the Linux kernel.
Package: nic-extra-modules
-Depends: kernel-image, isa-pnp-modules, nic-shared-modules, core-modules
+Depends: linux-image, isa-pnp-modules, nic-shared-modules, core-modules
Priority: standard
Description: Rare NIC drivers
This package contains rare NIC drivers for the Linux kernel.
Package: nic-wireless-modules
-Depends: kernel-image, nic-shared-modules, core-modules
+Depends: linux-image, nic-shared-modules, core-modules
Priority: standard
Description: Wireless NIC drivers
This package contains wireless NIC drivers for the Linux kernel.
Package: nic-shared-modules
-Depends: kernel-image
+Depends: linux-image
Priority: standard
Description: Shared NIC drivers
This package contains NIC drivers needed by combinations of nic-modules,
nic-extra-modules, nic-pcmcia-modules, and nic-wireless-modules.
Package: serial-modules
-Depends: kernel-image, pcmcia-modules
+Depends: linux-image, pcmcia-modules
Priority: optional
Description: Serial drivers
This package contains serial drivers for the Linux kernel.
Package: usb-serial-modules
-Depends: kernel-image, usb-modules
+Depends: linux-image, usb-modules
Priority: optional
Description: USB serial drivers
This package contains USB serial drivers for the Linux kernel.
Package: ppp-modules
-Depends: serial-modules, kernel-image
+Depends: serial-modules, linux-image
Priority: optional
Description: PPP drivers
This package contains PPP drivers for the Linux kernel.
Package: isa-pnp-modules
-Depends: kernel-image
+Depends: linux-image
Priority: standard
Description: isa-pnp drivers
This package contains isa-pnp drivers for the Linux kernel.
Package: socket-modules
-Depends: kernel-image
+Depends: linux-image
Priority: extra
Description: Socket drivers
This package contains the packet socket driver, used by dhcp and other
@@ -67,55 +67,55 @@ Description: Socket drivers
domain socket driver.
Package: ide-modules
-Depends: kernel-image, ide-core-modules
+Depends: linux-image, ide-core-modules
Priority: standard
Description: IDE drivers
This package contains IDE drivers for the Linux kernel.
Package: pata-modules
-Depends: kernel-image, ata-modules
+Depends: linux-image, ata-modules
Priority: standard
Description: PATA drivers
This package contains PATA drivers for the Linux kernel.
Package: ide-core-modules
-Depends: kernel-image
+Depends: linux-image
Priority: standard
Description: IDE support
This package contains core IDE support for the Linux kernel.
Package: cdrom-core-modules
-Depends: kernel-image, scsi-core-modules, ide-modules
+Depends: linux-image, scsi-core-modules, ide-modules
Priority: standard
Description: CDROM support
This package contains core CDROM support for the Linux kernel.
Package: cdrom-modules
-Depends: ide-modules, cdrom-core-modules, kernel-image
+Depends: ide-modules, cdrom-core-modules, linux-image
Priority: optional
Description: Esoteric CDROM drivers
This package contains esoteric CDROM drivers for the Linux kernel.
Package: firewire-core-modules
-Depends: scsi-core-modules, kernel-image
+Depends: scsi-core-modules, linux-image
Priority: standard
Description: Core FireWire drivers
This package contains core FireWire drivers for the Linux kernel.
Package: scsi-core-modules
-Depends: kernel-image
+Depends: linux-image
Priority: standard
Description: Core SCSI subsystem
This package contains the core SCSI subsystem for the Linux kernel.
Package: scsi-modules
-Depends: kernel-image, isa-pnp-modules, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules, ata-modules
+Depends: linux-image, isa-pnp-modules, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules, ata-modules
Priority: standard
Description: SCSI drivers
This package contains SCSI drivers for the Linux kernel.
Package: scsi-common-modules
-Depends: kernel-image, isa-pnp-modules, scsi-core-modules, cdrom-core-modules
+Depends: linux-image, isa-pnp-modules, scsi-core-modules, cdrom-core-modules
Priority: standard
Description: Very common SCSI drivers
This package contains very common SCSI drivers for the Linux kernel.
@@ -129,115 +129,115 @@ Description: Uncommon SCSI drivers
controllers.
Package: plip-modules
-Depends: kernel-image, parport-modules
+Depends: linux-image, parport-modules
Priority: optional
Description: PLIP drivers
This package contains PLIP drivers for the Linux kernel.
Package: floppy-modules
-Depends: kernel-image
+Depends: linux-image
Priority: standard
Description: Floppy driver
This package contains the floppy driver for the Linux kernel.
Package: loop-modules
-Depends: kernel-image
+Depends: linux-image
Priority: standard
Description: Loopback filesystem support
This package contains loopback filesystem support for the Linux kernel.
Package: ipv6-modules
-Depends: kernel-image
+Depends: linux-image
Priority: extra
Description: IPv6 driver
This package contains the IPv6 driver for the Linux kernel.
Package: ext2-modules
-Depends: kernel-image
+Depends: linux-image
Priority: standard
Description: EXT2 filesystem support
This package contains the EXT2 filesystem module for the Linux kernel.
Package: ext3-modules
-Depends: kernel-image
+Depends: linux-image
Priority: standard
Description: EXT3 filesystem support
This package contains the EXT3 filesystem module for the Linux kernel.
Package: jfs-modules
-Depends: kernel-image
+Depends: linux-image
Priority: standard
Description: JFS filesystem support
This package contains the JFS filesystem module for the Linux kernel.
Package: ntfs-modules
-Depends: kernel-image
+Depends: linux-image
Priority: extra
Description: NTFS filesystem support
This package contains the NTFS file system module for the Linux kernel.
Package: reiserfs-modules
-Depends: kernel-image
+Depends: linux-image
Priority: standard
Description: Reiser filesystem support
This package contains the Reiser filesystem module for the Linux kernel.
Package: xfs-modules
-Depends: kernel-image
+Depends: linux-image
Priority: standard
Description: XFS filesystem support
This package contains the XFS filesystem module for the Linux kernel.
Package: fat-modules
-Depends: kernel-image
+Depends: linux-image
Priority: extra
Description: FAT filesystem support
This package contains the FAT and VFAT filesystem modules for the Linux kernel.
Package: hfs-modules
-Depends: kernel-image
+Depends: linux-image
Priority: extra
Description: HFS filesystem support
This package contains the HFS and HFS+ filesystem modules for the Linux kernel.
Package: affs-modules
-Depends: kernel-image
+Depends: linux-image
Priority: extra
Description: Amiga filesystem support
This package contains the Amiga filesystem module for the Linux kernel.
Package: ufs-modules
-Depends: kernel-image
+Depends: linux-image
Priority: extra
Description: UFS filesystem support
This package contains the UFS filesystem module for the Linux kernel.
Package: qnx4-modules
-Depends: kernel-image
+Depends: linux-image
Priority: extra
Description: QNX4 filesystem support
This package contains the QNX4 filesystem module for the Linux kernel.
Package: minix-modules
-Depends: kernel-image
+Depends: linux-image
Priority: extra
Description: Minix filesystem support
This package contains the Minix filesystem module for the Linux kernel.
Package: nfs-modules
-Depends: kernel-image
+Depends: linux-image
Priority: extra
Description: NFS filesystem support
This package contains the NFS filesystem module for the Linux kernel.
Package: md-modules
-Depends: kernel-image
+Depends: linux-image
Priority: extra
Description: RAID and LVM support
This package contains RAID and LVM modules for the Linux kernel.
Package: usb-modules
-Depends: kernel-image
+Depends: linux-image
Priority: extra
Description: USB support
This package contains core USB drivers for the Linux kernel.
@@ -249,124 +249,124 @@ Description: USB storage support
This package contains the USB storage driver for the Linux kernel.
Package: pcmcia-storage-modules
-Depends: kernel-image, ide-core-modules, cdrom-core-modules, pcmcia-modules, ata-modules
+Depends: linux-image, ide-core-modules, cdrom-core-modules, pcmcia-modules, ata-modules
Priority: standard
Description: PCMCIA storage drivers
This package contains PCMCIA storage drivers for the Linux kernel.
Package: brltty-modules
-Depends: kernel-image, usb-modules
+Depends: linux-image, usb-modules
Priority: extra
Description: Braille support
This package contains Braille drivers for the Linux kernel.
Package: fb-modules
-Depends: kernel-image
+Depends: linux-image
Priority: extra
Description: Frame buffer support
This package contains Frame buffer drivers for the Linux kernel.
Package: input-modules
-Depends: kernel-image, usb-modules
+Depends: linux-image, usb-modules
Priority: extra
Description: Input devices support
This package contains input device drivers for the Linux kernel.
Package: mouse-modules
-Depends: kernel-image, input-modules, usb-modules
+Depends: linux-image, input-modules, usb-modules
Priority: extra
Description: Mouse support
This package contains mouse drivers for the Linux kernel.
Package: irda-modules
-Depends: kernel-image, ppp-modules, usb-modules
+Depends: linux-image, ppp-modules, usb-modules
Priority: extra
Description: Infrared devices support
This package contains infrared device drivers for the Linux kernel.
Package: parport-modules
-Depends: kernel-image
+Depends: linux-image
Priority: extra
Description: Parallel port support
This package contains parallel port drivers for the Linux kernel.
Package: nic-pcmcia-modules
-Depends: kernel-image, nic-shared-modules, nic-wireless-modules, pcmcia-modules
+Depends: linux-image, nic-shared-modules, nic-wireless-modules, pcmcia-modules
Priority: standard
Description: Common PCMCIA NIC drivers
This package contains common PCMCIA NIC drivers for the Linux kernel.
Package: pcmcia-modules
-Depends: kernel-image, isa-pnp-modules
+Depends: linux-image, isa-pnp-modules
Priority: standard
Description: Common PCMCIA drivers
This package contains common PCMCIA drivers for the Linux kernel.
Package: nic-usb-modules
-Depends: kernel-image, nic-shared-modules, nic-wireless-modules, usb-modules, core-modules
+Depends: linux-image, nic-shared-modules, nic-wireless-modules, usb-modules, core-modules
Priority: standard
Description: USB NIC drivers
This package contains USB network adapter drivers for the Linux kernel.
Package: sata-modules
-Depends: kernel-image, scsi-core-modules, ata-modules
+Depends: linux-image, scsi-core-modules, ata-modules
Priority: standard
Description: SATA drivers
This package contains SATA drivers for the Linux kernel.
Package: core-modules
-Depends: kernel-image
+Depends: linux-image
Priority: standard
Description: Core modules
This package contains core modules for the kernel, that will almost
always be needed.
Package: acpi-modules
-Depends: kernel-image
+Depends: linux-image
Priority: extra
Description: ACPI support modules
This package contains linux kernel modules for ACPI.
Package: crc-modules
-Depends: kernel-image
+Depends: linux-image
Priority: extra
Description: CRC modules
This package contains CRC support modules.
Package: crypto-modules
-Depends: kernel-image
+Depends: linux-image
Priority: extra
Description: crypto modules
This package contains crypto modules.
Package: efi-modules
-Depends: kernel-image
+Depends: linux-image
Priority: extra
Description: EFI modules
This package contains EFI modules.
Package: ata-modules
-Depends: kernel-image, scsi-core-modules
+Depends: linux-image, scsi-core-modules
Priority: extra
Description: ATA disk modules.
This package contains core ATA disk modules used by both PATA and SATA
disk drivers.
Package: nbd-modules
-Depends: kernel-image
+Depends: linux-image
Priority: extra
Description: Network Block Device modules.
This package contains the modules required for support of the Network Block
Device
Package: loop-aes-modules
-Depends: kernel-image!
+Depends: linux-image!
Priority: extra
Description: loop-AES crypto modules
This package contains loop-AES crypto modules.
Package: squashfs-modules
-Depends: kernel-image!
+Depends: linux-image!
Priority: extra
Description: squashfs modules
This package contains squashfs modules.
diff --git a/packages/kernel/linux-kernel-di-alpha-2.6/package-list b/packages/kernel/linux-kernel-di-alpha-2.6/package-list
index 07ecff8..7e0f8ad 100644
--- a/packages/kernel/linux-kernel-di-alpha-2.6/package-list
+++ b/packages/kernel/linux-kernel-di-alpha-2.6/package-list
@@ -3,24 +3,24 @@
# architecture, which is derived from the files in the modules directory.
# It overwrites specifications from /usr/share/kernel-wedge/package-list.
#
-Package: kernel-image
+Package: linux-image
Provides: ext2-modules
Package: srm-modules
-Depends: kernel-image
+Depends: linux-image
Priority: standard
Description: SRM environment driver
This package contains the SRM environment driver for the Alpha Linux
kernel.
Package: fb-modules
-Depends: kernel-image, crc-modules, core-modules
+Depends: linux-image, crc-modules, core-modules
Priority: extra
Description: Frame buffer support
This package contains Frame buffer drivers for the Linux kernel.
Package: nic-shared-modules
-Depends: kernel-image, crc-modules, core-modules
+Depends: linux-image, crc-modules, core-modules
Priority: standard
Description: Shared NIC drivers
This package contains NIC drivers needed by combinations of nic-modules,
diff --git a/packages/kernel/linux-kernel-di-amd64-2.6/package-list b/packages/kernel/linux-kernel-di-amd64-2.6/package-list
index 8ee9c3d..ed9385a 100644
--- a/packages/kernel/linux-kernel-di-amd64-2.6/package-list
+++ b/packages/kernel/linux-kernel-di-amd64-2.6/package-list
@@ -3,28 +3,28 @@
# architecture, which is derived from the files in the modules directory.
# It overwrites specifications from /usr/share/kernel-wedge/package-list.
#
-Package: kernel-image
+Package: linux-image
Package: fat-modules
Priority: standard
Package: nic-modules
-Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules
+Depends: linux-image, nic-shared-modules, core-modules, firewire-core-modules
Package: scsi-modules
-Depends: kernel-image, scsi-core-modules, scsi-common-modules, parport-modules, cdrom-core-modules, core-modules
+Depends: linux-image, scsi-core-modules, scsi-common-modules, parport-modules, cdrom-core-modules, core-modules
Package: nic-extra-modules
-Depends: kernel-image, nic-shared-modules, core-modules, crc-modules
+Depends: linux-image, nic-shared-modules, core-modules, crc-modules
Package: ppp-modules
-Depends: serial-modules, kernel-image, crc-modules
+Depends: serial-modules, linux-image, crc-modules
Package: pcmcia-modules
-Depends: kernel-image, core-modules
+Depends: linux-image, core-modules
Package: ext2-modules
-Depends: kernel-image, core-modules
+Depends: linux-image, core-modules
Package: ext3-modules
-Depends: kernel-image, core-modules
+Depends: linux-image, core-modules
diff --git a/packages/kernel/linux-kernel-di-arm-2.6/package-list b/packages/kernel/linux-kernel-di-arm-2.6/package-list
index a158749..f6a5fb5 100644
--- a/packages/kernel/linux-kernel-di-arm-2.6/package-list
+++ b/packages/kernel/linux-kernel-di-arm-2.6/package-list
@@ -3,11 +3,11 @@
# architecture, which is derived from the files in the modules directory.
# It overwrites specifications from /usr/share/kernel-wedge/package-list.
#
-Package: kernel-image
+Package: linux-image
Provides_footbridge: ext2-modules, ext3-modules, socket-modules, ide-core-modules, parport-modules
Provides_iop32x: socket-modules
Provides_ixp4xx: socket-modules
Package: nic-modules
-Depends: kernel-image, core-modules
+Depends: linux-image, core-modules
diff --git a/packages/kernel/linux-kernel-di-armel-2.6/package-list b/packages/kernel/linux-kernel-di-armel-2.6/package-list
index 9cc40e5..3522329 100644
--- a/packages/kernel/linux-kernel-di-armel-2.6/package-list
+++ b/packages/kernel/linux-kernel-di-armel-2.6/package-list
@@ -3,6 +3,6 @@
# architecture, which is derived from the files in the modules directory.
# It overwrites specifications from /usr/share/kernel-wedge/package-list.
#
-Package: kernel-image
+Package: linux-image
Provides_iop32x: socket-modules
Provides_ixp4xx: socket-modules
diff --git a/packages/kernel/linux-kernel-di-hppa-2.6/package-list b/packages/kernel/linux-kernel-di-hppa-2.6/package-list
index 481b3bd..97a759c 100644
--- a/packages/kernel/linux-kernel-di-hppa-2.6/package-list
+++ b/packages/kernel/linux-kernel-di-hppa-2.6/package-list
@@ -3,7 +3,7 @@
# architecture, which is derived from the files in the modules directory.
# It overwrites specifications from /usr/share/kernel-wedge/package-list.
#
-Package: kernel-image
+Package: linux-image
Provides: ext2-modules
Package: usb-storage-modules
diff --git a/packages/kernel/linux-kernel-di-i386-2.6/package-list b/packages/kernel/linux-kernel-di-i386-2.6/package-list
index c02b920..e2e1242 100644
--- a/packages/kernel/linux-kernel-di-i386-2.6/package-list
+++ b/packages/kernel/linux-kernel-di-i386-2.6/package-list
@@ -3,23 +3,23 @@
# architecture, which is derived from the files in the modules directory.
# It overwrites specifications from /usr/share/kernel-wedge/package-list.
#
-Package: kernel-image
+Package: linux-image
Provides: ext2-modules
Package: fat-modules
Priority: standard
Package: nic-modules
-Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules
+Depends: linux-image, nic-shared-modules, core-modules, firewire-core-modules
Package: scsi-modules
-Depends: kernel-image, isa-pnp-modules, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules
+Depends: linux-image, isa-pnp-modules, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules
Package: nic-extra-modules
-Depends: kernel-image, isa-pnp-modules, nic-shared-modules, core-modules, crc-modules
+Depends: linux-image, isa-pnp-modules, nic-shared-modules, core-modules, crc-modules
Package: ppp-modules
-Depends: serial-modules, kernel-image, crc-modules
+Depends: serial-modules, linux-image, crc-modules
Package: pcmcia-modules
-Depends: kernel-image, isa-pnp-modules, core-modules
+Depends: linux-image, isa-pnp-modules, core-modules
diff --git a/packages/kernel/linux-kernel-di-ia64-2.6/package-list b/packages/kernel/linux-kernel-di-ia64-2.6/package-list
index de21acb..7ad5d25 100644
--- a/packages/kernel/linux-kernel-di-ia64-2.6/package-list
+++ b/packages/kernel/linux-kernel-di-ia64-2.6/package-list
@@ -7,10 +7,10 @@ Package: fat-modules
Priority: standard
Package: ide-modules
-Depends: kernel-image, ide-core-modules, sn-modules
+Depends: linux-image, ide-core-modules, sn-modules
Package: nic-modules
-Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules, crc-modules
+Depends: linux-image, nic-shared-modules, core-modules, firewire-core-modules, crc-modules
Package: nic-usb-modules
Depends: core-modules
@@ -19,19 +19,19 @@ Package: pcmcia-modules
Depends: core-modules
Package: ppp-modules
-Depends: serial-modules, kernel-image, crc-modules
+Depends: serial-modules, linux-image, crc-modules
Package: sata-modules
Depends: ata-modules
Package: scsi-modules
-Depends: kernel-image, isa-pnp-modules, ata-modules, parport-modules, cdrom-core-modules, core-modules
+Depends: linux-image, isa-pnp-modules, ata-modules, parport-modules, cdrom-core-modules, core-modules
Package: serial-modules
-Depends: kernel-image, pcmcia-modules, sn-modules
+Depends: linux-image, pcmcia-modules, sn-modules
Package: sn-modules
-Depends: kernel-image
+Depends: linux-image
Priority: extra
Description: SN modules
This package contains SN modules for Altix systems
diff --git a/packages/kernel/linux-kernel-di-m68k-2.6/package-list b/packages/kernel/linux-kernel-di-m68k-2.6/package-list
index f944396..4cabf00 100644
--- a/packages/kernel/linux-kernel-di-m68k-2.6/package-list
+++ b/packages/kernel/linux-kernel-di-m68k-2.6/package-list
@@ -3,6 +3,6 @@
# architecture, which is derived from the files in the modules directory.
# It overwrites specifications from /usr/share/kernel-wedge/package-list.
#
-Package: kernel-image
+Package: linux-image
Provides: loop-modules, ext2-modules, ext3-modules
Provides_mac: loop-modules, ext2-modules, ext3-modules, jfs-modules, reiserfs-modules
diff --git a/packages/kernel/linux-kernel-di-mips-2.6/package-list b/packages/kernel/linux-kernel-di-mips-2.6/package-list
index d4e5e9c..6392860 100644
--- a/packages/kernel/linux-kernel-di-mips-2.6/package-list
+++ b/packages/kernel/linux-kernel-di-mips-2.6/package-list
@@ -3,7 +3,7 @@
# architecture, which is derived from the files in the modules directory.
# It overwrites specifications from /usr/share/kernel-wedge/package-list.
#
-Package: kernel-image
+Package: linux-image
Provides: ext2-modules, ext3-modules, socket-modules
Provides_sb1-bcm91250a: ext2-modules, ext3-modules, ide-core-modules, socket-modules
Provides_sb1a-bcm91480b: ext2-modules, ext3-modules, socket-modules
diff --git a/packages/kernel/linux-kernel-di-mipsel-2.6/package-list b/packages/kernel/linux-kernel-di-mipsel-2.6/package-list
index 84c83e5..3f0daf9 100644
--- a/packages/kernel/linux-kernel-di-mipsel-2.6/package-list
+++ b/packages/kernel/linux-kernel-di-mipsel-2.6/package-list
@@ -3,7 +3,7 @@
# architecture, which is derived from the files in the modules directory.
# It overwrites specifications from /usr/share/kernel-wedge/package-list.
#
-Package: kernel-image
+Package: linux-image
Provides: ext2-modules, ext3-modules, socket-modules
Provides_r5k-cobalt: ext2-modules, ext3-modules, ide-core-modules, socket-modules
Provides_sb1-bcm91250a: ext2-modules, ext3-modules, ide-core-modules, socket-modules
diff --git a/packages/kernel/linux-kernel-di-powerpc-2.6/modules/powerpc-powerpc-miboot/kernel-image b/packages/kernel/linux-kernel-di-powerpc-2.6/modules/powerpc-powerpc-miboot/kernel-image
index a0b7d0c..b1498e7 100644
--- a/packages/kernel/linux-kernel-di-powerpc-2.6/modules/powerpc-powerpc-miboot/kernel-image
+++ b/packages/kernel/linux-kernel-di-powerpc-2.6/modules/powerpc-powerpc-miboot/kernel-image
@@ -1 +1 @@
-#include "../powerpc/kernel-image"
+#include "../powerpc/linux-image"
diff --git a/packages/kernel/linux-kernel-di-powerpc-2.6/modules/powerpc-powerpc64/kernel-image b/packages/kernel/linux-kernel-di-powerpc-2.6/modules/powerpc-powerpc64/kernel-image
index a0b7d0c..b1498e7 100644
--- a/packages/kernel/linux-kernel-di-powerpc-2.6/modules/powerpc-powerpc64/kernel-image
+++ b/packages/kernel/linux-kernel-di-powerpc-2.6/modules/powerpc-powerpc64/kernel-image
@@ -1 +1 @@
-#include "../powerpc/kernel-image"
+#include "../powerpc/linux-image"
diff --git a/packages/kernel/linux-kernel-di-powerpc-2.6/modules/ppc64/kernel-image b/packages/kernel/linux-kernel-di-powerpc-2.6/modules/ppc64/kernel-image
index 9095d8c..fbb000e 100644
--- a/packages/kernel/linux-kernel-di-powerpc-2.6/modules/ppc64/kernel-image
+++ b/packages/kernel/linux-kernel-di-powerpc-2.6/modules/ppc64/kernel-image
@@ -1 +1 @@
-#include "../powerpc-powerpc64/kernel-image"
+#include "../powerpc-powerpc64/linux-image"
diff --git a/packages/kernel/linux-kernel-di-powerpc-2.6/package-list b/packages/kernel/linux-kernel-di-powerpc-2.6/package-list
index c2d13ff..6da407e 100644
--- a/packages/kernel/linux-kernel-di-powerpc-2.6/package-list
+++ b/packages/kernel/linux-kernel-di-powerpc-2.6/package-list
@@ -4,51 +4,51 @@
# It overwrites specifications from /usr/share/kernel-wedge/package-list.
#
Package: fs-common-modules
-Depends: kernel-image
+Depends: linux-image
Priority: standard
Description: Common filesystem support
This package contains drivers common to several filesystem modules.
Package: ext2-modules
-Depends: kernel-image, fs-common-modules
+Depends: linux-image, fs-common-modules
Package: ext3-modules
-Depends: kernel-image, fs-common-modules
+Depends: linux-image, fs-common-modules
Package: fat-modules
-Depends: kernel-image, fs-common-modules
+Depends: linux-image, fs-common-modules
Package: hfs-modules
-Depends: kernel-image, fs-common-modules
+Depends: linux-image, fs-common-modules
# due to isofs
Package: ide-modules
-Depends: kernel-image, ide-core-modules, fs-common-modules
+Depends: linux-image, ide-core-modules, fs-common-modules
Package: jfs-modules
-Depends: kernel-image, fs-common-modules
+Depends: linux-image, fs-common-modules
Package: nic-modules
-Depends: kernel-image, nic-shared-modules, core-modules, firewire-core-modules
+Depends: linux-image, nic-shared-modules, core-modules, firewire-core-modules
Package: nic-extra-modules
-Depends: kernel-image, isa-pnp-modules, nic-shared-modules, core-modules
+Depends: linux-image, isa-pnp-modules, nic-shared-modules, core-modules
Package: scsi-modules
-Depends: kernel-image, isa-pnp-modules, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules
+Depends: linux-image, isa-pnp-modules, scsi-core-modules, parport-modules, cdrom-core-modules, core-modules
Package: pcmcia-modules
Depends: core-modules
Package: hypervisor-modules
-Depends: kernel-image
+Depends: linux-image
Priority: standard
Description: IBM 64bit hypervisor console modules
Contains drivers for the hypervisor console, used as console for linux
running in logical partitions of IBM hardware supporting it.
Package: fancontrol-modules
-Depends: kernel-image
+Depends: linux-image
Priority: standard
Description: Apple powermac fancontrol modules
Contains drivers for macintosh i2c bus as well as for the monitoring devices
diff --git a/packages/kernel/linux-kernel-di-s390-2.6/package-list b/packages/kernel/linux-kernel-di-s390-2.6/package-list
index 9548847..51c2700 100644
--- a/packages/kernel/linux-kernel-di-s390-2.6/package-list
+++ b/packages/kernel/linux-kernel-di-s390-2.6/package-list
@@ -3,11 +3,11 @@
# architecture, which is derived from the files in the modules directory.
# It overwrites specifications from /usr/share/kernel-wedge/package-list.
#
-Package: kernel-image
+Package: linux-image
Provides: ext2-modules, ext3-modules
Package: dasd-modules
-Depends: kernel-image
+Depends: linux-image
Priority: standard
Description: dasd modules
This package contains dasd modules.
diff --git a/packages/kernel/linux-kernel-di-sparc-2.6/package-list b/packages/kernel/linux-kernel-di-sparc-2.6/package-list
index 22957d0..94fc2f5 100644
--- a/packages/kernel/linux-kernel-di-sparc-2.6/package-list
+++ b/packages/kernel/linux-kernel-di-sparc-2.6/package-list
@@ -3,7 +3,7 @@
# architecture, which is derived from the files in the modules directory.
# It overwrites specifications from /usr/share/kernel-wedge/package-list.
#
-Package: kernel-image
+Package: linux-image
Provides_sparc64: ext2-modules
Provides_sparc32: ext2-modules
@@ -15,4 +15,4 @@ Description: Network card modules for Sparc kernels
systems, as well as various PCI NIC drivers (only on sparc64.)
.
Do not install this package on a real Debian system! You probably
- want a kernel-image package instead.
+ want a linux-image package instead.
Reply to: