[PATCH RFC] Remove KERNELMAJOR feature
Historically the KERNELMAJOR feature allows to build the same images for
two different kernels, for example 2.4 and 2.6 kernel. This is not used
anymore, but KERNELMAJOR still has to be defined, otherwise the
arguments to pkg-list are shift by one, causing the build to fail. Thus
depending on the architecture, KERNELMAJOR is defined to random values
like 2.4, 2.6 or 3.11.
Note also that kfreebsd is building the images for both kernel 9 and 10,
but for that uses different configuration files.
It is therefore probably a good idea to remove KERNELMAJOR support,
which is what the current patches does.
---
build/Makefile | 2 +-
build/README | 7 +------
build/config/alpha.cfg | 1 -
build/config/amd64.cfg | 1 -
build/config/armel.cfg | 1 -
build/config/armhf.cfg | 1 -
build/config/hppa.cfg | 1 -
build/config/hurd-i386.cfg | 3 +--
build/config/i386.cfg | 1 -
build/config/ia64.cfg | 1 -
build/config/kfreebsd-amd64.cfg | 1 -
build/config/kfreebsd-i386.cfg | 1 -
build/config/m68k.cfg | 1 -
build/config/mips.cfg | 1 -
build/config/mipsel.cfg | 1 -
build/config/powerpc.cfg | 28 ++++++++++------------------
build/config/powerpc/apus.cfg | 1 -
build/config/s390.cfg | 1 -
build/config/s390x.cfg | 1 -
build/config/sh4.cfg | 1 -
build/config/sparc.cfg | 1 -
build/config/sparc64.cfg | 1 -
build/util/pkg-list | 10 ++--------
23 files changed, 15 insertions(+), 53 deletions(-)
diff --git a/build/Makefile b/build/Makefile
index deb00a4..8359097 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -607,7 +607,7 @@ endif
# Get the list of udebs to install.
# HACK Alert: pkg-lists/ is still sorted by TYPE instead of a dir hierarchy.
-UDEBS = $(shell set -e; get-packages udeb update >&2; pkg-list $(TYPE) "$(DRIVER_FOR)" $(KERNEL_FLAVOUR) $(KERNELMAJOR) "$(SUBARCH)" $(KERNELIMAGEVERSION)) $(EXTRAS)
+UDEBS = $(shell set -e; get-packages udeb update >&2; pkg-list $(TYPE) "$(DRIVER_FOR)" $(KERNEL_FLAVOUR) "$(SUBARCH)" $(KERNELIMAGEVERSION)) $(EXTRAS)
# Get all required udebs and put them in UDEBDIR.
$(STAMPS)get_udebs-$(targetstring)-stamp: sources.list.udeb
diff --git a/build/README b/build/README
index 33f6f5b..d2753c9 100644
--- a/build/README
+++ b/build/README
@@ -147,8 +147,7 @@ like this:
SUBARCH_SUPPORTED = r4k-ip22 r5k-ip22 sb1-bcm91250a miniiso
-KERNELMAJOR = 2.4
-KERNELMINOR = 25
+KERNELVERSION = 3.12-1
KERNEL_FLAVOUR = di
KERNELIMAGEVERSION = $(KERNELVERSION)
KERNELNAME = $(foreach ver,$(KERNELVERSION),vmlinux-$(ver))
@@ -191,10 +190,6 @@ FLAVOUR_SUPPORTED
MEDIUM and FLAVOUR for every snippet they invoke that way.
At least one of them must be defined.
-KERNELMAJOR
- The high part of the kernel version, like "2.6". Unluckily, this is
- what the kernel people call MAJOR.MINOR.
-
KERNELVERSION
The version of the kernel .udeb package, like "2.4.26-r4k-ip22"
diff --git a/build/config/alpha.cfg b/build/config/alpha.cfg
index 523759e..26eeeb8 100644
--- a/build/config/alpha.cfg
+++ b/build/config/alpha.cfg
@@ -2,7 +2,6 @@ MEDIUM_SUPPORTED = cdrom netboot miniiso
# The version of the kernel to use.
KERNELVERSION = 2.6.30-2-alpha-generic
-KERNELMAJOR = 2.6
KERNEL_FLAVOUR = di
KERNELNAME = vmlinuz
KERNELIMAGEVERSION = $(KERNELVERSION)
diff --git a/build/config/amd64.cfg b/build/config/amd64.cfg
index 05d7bf9..ae0063f 100644
--- a/build/config/amd64.cfg
+++ b/build/config/amd64.cfg
@@ -3,7 +3,6 @@ MEDIUM_SUPPORTED_EXTRA = monolithic
# The version of the kernel to use.
KERNELVERSION = 3.12-1-amd64
-KERNELMAJOR = 2.6
KERNEL_FLAVOUR = di
KERNELNAME = vmlinuz
KERNELIMAGEVERSION = $(KERNELVERSION)
diff --git a/build/config/armel.cfg b/build/config/armel.cfg
index 9b505c7..032d361 100644
--- a/build/config/armel.cfg
+++ b/build/config/armel.cfg
@@ -1,6 +1,5 @@
SUBARCH_SUPPORTED = iop32x kirkwood orion5x versatile
-KERNELMAJOR = 2.6
KERNELVERSION = 3.12-1
KERNEL_FLAVOUR = di
KERNELIMAGEVERSION = $(KERNELVERSION)
diff --git a/build/config/armhf.cfg b/build/config/armhf.cfg
index d44d191..a2bf409 100644
--- a/build/config/armhf.cfg
+++ b/build/config/armhf.cfg
@@ -2,7 +2,6 @@ SUBARCH_SUPPORTED = armmp
MKLIBS = mklibs --ldlib=/lib/ld-linux-armhf.so.3
-KERNELMAJOR = 2.6
KERNELVERSION = 3.12-1
KERNEL_FLAVOUR = di
KERNELIMAGEVERSION = $(KERNELVERSION)
diff --git a/build/config/hppa.cfg b/build/config/hppa.cfg
index c3c8e57..bae2359 100644
--- a/build/config/hppa.cfg
+++ b/build/config/hppa.cfg
@@ -3,7 +3,6 @@ MEDIUM_SUPPORTED = cdrom netboot miniiso
KERNEL_FLAVOUR = di
BASEVERSION = 2.6.37-2
-KERNELMAJOR = 2.6
KERNELIMAGEVERSION = $(BASEVERSION)-parisc $(BASEVERSION)-parisc64
KERNELVERSION = $(foreach ver,${KERNELIMAGEVERSION},$(ver))
KERNELNAME = $(foreach ver,${KERNELVERSION},vmlinux-$(ver))
diff --git a/build/config/hurd-i386.cfg b/build/config/hurd-i386.cfg
index cf2d1bd..d4857ca 100644
--- a/build/config/hurd-i386.cfg
+++ b/build/config/hurd-i386.cfg
@@ -2,8 +2,7 @@ MEDIUM_SUPPORTED = cdrom cdrom-xen netboot netboot-gtk netboot-xen hd-media
MEDIUM_SUPPORTED_EXTRA = monolithic
# The version of the kernel to use.
-KERNELMAJOR = 1.3.99
-BASEVERSION = $(KERNELMAJOR)
+BASEVERSION = 1.3.99
KERNELVERSION = $(BASEVERSION)-486
KERNEL_FLAVOUR = di
KERNELNAME = gnumach.gz ext2fs.static ld.so.1
diff --git a/build/config/i386.cfg b/build/config/i386.cfg
index 70e4357..06fc72d 100644
--- a/build/config/i386.cfg
+++ b/build/config/i386.cfg
@@ -4,7 +4,6 @@ MEDIUM_SUPPORTED_EXTRA = monolithic
# The version of the kernel to use.
BASEVERSION = 3.12-1
KERNELVERSION = $(BASEVERSION)-486
-KERNELMAJOR = 2.6
KERNEL_FLAVOUR = di
KERNELNAME = vmlinuz
KERNELIMAGEVERSION = $(KERNELVERSION)
diff --git a/build/config/ia64.cfg b/build/config/ia64.cfg
index 51b73ed..0e357a2 100644
--- a/build/config/ia64.cfg
+++ b/build/config/ia64.cfg
@@ -4,7 +4,6 @@ FLOPPY_SIZE = 32768
MEDIUM_SUPPORTED = cdrom netboot
# The version of the kernel to use.
-KERNELMAJOR = 2.6
KERNELVERSION = 3.12-1-itanium
KERNEL_FLAVOUR = di
KERNELNAME = vmlinuz
diff --git a/build/config/kfreebsd-amd64.cfg b/build/config/kfreebsd-amd64.cfg
index 4844866..08f6860 100644
--- a/build/config/kfreebsd-amd64.cfg
+++ b/build/config/kfreebsd-amd64.cfg
@@ -7,7 +7,6 @@ MEDIUM_SUPPORTED_EXTRA += netboot-10 netboot-gtk-10 monolithic-10
# The version of the kernel to use.
KERNELVERSION_9 = 9.2-1-amd64
KERNELVERSION_10 = 10.0-0-amd64
-KERNELMAJOR = 9
KERNEL_FLAVOUR = di
KERNELIMAGEVERSION = $(KERNELVERSION)
diff --git a/build/config/kfreebsd-i386.cfg b/build/config/kfreebsd-i386.cfg
index deb93c5..7e63b2b 100644
--- a/build/config/kfreebsd-i386.cfg
+++ b/build/config/kfreebsd-i386.cfg
@@ -7,7 +7,6 @@ MEDIUM_SUPPORTED_EXTRA += netboot-10 monolithic-10
# The version of the kernel to use.
KERNELVERSION_9 = 9.2-1-486
KERNELVERSION_10 = 10.0-0-486
-KERNELMAJOR = 9
KERNEL_FLAVOUR = di
KERNELIMAGEVERSION = $(KERNELVERSION)
diff --git a/build/config/m68k.cfg b/build/config/m68k.cfg
index 46b93a7..44ac33c 100644
--- a/build/config/m68k.cfg
+++ b/build/config/m68k.cfg
@@ -10,7 +10,6 @@ M68K_KERNEL = $(M68K_KERNEL_AMIGA) $(M68K_KERNEL_ATARI) $(M68K_KERNEL_MAC)
KEYRING=/usr/share/keyrings/debian-ports-archive-keyring.gpg
-KERNELMAJOR = 3.12
KERNELVERSION = $(M68K_KERNEL)
KERNEL_FLAVOUR = di
KERNELIMAGEVERSION = $(KERNELVERSION)
diff --git a/build/config/mips.cfg b/build/config/mips.cfg
index dabb088..1a69032 100644
--- a/build/config/mips.cfg
+++ b/build/config/mips.cfg
@@ -1,6 +1,5 @@
SUBARCH_SUPPORTED = malta octeon r4k-ip22 r5k-ip32 sb1-bcm91250a miniiso
-KERNELMAJOR = 2.6
# Targets for 3.x kernel images will use this version instead.
KERNELVERSION = 3.12-1
KERNEL_FLAVOUR = di
diff --git a/build/config/mipsel.cfg b/build/config/mipsel.cfg
index 51ff56c..2b26bac 100644
--- a/build/config/mipsel.cfg
+++ b/build/config/mipsel.cfg
@@ -1,6 +1,5 @@
SUBARCH_SUPPORTED = malta sb1-bcm91250a loongson-2e loongson-2f
-KERNELMAJOR = 2.6
# Targets for 3.x kernel images will use this version instead.
KERNELVERSION = 3.12-1
KERNEL_FLAVOUR = di
diff --git a/build/config/powerpc.cfg b/build/config/powerpc.cfg
index cd2028e..4c18f87 100644
--- a/build/config/powerpc.cfg
+++ b/build/config/powerpc.cfg
@@ -1,28 +1,20 @@
SUBARCH_SUPPORTED = powerpc powerpc64 # apus prep
-KERNELMAJOR = 2.6
BASEVERSION = 3.12-1
# create the kernels with builtin initrd.
builtin_initrd: $(TEMP_KERNEL) $(TEMP_INITRD)
# temporary hack
- case $(KERNELMAJOR) in \
- 2.6) \
- for subarch in $(SUBARCHES); do \
- rm -f $(DEST)/vmlinuz-$$subarch.initrd; \
- mkvmlinuz -v \
- -a $$subarch \
- -r $(KERNELVERSION) \
- -k $(TEMP_KERNEL) \
- -z -i $(TEMP_INITRD) \
- -d $(TEMP)/lib \
- -o $(DEST)/vmlinuz-$$subarch.initrd; \
- done \
- ;; \
- *) \
- echo "Kernel $(KERNELMAJOR) not supported" \
- ;;\
- esac
+ for subarch in $(SUBARCHES); do \
+ rm -f $(DEST)/vmlinuz-$$subarch.initrd; \
+ mkvmlinuz -v \
+ -a $$subarch \
+ -r $(KERNELVERSION) \
+ -k $(TEMP_KERNEL) \
+ -z -i $(TEMP_INITRD) \
+ -d $(TEMP)/lib \
+ -o $(DEST)/vmlinuz-$$subarch.initrd; \
+ done
# cd content for powerpc, includes yaboot for booting
# apple powerpc (newworld) computers
diff --git a/build/config/powerpc/apus.cfg b/build/config/powerpc/apus.cfg
index f804a7c..bc3dc4f 100644
--- a/build/config/powerpc/apus.cfg
+++ b/build/config/powerpc/apus.cfg
@@ -1,7 +1,6 @@
MEDIUM_SUPPORTED = nativehd cdrom-apus netboot-apus
# The version of the kernel to use.
-KERNELMAJOR = 2.4
KERNELVERSION = 2.4.27-apus
KERNEL_FLAVOUR = di
KERNELIMAGEVERSION = $(KERNELVERSION)
diff --git a/build/config/s390.cfg b/build/config/s390.cfg
index c3d77ca..694ad73 100644
--- a/build/config/s390.cfg
+++ b/build/config/s390.cfg
@@ -2,7 +2,6 @@ MEDIUM_SUPPORTED = generic
KERNEL = $(DEST)/image.debian
-KERNELMAJOR = 2.6
KERNELVERSION = 3.12-1-s390x
KERNEL_FLAVOUR = di
KERNELNAME = vmlinuz
diff --git a/build/config/s390x.cfg b/build/config/s390x.cfg
index 4cf0c1d..12f0e40 100644
--- a/build/config/s390x.cfg
+++ b/build/config/s390x.cfg
@@ -2,7 +2,6 @@ MEDIUM_SUPPORTED = generic
KERNEL = $(DEST)/image.debian
-KERNELMAJOR = 2.6
KERNELVERSION = 3.12-1-s390x
KERNEL_FLAVOUR = di
KERNELNAME = vmlinuz
diff --git a/build/config/sh4.cfg b/build/config/sh4.cfg
index 1d80373..a1926c1 100644
--- a/build/config/sh4.cfg
+++ b/build/config/sh4.cfg
@@ -1,6 +1,5 @@
SUBARCH_SUPPORTED = sh7751r sh7785lcr
-KERNELMAJOR = 2.6
KERNELVERSION = 2.6.32-5
KERNEL_FLAVOUR = di
KERNELIMAGEVERSION = $(KERNELVERSION)
diff --git a/build/config/sparc.cfg b/build/config/sparc.cfg
index add40f6..17effc2 100644
--- a/build/config/sparc.cfg
+++ b/build/config/sparc.cfg
@@ -2,7 +2,6 @@ MEDIUM_SUPPORTED = cdrom netboot miniiso
VERSIONED_SYSTEM_MAP = t
-KERNELMAJOR = 2.6
KERNELVERSION = 3.12-1-sparc64
KERNEL_FLAVOUR = di
diff --git a/build/config/sparc64.cfg b/build/config/sparc64.cfg
index 567d5c6..2c2f976 100644
--- a/build/config/sparc64.cfg
+++ b/build/config/sparc64.cfg
@@ -2,7 +2,6 @@ MEDIUM_SUPPORTED = cdrom netboot #miniiso
VERSIONED_SYSTEM_MAP = t
-KERNELMAJOR = 2.6
KERNELVERSION = 2.6.32-5-sparc64
KERNEL_FLAVOUR = di
diff --git a/build/util/pkg-list b/build/util/pkg-list
index b2faec8..bcd30b7 100755
--- a/build/util/pkg-list
+++ b/build/util/pkg-list
@@ -9,12 +9,11 @@ use warnings;
use strict;
if (int(@ARGV) < 5) {
- die "Usage: $0 type DRIVER_FOR KERNEL_FLAVOUR KERNELMAJOR SUB_ARCH KERNEL_VERSION [KERNEL_VERSION ...]\n";
+ die "Usage: $0 type DRIVER_FOR KERNEL_FLAVOUR SUB_ARCH KERNEL_VERSION [KERNEL_VERSION ...]\n";
}
my $type=shift;
my $driver_for=shift;
my $kernel_flavour=shift;
-my $kernel_major=shift;
my $sub_arch=shift;
my @kernel_versions=@ARGV;
@@ -76,12 +75,7 @@ sub collectpackage {
my $exclude=shift;
my $postponed=shift;
- if ($line=~s/^(.*) \[([0-9. ]+)\]$/$1/) {
- my %kernels=();
- $kernels{$_} = 1 foreach split ' ', $2;
- return unless $kernels{$kernel_major};
- }
- elsif ($line=~s/^(.*) \[(.+)\]$/$1/) {
+ if ($line=~s/^(.*) \[(.+)\]$/$1/) {
my %oses=();
$oses{$_} = 1 foreach split ' ', $2;
return unless $oses{$deb_host_arch_os};
--
1.8.4.2
Reply to: