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

merge recent changes from head to debian-edu branch

This commit is contained in:
Joey Hess 2004-09-16 16:59:09 +00:00
parent e7692569c5
commit 68cb76a792
8 changed files with 15811 additions and 16061 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
debian/changelog vendored
View File

@ -9,6 +9,9 @@ debian-cd (2.2.20) UNRELEASED; urgency=low
partitioner, and discover2-data-udeb, which are not in unstable for i386
any longer.
- Updated exclude-udebs to match the current CD initrd package list.
- Access floppy reorg.
- Sparc daily builds moved to joshk's builds.
- Update tasks for 2.4.27 and 2.6.8 kernels.
* Stephen R. Marenka
- Add support for m68k reorganization.
- Bump m68k 2.4 kernels to 2.4.27.

505
tasks/debian-installer
View File

File diff suppressed because it is too large Load Diff

52
tasks/debian-installer+kernel
View File

@ -5,7 +5,7 @@
* This list can be generated with the command:
* ../tools/generate_di+k_list
*
* Last update: Wed Sep 8 15:02:36 EDT 2004
* Last update: Mon Sep 13 13:27:20 EDT 2004
*/
#include <debian-installer>
@ -37,14 +37,28 @@ grub
lilo
kernel-image-2.4.27-1-386
kernel-pcmcia-modules-2.4.27-1-386
kernel-image-2.6.8-1-386
#endif
#ifdef ARCH_alpha
aboot
aboot-base
discover1
kernel-image-2.4-generic
kernel-image-2.4-smp
kernel-image-2.4.26-1-generic
kernel-image-2.4.26-1-smp
kernel-image-2.6-generic
kernel-image-2.6-smp
kernel-image-2.6.6-1-generic
kernel-image-2.6.6-1-smp
kernel-image-netbootable
#endif
#ifdef ARCH_hppa
discover1
kernel-image-2.4.26-32-smp
kernel-image-2.4.26-64
kernel-image-2.4.26-64-smp
kernel-image-netbootable
#endif
#ifdef ARCH_ia64
discover1
@ -60,9 +74,13 @@ kernel-image-2.4-mckinley-smp
#endif
#ifdef ARCH_mips
arcboot
kernel-image-2.4.26-r4k-ip22
kernel-image-2.4.26-r5k-ip22
#endif
#ifdef ARCH_mipsel
delo
kernel-image-2.4.26-r3k-kn02
kernel-image-2.4.26-r4k-kn04
#endif
#ifdef ARCH_powerpc
discover1
@ -71,10 +89,42 @@ yaboot
mkvmlinuz
module-init-tools
initrd-tools
kernel-image-2.6.7-powerpc
kernel-image-2.6.7-power3
kernel-image-2.6.7-power4
kernel-image-2.4.25-power3-pmac
kernel-image-2.4.25-power3-chrp-rs6k
kernel-image-2.4.25-power4-pmac
kernel-image-2.4.25-power4-chrp-rs6k
kernel-image-2.4.25-powerpc-pmac
kernel-image-2.4.25-powerpc-small-pmac
kernel-image-2.4.25-powerpc-prep
kernel-image-2.4.25-powerpc-chrp
kernel-image-2.4.25-powerpc-chrp-rs6k
kernel-image-2.4.25-apus
#endif
#ifdef ARCH_sparc
discover1
initrd-tools
kernel-image-2.4-sparc32
kernel-image-2.4-sparc32-smp
kernel-image-2.4-sparc64
kernel-image-2.4-sparc64-smp
kernel-image-2.4.26-sparc32
kernel-image-2.4.26-sparc32-smp
kernel-image-2.4.26-sparc64
kernel-image-2.4.26-sparc64-smp
#endif
#ifdef ARCH_m68k
kernel-image-2.2.25-atari
kernel-image-2.2.25-bvme6000
kernel-image-2.2.25-mac
kernel-image-2.2.25-mvme147
kernel-image-2.2.25-mvme16x
kernel-image-2.4.27-amiga
kernel-image-2.4.27-atari
kernel-image-2.4.27-bvme6000
kernel-image-2.4.27-mvme147
kernel-image-2.4.27-mvme16x
kernel-image-2.4.27-q40
#endif

14
tasks/exclude-sarge
View File

@ -32,8 +32,6 @@ kernel-image-2.4.24-1-k6
kernel-image-2.4.24-1-k7
kernel-image-2.4.24-1-k7-smp
kernel-image-2.4.24-speakup
kernel-image-2.4.26-speakup
kernel-image-2.4.27-speakup
kernel-image-2.4.25-1-386
kernel-image-2.4.25-1-586tsc
kernel-image-2.4.25-1-686
@ -41,23 +39,19 @@ kernel-image-2.4.25-1-686-smp
kernel-image-2.4.25-1-k6
kernel-image-2.4.25-1-k7
kernel-image-2.4.25-1-k7-smp
kernel-image-2.4.26-speakup
kernel-image-2.4.26-1-386
kernel-image-2.4.26-1-586tsc
kernel-image-2.4.26-1-686-smp
kernel-image-2.4.26-1-686
kernel-image-2.4.26-1-686-smp
kernel-image-2.4.26-1-k6
kernel-image-2.4.26-1-k7
kernel-image-2.4.26-1-k7-smp
kernel-image-2.4.27-1-586tsc
kernel-image-2.4.27-1-686-smp
kernel-image-2.4.27-1-686
kernel-image-2.4.27-1-k6
kernel-image-2.4.27-1-k7
kernel-image-2.4.27-1-k7-smp
kernel-image-2.4.28-1-586tsc
kernel-image-2.4.28-1-k6
kernel-image-2.4.28-1-k7
kernel-image-2.4.28-1-k7-smp
kernel-image-2.6-386
kernel-image-2.6-686
kernel-image-2.6-686-smp
@ -110,19 +104,17 @@ kernel-pcmcia-modules-2.4.25-1-k7
kernel-pcmcia-modules-2.4.25-1-k7-smp
kernel-pcmcia-modules-2.4.26-1-386
kernel-pcmcia-modules-2.4.26-1-586tsc
kernel-pcmcia-modules-2.4.26-1-686-smp
kernel-pcmcia-modules-2.4.26-1-686
kernel-pcmcia-modules-2.4.26-1-686-smp
kernel-pcmcia-modules-2.4.26-1-k6
kernel-pcmcia-modules-2.4.26-1-k7
kernel-pcmcia-modules-2.4.26-1-k7-smp
kernel-pcmcia-modules-2.4.27-1-586tsc
kernel-pcmcia-modules-2.4.27-1-686-smp
kernel-pcmcia-modules-2.4.27-1-686
kernel-pcmcia-modules-2.4.27-1-k6
kernel-pcmcia-modules-2.4.27-1-k7
kernel-pcmcia-modules-2.4.27-1-k7-smp
kernel-pcmcia-modules-2.4.28-1-686-smp
kernel-pcmcia-modules-2.4.28-1-686
kernel-pcmcia-modules-2.4.28-1-586tsc
kernel-pcmcia-modules-2.4.28-1-k6
kernel-pcmcia-modules-2.4.28-1-k7

31270
tasks/popularity-contest-sarge
View File

File diff suppressed because it is too large Load Diff

20
tools/boot/sarge/boot-i386
View File

@ -46,9 +46,12 @@ KTYPE[10]=""
THISTYPE=${KTYPE[$NN]}
BOOT_IMAGES="cdrom/boot.img cdrom/initrd.gz cdrom/vmlinuz cdrom/debian-cd_info.tar.gz"
DISK_IMAGES="floppy/cd-drivers.img floppy/boot.img floppy/root.img floppy/net-drivers.img floppy/asian-root.img floppy/access/boot.img floppy/access/root.img floppy/access/drivers.img "
DISK_IMAGES="floppy/cd-drivers.img floppy/boot.img floppy/root.img"
# Note that floppy/access/drivers.img was renamed to cd-drivers, both
# present for the transition.
EXTRA_DISK_IMAGES="floppy/net-drivers.img floppy/access/root.img floppy/access/boot.img floppy/access/cd-drivers.img floppy/access/drivers.img"
# Download boot images
# Download boot images and floppies.
for image in $BOOT_IMAGES $DISK_IMAGES; do
if [ ! -e "$image" ]; then
dir=$(dirname $image)
@ -61,6 +64,19 @@ for image in $BOOT_IMAGES $DISK_IMAGES; do
fi
done
# Floppies that are not really required or may be unavailable.
for image in $EXTRA_DISK_IMAGES; do
if [ ! -e "$image" ]; then
dir=$(dirname $image)
mkdir -p $dir
if [ ! "$DI_WWW_HOME" ];then
cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$image""$image" || true
else
wget "$DI_WWW_HOME/$image" -O "$image" || rm -f "$image"
fi
fi
done
if [ "$NN" = "1" ]; then
echo "Using ISOLINUX boot-disks image on CD$N"
mkdir -p boot$N/isolinux

6
tools/boot/sarge/boot-ia64
View File

@ -32,9 +32,11 @@ fi
for image in boot.img; do
if [ ! -e "$image" ]; then
if [ ! "$DI_WWW_HOME" ];then
cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/$image" .
cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/cdrom/$image" . || \
cp "$MIRROR/dists/$DI_DIST/main/installer-$ARCH/current/images/$image" .
else
wget "$DI_WWW_HOME/cdrom/$image"
wget "$DI_WWW_HOME/cdrom/$image" || \
wget "$DI_WWW_HOME/$image"
fi
fi
done

2
tools/boot/sarge/boot-sparc
View File

@ -11,7 +11,7 @@ set -e
N=$1
CDDIR=$2
if [ "$DI_WWW_HOME" = "default" ];then
DI_WWW_HOME="http://people.debian.org/~jbailey/d-i/sparc/daily/cdrom"
DI_WWW_HOME="http://people.debian.org/~joshk/d-i/images/daily/cdrom"
fi
if [ ! "$DI_DIST" ]; then
DI_DIST="$DI_CODENAME"