diff options
| -rw-r--r-- | distrib/i386/Makefile | 4 | ||||
| -rw-r--r-- | distrib/i386/cdfs/Makefile | 32 | ||||
| -rw-r--r-- | distrib/i386/ramdisk_cd/Makefile | 27 |
3 files changed, 25 insertions, 38 deletions
diff --git a/distrib/i386/Makefile b/distrib/i386/Makefile index b0525ac46f6..72e609c3b78 100644 --- a/distrib/i386/Makefile +++ b/distrib/i386/Makefile @@ -1,6 +1,6 @@ -# $OpenBSD: Makefile,v 1.12 2015/02/23 09:33:38 deraadt Exp $ +# $OpenBSD: Makefile,v 1.13 2019/04/30 21:11:17 deraadt Exp $ -SUBDIR= ramdisk_cd ramdisk cdfs +SUBDIR= ramdisk_cd ramdisk .if make(obj) || make(cleandir) || make(clean) SUBDIR+= iso diff --git a/distrib/i386/cdfs/Makefile b/distrib/i386/cdfs/Makefile deleted file mode 100644 index d1b61e67aa3..00000000000 --- a/distrib/i386/cdfs/Makefile +++ /dev/null @@ -1,32 +0,0 @@ -# $OpenBSD: Makefile,v 1.13 2019/04/30 17:46:03 deraadt Exp $ - -CDROM= cd${OSrev}.iso - -all: ${CDROM} - -${CDROM}: - rm -rf ${.OBJDIR}/cd-dir - mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/i386 - mkdir -p ${.OBJDIR}/cd-dir/etc - echo "set image /${OSREV}/i386/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf - cp ${.OBJDIR}/../ramdisk_cd/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/i386 - cp ${DESTDIR}/usr/mdec/cdbr ${.OBJDIR}/cd-dir/${OSREV}/i386 - cp ${DESTDIR}/usr/mdec/cdboot ${.OBJDIR}/cd-dir/${OSREV}/i386/cdboot - mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \ - -A "OpenBSD ${OSREV} i386 bootonly CD" \ - -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \ - -p "Theo de Raadt <deraadt@openbsd.org>" \ - -V "OpenBSD/i386 ${OSREV} boot-only CD" \ - -b ${OSREV}/i386/cdbr -c ${OSREV}/i386/boot.catalog \ - ${.OBJDIR}/cd-dir - -.ifdef RELEASEDIR -install: - cp ${CDROM} ${RELEASEDIR} -.endif # RELEASEDIR - -clean cleandir: - /bin/rm -f ${CDROM} - rm -rf cd-dir - -.include <bsd.obj.mk> diff --git a/distrib/i386/ramdisk_cd/Makefile b/distrib/i386/ramdisk_cd/Makefile index a7e48792f31..4733829f64a 100644 --- a/distrib/i386/ramdisk_cd/Makefile +++ b/distrib/i386/ramdisk_cd/Makefile @@ -1,8 +1,9 @@ -# $OpenBSD: Makefile,v 1.8 2019/04/30 17:46:04 deraadt Exp $ +# $OpenBSD: Makefile,v 1.9 2019/04/30 21:11:22 deraadt Exp $ FS= miniroot${OSrev}.fs FSSIZE= 7936 FSDISKTYPE= mini34 +CDROM= cd${OSrev}.iso MOUNT_POINT= /mnt MTREE= ${UTILS}/mtree.conf @@ -12,7 +13,7 @@ UTILS= ${.CURDIR}/../../miniroot RAMDISK=RAMDISK_CD LBA=1 -all: ${FS} +all: ${FS} ${CDROM} ${FS}: bsd.gz dd if=/dev/zero of=${FS} bs=512 count=${FSSIZE} @@ -34,6 +35,22 @@ ${FS}: bsd.gz vnconfig -u `cat vnd` rm -f vnd +${CDROM}: bsd.rd + rm -rf ${.OBJDIR}/cd-dir + mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/i386 + mkdir -p ${.OBJDIR}/cd-dir/etc + echo "set image /${OSREV}/i386/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf + cp ${.OBJDIR}/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/i386 + cp ${DESTDIR}/usr/mdec/cdbr ${.OBJDIR}/cd-dir/${OSREV}/i386 + cp ${DESTDIR}/usr/mdec/cdboot ${.OBJDIR}/cd-dir/${OSREV}/i386/cdboot + mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} -v -v \ + -A "OpenBSD ${OSREV} i386 bootonly CD" \ + -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \ + -p "Theo de Raadt <deraadt@openbsd.org>" \ + -V "OpenBSD/i386 ${OSREV} boot-only CD" \ + -b ${OSREV}/i386/cdbr -c ${OSREV}/i386/boot.catalog \ + ${.OBJDIR}/cd-dir + MRDISKTYPE= rdrootb MRMAKEFSARGS= -o disklabel=${MRDISKTYPE},minfree=0,density=4096 @@ -81,13 +98,15 @@ unconfig: install: cp bsd.rd ${RELEASEDIR}/bsd.rd chmod a+r ${RELEASEDIR}/bsd.rd - cp ${FS} ${RELEASEDIR}/${FS} + cp ${FS} ${CDROM} ${RELEASEDIR} .endif # RELEASEDIR clean cleandir: /bin/rm -f *.core mr.fs instbin instbin.mk instbin*.cache \ *.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.fs \ lib*.a lib*.olist instbin.map boot instbin.conf ${FS} - /bin/rm -rf mr.fs.d + rm -rf mr.fs.d + rm -f ${CDROM} + rm -rf cd-dir .include <bsd.obj.mk> |