Module Name: src
Committed By: martin
Date: Mon Mar 25 15:21:05 UTC 2024
Modified Files:
src/distrib/amd64/ramdisks/common [netbsd-8]: Makefile.ramdisk
src/distrib/i386/ramdisks/common [netbsd-8]: Makefile.ramdisk
src/etc/etc.amd64 [netbsd-8]: Makefile.inc
src/etc/etc.i386 [netbsd-8]: Makefile.inc
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1949):
etc/etc.amd64/Makefile.inc: revision 1.17
distrib/amd64/ramdisks/common/Makefile.ramdisk: revision 1.17
etc/etc.i386/Makefile.inc: revision 1.70
distrib/i386/ramdisks/common/Makefile.ramdisk: revision 1.16
x86: Release the ramdisks too.
This way we will get cgdroot.fs (and zfsroot.fs too) in the release.
PR misc/57534
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.8.1 \
src/distrib/amd64/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.12 -r1.12.8.1 \
src/distrib/i386/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.15 -r1.15.8.1 src/etc/etc.amd64/Makefile.inc
cvs rdiff -u -r1.68 -r1.68.8.1 src/etc/etc.i386/Makefile.inc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/amd64/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.11 src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.11.8.1
--- src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.11 Wed Oct 7 14:09:04 2015
+++ src/distrib/amd64/ramdisks/common/Makefile.ramdisk Mon Mar 25 15:21:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ramdisk,v 1.11 2015/10/07 14:09:04 martin Exp $
+# $NetBSD: Makefile.ramdisk,v 1.11.8.1 2024/03/25 15:21:04 martin Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -46,6 +46,8 @@ ${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image"
-release:
+release: ${IMAGE}
+ ${HOST_INSTALL_FILE} -m ${NONBINMODE} ${IMAGE} \
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/ramdisk/
.include <bsd.prog.mk>
Index: src/distrib/i386/ramdisks/common/Makefile.ramdisk
diff -u src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.12 src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.12.8.1
--- src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.12 Wed Oct 7 14:09:05 2015
+++ src/distrib/i386/ramdisks/common/Makefile.ramdisk Mon Mar 25 15:21:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ramdisk,v 1.12 2015/10/07 14:09:05 martin Exp $
+# $NetBSD: Makefile.ramdisk,v 1.12.8.1 2024/03/25 15:21:04 martin Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -53,6 +53,8 @@ ${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image"
-release:
+release: ${IMAGE}
+ ${HOST_INSTALL_FILE} -m ${NONBINMODE} ${IMAGE} \
+ ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/ramdisk/
.include <bsd.prog.mk>
Index: src/etc/etc.amd64/Makefile.inc
diff -u src/etc/etc.amd64/Makefile.inc:1.15 src/etc/etc.amd64/Makefile.inc:1.15.8.1
--- src/etc/etc.amd64/Makefile.inc:1.15 Sun Jan 11 04:03:47 2015
+++ src/etc/etc.amd64/Makefile.inc Mon Mar 25 15:21:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.15 2015/01/11 04:03:47 snj Exp $
+# $NetBSD: Makefile.inc,v 1.15.8.1 2024/03/25 15:21:04 martin Exp $
#
# etc.amd64/Makefile.inc -- amd64-specific etc Makefile targets
#
@@ -15,9 +15,11 @@ BUILD_KERNELS= INSTALL INSTALL_XEN3_DOM
INSTALLATION_DIRS+= installation/cdrom
INSTALLATION_DIRS+= installation/misc
INSTALLATION_DIRS+= installation/miniroot
+INSTALLATION_DIRS+= installation/ramdisk
snap_md_post:
cd ${KERNSRCDIR}/arch/i386/stand/pxeboot && ${MAKE} release
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom '*.iso'
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot '*.*'
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc '*.*'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/ramdisk '*.*'
Index: src/etc/etc.i386/Makefile.inc
diff -u src/etc/etc.i386/Makefile.inc:1.68 src/etc/etc.i386/Makefile.inc:1.68.8.1
--- src/etc/etc.i386/Makefile.inc:1.68 Sat Mar 7 07:28:37 2015
+++ src/etc/etc.i386/Makefile.inc Mon Mar 25 15:21:04 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.68 2015/03/07 07:28:37 mrg Exp $
+# $NetBSD: Makefile.inc,v 1.68.8.1 2024/03/25 15:21:04 martin Exp $
#
# etc.i386/Makefile.inc -- i386-specific etc Makefile targets
#
@@ -29,6 +29,7 @@ INSTALLATION_DIRS+= installation/misc
INSTALLATION_DIRS+= installation/cdrom
INSTALLATION_DIRS+= installation/floppy
INSTALLATION_DIRS+= installation/miniroot
+INSTALLATION_DIRS+= installation/ramdisk
# i386 specific distrib stuff
snap_md_post:
@@ -39,3 +40,4 @@ snap_md_post:
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/floppy '*.fs'
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot '*.*'
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc '*.*'
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/ramdisk '*.*'
