diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-28 15:21:51 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2019-04-28 15:21:51 +0000 |
| commit | 9f26f88fc9914553f72c6c16a69ab28d35da1f66 (patch) | |
| tree | 6916054d9b733b75537d8d6af1c2aa2334fdec8f /distrib/octeon/ramdisk | |
| parent | b23dbd1048b63741bb0d8faf81e0932a68989654 (diff) | |
CBIN variable is also pointless, it is always "instbin". Rather than
having two mysterious names, let's settle on one.
Diffstat (limited to 'distrib/octeon/ramdisk')
| -rw-r--r-- | distrib/octeon/ramdisk/Makefile | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/distrib/octeon/ramdisk/Makefile b/distrib/octeon/ramdisk/Makefile index e5d1361ef7c..94fe30aaffe 100644 --- a/distrib/octeon/ramdisk/Makefile +++ b/distrib/octeon/ramdisk/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.7 2019/04/28 15:15:39 deraadt Exp $ +# $OpenBSD: Makefile,v 1.8 2019/04/28 15:21:50 deraadt Exp $ REV= ${OSrev} TOP= ${.CURDIR}/.. IMAGE= mr.fs -CBIN?= instbin -CRUNCHCONF?= ${CBIN}.conf +CRUNCHCONF?= instbin.conf CRUNCHCONFS?= ${.CURDIR}/../common/crunch.conf LISTS= ${.CURDIR}/list UTILS?= ${.CURDIR}/../../miniroot @@ -23,14 +22,14 @@ bsd.rd: ${IMAGE} bsd cp bsd bsd.rd rdsetroot bsd.rd ${IMAGE} -${IMAGE}: ${CBIN} +${IMAGE}: instbin rm -rf $@.d install -d -o root -g wheel $@.d mtree -def ${MTREE} -p $@.d -u TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} REV=${REV} \ TARGDIR=$@.d UTILS=${UTILS} RELEASEDIR=${RELEASEDIR} \ sh ${UTILS}/runlist.sh ${LISTS} - rm $@.d/${CBIN} + rm $@.d/instbin makefs ${MAKEFSARGS_RD} $@ $@.d bsd: @@ -38,18 +37,18 @@ bsd: su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' cp -p ${TOP}/../../sys/arch/octeon/compile/RAMDISK/obj/bsd bsd -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} +instbin.mk instbin.cache instbin.c: ${CRUNCHCONF} crunchgen -M -E -D ${.CURDIR}/../../.. -L ${DESTDIR}/usr/lib ${.ALLSRC} -${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c - ${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all +instbin: instbin.mk instbin.cache instbin.c + ${MAKE} -f instbin.mk SRCLIBDIR=${.CURDIR}/../../../lib all ${CRUNCHCONF}: ${LISTS} - awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CBIN}.conf + awk -f ${UTILS}/makeconf.awk ${LISTS} > instbin.conf clean cleandir: - /bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}.cache \ - lib*.a lib*.olist ${CBIN}.map *.o *.lo *.c bsd bsd.rd + /bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \ + lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd rm -rf cd-dir ${IMAGE}.d .ifdef RELEASEDIR |