Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/distrib/i386/floppies Merge latest build system changes, and...
details: https://anonhg.NetBSD.org/src/rev/b6df25424ce3
branches: trunk
changeset: 485789:b6df25424ce3
user: mycroft <mycroft%NetBSD.org@localhost>
date: Fri May 05 20:13:29 2000 +0000
description:
Merge latest build system changes, and use the kernels built in ramdisk-kernel.
diffstat:
distrib/i386/floppies/Makefile | 6 +--
distrib/i386/floppies/bootfloppy-big/Makefile | 10 ++++--
distrib/i386/floppies/bootfloppy-common/Makefile.inc | 29 ++++++-------------
distrib/i386/floppies/bootfloppy-common/list | 4 +-
distrib/i386/floppies/bootfloppy-small/Makefile | 9 ++++--
distrib/i386/floppies/bootfloppy-tiny/Makefile | 9 ++++--
distrib/i386/floppies/bootfloppy/Makefile | 10 ++++--
distrib/i386/floppies/fdset-common/Makefile.inc | 22 +++-----------
distrib/i386/floppies/fdset/Makefile | 8 +++--
distrib/i386/floppies/ramdisk-kernel/Makefile | 14 ++++-----
distrib/i386/floppies/ramdisk/Makefile | 3 +-
distrib/i386/floppies/ramdisk/Makefile.inc | 3 +-
12 files changed, 56 insertions(+), 71 deletions(-)
diffs (truncated from 349 to 300 lines):
diff -r 1e8967df44eb -r b6df25424ce3 distrib/i386/floppies/Makefile
--- a/distrib/i386/floppies/Makefile Fri May 05 20:12:00 2000 +0000
+++ b/distrib/i386/floppies/Makefile Fri May 05 20:13:29 2000 +0000
@@ -1,8 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2000/05/05 19:30:13 mycroft Exp $
+# $NetBSD: Makefile,v 1.13 2000/05/05 20:13:29 mycroft Exp $
-SUBDIR= ramdisk ramdisk-kernel fdset bootfloppy-big
-
-# SUBDIR += bootfloppy-tiny
+SUBDIR= ramdisk ramdisk-kernel fdset bootfloppy-big # bootfloppy-tiny
TARGETS+=release
diff -r 1e8967df44eb -r b6df25424ce3 distrib/i386/floppies/bootfloppy-big/Makefile
--- a/distrib/i386/floppies/bootfloppy-big/Makefile Fri May 05 20:12:00 2000 +0000
+++ b/distrib/i386/floppies/bootfloppy-big/Makefile Fri May 05 20:13:29 2000 +0000
@@ -1,11 +1,13 @@
-# $NetBSD: Makefile,v 1.5 2000/05/02 16:06:48 sjg Exp $
+# $NetBSD: Makefile,v 1.6 2000/05/05 20:13:30 mycroft Exp $
-TOP= ${.CURDIR}/..
+TOP= ${.CURDIR}/..
.include "${TOP}/Makefile.inc"
-IMAGE= boot-big.fs
-KERN?= ${KERNOBJDIR}/INSTALL/netbsd
+IMAGE= boot-big.fs
+KERN!= cd $(.CURDIR)/../ramdisk-kernel/; \
+ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/netbsd.INSTALL.gz\n" | \
+ ${MAKE} -s -f-
# This Makefile builds a boot image on a 2.88M-sized image.
#
diff -r 1e8967df44eb -r b6df25424ce3 distrib/i386/floppies/bootfloppy-common/Makefile.inc
--- a/distrib/i386/floppies/bootfloppy-common/Makefile.inc Fri May 05 20:12:00 2000 +0000
+++ b/distrib/i386/floppies/bootfloppy-common/Makefile.inc Fri May 05 20:13:29 2000 +0000
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile.inc,v 1.24 2000/05/02 16:06:48 sjg Exp $
+# $NetBSD: Makefile.inc,v 1.25 2000/05/05 20:13:30 mycroft Exp $
# TOP is assumed to be defined by Makefile including this one.
COMMONDIR= ${TOP}/bootfloppy-common
-.include <bsd.kernobj.mk>
-
MOUNT_POINT?= /mnt
VND?= vnd0
VND_DEV= /dev/${VND}a
@@ -13,14 +11,11 @@
VND_CDEV= /dev/${VND}d
VND_CRDEV= /dev/r${VND}d
IMAGE?= xxx.fs
-KERN?= netbsd-xxx
MDEC= ${DESTDIR}/usr/mdec
+BOOTCODE= ${MDEC}/biosboot.sym
STRIP?= strip
-LISTS= ${COMMONDIR}/list
-RAMDISK !=cd $(.CURDIR)/../ramdisk/; \
- printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/ramdisk.fs\n" | \
- ${MAKE} -s -f-
+LISTS?= ${COMMONDIR}/list
DISKTYPE?= floppy3
DISKSIZE?= 2880
@@ -35,17 +30,16 @@
INO_BYTES?= 204800
-CLEANFILES+= netbsd.ram.gz
+CLEANFILES+= netbsd
-realall: netbsd.ram.gz
+realall: netbsd
dd if=/dev/zero of=${IMAGE} count=${DISKSIZE}
vnconfig -t ${DISKTYPE} -v -c ${VND_CDEV} ${IMAGE}
disklabel -rw ${VND_CDEV} ${DISKTYPE}
newfs -B le -m 0 -o space -i ${INO_BYTES} -c 80 ${VND_RDEV} ${DISKTYPE}
- ${MDEC}/installboot -v -f ${MDEC}/biosboot.sym ${VND_RDEV}
+ ${MDEC}/installboot -v -f ${BOOTCODE} ${VND_RDEV}
mount ${VND_DEV} ${MOUNT_POINT}
TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
- KERNOBJDIR=${KERNOBJDIR} \
TARGDIR=${MOUNT_POINT} sh ${TOP}/runlist.sh ${LISTS}
@echo ""
@df -i ${MOUNT_POINT}
@@ -57,12 +51,9 @@
-vnconfig -u ${VND_DEV}
-/bin/rm -f ${IMAGE}
-netbsd.ram.gz: ${KERN} ${RAMDISK}
- cp ${KERN} netbsd.tmp
- ${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK}
- ${STRIP} netbsd.tmp
- gzip -9 netbsd.tmp
- mv netbsd.tmp.gz ${.TARGET}
+netbsd: ${KERN}
+ rm -f netbsd
+ cp ${KERN} netbsd
release:
-mkdir -p ${RELEASEDIR}/installation/floppies
@@ -70,7 +61,7 @@
gzip <${IMAGE} >${RELEASEDIR}/installation/floppies/${IMAGE}.gz
clean cleandir distclean:
- /bin/rm -f *.core ${IMAGE} ${CLEANFILES}
+ /bin/rm -f *.core ${CLEANFILES} ${IMAGE}
.include <bsd.own.mk>
.include <bsd.obj.mk>
diff -r 1e8967df44eb -r b6df25424ce3 distrib/i386/floppies/bootfloppy-common/list
--- a/distrib/i386/floppies/bootfloppy-common/list Fri May 05 20:12:00 2000 +0000
+++ b/distrib/i386/floppies/bootfloppy-common/list Fri May 05 20:13:29 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: list,v 1.3 1999/03/13 20:02:32 sommerfe Exp $
+# $NetBSD: list,v 1.4 2000/05/05 20:13:31 mycroft Exp $
# copy the kernel
# We copy compressed kernel to "netbsd" rather than "netbsd.gz" for two reasons
@@ -6,4 +6,4 @@
# 2) avoids possible moment of confusion when bootblocks
# print "no such file or directory" error before moving on to netbsd.gz
-COPY ${OBJDIR}/netbsd.ram.gz netbsd
+COPY ${OBJDIR}/netbsd netbsd
diff -r 1e8967df44eb -r b6df25424ce3 distrib/i386/floppies/bootfloppy-small/Makefile
--- a/distrib/i386/floppies/bootfloppy-small/Makefile Fri May 05 20:12:00 2000 +0000
+++ b/distrib/i386/floppies/bootfloppy-small/Makefile Fri May 05 20:13:29 2000 +0000
@@ -1,11 +1,14 @@
-# $NetBSD: Makefile,v 1.4 2000/05/02 16:06:49 sjg Exp $
+# $NetBSD: Makefile,v 1.5 2000/05/05 20:13:31 mycroft Exp $
-TOP= ${.CURDIR}/..
+TOP= ${.CURDIR}/..
.include "${TOP}/Makefile.inc"
IMAGE= boot-small.fs
-KERN?= ${KERNOBJDIR}/INSTALL_SMALL/netbsd
+KERN!= cd $(.CURDIR)/../ramdisk-kernel/; \
+ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/netbsd.INSTALL_SMALL.gz\n" | \
+ ${MAKE} -s -f-
+
DISKTYPE= floppy5
DISKSIZE= 2400
diff -r 1e8967df44eb -r b6df25424ce3 distrib/i386/floppies/bootfloppy-tiny/Makefile
--- a/distrib/i386/floppies/bootfloppy-tiny/Makefile Fri May 05 20:12:00 2000 +0000
+++ b/distrib/i386/floppies/bootfloppy-tiny/Makefile Fri May 05 20:13:29 2000 +0000
@@ -1,11 +1,14 @@
-# $NetBSD: Makefile,v 1.3 2000/05/02 16:06:49 sjg Exp $
+# $NetBSD: Makefile,v 1.4 2000/05/05 20:13:31 mycroft Exp $
-TOP= ${.CURDIR}/..
+TOP= ${.CURDIR}/..
.include "${TOP}/Makefile.inc"
IMAGE= boot-tiny.fs
-KERN?= ${KERNOBJDIR}/INSTALL_TINY/netbsd
+KERN!= cd $(.CURDIR)/../ramdisk-kernel/; \
+ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/netbsd.INSTALL_TINY.gz\n" | \
+ ${MAKE} -s -f-
+
DISKTYPE= floppy5
DISKSIZE= 2400
diff -r 1e8967df44eb -r b6df25424ce3 distrib/i386/floppies/bootfloppy/Makefile
--- a/distrib/i386/floppies/bootfloppy/Makefile Fri May 05 20:12:00 2000 +0000
+++ b/distrib/i386/floppies/bootfloppy/Makefile Fri May 05 20:13:29 2000 +0000
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2000/05/02 16:06:48 sjg Exp $
+# $NetBSD: Makefile,v 1.6 2000/05/05 20:13:30 mycroft Exp $
-TOP= ${.CURDIR}/..
+TOP= ${.CURDIR}/..
.include "${TOP}/Makefile.inc"
-IMAGE= boot.fs
-KERN?= ${KERNOBJDIR}/INSTALL/netbsd
+IMAGE= boot.fs
+KERN!= cd $(.CURDIR)/../ramdisk-kernel/; \
+ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/netbsd.INSTALL.gz\n" | \
+ ${MAKE} -s -f-
.include "${TOP}/bootfloppy-common/Makefile.inc"
diff -r 1e8967df44eb -r b6df25424ce3 distrib/i386/floppies/fdset-common/Makefile.inc
--- a/distrib/i386/floppies/fdset-common/Makefile.inc Fri May 05 20:12:00 2000 +0000
+++ b/distrib/i386/floppies/fdset-common/Makefile.inc Fri May 05 20:13:29 2000 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.12 2000/05/04 14:12:13 hubertf Exp $
+# $NetBSD: Makefile.inc,v 1.13 2000/05/05 20:13:32 mycroft Exp $
# TOP is assumed to be defined by Makefile including this one.
@@ -14,21 +14,16 @@
BASENAME= boot
IMAGE1= ${BASENAME}1.fs
FSTMP= ustar.tmp
-KERN?= netbsd-xxx
MDEC= ${DESTDIR}/usr/mdec
BOOTCODE= ${MDEC}/biosboot.sym
#BOOTCODE= ${MDEC}/biosboot_com0.sym # Serial output
STRIP?= strip
-RAMDISK !=cd $(.CURDIR)/../ramdisk/; \
- printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/ramdisk.fs\n" | \
- ${MAKE} -s -f-
-
DISKTYPE?= floppy3
DISKSIZE?= 2880
BLOCK8K?= 179
-CLEANFILES+= netbsd.ram.gz netbsd boot ustar.tmp
+CLEANFILES+= netbsd boot ustar.tmp
realall: netbsd boot
@echo Making disk number one
@@ -45,7 +40,7 @@
dd bs=8k seek=1 count=${BLOCK8K} if=${FSTMP} of=${VND_CDEV}
disklabel -rw ${VND_CDEV} ${DISKTYPE}
@echo "installing new bootblocks"
- ${MDEC}/installboot -b 17 -v ${BOOTCODE} ${VND_RDEV}
+ ${MDEC}/installboot -b 17 -v -f ${BOOTCODE} ${VND_RDEV}
vnconfig -u ${VND_CDEV}
:
@ls -l ${FSTMP} | (read mode links uid gid size junk; \
@@ -79,21 +74,14 @@
done; \
fi; )
-netbsd.ram.gz: ${KERN} ${RAMDISK}
- cp ${KERN} netbsd.tmp
- ${DESTDIR}/usr/sbin/mdsetimage -v netbsd.tmp ${RAMDISK}
- ${STRIP} netbsd.tmp
- gzip -9 netbsd.tmp
- mv netbsd.tmp.gz ${.TARGET}
-
# Let the kernel on the diskette be called "netbsd" although
# it is compressed. This is because the boot code will search
# for "netbsd" first, and calling it "netbsd" instead of "netbsd.gz"
# we avoid scanning all the diskettes before reading the file.
-netbsd: netbsd.ram.gz
+netbsd: ${KERN}
rm -f netbsd
- ln netbsd.ram.gz netbsd
+ cp ${KERN} netbsd
# This is "cheating", just so that we have the available
# space at the start of the tar file. Installboot will overwrite
diff -r 1e8967df44eb -r b6df25424ce3 distrib/i386/floppies/fdset/Makefile
--- a/distrib/i386/floppies/fdset/Makefile Fri May 05 20:12:00 2000 +0000
+++ b/distrib/i386/floppies/fdset/Makefile Fri May 05 20:13:29 2000 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2000/05/02 16:06:49 sjg Exp $
+# $NetBSD: Makefile,v 1.4 2000/05/05 20:13:32 mycroft Exp $
-TOP= ${.CURDIR}/..
+TOP= ${.CURDIR}/..
.include "${TOP}/Makefile.inc"
-KERN?= ${KERNOBJDIR}/INSTALL/netbsd
+KERN!= cd $(.CURDIR)/../ramdisk-kernel/; \
+ printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}/netbsd.INSTALL.gz\n" | \
+ ${MAKE} -s -f-
.include "${TOP}/fdset-common/Makefile.inc"
diff -r 1e8967df44eb -r b6df25424ce3 distrib/i386/floppies/ramdisk-kernel/Makefile
--- a/distrib/i386/floppies/ramdisk-kernel/Makefile Fri May 05 20:12:00 2000 +0000
+++ b/distrib/i386/floppies/ramdisk-kernel/Makefile Fri May 05 20:13:29 2000 +0000
@@ -1,13 +1,13 @@
-# $NetBSD: Makefile,v 1.1 2000/05/05 19:29:28 mycroft Exp $
+# $NetBSD: Makefile,v 1.2 2000/05/05 20:13:33 mycroft Exp $
TOP= ${.CURDIR}/..
.include "${TOP}/Makefile.inc"
+.include <bsd.kernobj.mk>
MDEC= ${DESTDIR}/usr/mdec
STRIP?= strip
-KERNDIR= ${.CURDIR}/../../../../sys/arch/i386/compile
COMMONDIR= ${TOP}/bootfloppy-common
LISTS= ${COMMONDIR}/list
RAMDISK !=cd $(.CURDIR)/../ramdisk/; \
@@ -18,17 +18,15 @@
all: ${KERNELS}
-KERN?= ${.CURDIR}/../../../../sys/arch/i386/compile/INSTALL/netbsd
-netbsd.INSTALL.gz: ${KERNDIR}/INSTALL/netbsd ${RAMDISK}
- cp ${KERNDIR}/INSTALL/netbsd netbsd.tmp
Home |
Main Index |
Thread Index |
Old Index