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

* Fixed Makefile. 

* Updated boot-i386 for bf 3.0.19.
This commit is contained in:
Raphaël Hertzog 2002-02-11 14:04:08 +00:00
parent 930a6f32df
commit e14b741797
3 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -325,9 +325,9 @@ ifdef FORCENONUSONCD1
grep-dctrl -FSection -n -sPackage -e '^(non-US|non-us/main)' - | \ grep-dctrl -FSection -n -sPackage -e '^(non-US|non-us/main)' - | \
sort | uniq > $(BDIR)/Debian_$(CODENAME)_nonUS sort | uniq > $(BDIR)/Debian_$(CODENAME)_nonUS
endif endif
if [ -x "`which debootstrap`" ]; then \ $(Q)if [ -x "`which debootstrap`" ]; then \
debootstrap --arch $(ARCH) --print-debs $(CODENAME) \ debootstrap --arch $(ARCH) --print-debs $(CODENAME) \
| tr ' ' '\n' >>$(BDIR)/rawlist \ | tr ' ' '\n' >>$(BDIR)/rawlist; \
fi fi
$(Q)perl -npe 's/\@ARCH\@/$(ARCH)/g' $(TASK) | \ $(Q)perl -npe 's/\@ARCH\@/$(ARCH)/g' $(TASK) | \
cpp -nostdinc -nostdinc++ -P -undef -D ARCH=$(ARCH) -D ARCH_$(ARCH) \ cpp -nostdinc -nostdinc++ -P -undef -D ARCH=$(ARCH) -D ARCH_$(ARCH) \

1
debian/changelog vendored
View File

@ -5,6 +5,7 @@ debian-cd (2.2.13) unstable; urgency=low
* Automatically add packages listed by local debootstrap. Closes: #131820 * Automatically add packages listed by local debootstrap. Closes: #131820
* Adapted to new s390 boot-floppies 3.0.19 directory structure (Stefan * Adapted to new s390 boot-floppies 3.0.19 directory structure (Stefan
Gybas <sgybas@debian.org>). Gybas <sgybas@debian.org>).
* Updated boot-i386 for the boot-floppies 3.0.19.
-- Raphael Hertzog <hertzog@debian.org> Sun, 20 Jan 2002 15:42:29 +0100 -- Raphael Hertzog <hertzog@debian.org> Sun, 20 Jan 2002 15:42:29 +0100

28
tools/boot/woody/boot-i386
View File

@ -38,9 +38,9 @@ NN=`echo $N | sed -e 's/_NONUS//'`
# #
KTYPE[1]="" KTYPE[1]=""
KTYPE[2]="compact" KTYPE[2]="compact"
KTYPE[3]="idepci" KTYPE[3]="bf2.4"
KTYPE[4]="udma100-ext3" KTYPE[4]="idepci"
KTYPE[5]="reiserfs" KTYPE[5]=""
KTYPE[6]="" KTYPE[6]=""
KTYPE[7]="" KTYPE[7]=""
KTYPE[8]="" KTYPE[8]=""
@ -75,7 +75,7 @@ if [ "$N" = "1" ] || [ "$N" = "1_NONUS" ] ; then
if [ "$MULTIBOOT" = "yes" ] ; then if [ "$MULTIBOOT" = "yes" ] ; then
echo "Adding additional boot images to CD1" echo "Adding additional boot images to CD1"
for i in 2 3 4 5 ; do for i in 2 3 4 ; do
# first copy/link the next boot block to the disk. # first copy/link the next boot block to the disk.
ln CD1/dists/$CODENAME/main/disks-$ARCH/current/images-2.88/${KTYPE[$i]}/rescue.bin boot$N/boot/${KTYPE[$i]}.bin ln CD1/dists/$CODENAME/main/disks-$ARCH/current/images-2.88/${KTYPE[$i]}/rescue.bin boot$N/boot/${KTYPE[$i]}.bin
@ -96,8 +96,7 @@ fi
cp -f linux $CDDIR/install/linux ; \ cp -f linux $CDDIR/install/linux ; \
cp -f compact/linux $CDDIR/install/lincompt ; \ cp -f compact/linux $CDDIR/install/lincompt ; \
cp -f idepci/linux $CDDIR/install/linpci ; \ cp -f idepci/linux $CDDIR/install/linpci ; \
cp -f udma100-ext3/linux $CDDIR/install/linext3 ; \ cp -f bf2.4/linux $CDDIR/install/lin24 ; \
cp -f reiserfs/linux $CDDIR/install/linreis ; \
cp -f images-1.44/root.bin $CDDIR/install ) cp -f images-1.44/root.bin $CDDIR/install )
@ -121,12 +120,10 @@ smartdrv /c
echo Please choose a linux kernel now echo Please choose a linux kernel now
echo 1= standard kernel (2.2) echo 1= standard kernel (2.2)
echo 2= compact kernel (2.2) echo 2= compact kernel (2.2)
echo 3= IDEPCI kernel (2.2) echo 3= 2.4.x kernel (2.4)
echo 4= UDMA100-ext3 kernel (2.2) echo 4= IDEPCI kernel (2.2)
echo 5= reiserfs kernel (2.2)
choice /c:1234 choice /c:1234
if errorlevel 5 goto FIVE
if errorlevel 4 goto FOUR if errorlevel 4 goto FOUR
if errorlevel 3 goto THREE if errorlevel 3 goto THREE
if errorlevel 2 goto TWO if errorlevel 2 goto TWO
@ -144,16 +141,13 @@ echo using compact kernel
loadlin.exe lincompt root=/dev/ram ro initrd=root.bin cdrom loadlin.exe lincompt root=/dev/ram ro initrd=root.bin cdrom
:THREE :THREE
echo using 2.4.x kernel
loadlin.exe lin24 root=/dev/ram ro initrd=root.bin cdrom
:FOUR
echo using IDEPCI kernel echo using IDEPCI kernel
loadlin.exe linpci root=/dev/ram ro initrd=root.bin cdrom loadlin.exe linpci root=/dev/ram ro initrd=root.bin cdrom
:FOUR
echo using UDMA100-ext3 kernel
loadlin.exe linext3 root=/dev/ram ro initrd=root.bin cdrom
:FIVE
echo using reiserfs kernel
loadlin.exe linreis root=/dev/ram ro initrd=root.bin cdrom
EOF EOF
) |todos > $CDDIR/install/boot.bat ) |todos > $CDDIR/install/boot.bat