diff options
| author | Sebastien Marie <semarie@cvs.openbsd.org> | 2021-02-14 17:11:03 +0000 |
|---|---|---|
| committer | Sebastien Marie <semarie@cvs.openbsd.org> | 2021-02-14 17:11:03 +0000 |
| commit | 71b18407c1401e9300aedb1afe1d6f47e76518cf (patch) | |
| tree | 49329091fd1c93fa5f72fbb2b5d4afd17a2b3500 /distrib/amd64/ramdisk_cd | |
| parent | 5fdb5ff0454e5fca152d7967e6fd039a79a5850d (diff) | |
distrib: use ${MACHINE} instead of hardcoded value
ok deraadt@
Diffstat (limited to 'distrib/amd64/ramdisk_cd')
| -rw-r--r-- | distrib/amd64/ramdisk_cd/Makefile | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/distrib/amd64/ramdisk_cd/Makefile b/distrib/amd64/ramdisk_cd/Makefile index ba206c042f3..591a12b09b7 100644 --- a/distrib/amd64/ramdisk_cd/Makefile +++ b/distrib/amd64/ramdisk_cd/Makefile @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile,v 1.28 2021/02/13 18:52:08 semarie Exp $ +# $OpenBSD: Makefile,v 1.29 2021/02/14 17:11:02 semarie Exp $ FS= miniroot${OSrev}.img FSSIZE= 9920 @@ -38,18 +38,18 @@ ${FS}: bsd.gz ${CDROM}: bsd.rd rm -rf ${.OBJDIR}/cd-dir - mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/amd64 + mkdir -p ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} mkdir -p ${.OBJDIR}/cd-dir/etc - echo "set image /${OSREV}/amd64/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf - cp ${.OBJDIR}/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/amd64 - cp ${DESTDIR}/usr/mdec/cdbr ${.OBJDIR}/cd-dir/${OSREV}/amd64 - cp ${DESTDIR}/usr/mdec/cdboot ${.OBJDIR}/cd-dir/${OSREV}/amd64/cdboot + echo "set image /${OSREV}/${MACHINE}/bsd.rd" > ${.OBJDIR}/cd-dir/etc/boot.conf + cp ${.OBJDIR}/bsd.rd ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} + cp ${DESTDIR}/usr/mdec/cdbr ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE} + cp ${DESTDIR}/usr/mdec/cdboot ${.OBJDIR}/cd-dir/${OSREV}/${MACHINE}/cdboot mkhybrid -a -R -T -L -l -d -D -N -o ${.OBJDIR}/${CDROM} \ - -A "OpenBSD ${OSREV} amd64 bootonly CD" \ + -A "OpenBSD ${OSREV} ${MACHINE} bootonly CD" \ -P "Copyright (c) `date +%Y` Theo de Raadt, The OpenBSD project" \ -p "Theo de Raadt <deraadt@openbsd.org>" \ - -V "OpenBSD/amd64 ${OSREV} boot-only CD" \ - -b ${OSREV}/amd64/cdbr -c ${OSREV}/amd64/boot.catalog \ + -V "OpenBSD/${MACHINE} ${OSREV} boot-only CD" \ + -b ${OSREV}/${MACHINE}/cdbr -c ${OSREV}/${MACHINE}/boot.catalog \ ${.OBJDIR}/cd-dir MRDISKTYPE= rdrootb |