Hello All, When adding the kernel/bootloader packages for mips/mipsel in debian-cd I found some probably arch-dependent packages were on this list unconditionally. The appended patch is my best guess about it, but I'm not sure about some issues:
- Is discover actually needed for most arches? - Is is ok to have bootloaders for i386 listed but not for others? - Which architectures need pcmcia-cs? Thiemo Index: tools/generate_di+k_list =================================================================== RCS file: /cvs/debian-boot/debian-cd/tools/generate_di+k_list,v retrieving revision 1.16 diff -u -p -r1.16 generate_di+k_list --- tools/generate_di+k_list 18 Mar 2004 19:52:33 -0000 1.16 +++ tools/generate_di+k_list 26 Mar 2004 12:25:35 -0000 @@ -17,10 +17,7 @@ cat > debian-installer+kernel << EOF */ #include <debian-installer> -discover eject -grub -lilo locales lvm10 aptitude @@ -30,11 +27,14 @@ hotplug iso-codes console-cyrillic console-terminus -pcmcia-cs wireless-tools xfsprogs reiserfsprogs #ifdef ARCH_i386 +discover +grub +lilo +pcmcia-cs EOF /bin/sed -n 's/Package: \(kernel-image-2.4.*-386\)$/\1/p' \ @@ -47,6 +47,7 @@ EOF cat >> debian-installer+kernel << EOF #endif #ifdef ARCH_alpha +discover EOF /bin/sed -n 's/Package: \(kernel-image-.*\)$/\1/p' \ @@ -56,6 +57,7 @@ EOF cat >> debian-installer+kernel << EOF #endif #ifdef ARCH_hppa +discover EOF /bin/sed -n 's/Package: \(kernel-image-.*\)$/\1/p' \ @@ -65,6 +67,7 @@ EOF cat >> debian-installer+kernel << EOF #endif #ifdef ARCH_ia64 +discover initrd-tools EOF @@ -74,7 +77,35 @@ EOF cat >> debian-installer+kernel << EOF #endif +#ifdef ARCH_mips +EOF + +# Only include mips kernels that d-i base-installer installs. +for subarch in r4k-ip22 r5k-ip22; do + sed -n 's/Package: \(kernel-image-.*-.*\)$/\1/p' \ + $MIRROR/dists/$CODENAME/main/binary-mips/Packages \ + | grep -- "-$subarch$" | sort -n | tail -n 1 \ + >> debian-installer+kernel +done + +cat >> debian-installer+kernel << EOF +#endif +#ifdef ARCH_mipsel +EOF + +# Only include mipsel kernels that d-i base-installer installs. +for subarch in r3k-kn02 r4k-kn04; do + sed -n 's/Package: \(kernel-image-.*-.*\)$/\1/p' \ + $MIRROR/dists/$CODENAME/main/binary-mipsel/Packages \ + | grep -- "-$subarch$" | sort -n | tail -n 1 \ + >> debian-installer+kernel +done + +cat >> debian-installer+kernel << EOF +#endif #ifdef ARCH_powerpc +discover +pcmcia-cs EOF # Only include powerpc kernels that d-i base-installer installs. @@ -89,6 +120,7 @@ done cat >> debian-installer+kernel << EOF #endif #ifdef ARCH_sparc +discover EOF /bin/sed -n 's/Package: \(kernel-image-.*-sparc.*\)$/\1/p' \ -- To UNSUBSCRIBE, email to [EMAIL PROTECTED] with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
