Peppermint
/
debian-cd-clone
mirror of https://salsa.debian.org/images-team/debian-cd.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* generate_di+k_list: Add some mips and mipsel subarches that are new in 

etch or were missing before.
* generate_di+k_list: Use kernel-image-2.4-<subarch> and
  linux-image-2.4-<subarch> packages for as many architectures as we can,
  instead of enumerating the versions of the kernels to include. Much
  cleaner and more robust and will make d-i more robust as well.
This commit is contained in:
Joey Hess 2005-09-14 20:52:48 +00:00
parent 31c9a29551
commit e7ba4d71f9
2 changed files with 58 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -25,6 +25,12 @@ debian-cd (2.2.24) UNRELEASED; urgency=low
* Remove other random hadcoded paths to programs in bin.
* generate_di+k_list: Deal with kernel package name change. All arches
with 2.6 kernels will now include only linux-image packages.
* generate_di+k_list: Add some mips and mipsel subarches that are new in
etch or were missing before.
* generate_di+k_list: Use kernel-image-2.4-<subarch> and
linux-image-2.4-<subarch> packages for as many architectures as we can,
instead of enumerating the versions of the kernels to include. Much
cleaner and more robust and will make d-i more robust as well.
-- Joey Hess <joeyh@debian.org> Wed, 14 Sep 2005 16:05:02 -0400

132
tools/generate_di+k_list
View File

@ -47,96 +47,59 @@ discover
discover1
grub
lilo
EOF
/bin/sed -n 's/Package: \(kernel-image-2.4.*-386\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-i386/Packages| tail -n 1 \
>> debian-installer+kernel-$DI_CODENAME
/bin/sed -n 's/Package: \(kernel-pcmcia-modules-2.4.*-386\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-i386/Packages| tail -n 1 \
>> debian-installer+kernel-$DI_CODENAME
/bin/sed -n 's/Package: \(kernel-headers-2.4.*-386\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-i386/Packages| tail -n 1 \
>> debian-installer+kernel-$DI_CODENAME
/bin/sed -n 's/Package: \(linux-image-2.6.*-386\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-i386/Packages| tail -n 1 \
>> debian-installer+kernel-$DI_CODENAME
/bin/sed -n 's/Package: \(linux-headers-2.6.*-386\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-i386/Packages| tail -n 1 \
>> debian-installer+kernel-$DI_CODENAME
cat >> debian-installer+kernel-$DI_CODENAME << EOF
/* Note that we do not have to include every optimised kernel flavor for
* i386. Kernel headers are included as third party modules are commonly
* used on this architecture.
*/
kernel-image-2.4-386
kernel-pcmcia-modules-2.4-386
kernel-headers-2.4-386
linux-image-2.6-386
linux-headers-2.6-386
#endif
#ifdef ARCH_amd64
discover
discover1
grub
lilo
EOF
if [ ! -e $MIRROR/dists/$CODENAME/main/binary-amd64/Packages ]; then
echo "Cannot find amd64 packages file, inserting static entry as workaround" >&2
echo linux-image-2.6.8-12-amd64-generic >> debian-installer+kernel-$DI_CODENAME
else
/bin/sed -n 's/Package: \(linux-image-2.6.*-generic\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-amd64/Packages| tail -n 1 \
>> debian-installer+kernel-$DI_CODENAME
/bin/sed -n 's/Package: \(linux-headers-2.6.*-generic\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-amd64/Packages| tail -n 1 \
>> debian-installer+kernel-$DI_CODENAME
fi
cat >> debian-installer+kernel-$DI_CODENAME << EOF
linux-image-2.6-amd64-generic
linux-headers-2.6-amd64-generic
#endif
#ifdef ARCH_alpha
aboot
aboot-base
discover1
EOF
/bin/sed -n 's/Package: \(kernel-image-.*\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-alpha/Packages|grep -v 2.4.21 \
>> debian-installer+kernel-$DI_CODENAME
cat >> debian-installer+kernel-$DI_CODENAME << EOF
kernel-image-2.4-generic
kernel-image-2.4-smp
#endif
#ifdef ARCH_hppa
discover1
EOF
/bin/sed -n 's/Package: \(linux-image-2.6.*\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-hppa/Packages| tail -n4 \
>> debian-installer+kernel-$DI_CODENAME
cat >> debian-installer+kernel-$DI_CODENAME << EOF
linux-image-2.6-parisc
linux-image-2.6-parisc-smp
linux-image-2.6-parisc64
linux-image-2.6-parisc64-smp
#endif
#ifdef ARCH_ia64
discover1
initrd-tools
EOF
/bin/sed -n 's/Package: \(kernel-image-2\.4\..*\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-ia64/Packages | tail -n 4 \
>> debian-installer+kernel-$DI_CODENAME
/bin/sed -n 's/Package: \(kernel-image-2\.4-.*\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-ia64/Packages \
>> debian-installer+kernel-$DI_CODENAME
/bin/sed -n 's/Package: \(linux-image-2\.6\..*\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-ia64/Packages | tail -n 4 \
>> debian-installer+kernel-$DI_CODENAME
/bin/sed -n 's/Package: \(linux-image-2\.6-.*\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-ia64/Packages \
>> debian-installer+kernel-$DI_CODENAME
cat >> debian-installer+kernel-$DI_CODENAME << EOF
linux-image-2.6-itanium
linux-image-2.6-itanium-smp
linux-image-2.6-mckinley
linux-image-2.6-mckinley-smp
#endif
#ifdef ARCH_mips
arcboot
EOF
# Only include mips kernels that d-i base-installer installs.
for subarch in r4k-ip22 r5k-ip22; do
# XXX once mips gets kernel-image-2.4-<subarch> packages, use those
# instead.
for subarch in r4k-ip22 r5k-ip22 sb1-swarm-bn; do
sed -n 's/Package: \(kernel-image-.*-.*\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-mips/Packages \
| grep -- "-$subarch$" | sort -n | tail -n 1 \
@ -145,12 +108,15 @@ done
cat >> debian-installer+kernel-$DI_CODENAME << EOF
#endif
#ifdef ARCH_mipsel
delo
EOF
# Only include mipsel kernels that d-i base-installer installs.
for subarch in r3k-kn02 r4k-kn04; do
# XXX once mips gets kernel-image-2.4-<subarch> packages, use those
# instead.
for subarch in r3k-kn02 r4k-kn04 cobalt lasat; do
sed -n 's/Package: \(kernel-image-.*-.*\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-mipsel/Packages \
| grep -- "-$subarch$" | sort -n | tail -n 1 \
@ -159,6 +125,7 @@ done
cat >> debian-installer+kernel-$DI_CODENAME << EOF
#endif
#ifdef ARCH_powerpc
discover1
quik
@ -166,9 +133,14 @@ yaboot
mkvmlinuz
module-init-tools
initrd-tools
linux-image-2.6-powerpc
linux-image-2.6-powerpc-smp
linux-image-2.6-powerpc64
EOF
# Only include powerpc kernels that d-i base-installer installs.
# XXX once powerpc 2.4 gets kernel-image-2.4-<subarch> packages, use those
# instead, but beware of apus.
for subarch in powerpc power3 power4 power3-pmac power3-chrp-rs6k \
power4-pmac power4-chrp-rs6k powerpc-pmac \
powerpc-prep powerpc-chrp powerpc-chrp-rs6k apus; do
@ -180,30 +152,30 @@ done
cat >> debian-installer+kernel-$DI_CODENAME << EOF
#endif
#ifdef ARCH_sparc
discover1
initrd-tools
EOF
/bin/sed -n 's/Package: \(kernel-image-2.4.*-sparc.*\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-sparc/Packages \
>> debian-installer+kernel-$DI_CODENAME
/bin/sed -n 's/Package: \(linux-image-2.6.*-sparc.*\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-sparc/Packages \
>> debian-installer+kernel-$DI_CODENAME
cat >> debian-installer+kernel-$DI_CODENAME << EOF
linux-image-2.6-sparc64
linux-image-2.6-sparc64-smp
kernel-image-2.4-sparc32
kernel-image-2.4-sparc32-smp
kernel-image-2.4-sparc64
kernel-image-2.4-sparc64-smp
#endif
#ifdef ARCH_m68k
fileutils
EOF
# Get all the latest 2.2 for mac kernel
/bin/sed -n 's/Package: \(kernel-image-2.2.*-mac\)$/\1/p' \
sed -n 's/Package: \(kernel-image-2.2.*-mac\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 1 \
>> debian-installer+kernel-$DI_CODENAME
# Get the latest 2.4 kernels, except mac
/bin/sed -n 's/Package: \(kernel-image-2.4.*\)$/\1/p' \
# XXX once m68k gets kernel-image-2.4-<subarch> packages, use those
# instead.
sed -n 's/Package: \(kernel-image-2.4.*\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-m68k/Packages | tail -n 7 | \
grep -v mac >> debian-installer+kernel-$DI_CODENAME
@ -213,7 +185,7 @@ cat >> debian-installer+kernel-$DI_CODENAME << EOF
discover1
EOF
/bin/sed -n 's/Package: \(kernel-image-2.4.*\)$/\1/p' \
sed -n 's/Package: \(kernel-image-2.4.*\)$/\1/p' \
$MIRROR/dists/$CODENAME/main/binary-arm/Packages|tail -n5 \
>> debian-installer+kernel-$DI_CODENAME