aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>1994-11-07 03:53:14 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>1994-11-07 03:53:14 +0000
commit544f693f5a21e1db762b4061945eb41ce17222ce (patch)
tree66154f60c15e579c8c15d3e01d635a462c8e62a7
parent98020fdd6c33f0bf7431900ef875f7c5dcc947db (diff)
downloadsrc-544f693f5a21e1db762b4061945eb41ce17222ce.tar.gz
src-544f693f5a21e1db762b4061945eb41ce17222ce.zip
Get us back on fd1200 floppies. Fix extract.sh to right filenames.
Notes
Notes: svn path=/head/; revision=4222
-rw-r--r--release/Makefile30
-rw-r--r--release/extract.sh4
2 files changed, 8 insertions, 26 deletions
diff --git a/release/Makefile b/release/Makefile
index ff3c6ec2c3b3..fd8042fe3fc4 100644
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,16 +1,8 @@
-# $Id: Makefile,v 1.19 1994/11/06 11:24:58 jkh Exp $
+# $Id: Makefile,v 1.20 1994/11/06 23:47:04 phk Exp $
#
-#For a 1.2MB boot floppy.
-#SMALL_FLOPPY= yes
-
-.if defined(SMALL_FLOPPY)
FDLABEL= fd1200
DDCOUNT= 80
-.else
-FDLABEL= fd1440
-DDCOUNT= 96
-.endif
FLOPPY= fd0
DDBS= 15k
@@ -26,7 +18,7 @@ CPIO1+= ftp rsh sed telnet rlogin
CPIO2= etc/services
-CPIO3= extract.sh
+CPIO3= extract.sh bininst
# Somewhat on the rough side...
CLEANFILES+= *.o *.c *.cache *.mk *.lo ${CPIO1} *.flp *.gz
CLEANFILES+= boot_flp boot_${FDLABEL}.flp cpio_flp_1
@@ -47,16 +39,14 @@ kernel: ${.CURDIR}/../sys/i386/conf/GENERIC
(cd ${.CURDIR}/../sys/i386/conf; config GENERIC)
(cd ${.CURDIR}/../sys/compile/GENERIC; ${MAKE} depend; ${MAKE} all; )
-boot.flp: boot_${FDLABEL}.flp
-
-boot_${FDLABEL}.flp:
+boot.flp:
-umount ${MNT}
-umount /dev/${FLOPPY}
- echo y | fdformat ${FLOPPY}
+ # echo y | fdformat ${FLOPPY}
disklabel -w -B \
-b ${DESTDIR}/usr/mdec/fdboot -s ${DESTDIR}/usr/mdec/bootfd \
/dev/r${FLOPPY} ${FDLABEL}
- newfs -c 80 -b 4096 -f 512 -i 4096 -m 0 -o space /dev/r${FLOPPY}
+ newfs -c 80 -b 4096 -f 512 -i 8192 -m 0 -o space /dev/r${FLOPPY}
mount -o async /dev/${FLOPPY} ${MNT}
mkdir ${MNT}/dev ${MNT}/stand ${MNT}/mnt
cp ${.CURDIR}/../sys/compile/GENERIC/kernel ${MNT}/kernel
@@ -71,23 +61,18 @@ boot_${FDLABEL}.flp:
chmod 755 ${MNT}/stand/sysinstall
ln ${MNT}/stand/sysinstall ${MNT}/stand/newfs
ln ${MNT}/stand/sysinstall ${MNT}/stand/gzip
- install -m 500 -c ${.CURDIR}/bininst ${MNT}/stand/bininst
-.if !defined(SMALL_FLOPPY)
install -m 400 -c ${.CURDIR}/../COPYRIGHT ${MNT}/COPYRIGHT
-.endif
install -m 400 -c ${.CURDIR}/../README ${MNT}/README
-.if !defined(SMALL_FLOPPY)
install -m 400 -c ${.CURDIR}/../share/FAQ/DISKSPACE.FAQ \
${MNT}/DISKSPACE.FAQ
install -m 400 -c ${.CURDIR}/../share/FAQ/RELNOTES.FreeBSD \
${MNT}/RELNOTES.FreeBSD
-.endif
touch ${MNT}/this_is_boot_flp
-umount ${MNT}
fsck /dev/r${FLOPPY}
dd if=/dev/r${FLOPPY} bs=${DDBS} count=${DDCOUNT} of=boot_${FDLABEL}.flp
gzip -9 -v < boot_${FDLABEL}.flp > boot_${FDLABEL}.flp.gz
- ls -l boot.flp*
+ df -k /dev/r${FLOPPY}
cpio.flp:
for i in ${CPIO1} ; do rm -f ./$$i ; ln cpio_flp_1 ./$$i ; done
@@ -103,9 +88,6 @@ crunch:
crunchgen ${.CURDIR}/cpio_flp_1.conf
${MAKE} -f cpio_flp_1.mk objs exe
-small.floppies:
- ${MAKE} SMALL_FLOPPY=yes crunch boot.flp cpio.flp
-
floppies: crunch boot.flp cpio.flp
release20:
diff --git a/release/extract.sh b/release/extract.sh
index 177efee42749..727d6ae6a840 100644
--- a/release/extract.sh
+++ b/release/extract.sh
@@ -1,4 +1,4 @@
:
-if [ -f bindist.tgz.aa ] ; then
- cat bindist.tgz.?? | zcat | ( cd / ; cpio -H tar -idumV )
+if [ -f bin_tgz.aa ] ; then
+ cat bin_tgz.?? | zcat | ( cd / ; cpio -H tar -idumV )
fi