Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Change to make sure that no bogusly made targets are left after 

interrupt or failure was lost in when rearranging. Bring it back.
(pointed out by jhawk).
This commit is contained in:
fvdl 2000-10-09 12:36:26 +00:00
parent ec40993b05
commit 8717b51da3
3 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
distrib/i386/floppies/fdset-common/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.24 2000/09/27 22:03:44 fvdl Exp $
# $NetBSD: Makefile.inc,v 1.25 2000/10/09 12:36:26 fvdl Exp $
# TOP is assumed to be defined by Makefile including this one.
@ -25,8 +25,9 @@ realall: netbsd boot
tar cvf ${FSTMP} boot netbsd
@echo
@echo Making disk number one
dd if=/dev/zero of=${IMAGE1} count=${DISKSIZE}
vnconfig -t ${DISKTYPE} -v -c ${VND_CDEV} ${IMAGE1}
-mv -f ${IMAGE1} ${IMAGE1}.tmp
dd if=/dev/zero of=${IMAGE1}.tmp count=${DISKSIZE}
vnconfig -t ${DISKTYPE} -v -c ${VND_CDEV} ${IMAGE1}.tmp
dd bs=8k seek=1 count=${BLOCK8K} if=${FSTMP} of=${VND_CDEV}
disklabel -rw ${VND_CDEV} ${DISKTYPE}
@echo "installing new bootblocks"
@ -63,6 +64,7 @@ realall: netbsd boot
echo "There are $$bytes ($$(($$bytes / 1024))K) bytes free\
on disk $$disks."; \
)
mv -f ${IMAGE1}.tmp ${IMAGE1}
# Let the kernel on the diskette be called "netbsd" although
# it is compressed. This is because the boot code will search
@ -94,7 +96,7 @@ release:
done
clean cleandir distclean:
/bin/rm -f *.core ${CLEANFILES} ${BASENAME}?.fs
/bin/rm -f *.core ${CLEANFILES} ${BASENAME}?.fs ${IMAGE1}.tmp
.include <bsd.own.mk>
.include <bsd.obj.mk>

10
distrib/i386/floppies/ramdisk-rescuesmall/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2000/09/27 16:04:15 fvdl Exp $
# $NetBSD: Makefile,v 1.2 2000/10/09 12:36:27 fvdl Exp $
TOP= ${.CURDIR}/..
WARNS=1
@ -31,8 +31,9 @@ RAMDISKSIZE!= expr ${RAMDISKSPC} \* ${RAMDISKCYLS}
realall: ${IMAGE}
${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREE} ${LISTS}
dd if=/dev/zero of=${IMAGE} count=${RAMDISKSIZE}
vnconfig -v -c ${VND_CDEV} ${IMAGE} 512/${RAMDISKSPC}/1/${RAMDISKCYLS}
rm -f ${IMAGE}.tmp
dd if=/dev/zero of=${IMAGE}.tmp count=${RAMDISKSIZE}
vnconfig -v -c ${VND_CDEV} ${IMAGE}.tmp 512/${RAMDISKSPC}/1/${RAMDISKCYLS}
-disklabel ${VND_CDEV} >tmplabel
disklabel -r -R ${VND_CDEV} tmplabel
newfs -B le -m 0 -o space -i 3950 -c 80 ${VND_RDEV}
@ -45,11 +46,12 @@ ${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREE} ${LISTS}
@echo ""
umount ${MOUNT_POINT}
vnconfig -u ${VND_CDEV}
mv -f ${IMAGE}.tmp ${IMAGE}
unconfig:
-umount -f ${MOUNT_POINT}
-vnconfig -u ${VND_DEV}
-/bin/rm -f ${IMAGE}
-/bin/rm -f ${IMAGE}.tmp
${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
crunchgen -D ${TOP}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC}

10
distrib/i386/floppies/ramdisk-rescuetiny/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1 2000/09/27 16:04:16 fvdl Exp $
# $NetBSD: Makefile,v 1.2 2000/10/09 12:36:27 fvdl Exp $
TOP= ${.CURDIR}/..
WARNS=1
@ -31,8 +31,9 @@ RAMDISKSIZE!= expr ${RAMDISKSPC} \* ${RAMDISKCYLS}
realall: ${IMAGE}
${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREE} ${LISTS}
dd if=/dev/zero of=${IMAGE} count=${RAMDISKSIZE}
vnconfig -v -c ${VND_CDEV} ${IMAGE} 512/${RAMDISKSPC}/1/${RAMDISKCYLS}
rm -f ${IMAGE}.tmp
dd if=/dev/zero of=${IMAGE}.tmp count=${RAMDISKSIZE}
vnconfig -v -c ${VND_CDEV} ${IMAGE}.tmp 512/${RAMDISKSPC}/1/${RAMDISKCYLS}
-disklabel ${VND_CDEV} >tmplabel
disklabel -r -R ${VND_CDEV} tmplabel
newfs -B le -m 0 -o space -i 3950 -c 80 ${VND_RDEV}
@ -45,6 +46,7 @@ ${IMAGE}: ${CBIN} ${AUXDEPENDS} ${MTREE} ${LISTS}
@echo ""
umount ${MOUNT_POINT}
vnconfig -u ${VND_CDEV}
mv -f ${IMAGE}.tmp ${IMAGE}
unconfig:
-umount -f ${MOUNT_POINT}
@ -70,7 +72,7 @@ HACKOBJS:= getcap.o getgrent.o getnet.o getnetgr.o getpwent.o setlocale.o yplib.
release:
clean cleandir distclean:
/bin/rm -f ${AUXCLEAN} *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.cro *.c
/bin/rm -f ${AUXCLEAN} *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache *.o *.cro *.c ${IMAGE}.tmp
.include <bsd.own.mk>
.include <bsd.obj.mk>