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

- Update debian-installer's tasks. 

- Update calc script and calc files.
- Make i386 cds 8.3 filenaming compatible again.
- Workaround the two kernels problem on hppa.
This commit is contained in:
Santiago Garcia Mantinan 2004-11-29 18:36:42 +00:00
parent f59b5ee368
commit f1d2a2a4fb
15 changed files with 115 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
debian/changelog vendored
View File

@ -16,6 +16,11 @@ debian-cd (2.2.21) UNRELEASED; urgency=low
files directly.
* Stephen R. Marenka
- m68k: add kernel-image-2.4.27-amiga to debian-installer+kernel.
* Santiago Garcia
- Update debian-installer's tasks.
- Update calc script and calc files.
- Make i386 cds 8.3 filenaming compatible again.
- Workaround the two kernels problem on hppa.
-- Joey Hess <joeyh@debian.org> Mon, 25 Oct 2004 03:03:36 -0400

87
tasks/debian-installer
View File

@ -3,7 +3,7 @@
* This list can be generated with the command:
* ../tools/generate_di_list
*
* Last update: Wed Oct 6 05:35:55 MDT 2004
* Last update: Sun Nov 21 16:22:00 MST 2004
*/
#ifdef ARCH_alpha
aboot-installer
@ -261,6 +261,8 @@ bterm-unifont
bugreporter-udeb
cdebconf-text-udeb
cdebootstrap-udeb
cdrom-core-modules-2.6.8-1-32-di
cdrom-core-modules-2.6.8-1-64-di
choose-mirror
console-keymaps-acorn
console-keymaps-amiga
@ -283,12 +285,20 @@ e2fsprogs-udeb
eject-udeb
ethdetect
evms-udeb
ext3-modules-2.6.8-1-32-di
ext3-modules-2.6.8-1-64-di
fbset-udeb
fdisk-udeb
hdparm-udeb
hw-detect-full
ide-modules-2.6.8-1-32-di
ide-modules-2.6.8-1-64-di
input-modules-2.6.8-1-32-di
input-modules-2.6.8-1-64-di
ipv6-modules-2.4.27-32-di
ipv6-modules-2.4.27-64-di
ipv6-modules-2.6.8-1-32-di
ipv6-modules-2.6.8-1-64-di
jfsutils-udeb
kbd-chooser
libblkid1-udeb
@ -304,11 +314,15 @@ libnss-files-udeb
libparted1.6-udeb
libreiserfs0.3-udeb
libuuid1-udeb
loop-modules-2.6.8-1-32-di
loop-modules-2.6.8-1-64-di
lowmem
lvm10-udeb
lvm2-udeb
lvmcfg
lvmcfg-utils
md-modules-2.6.8-1-32-di
md-modules-2.6.8-1-64-di
mdadm-udeb
mdcfg
mdcfg-utils
@ -321,6 +335,8 @@ network-console
network-preseed
nic-modules-2.4.27-32-di
nic-modules-2.4.27-64-di
nic-modules-2.6.8-1-32-di
nic-modules-2.6.8-1-64-di
nobootloader
ntfstools-udeb
openssh-client-udeb
@ -346,10 +362,18 @@ partman-xfs
pcmcia-cs-udeb
ppp-modules-2.4.27-32-di
ppp-modules-2.4.27-64-di
ppp-modules-2.6.8-1-32-di
ppp-modules-2.6.8-1-64-di
ppp-udeb
prebaseconfig
raidtools2-udeb
reiser4progs-udeb
scsi-modules-2.6.8-1-32-di
scsi-modules-2.6.8-1-64-di
usb-modules-2.6.8-1-32-di
usb-modules-2.6.8-1-64-di
usb-storage-modules-2.6.8-1-32-di
usb-storage-modules-2.6.8-1-64-di
userdevfs
wireless-tools-udeb
xfsprogs-udeb
@ -400,6 +424,7 @@ partman-ext3
partman-jfs
partman-lvm
partman-md
partman-partitioning
partman-reiserfs
partman-target
partman-xfs
@ -754,6 +779,15 @@ fat-modules-2.4.27-bvme6000-di
fat-modules-2.4.27-mvme147-di
fat-modules-2.4.27-mvme16x-di
fat-modules-2.4.27-q40-di
fat-modules-2.6.8-amiga-di
fat-modules-2.6.8-atari-di
fat-modules-2.6.8-bvme6000-di
fat-modules-2.6.8-hp-di
fat-modules-2.6.8-mac-di
fat-modules-2.6.8-mvme147-di
fat-modules-2.6.8-mvme16x-di
fat-modules-2.6.8-q40-di
fat-modules-2.6.8-sun3-di
fbset-udeb
hdparm-udeb
hw-detect-full
@ -763,6 +797,15 @@ jfs-modules-2.4.27-bvme6000-di
jfs-modules-2.4.27-mvme147-di
jfs-modules-2.4.27-mvme16x-di
jfs-modules-2.4.27-q40-di
jfs-modules-2.6.8-amiga-di
jfs-modules-2.6.8-atari-di
jfs-modules-2.6.8-bvme6000-di
jfs-modules-2.6.8-hp-di
jfs-modules-2.6.8-mac-di
jfs-modules-2.6.8-mvme147-di
jfs-modules-2.6.8-mvme16x-di
jfs-modules-2.6.8-q40-di
jfs-modules-2.6.8-sun3-di
jfsutils-udeb
kbd-chooser
libblkid1-udeb
@ -805,6 +848,15 @@ nic-shared-modules-2.4.27-bvme6000-di
nic-shared-modules-2.4.27-mvme147-di
nic-shared-modules-2.4.27-mvme16x-di
nic-shared-modules-2.4.27-q40-di
nic-shared-modules-2.6.8-amiga-di
nic-shared-modules-2.6.8-atari-di
nic-shared-modules-2.6.8-bvme6000-di
nic-shared-modules-2.6.8-hp-di
nic-shared-modules-2.6.8-mac-di
nic-shared-modules-2.6.8-mvme147-di
nic-shared-modules-2.6.8-mvme16x-di
nic-shared-modules-2.6.8-q40-di
nic-shared-modules-2.6.8-sun3-di
nobootloader
ntfstools-udeb
openssh-client-udeb
@ -839,6 +891,15 @@ ppp-modules-2.4.27-bvme6000-di
ppp-modules-2.4.27-mvme147-di
ppp-modules-2.4.27-mvme16x-di
ppp-modules-2.4.27-q40-di
ppp-modules-2.6.8-amiga-di
ppp-modules-2.6.8-atari-di
ppp-modules-2.6.8-bvme6000-di
ppp-modules-2.6.8-hp-di
ppp-modules-2.6.8-mac-di
ppp-modules-2.6.8-mvme147-di
ppp-modules-2.6.8-mvme16x-di
ppp-modules-2.6.8-q40-di
ppp-modules-2.6.8-sun3-di
ppp-udeb
prebaseconfig
raidtools2-udeb
@ -849,6 +910,15 @@ reiserfs-modules-2.4.27-bvme6000-di
reiserfs-modules-2.4.27-mvme147-di
reiserfs-modules-2.4.27-mvme16x-di
reiserfs-modules-2.4.27-q40-di
reiserfs-modules-2.6.8-amiga-di
reiserfs-modules-2.6.8-atari-di
reiserfs-modules-2.6.8-bvme6000-di
reiserfs-modules-2.6.8-hp-di
reiserfs-modules-2.6.8-mac-di
reiserfs-modules-2.6.8-mvme147-di
reiserfs-modules-2.6.8-mvme16x-di
reiserfs-modules-2.6.8-q40-di
reiserfs-modules-2.6.8-sun3-di
scsi-modules-2.2.25-atari-di
scsi-modules-2.2.25-bvme6000-di
scsi-modules-2.2.25-mac-di
@ -860,6 +930,15 @@ scsi-modules-2.4.27-bvme6000-di
scsi-modules-2.4.27-mvme147-di
scsi-modules-2.4.27-mvme16x-di
scsi-modules-2.4.27-q40-di
scsi-modules-2.6.8-amiga-di
scsi-modules-2.6.8-atari-di
scsi-modules-2.6.8-bvme6000-di
scsi-modules-2.6.8-hp-di
scsi-modules-2.6.8-mac-di
scsi-modules-2.6.8-mvme147-di
scsi-modules-2.6.8-mvme16x-di
scsi-modules-2.6.8-q40-di
scsi-modules-2.6.8-sun3-di
userdevfs
vmelilo-installer
wireless-tools-udeb
@ -1221,7 +1300,6 @@ isa-pnp-modules-2.4.27-power3-di
isa-pnp-modules-2.4.27-power4-di
isa-pnp-modules-2.4.27-powerpc-di
isa-pnp-modules-2.4.27-powerpc-small-di
jfs-modules-2.4.25-apus-di
jfs-modules-2.4.27-apus-di
jfs-modules-2.4.27-powerpc-small-di
jfs-modules-2.6.8-power3-di
@ -1254,7 +1332,6 @@ lvm2-udeb
lvmcfg
lvmcfg-utils
mac-fdisk-udeb
md-modules-2.4.25-apus-di
md-modules-2.4.27-apus-di
md-modules-2.4.27-power3-di
md-modules-2.4.27-power4-di
@ -1280,7 +1357,6 @@ nic-extra-modules-2.4.27-powerpc-small-di
nic-extra-modules-2.6.8-power3-di
nic-extra-modules-2.6.8-power4-di
nic-extra-modules-2.6.8-powerpc-di
nic-modules-2.4.25-apus-di
nic-modules-2.4.27-apus-di
nic-modules-2.4.27-power3-di
nic-modules-2.4.27-power4-di
@ -1308,7 +1384,6 @@ ntfstools-udeb
openssh-client-udeb
openssh-server-udeb
os-prober
parport-modules-2.4.25-apus-di
parport-modules-2.4.27-apus-di
parport-modules-2.4.27-powerpc-small-di
partconf-find-partitions
@ -1327,7 +1402,6 @@ partman-partitioning
partman-reiserfs
partman-target
partman-xfs
plip-modules-2.4.25-apus-di
plip-modules-2.4.27-apus-di
plip-modules-2.4.27-power3-di
plip-modules-2.4.27-power4-di
@ -1411,7 +1485,6 @@ eject-udeb
ethdetect
evms-udeb
fbset-udeb
fdisk-udeb
hdparm-udeb
hw-detect-full
jfsutils-udeb

5
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 Oct 6 05:36:00 MDT 2004
* Last update: Sun Nov 21 16:22:02 MST 2004
*/
#include <debian-installer>
@ -109,7 +109,7 @@ kernel-image-2.4.27-powerpc-pmac
kernel-image-2.4.27-powerpc-prep
kernel-image-2.4.27-powerpc-chrp
kernel-image-2.4.27-powerpc-chrp-rs6k
kernel-image-2.4.25-apus
kernel-image-2.4.27-apus
#endif
#ifdef ARCH_sparc
discover1
@ -131,7 +131,6 @@ kernel-image-2.6.8-1-sparc64-smp
#endif
#ifdef ARCH_m68k
kernel-image-2.2.25-mac
kernel-image-2.4.27-amiga
kernel-image-2.4.27-atari
kernel-image-2.4.27-bvme6000
kernel-image-2.4.27-mvme147

2
tools/boot/sarge/boot-alpha.calc
View File

@ -1,4 +1,4 @@
BOOT_SIZE_1=12
BOOT_SIZE_1=11
BOOT_SIZE_10=2
BOOT_SIZE_11=2
BOOT_SIZE_12=2

2
tools/boot/sarge/boot-hppa.calc
View File

@ -1,4 +1,4 @@
BOOT_SIZE_1=19
BOOT_SIZE_1=18
BOOT_SIZE_10=2
BOOT_SIZE_11=2
BOOT_SIZE_12=2

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

@ -86,16 +86,16 @@ if [ "$NN" = "1" ]; then
cp -f $BASEDIR/data/$DI_CODENAME/isolinux.bin boot$N/isolinux/
cp -lf cdrom/vmlinuz $CDDIR/install/
cp -lf cdrom/initrd.gz $CDDIR/install/
echo -n "-cache-inodes -J -l -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table " > $N.mkisofs_opts
echo -n "-cache-inodes -J -b isolinux/isolinux.bin -c isolinux/boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table " > $N.mkisofs_opts
else
if [ -n "$THISTYPE" ]; then
echo "Using $THISTYPE boot-disks image on CD$N"
mkdir -p boot$N/boot
cp $THISTYPE/boot.img boot$N/boot/
echo -n "-cache-inodes -J -l -b boot/boot.img " > $N.mkisofs_opts
echo -n "-cache-inodes -J -b boot/boot.img " > $N.mkisofs_opts
else
mkdir boot$N
echo -n "-cache-inodes -J -l " > $N.mkisofs_opts
echo -n "-cache-inodes -J " > $N.mkisofs_opts
fi
fi

2
tools/boot/sarge/boot-i386.calc
View File

@ -1,4 +1,4 @@
BOOT_SIZE_1=27
BOOT_SIZE_1=26
BOOT_SIZE_10=2
BOOT_SIZE_11=2
BOOT_SIZE_12=2

2
tools/boot/sarge/boot-ia64.calc
View File

@ -1,4 +1,4 @@
BOOT_SIZE_1=18
BOOT_SIZE_1=39
BOOT_SIZE_10=2
BOOT_SIZE_11=2
BOOT_SIZE_12=2

2
tools/boot/sarge/boot-m68k.calc
View File

@ -1,4 +1,4 @@
BOOT_SIZE_1=21
BOOT_SIZE_1=29
SIZE_MULT_1=97
BOOT_SIZE_10=2
SIZE_MULT_10=97

2
tools/boot/sarge/boot-mips.calc
View File

@ -1,4 +1,4 @@
BOOT_SIZE_1=16
BOOT_SIZE_1=15
BOOT_SIZE_10=2
BOOT_SIZE_11=2
BOOT_SIZE_12=2

2
tools/boot/sarge/boot-mipsel.calc
View File

@ -1,4 +1,4 @@
BOOT_SIZE_1=15
BOOT_SIZE_1=14
BOOT_SIZE_10=2
BOOT_SIZE_11=2
BOOT_SIZE_12=2

2
tools/boot/sarge/boot-powerpc.calc
View File

@ -1,4 +1,4 @@
BOOT_SIZE_1=65
BOOT_SIZE_1=81
BOOT_SIZE_10=2
BOOT_SIZE_11=2
BOOT_SIZE_12=2

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

@ -1,4 +1,4 @@
BOOT_SIZE_1=14
BOOT_SIZE_1=13
BOOT_SIZE_10=2
BOOT_SIZE_11=2
BOOT_SIZE_12=2

4
tools/boot/sarge/post-boot-hppa
View File

@ -21,8 +21,8 @@ if [ $N != 1 -a $N != 1_NONUS ]; then
exit 0
fi
K32=$(ls $CDROOT/install/vmlinux-*-32)
K64=$(ls $CDROOT/install/vmlinux-*-64)
K32=$(ls $CDROOT/install/vmlinux-*-32|head -1)
K64=$(ls $CDROOT/install/vmlinux-*-64|head -1)
/sbin/palo \
--commandline="0/vmlinux root=/dev/ram initrd=0/ramdisk init=/linuxrc" \
--recoverykernel="$K32" \

17
tools/calc
View File

@ -36,6 +36,17 @@ then
esac
done
fi
case "$ARCH" in
powerpc) echo SIZE_MULT_1=93 >> "boot/$CODENAME/boot-$ARCH.calc";;
esac
#Use different corrections depending on the size of the ISO
if [ -n "$SIZELIMIT1" ] && [ "$SIZELIMIT1" -gt 1000000000 ] ||
[ -n "$SIZELIMIT" ] && [ "$SIZELIMIT" -gt 1000000000 ] ||
[ -n "$DEFBINSIZE" ] && [ "$DEFBINSIZE" -gt 1000 ]
then
case "$ARCH" in
powerpc) echo SIZE_MULT_1=92 >> "boot/$CODENAME/boot-$ARCH.calc";;
esac
else
case "$ARCH" in
powerpc) echo SIZE_MULT_1=96 >> "boot/$CODENAME/boot-$ARCH.calc";;
esac
fi