* Remove debian-keyring.tar.gz from the doc dir.

* Don't include Contents-$ARCH.gz on netinst/businesscard CD.
   * Joey Hess
     - Include sarge installation manual on sarge CDs.
     - Remove install/doc, and just use doc/install.
     - Patch from Thiemo Seufer to add mips and mipsel kernels.
       Also, remove some packages from arches that do not need them.
This commit is contained in:
Joey Hess 2004-03-31 23:37:57 +00:00
parent 00930ef2e1
commit eb26b098f3
2 changed files with 37 additions and 3 deletions

2
debian/changelog vendored
View File

@ -5,6 +5,8 @@ debian-cd (2.2.18) UNRELEASED; urgency=low
* Joey Hess
- Include sarge installation manual on sarge CDs.
- Remove install/doc, and just use doc/install.
- Patch from Thiemo Seufer to add mips and mipsel kernels.
Also, remove some packages from arches that do not need them.
-- Raphael Hertzog <hertzog@debian.org> Thu, 25 Mar 2004 07:33:23 +0100

View File

@ -17,10 +17,7 @@ cat > debian-installer+kernel << EOF
*/
#include <debian-installer>
discover
eject
grub
lilo
locales
lvm10
aptitude
@ -35,6 +32,9 @@ wireless-tools
xfsprogs
reiserfsprogs
#ifdef ARCH_i386
discover
grub
lilo
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
@ -72,9 +75,37 @@ EOF
$MIRROR/dists/$CODENAME/main/binary-ia64/Packages |tail -n 4 \
>> debian-installer+kernel
cat >> debian-installer+kernel << EOF
#endif
#ifdef ARCH_mips
arcboot
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
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' \