summaryrefslogtreecommitdiff
path: root/distrib/hppa
diff options
context:
space:
mode:
authorMichael Shalayeff <mickey@cvs.openbsd.org>2003-02-13 21:42:46 +0000
committerMichael Shalayeff <mickey@cvs.openbsd.org>2003-02-13 21:42:46 +0000
commitb268828298ef9bfdb40cb95864d20e364759912b (patch)
tree2c920991e8e6e7c0a035681255569d00bc58c97b /distrib/hppa
parent5fc288e6b7d38dc70b8cbb5739eaeb994cae7dd8 (diff)
no mdec/boot on the ramdisk. name it chewable for the etc/makefiles
Diffstat (limited to 'distrib/hppa')
-rw-r--r--distrib/hppa/ramdisk/Makefile14
-rw-r--r--distrib/hppa/ramdisk/list5
2 files changed, 10 insertions, 9 deletions
diff --git a/distrib/hppa/ramdisk/Makefile b/distrib/hppa/ramdisk/Makefile
index 08386d93e3f..72b0f9afec4 100644
--- a/distrib/hppa/ramdisk/Makefile
+++ b/distrib/hppa/ramdisk/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.1 2003/01/30 21:05:01 mickey Exp $
+# $OpenBSD: Makefile,v 1.2 2003/02/13 21:42:45 mickey Exp $
CBIN= instbin
ARCHDIR= ${.CURDIR}/..
@@ -29,7 +29,7 @@ STRIP?= strip
LISTS= ${ARCHDIR}/list ${.CURDIR}/list
MTREE= ${UTILS}/mtree.conf
-FLOPPY?= ramdisk${REV}.lif
+LIF?= lif${REV}.fs
MKBOOT?= ${DESTDIR}/usr/mdec/mkboot
BOOT?= ${DESTDIR}/usr/mdec/boot
@@ -40,10 +40,10 @@ GZIPFLAGS?= -9
NEWFSOPTS= -t ffs -m 0 -o space -f 1024 -b 8192
NEWFSOPTS_RD?= ${NEWFSOPTS} -i 16384 -c 64 -s ${IMAGESIZE}
-all: bsd.rd ${FLOPPY}
+all: bsd.rd ${LIF}
-${FLOPPY}: bsd ${BOOT} ${BOOTXX}
- ${MKBOOT} -v ${BOOT} bsd ${FLOPPY}
+${LIF}: bsd ${BOOT} ${BOOTXX}
+ ${MKBOOT} -v ${BOOT} bsd ${LIF}
obsd:
cd ${SRCDIR}/sys/arch/${MACHINE}/conf && config ${KERNEL}
@@ -92,11 +92,11 @@ ${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
clean cleandir:
/bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \
- ${CBIN}.conf *.o *.lo *.c obsd bsd bsd.*
+ ${CBIN}.conf *.o *.lo *.c obsd bsd bsd.* ${LIF}
beforeinstall:
cp bsd.rd ${DESTDIR}/snapshot
- cp ${FLOPPY} ${DESTDIR}/snapshot
+ cp ${LIF} ${DESTDIR}/snapshot
unconfig:
-umount -f ${MOUNT_POINT}
diff --git a/distrib/hppa/ramdisk/list b/distrib/hppa/ramdisk/list
index fabc71854c5..2654a17407e 100644
--- a/distrib/hppa/ramdisk/list
+++ b/distrib/hppa/ramdisk/list
@@ -1,4 +1,4 @@
-# $OpenBSD: list,v 1.2 2003/01/30 22:09:56 deraadt Exp $
+# $OpenBSD: list,v 1.3 2003/02/13 21:42:45 mickey Exp $
# hppa extra's
LINK instbin sbin/disklabel
@@ -13,8 +13,9 @@ SYMLINK /tmp var/tmp
SCRIPT ${DESTDIR}/dev/MAKEDEV dev/MAKEDEV
SPECIAL cd dev; sh MAKEDEV ramdisk
-# we need the contents of /usr/mdec (but not boot or binstall)
+# we need the contents of /usr/mdec (but not boot or mkboot)
COPYDIR ${DESTDIR}/usr/mdec usr/mdec
+SPECIAL rm -f usr/mdec/boot
SPECIAL rm -f usr/mdec/mkboot
# various files that we need in /etc for the install