On Thu, Sep 19, 2019 at 07:02:08AM +0200, Martin Husemann wrote:
> On Thu, Sep 19, 2019 at 12:25:11PM +1000, Paul Ripke wrote:
> > Looks like the following patch is needed? A quick grep shows a bunch
> > more instances - but I'm not sure how common this arrangement is
> > outside of arm.
> >
> > diff --git a/sys/stand/efiboot/bootarm/Makefile
> > b/sys/stand/efiboot/bootarm/Makefile
> > index e9e0484ec1da..df0007ffc20e 100644
> > --- a/sys/stand/efiboot/bootarm/Makefile
> > +++ b/sys/stand/efiboot/bootarm/Makefile
> > @@ -17,4 +17,4 @@ LDFLAGS+= -N
> >
> > release: check_RELEASEDIR
> > ${HOST_INSTALL_FILE} -m ${BINMODE} ${PROG} \
> > - ${RELEASEDIR}/${MACHINE}/installation/misc
> > + ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
>
> Yes, this sounds correct.
> Can you fix + test the other instances you found as well and provide a
> single patch for all?
>
> Thanks!
Attached, tested on a few archs I usually build. Likely does't effect
most archs, but I think it pays to be consistent? It fixes the issue
I saw.
--
Paul Ripke
"Great minds discuss ideas, average minds discuss events, small minds
discuss people."
-- Disputed: Often attributed to Eleanor Roosevelt. 1948.
diff --git a/distrib/acorn32/cdroms/installcd/Makefile
b/distrib/acorn32/cdroms/installcd/Makefile
index 39fd9a721409..845025f57687 100644
--- a/distrib/acorn32/cdroms/installcd/Makefile
+++ b/distrib/acorn32/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.3 2018/09/28 15:05:19 martin Exp $
CDBASE= acorn32cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/alpha/cdroms/installcd/Makefile
b/distrib/alpha/cdroms/installcd/Makefile
index 40c7c9d42ff7..de48a8369c20 100644
--- a/distrib/alpha/cdroms/installcd/Makefile
+++ b/distrib/alpha/cdroms/installcd/Makefile
@@ -2,7 +2,7 @@
CDBASE= alphacd # gives ${CDBASE}.iso
CDINSTKERNEL= ../../instkernel/instkernel
CDKERNELS= netbsd netbsd
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
#make the CD bootable
diff --git a/distrib/amd64/cdroms/installcd/Makefile
b/distrib/amd64/cdroms/installcd/Makefile
index f365e1d96a57..b15058aa5bec 100644
--- a/distrib/amd64/cdroms/installcd/Makefile
+++ b/distrib/amd64/cdroms/installcd/Makefile
@@ -8,7 +8,7 @@
.include "${.CURDIR}/../Makefile.cdrom"
CDBASE= amd64cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDBUILDEXTRA= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
diff --git a/distrib/amiga/cdroms/installcd/Makefile
b/distrib/amiga/cdroms/installcd/Makefile
index 927e447dbcad..1db5f65f75a7 100644
--- a/distrib/amiga/cdroms/installcd/Makefile
+++ b/distrib/amiga/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
CDBASE= amigacd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/arc/cdroms/installcd/Makefile
b/distrib/arc/cdroms/installcd/Makefile
index 3e8464bbcfb5..fa5d1669b30d 100644
--- a/distrib/arc/cdroms/installcd/Makefile
+++ b/distrib/arc/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.4 2018/09/28 15:05:20 martin Exp $
CDBASE= arccd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDKERNELS= netbsd-RAMDISK.gz netbsd
CDINSTKERNEL= ../../instkernel
diff --git a/distrib/atari/cdroms/installcd/Makefile
b/distrib/atari/cdroms/installcd/Makefile
index 4496be4b9b36..bea59ce3aa60 100644
--- a/distrib/atari/cdroms/installcd/Makefile
+++ b/distrib/atari/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
CDBASE= ataricd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/cats/cdroms/installcd/Makefile
b/distrib/cats/cdroms/installcd/Makefile
index 478b799b125b..82c52cab6545 100644
--- a/distrib/cats/cdroms/installcd/Makefile
+++ b/distrib/cats/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.3 2018/09/28 15:05:20 martin Exp $
CDBASE= catscd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDKERNELS= netbsd-INSTALL.aout netbsd
CDINSTKERNEL= ../../instkernel
diff --git a/distrib/cobalt/cdroms/installcd/Makefile
b/distrib/cobalt/cdroms/installcd/Makefile
index 931bb56e95b9..62363af49b50 100644
--- a/distrib/cobalt/cdroms/installcd/Makefile
+++ b/distrib/cobalt/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
CDBASE= cobaltcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/common/Makefile.bootcd b/distrib/common/Makefile.bootcd
index 2f9edee2ef16..e33ab47c3315 100644
--- a/distrib/common/Makefile.bootcd
+++ b/distrib/common/Makefile.bootcd
@@ -12,7 +12,7 @@
# CDBASE Basename of the iso
#
# Optional variables:
-# CDRELEASE Set to 'true' to include $RELEASEDIR/$MACHINE on the CD
+# CDRELEASE Set to 'true' to include $RELEASEDIR/$RELEASEMACHINEDIR
on the CD
# CDRELEASE_NOISOS Excludes installation/cdrom directory if set
# CDRELEASE_NODEBUG Excludes debug sets if set
# CDSOURCE Set to 'true' to include $RELEASEDIR/source on the CD
diff --git a/distrib/dreamcast/cdroms/installcd/Makefile
b/distrib/dreamcast/cdroms/installcd/Makefile
index ea71df7ecb7d..34bfd376e17a 100644
--- a/distrib/dreamcast/cdroms/installcd/Makefile
+++ b/distrib/dreamcast/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
CDBASE= dreamcastcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/emips/cdroms/installcd/Makefile
b/distrib/emips/cdroms/installcd/Makefile
index d23635a4b6b9..dd9b885213a1 100644
--- a/distrib/emips/cdroms/installcd/Makefile
+++ b/distrib/emips/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.3 2018/09/28 15:05:20 martin Exp $
CDBASE= emipscd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDKERNELS= netbsd-INSTALL.gz netbsd
CDINSTKERNEL= ../../instkernel
diff --git a/distrib/evbarm/cdroms/installcd/Makefile
b/distrib/evbarm/cdroms/installcd/Makefile
index 72fd3476e9d1..0f212d07362e 100644
--- a/distrib/evbarm/cdroms/installcd/Makefile
+++ b/distrib/evbarm/cdroms/installcd/Makefile
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.3 2018/09/28 15:05:20 martin Exp $
CDBASE= evbarm-${MACHINE_ARCH}cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include
$RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/evbmips/cdroms/installcd/Makefile
b/distrib/evbmips/cdroms/installcd/Makefile
index 24df14434f26..13b8336bcca2 100644
--- a/distrib/evbmips/cdroms/installcd/Makefile
+++ b/distrib/evbmips/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
CDBASE= evbmips-${MACHINE_ARCH}cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/evbppc/cdroms/installcd/Makefile
b/distrib/evbppc/cdroms/installcd/Makefile
index 97c70437d53d..7087da47f701 100644
--- a/distrib/evbppc/cdroms/installcd/Makefile
+++ b/distrib/evbppc/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
CDBASE= evbppccd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/evbsh3/cdroms/installcd/Makefile
b/distrib/evbsh3/cdroms/installcd/Makefile
index a9ff01a7164f..446e346723c1 100644
--- a/distrib/evbsh3/cdroms/installcd/Makefile
+++ b/distrib/evbsh3/cdroms/installcd/Makefile
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:20 martin Exp $
CDBASE= evbsh3-${MACHINE_ARCH}cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include
$RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/ews4800mips/cdroms/installcd/Makefile
b/distrib/ews4800mips/cdroms/installcd/Makefile
index f59f3e8b88ad..6d40ea8f421f 100644
--- a/distrib/ews4800mips/cdroms/installcd/Makefile
+++ b/distrib/ews4800mips/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
CDBASE= ews4800mipscd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/hp300/cdroms/installcd/Makefile
b/distrib/hp300/cdroms/installcd/Makefile
index 36c942a2e49c..104aa51804b3 100644
--- a/distrib/hp300/cdroms/installcd/Makefile
+++ b/distrib/hp300/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
CDBASE= hp300cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/hpcarm/cdroms/installcd/Makefile
b/distrib/hpcarm/cdroms/installcd/Makefile
index ca6006df3ac5..ffdf2da8b06d 100644
--- a/distrib/hpcarm/cdroms/installcd/Makefile
+++ b/distrib/hpcarm/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
CDBASE= hpcarmcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/hpcmips/cdroms/installcd/Makefile
b/distrib/hpcmips/cdroms/installcd/Makefile
index a45c5b19e929..ea34430deb28 100644
--- a/distrib/hpcmips/cdroms/installcd/Makefile
+++ b/distrib/hpcmips/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
CDBASE= hpcmipscd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/hpcsh/cdroms/installcd/Makefile
b/distrib/hpcsh/cdroms/installcd/Makefile
index 52c74a543408..9178493bb55e 100644
--- a/distrib/hpcsh/cdroms/installcd/Makefile
+++ b/distrib/hpcsh/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
CDBASE= hpcshcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/hppa/cdroms/installcd/Makefile
b/distrib/hppa/cdroms/installcd/Makefile
index 8651ec49de10..236ac2d86dac 100644
--- a/distrib/hppa/cdroms/installcd/Makefile
+++ b/distrib/hppa/cdroms/installcd/Makefile
@@ -3,7 +3,7 @@
.include "${.CURDIR}/../Makefile.cdrom"
CDBASE= hppacd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/i386/cdroms/installcd/Makefile
b/distrib/i386/cdroms/installcd/Makefile
index e8ae32c6743c..ec8e6455ea10 100644
--- a/distrib/i386/cdroms/installcd/Makefile
+++ b/distrib/i386/cdroms/installcd/Makefile
@@ -8,7 +8,7 @@
.include "${.CURDIR}/../Makefile.cdrom"
CDBASE= i386cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDBUILDEXTRA+= boot.cfg # Add boot.cfg file
CLEANFILES+= boot.cfg
diff --git a/distrib/ia64/cdroms/installcd/Makefile
b/distrib/ia64/cdroms/installcd/Makefile
index 146f778826ce..7a83e0bed720 100644
--- a/distrib/ia64/cdroms/installcd/Makefile
+++ b/distrib/ia64/cdroms/installcd/Makefile
@@ -2,7 +2,7 @@
CDBASE= ia64cd # gives ${CDBASE}.iso
#CDINSTKERNEL= ../../instkernel/instkernel
CDKERNELS= netbsd netbsd
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
# don't make the CD bootable, there is no installboot support for ia64
diff --git a/distrib/ibmnws/cdroms/installcd/Makefile
b/distrib/ibmnws/cdroms/installcd/Makefile
index e3a4e6899d10..e83a7f6a7f28 100644
--- a/distrib/ibmnws/cdroms/installcd/Makefile
+++ b/distrib/ibmnws/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
CDBASE= ibmnwscd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/luna68k/cdroms/installcd/Makefile
b/distrib/luna68k/cdroms/installcd/Makefile
index 301da71b77df..3cd87258568c 100644
--- a/distrib/luna68k/cdroms/installcd/Makefile
+++ b/distrib/luna68k/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:21 martin Exp $
CDBASE= luna68kcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/macppc/cdroms/installcd/Makefile
b/distrib/macppc/cdroms/installcd/Makefile
index 6b53c1533b9e..055c3bdc4e6a 100644
--- a/distrib/macppc/cdroms/installcd/Makefile
+++ b/distrib/macppc/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.4 2018/11/13 03:07:21 scole Exp $
CDBASE= macppccd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDKERNELS= netbsd-INSTALL.gz netbsd
CDKERNELS+= netbsd-INSTALL_601.gz netbsd.601
diff --git a/distrib/mipsco/cdroms/installcd/Makefile
b/distrib/mipsco/cdroms/installcd/Makefile
index b41547faa0f8..55617713c06e 100644
--- a/distrib/mipsco/cdroms/installcd/Makefile
+++ b/distrib/mipsco/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
CDBASE= mipscocd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/mvme68k/cdroms/installcd/Makefile
b/distrib/mvme68k/cdroms/installcd/Makefile
index b7ccc78cd612..3cbae8373273 100644
--- a/distrib/mvme68k/cdroms/installcd/Makefile
+++ b/distrib/mvme68k/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
CDBASE= mvme68kcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/mvmeppc/cdroms/installcd/Makefile
b/distrib/mvmeppc/cdroms/installcd/Makefile
index 50fbf3a0eb1f..d1bf38cade17 100644
--- a/distrib/mvmeppc/cdroms/installcd/Makefile
+++ b/distrib/mvmeppc/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
CDBASE= mvmeppccd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/news68k/cdroms/installcd/Makefile
b/distrib/news68k/cdroms/installcd/Makefile
index 09b0aaefeece..5edfe059558c 100644
--- a/distrib/news68k/cdroms/installcd/Makefile
+++ b/distrib/news68k/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
CDBASE= news68kcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/newsmips/cdroms/installcd/Makefile
b/distrib/newsmips/cdroms/installcd/Makefile
index 77e36517ca5d..628eb2fd4e49 100644
--- a/distrib/newsmips/cdroms/installcd/Makefile
+++ b/distrib/newsmips/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
CDBASE= newsmipscd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/ofppc/cdroms/installcd/Makefile
b/distrib/ofppc/cdroms/installcd/Makefile
index 084faf72069f..1183f48ddac8 100644
--- a/distrib/ofppc/cdroms/installcd/Makefile
+++ b/distrib/ofppc/cdroms/installcd/Makefile
@@ -1,7 +1,7 @@
# $NetBSD: Makefile,v 1.6 2018/09/28 15:05:22 martin Exp $
CDBASE= ofppccd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDKERNELS+= netbsd-INSTALL.gz netbsd
CDINSTKERNEL= ../../instkernel
diff --git a/distrib/playstation2/cdroms/installcd/Makefile
b/distrib/playstation2/cdroms/installcd/Makefile
index 9ff503c76865..8a8f0d798a84 100644
--- a/distrib/playstation2/cdroms/installcd/Makefile
+++ b/distrib/playstation2/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.4 2018/09/28 15:05:22 martin Exp $
CDBASE= playstation2cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/pmax/cdroms/installcd/Makefile
b/distrib/pmax/cdroms/installcd/Makefile
index 56dd85f6b18b..52540a2887e2 100644
--- a/distrib/pmax/cdroms/installcd/Makefile
+++ b/distrib/pmax/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.4 2018/09/28 15:05:22 martin Exp $
CDBASE= pmaxcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.if ${MACHINE_ARCH} == "mipsel"
CDKERNELS= netbsd-INSTALL.gz netbsd
diff --git a/distrib/prep/cdroms/installcd/Makefile
b/distrib/prep/cdroms/installcd/Makefile
index e67d4d9c528e..a7d97a9e60fe 100644
--- a/distrib/prep/cdroms/installcd/Makefile
+++ b/distrib/prep/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.4 2018/09/28 15:05:22 martin Exp $
CDBASE= prepcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDMAKEFSOPTIONS=bootimage=powerpc;cdrom/prep/installation/floppy/sysinst_com0.fs
diff --git a/distrib/sandpoint/cdroms/installcd/Makefile
b/distrib/sandpoint/cdroms/installcd/Makefile
index 2226a327f026..226ca3c54135 100644
--- a/distrib/sandpoint/cdroms/installcd/Makefile
+++ b/distrib/sandpoint/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
CDBASE= sandpointcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/sgimips/cdroms/installcd/Makefile
b/distrib/sgimips/cdroms/installcd/Makefile
index bdc48197a802..c43e58b9421f 100644
--- a/distrib/sgimips/cdroms/installcd/Makefile
+++ b/distrib/sgimips/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.3 2018/09/28 15:05:22 martin Exp $
CDBASE= sgimipscd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDKERNELS= netbsd-INSTALL32_IP2x.gz ip2x
CDKERNELS+= netbsd-INSTALL32_IP3x.gz ip3x
diff --git a/distrib/shark/cdroms/installcd/Makefile
b/distrib/shark/cdroms/installcd/Makefile
index 03635c78d0c4..30840db96cd8 100644
--- a/distrib/shark/cdroms/installcd/Makefile
+++ b/distrib/shark/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:22 martin Exp $
CDBASE= sharkcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/sparc/cdroms/installcd/Makefile
b/distrib/sparc/cdroms/installcd/Makefile
index b63807a817e7..620648ee8216 100644
--- a/distrib/sparc/cdroms/installcd/Makefile
+++ b/distrib/sparc/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.3 2018/09/28 15:05:23 martin Exp $
CDBASE= sparccd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
# for PRINTOBJDIR
diff --git a/distrib/sparc64/cdroms/installcd/Makefile
b/distrib/sparc64/cdroms/installcd/Makefile
index 91754f46fcda..85a767da2036 100644
--- a/distrib/sparc64/cdroms/installcd/Makefile
+++ b/distrib/sparc64/cdroms/installcd/Makefile
@@ -3,9 +3,9 @@
.include <bsd.own.mk>
CDBASE= sparc64cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
-CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz
netbsd
+CDKERNELS=
${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-GENERIC.gz netbsd
CD_SETS= base etc
.if ${MKKMOD} != "no"
CD_SETS+= modules
diff --git a/distrib/sun2/cdroms/installcd/Makefile
b/distrib/sun2/cdroms/installcd/Makefile
index 50d19143b099..5444c9cad45b 100644
--- a/distrib/sun2/cdroms/installcd/Makefile
+++ b/distrib/sun2/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:23 martin Exp $
CDBASE= sun2cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/distrib/sun3/cdroms/installcd/Makefile
b/distrib/sun3/cdroms/installcd/Makefile
index 303ff47df83f..69e2218eae55 100644
--- a/distrib/sun3/cdroms/installcd/Makefile
+++ b/distrib/sun3/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.3 2018/09/28 15:05:23 martin Exp $
CDBASE= sun3cd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
# for PRINTOBJDIR
diff --git a/distrib/vax/cdroms/installcd/Makefile
b/distrib/vax/cdroms/installcd/Makefile
index cd6ed9a4c942..ef11d03b2618 100644
--- a/distrib/vax/cdroms/installcd/Makefile
+++ b/distrib/vax/cdroms/installcd/Makefile
@@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.17 2018/09/28 15:05:23 martin Exp $
CDBASE= vaxcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
-CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz
netbsd.gz
+CDKERNELS=
${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/kernel/netbsd-GENERIC.gz
netbsd.gz
CDRELEASE_NOISOS=true
CD_SETS= base etc # no modules for VAX
diff --git a/distrib/x68k/cdroms/installcd/Makefile
b/distrib/x68k/cdroms/installcd/Makefile
index b9b093b874db..efaa2647c8bb 100644
--- a/distrib/x68k/cdroms/installcd/Makefile
+++ b/distrib/x68k/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.4 2018/09/28 15:05:23 martin Exp $
CDBASE= x68kcd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
CDINSTKERNEL= ../../floppies/instkernel
CDKERNELS= netbsd-INSTALL.gz netbsd
diff --git a/distrib/zaurus/cdroms/installcd/Makefile
b/distrib/zaurus/cdroms/installcd/Makefile
index e25cd7a5ad37..248d32beef18 100644
--- a/distrib/zaurus/cdroms/installcd/Makefile
+++ b/distrib/zaurus/cdroms/installcd/Makefile
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.2 2018/09/28 15:05:23 martin Exp $
CDBASE= zauruscd # gives ${CDBASE}.iso
-CDRELEASE= true # include $RELEASEDIR/$MACHINE
+CDRELEASE= true # include $RELEASEDIR/$RELEASEMACHINEDIR
CDRELEASE_NODEBUG= true
.include "${.CURDIR}/../../../common/Makefile.bootcd"
diff --git a/sys/arch/alpha/stand/netboot/Makefile
b/sys/arch/alpha/stand/netboot/Makefile
index db2be15475ca..ffc1c2f2bf75 100644
--- a/sys/arch/alpha/stand/netboot/Makefile
+++ b/sys/arch/alpha/stand/netboot/Makefile
@@ -33,4 +33,4 @@ ${PROG}.sym: ${OBJS} ${LIBSA} ${LIBZ} ${LIBKERN}
release: check_RELEASEDIR .WAIT ${PROG}
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${PROG} \
- ${RELEASEDIR}/${MACHINE}/installation/netboot
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/netboot
diff --git a/sys/arch/hp300/stand/inst/Makefile
b/sys/arch/hp300/stand/inst/Makefile
index 8c07b448e605..605b555ae5b9 100644
--- a/sys/arch/hp300/stand/inst/Makefile
+++ b/sys/arch/hp300/stand/inst/Makefile
@@ -18,4 +18,4 @@ install:
release: check_RELEASEDIR .WAIT inst.lif
${HOST_INSTALL_FILE} -m ${NONBINMODE} inst.lif \
- ${RELEASEDIR}/${MACHINE}/installation/misc/SYS_INST
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/SYS_INST
diff --git a/sys/arch/hp300/stand/uboot/Makefile
b/sys/arch/hp300/stand/uboot/Makefile
index f4930b0e8469..6c115d791d01 100644
--- a/sys/arch/hp300/stand/uboot/Makefile
+++ b/sys/arch/hp300/stand/uboot/Makefile
@@ -30,4 +30,4 @@ install:
release: check_RELEASEDIR .WAIT uboot.lif
${HOST_INSTALL_FILE} -m ${NONBINMODE} uboot.lif \
- ${RELEASEDIR}/${MACHINE}/installation/misc/SYS_UBOOT
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/SYS_UBOOT
diff --git a/sys/arch/i386/stand/dosboot/Makefile
b/sys/arch/i386/stand/dosboot/Makefile
index 4f15243506fc..da4178846c48 100644
--- a/sys/arch/i386/stand/dosboot/Makefile
+++ b/sys/arch/i386/stand/dosboot/Makefile
@@ -37,6 +37,6 @@ VERSIONFILE= ${.CURDIR}/version
release: check_RELEASEDIR
${HOST_INSTALL_FILE} -m ${BINMODE} dosboot.com \
- ${RELEASEDIR}/${MACHINE}/installation/misc
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
.include "../Makefile.booters"
diff --git a/sys/arch/i386/stand/misc/Makefile
b/sys/arch/i386/stand/misc/Makefile
index 2c0654d5a23e..d7c61c8276c9 100644
--- a/sys/arch/i386/stand/misc/Makefile
+++ b/sys/arch/i386/stand/misc/Makefile
@@ -13,8 +13,8 @@ release: check_RELEASEDIR .WAIT ${MISC_FILES}
${UUDECODE_FILES}
${_MKMSG_INSTALL} ${MISC_FILES}
cd ${.CURDIR} && \
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${MISC_FILES} \
- ${RELEASEDIR}/${MACHINE}/installation/misc
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
${_MKMSG_INSTALL} ${UUDECODE_FILES}
cd ${.OBJDIR} && \
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${UUDECODE_FILES} \
- ${RELEASEDIR}/${MACHINE}/installation/misc
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
diff --git a/sys/arch/i386/stand/pxeboot/Makefile
b/sys/arch/i386/stand/pxeboot/Makefile
index 4c78183fa6d1..a2cacdae79fc 100644
--- a/sys/arch/i386/stand/pxeboot/Makefile
+++ b/sys/arch/i386/stand/pxeboot/Makefile
@@ -83,4 +83,4 @@ VERSIONFILE= ${.CURDIR}/../pxeboot/version
release: check_RELEASEDIR
${HOST_INSTALL_FILE} -m ${BINMODE} ${PROG} \
- ${RELEASEDIR}/${MACHINE}/installation/misc
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
diff --git a/sys/arch/x68k/stand/loadbsd/Makefile
b/sys/arch/x68k/stand/loadbsd/Makefile
index 6498bc1bfe1b..7ad323713480 100644
--- a/sys/arch/x68k/stand/loadbsd/Makefile
+++ b/sys/arch/x68k/stand/loadbsd/Makefile
@@ -48,8 +48,8 @@ ${BASE}${i}: ${OBJS} ${LIBDOS}/libdos.a ${LIBIOCS}/libiocs.a
release: check_RELEASEDIR
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${PROG} \
- ${RELEASEDIR}/${MACHINE}/installation/misc
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
${TOOL_MANDOC_ASCII} ${DESTDIR}/usr/share/man/man8/x68k/loadbsd.8 > \
- ${RELEASEDIR}/${MACHINE}/installation/misc/loadbsd.0
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/loadbsd.0
${TOOL_MANDOC_HTML} ${DESTDIR}/usr/share/man/man8/x68k/loadbsd.8 > \
- ${RELEASEDIR}/${MACHINE}/installation/misc/loadbsd.html
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc/loadbsd.html
diff --git a/sys/arch/zaurus/stand/zboot/Makefile
b/sys/arch/zaurus/stand/zboot/Makefile
index 5658648b3328..3e0cd2968917 100644
--- a/sys/arch/zaurus/stand/zboot/Makefile
+++ b/sys/arch/zaurus/stand/zboot/Makefile
@@ -67,4 +67,4 @@ cleanlibdir:
release: check_RELEASEDIR
${HOST_INSTALL_FILE} -m ${BINMODE} ${PROG} \
- ${RELEASEDIR}/${MACHINE}/installation
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
diff --git a/sys/arch/zaurus/stand/zbsdmod/Makefile
b/sys/arch/zaurus/stand/zbsdmod/Makefile
index 61afd8b0592c..97328aa019d5 100644
--- a/sys/arch/zaurus/stand/zbsdmod/Makefile
+++ b/sys/arch/zaurus/stand/zbsdmod/Makefile
@@ -30,4 +30,4 @@ CPPFLAGS+= -I${.OBJDIR} -I${S}
release: check_RELEASEDIR
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${OBJS} \
- ${RELEASEDIR}/${MACHINE}/installation
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
diff --git a/sys/stand/efiboot/bootaa64/Makefile
b/sys/stand/efiboot/bootaa64/Makefile
index 5e12a6b139c1..9392765f3a67 100644
--- a/sys/stand/efiboot/bootaa64/Makefile
+++ b/sys/stand/efiboot/bootaa64/Makefile
@@ -17,4 +17,4 @@ CFLAGS+= -DEFIBOOT_ACPI
release: check_RELEASEDIR
${HOST_INSTALL_FILE} -m ${BINMODE} ${PROG} \
- ${RELEASEDIR}/${MACHINE}/installation/misc
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
diff --git a/sys/stand/efiboot/bootarm/Makefile
b/sys/stand/efiboot/bootarm/Makefile
index e9e0484ec1da..df0007ffc20e 100644
--- a/sys/stand/efiboot/bootarm/Makefile
+++ b/sys/stand/efiboot/bootarm/Makefile
@@ -17,4 +17,4 @@ LDFLAGS+= -N
release: check_RELEASEDIR
${HOST_INSTALL_FILE} -m ${BINMODE} ${PROG} \
- ${RELEASEDIR}/${MACHINE}/installation/misc
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc
diff --git a/Makefile b/Makefile
index 2719a065d..d69350ae3 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@
#
# release snapshot: Same as build, plus tar up the X sets and install
# them under the ${RELEASEDIR}/binary/sets directory (NetBSD <=1.6)
-# or the ${RELEASEDIR}/${MACHINE}/binary/sets directory (NetBSD >1.6).
+# or the ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets directory (NetBSD
>1.6).
#
# DESTDIR -- Same as for build. Mandatory for building a release.
# RELEASEDIR -- As explained above.
@@ -105,16 +105,16 @@ release snapshot: build
#
.endif # INSTALL_DONE or BUILD_DONE
#
- ${INSTALL} -d -m 755 -o root -g wheel
${RELEASEDIR}/${MACHINE}/binary/sets
+ ${INSTALL} -d -m 755 -o root -g wheel
${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
${INSTALL} -d -m 755 -o root -g wheel ${DESTDIR}/etc/mtree
.if defined(METALOG.add) && !exists(${DESTDIR}/etc/master.passwd)
cd ${NETBSDSRCDIR}/distrib/sets && \
- sh ./maketars -x -d ${DESTDIR:S,^$,/,} -N ${NETBSDSRCDIR}/etc -t
${RELEASEDIR}/${MACHINE}/binary/sets
+ sh ./maketars -x -d ${DESTDIR:S,^$,/,} -N ${NETBSDSRCDIR}/etc -t
${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
.else
cd ${NETBSDSRCDIR}/distrib/sets && \
- sh ./maketars -x -d ${DESTDIR:S,^$,/,} -t
${RELEASEDIR}/${MACHINE}/binary/sets
+ sh ./maketars -x -d ${DESTDIR:S,^$,/,} -t
${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
.endif
- cd ${RELEASEDIR}/${MACHINE}/binary/sets && \
+ cd ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets && \
cksum -o 1 *.tgz >BSDSUM && \
cksum *.tgz >CKSUM && \
cksum -m *.tgz >MD5 && \
