diff options
| author |   deraadt <deraadt@openbsd.org> | 2019-04-28 15:21:49 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2019-04-28 15:21:49 +0000 |
| commit | 6a1b39a08e3c887b4c10c7835d71b0f794c98ddf (patch) | |
| tree | 07fb2ab04e1623b61f1663889034970bf4983f5c /distrib/macppc | |
| parent | the BSD_RD variable is pointless (diff) | |
| download | wireguard-openbsd-6a1b39a08e3c887b4c10c7835d71b0f794c98ddf.tar.xz wireguard-openbsd-6a1b39a08e3c887b4c10c7835d71b0f794c98ddf.zip | |
CBIN variable is also pointless, it is always "instbin". Rather than
having two mysterious names, let's settle on one.
Diffstat (limited to 'distrib/macppc')
| -rw-r--r-- | distrib/macppc/ramdisk/Makefile | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/distrib/macppc/ramdisk/Makefile b/distrib/macppc/ramdisk/Makefile index 38e1579ff43..9698cc27ff6 100644 --- a/distrib/macppc/ramdisk/Makefile +++ b/distrib/macppc/ramdisk/Makefile @@ -1,12 +1,11 @@ -# $OpenBSD: Makefile,v 1.37 2019/04/28 15:15:39 deraadt Exp $ +# $OpenBSD: Makefile,v 1.38 2019/04/28 15:21:49 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 @@ -52,14 +51,14 @@ cd: bsd.rd -V "OpenBSD/macppc ${OSREV} boot-only CD" \ -o ${.OBJDIR}/cd${OSrev}.iso ${.OBJDIR}/cd-dir -${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 vnconfig -v mr.fs > vnd df -i /dev/`cat vnd`a @@ -73,18 +72,18 @@ bsd: su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && exec ${MAKE}' cp -p ${TOP}/../../sys/arch/macppc/compile/RAMDISK/obj/bsd bsd -${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF} +instbin.mk instbin.cache instbin.c: ${CRUNCHCONF} crunchgen -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 cd${REV}.iso + /bin/rm -f *.core ${IMAGE} instbin instbin.mk instbin.cache \ + lib*.a lib*.olist instbin.map *.o *.lo *.c bsd bsd.rd cd${REV}.iso rm -rf cd-dir ${IMAGE}.d .ifdef RELEASEDIR |