Package: debian-cd Version: 3.1.13 Severity: serious As the 486 kernel flavour was renamed to 586, linux-image-586 needs to be included on CD#1 and so should linux-headers-586.
There is an option to exclude the 486 flavour, and I wasn't sure whether this should cover 586 as well or whether it should be renamed. The following *untested* patch is meant to exclude both flavours if either of EXCLUDE_{486,586}_KERNEL is set. Ben. Index: Makefile =================================================================== --- Makefile (revision 2573) +++ Makefile (working copy) @@ -371,8 +371,9 @@ if [ "$(FORCE_FIRMWARE)"x = "1"x ] ; then \ ARCHDEFS="$$ARCHDEFS -DFORCE_FIRMWARE"; \ fi; \ - if [ "$(EXCLUDE_486_KERNEL)"x = "1"x ] ; then \ - ARCHDEFS="$$ARCHDEFS -DARCH_i386_EXCLUDE_486_KERNEL"; \ + if [ "$(EXCLUDE_486_KERNEL)"x = "1"x ] || \ + [ "$(EXCLUDE_586_KERNEL)"x = "1"x ] ; then \ + ARCHDEFS="$$ARCHDEFS -DARCH_i386_EXCLUDE_486_586_KERNEL"; \ fi; \ if [ "$(SOURCEONLY)"x != "yes"x ] ; then \ cat $(TASKDIR)/$(TASK) | \ Index: tools/generate_di+k_list =================================================================== --- tools/generate_di+k_list (revision 2573) +++ tools/generate_di+k_list (working copy) @@ -122,9 +122,11 @@ */ linux-image-686-pae linux-headers-686-pae -#ifndef ARCH_i386_EXCLUDE_486_KERNEL +#ifndef ARCH_i386_EXCLUDE_486_586_KERNEL linux-image-486 linux-headers-486 +linux-image-586 +linux-headers-586 #endif #endif --- END --- -- System Information: Debian Release: 8.0 APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental') Architecture: i386 (x86_64) Foreign Architectures: amd64 Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores) Locale: LANG=en_GB.utf8, LC_CTYPE=en_GB.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) -- To UNSUBSCRIBE, email to debian-cd-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: https://lists.debian.org/20150211190359.7724.77728.report...@deadeye.wl.decadent.org.uk