Unshare Makefile.inc so we can determine how to squeeze makefs

into the picture.
ok natano

4 files changed, 150 insertions, 5 deletions

diff --git a/distrib/amd64/ramdiskA/Makefile b/distrib/amd64/ramdiskA/Makefile
index 7d90840943e..a3fbf025342 100644
--- a/distrib/amd64/ramdiskA/Makefile
+++ b/distrib/amd64/ramdiskA/Makefile
@@ -1,10 +1,10 @@
-#	$OpenBSD: Makefile,v 1.2 2012/10/12 14:07:46 jsing Exp $
+#	$OpenBSD: Makefile,v 1.3 2016/10/19 16:49:58 deraadt Exp $
 
 .PATH: ${.CURDIR}/../ramdiskA
 BOOT=${DESTDIR}/usr/mdec/fdboot
 RAMDISK=RAMDISK
 NOBSDRD=1
 
-.include "${.CURDIR}/../common/Makefile.inc"
+.include "${.CURDIR}/Makefile.inc"
 
 LISTS+=		${.CURDIR}/list.local
diff --git a/distrib/amd64/ramdiskA/Makefile.inc b/distrib/amd64/ramdiskA/Makefile.inc
new file mode 100644
index 00000000000..ea03795815e
--- /dev/null
+++ b/distrib/amd64/ramdiskA/Makefile.inc
@@ -0,0 +1,145 @@
+#	$OpenBSD: Makefile.inc,v 1.1 2016/10/19 16:49:58 deraadt Exp $
+
+TOP=		${.CURDIR}/..
+
+.include "${TOP}/Makefile.inc"
+IMAGE=		mr.fs
+CBIN?=		instbin
+CRUNCHCONF?=	${CBIN}.conf
+LISTS?=		${.CURDIR}/../common/list
+UTILS?=		${.CURDIR}/../../miniroot
+
+MOUNT_POINT=	/mnt
+MTREE=		${UTILS}/mtree.conf
+
+XNAME?=		floppy
+FS?=		${XNAME}${REV}.fs
+VND?=		vnd0
+VND_DEV=	/dev/${VND}a
+VND_RDEV=	/dev/r${VND}a
+VND_CRDEV=	/dev/r${VND}c
+VND_IDEV=	/dev/${VND}i
+VND_IRDEV=	/dev/r${VND}i
+PID!=		echo $$$$
+REALIMAGE!=	echo /var/tmp/image.${PID}
+BOOT?=		${DESTDIR}/usr/mdec/boot
+EFIBOOT?=	${DESTDIR}/usr/mdec/BOOTX64.EFI ${DESTDIR}/usr/mdec/BOOTIA32.EFI
+FLOPPYSIZE?=	2880
+FLOPPYTYPE?=	floppy3
+
+all:	${FS}
+
+${FS}:	bsd.gz
+	dd if=/dev/zero of=${REALIMAGE} bs=512 count=${FLOPPYSIZE}
+	vnconfig -v -c ${VND} ${REALIMAGE}
+.ifdef TEMPLATE
+	disklabel -wAT ${TEMPLATE} ${VND}
+	newfs -t msdos ${VND_IRDEV}
+	mount ${VND_IDEV} ${MOUNT_POINT}
+	mkdir -p ${MOUNT_POINT}/efi/boot
+	cp ${EFIBOOT} ${MOUNT_POINT}/efi/boot
+	umount ${MOUNT_POINT}
+.else
+	disklabel -w ${VND} ${FLOPPYTYPE}
+.endif
+	newfs -m 0 -o space -i 524288 -c ${FLOPPYSIZE} ${VND_RDEV}
+	mount ${VND_DEV} ${MOUNT_POINT}
+	cp ${BOOT} ${.OBJDIR}/boot
+	strip ${.OBJDIR}/boot
+	strip -R .comment ${.OBJDIR}/boot
+	installboot -v -r ${MOUNT_POINT} ${VND_CRDEV} \
+	    ${DESTDIR}/usr/mdec/biosboot ${.OBJDIR}/boot
+	dd if=bsd.gz of=${MOUNT_POINT}/bsd bs=512
+	@echo ""
+	@df -i ${MOUNT_POINT}
+	@echo ""
+	umount ${MOUNT_POINT}
+	vnconfig -u ${VND}
+	cp ${REALIMAGE} ${FS}
+	rm ${REALIMAGE}
+
+DISKTYPE?=       rdroot
+NBLKS?=          4480
+# minfree, opt, b/i  trks, sects, cpg
+NEWFSARGS= -m 0 -o space -i 4096
+
+bsd.gz: bsd.rd
+	cp bsd.rd bsd.strip
+	strip bsd.strip
+	strip -R .comment bsd.strip
+	gzip -c9n bsd.strip > bsd.gz
+
+bsd.rd:	${IMAGE} bsd rdsetroot
+	cp bsd bsd.rd
+	${.OBJDIR}/rdsetroot bsd.rd ${IMAGE}
+
+
+bsd:
+	cd ${.CURDIR}/../../../sys/arch/amd64/compile/${RAMDISK} && \
+	    su ${BUILDUSER} -c '${MAKE} config && ${MAKE} clean && env COPTS=-Os ${MAKE}'
+	cp -p ${.CURDIR}/../../../sys/arch/amd64/compile/${RAMDISK}/obj/bsd bsd
+
+${IMAGE}: ${CBIN} rd_setup do_files rd_teardown
+
+rd_setup: ${CBIN}
+	dd if=/dev/zero of=${REALIMAGE} bs=512 count=${NBLKS}
+	vnconfig -v -c ${VND} ${REALIMAGE}
+	disklabel -w ${VND} ${DISKTYPE}
+	newfs ${NEWFSARGS} ${VND_RDEV}
+	fsck ${VND_RDEV}
+	mount ${VND_DEV} ${MOUNT_POINT}
+
+rd_teardown:
+	@df -i ${MOUNT_POINT}
+	-umount ${MOUNT_POINT}
+	-vnconfig -u ${VND}
+	cp ${REALIMAGE} ${IMAGE}
+	rm ${REALIMAGE}
+
+rdsetroot:	${TOP}/../common/elfrdsetroot.c
+	${HOSTCC} ${HOSTCFLAGS} -o rdsetroot \
+	    ${TOP}/../common/elfrdsetroot.c ${TOP}/../common/elf32.c \
+	    ${TOP}/../common/elf64.c
+
+unconfig:
+	-umount -f ${MOUNT_POINT}
+	-vnconfig -u ${VND}
+
+.PRECIOUS:	${IMAGE}
+
+.ifdef RELEASEDIR
+install:
+.ifndef NOBSDRD
+	cp bsd.rd ${RELEASEDIR}/bsd.rd
+.endif
+.ifndef NOFS
+	cp ${FS} ${RELEASEDIR}/${FS}
+.endif
+.endif	# RELEASEDIR
+
+${CBIN}.mk ${CBIN}.cache ${CBIN}.c: ${CRUNCHCONF}
+	crunchgen -E -D ${BSDSRCDIR} -L ${DESTDIR}/usr/lib \
+	-c ${CBIN}.c -e ${CBIN} -m ${CBIN}.mk ${CRUNCHCONF}
+
+${CBIN}: ${CBIN}.mk ${CBIN}.cache ${CBIN}.c
+	${MAKE} -f ${CBIN}.mk SRCLIBDIR=${.CURDIR}/../../../lib all
+	strip -R .comment ${CBIN}
+
+${CRUNCHCONF}: ${LISTS}
+	awk -f ${UTILS}/makeconf.awk CBIN=${CBIN} ${LISTS} > ${CRUNCHCONF}
+
+do_files:
+	mtree -def ${MTREE} -p ${MOUNT_POINT}/ -u
+	TOPDIR=${TOP} CURDIR=${.CURDIR} OBJDIR=${.OBJDIR} \
+	    REV=${REV} TARGDIR=${MOUNT_POINT} UTILS=${UTILS} \
+	    RELEASEDIR=${RELEASEDIR} sh ${UTILS}/runlist.sh ${LISTS}
+	rm ${MOUNT_POINT}/${CBIN}
+
+clean cleandir:
+	/bin/rm -f *.core ${IMAGE} ${CBIN} ${CBIN}.mk ${CBIN}*.cache \
+	    *.o *.lo *.c bsd bsd.rd bsd.gz bsd.strip floppy*.fs \
+	    lib*.a lib*.olist ${CBIN}.map \
+	    rdsetroot boot ${CRUNCHCONF} ${FS}
+
+.include <bsd.obj.mk>
+.include <bsd.subdir.mk>
diff --git a/distrib/amd64/ramdisk_cd/Makefile b/distrib/amd64/ramdisk_cd/Makefile
index 5605e838990..9848bb3a11a 100644
--- a/distrib/amd64/ramdisk_cd/Makefile
+++ b/distrib/amd64/ramdisk_cd/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.8 2015/09/06 19:35:19 kettenis Exp $
+#	$OpenBSD: Makefile,v 1.9 2016/10/19 16:49:58 deraadt Exp $
 
 .PATH: ${.CURDIR}/../ramdisk
 RAMDISK=RAMDISK_CD
@@ -8,6 +8,6 @@ XNAME=miniroot
 LBA=1
 TEMPLATE=${.CURDIR}/template
 
-.include "${.CURDIR}/../common/Makefile.inc"
+.include "${.CURDIR}/Makefile.inc"
 
 LISTS+=		${.CURDIR}/list.local
diff --git a/distrib/amd64/common/Makefile.inc b/distrib/amd64/ramdisk_cd/Makefile.inc
index 5317cf02803..f4900f8cca3 100644
--- a/distrib/amd64/common/Makefile.inc
+++ b/distrib/amd64/ramdisk_cd/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.29 2016/10/14 18:44:19 deraadt Exp $
+#	$OpenBSD: Makefile.inc,v 1.1 2016/10/19 16:49:58 deraadt Exp $
 
 TOP=		${.CURDIR}/..