Module Name: src
Committed By: martin
Date: Mon Mar 25 15:19:44 UTC 2024
Modified Files:
src/distrib/amd64/ramdisks/common [netbsd-9]: Makefile.ramdisk
src/distrib/i386/ramdisks/common [netbsd-9]: Makefile.ramdisk
src/etc/etc.amd64 [netbsd-9]: Makefile.inc
src/etc/etc.i386 [netbsd-9]: Makefile.inc
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #1820):
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.14.2.1 -r1.14.2.2 \
src/distrib/amd64/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.13.4.1 -r1.13.4.2 \
src/distrib/i386/ramdisks/common/Makefile.ramdisk
cvs rdiff -u -r1.16 -r1.16.2.1 src/etc/etc.amd64/Makefile.inc
cvs rdiff -u -r1.69 -r1.69.2.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.14.2.1 src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.14.2.2
--- src/distrib/amd64/ramdisks/common/Makefile.ramdisk:1.14.2.1 Wed Apr 13 03:39:23 2022
+++ src/distrib/amd64/ramdisks/common/Makefile.ramdisk Mon Mar 25 15:19:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ramdisk,v 1.14.2.1 2022/04/13 03:39:23 snj Exp $
+# $NetBSD: Makefile.ramdisk,v 1.14.2.2 2024/03/25 15:19:44 martin Exp $
NOSANITIZER= # defined
@@ -50,6 +50,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.13.4.1 src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.13.4.2
--- src/distrib/i386/ramdisks/common/Makefile.ramdisk:1.13.4.1 Thu Aug 29 16:48:44 2019
+++ src/distrib/i386/ramdisks/common/Makefile.ramdisk Mon Mar 25 15:19:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.ramdisk,v 1.13.4.1 2019/08/29 16:48:44 martin Exp $
+# $NetBSD: Makefile.ramdisk,v 1.13.4.2 2024/03/25 15:19:44 martin Exp $
NOSANITIZER= # defined
@@ -56,6 +56,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.16 src/etc/etc.amd64/Makefile.inc:1.16.2.1
--- src/etc/etc.amd64/Makefile.inc:1.16 Thu Aug 2 16:26:09 2018
+++ src/etc/etc.amd64/Makefile.inc Mon Mar 25 15:19:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.16 2018/08/02 16:26:09 maxv Exp $
+# $NetBSD: Makefile.inc,v 1.16.2.1 2024/03/25 15:19:44 martin Exp $
#
# etc.amd64/Makefile.inc -- amd64-specific etc Makefile targets
#
@@ -16,9 +16,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.69 src/etc/etc.i386/Makefile.inc:1.69.2.1
--- src/etc/etc.i386/Makefile.inc:1.69 Thu Jul 26 16:22:49 2018
+++ src/etc/etc.i386/Makefile.inc Mon Mar 25 15:19:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.69 2018/07/26 16:22:49 maxv Exp $
+# $NetBSD: Makefile.inc,v 1.69.2.1 2024/03/25 15:19:44 martin Exp $
#
# etc.i386/Makefile.inc -- i386-specific etc Makefile targets
#
@@ -26,6 +26,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:
@@ -36,3 +37,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 '*.*'
