Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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
This commit is contained in:
martin 2024-03-25 15:19:44 +00:00
parent b03fe60d15
commit a6ef924305
4 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
distrib/amd64/ramdisks/common/Makefile.ramdisk
View File

@ -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 NOSANITIZER= # defined
@ -50,6 +50,8 @@ ${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.makedev" .include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image" .include "${DISTRIBDIR}/common/Makefile.image"
release: release: ${IMAGE}
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${IMAGE} \
${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/ramdisk/
.include <bsd.prog.mk> .include <bsd.prog.mk>

6
distrib/i386/ramdisks/common/Makefile.ramdisk
View File

@ -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 NOSANITIZER= # defined
@ -56,6 +56,8 @@ ${CRUNCHBIN}: libhack.o
.include "${DISTRIBDIR}/common/Makefile.makedev" .include "${DISTRIBDIR}/common/Makefile.makedev"
.include "${DISTRIBDIR}/common/Makefile.image" .include "${DISTRIBDIR}/common/Makefile.image"
release: release: ${IMAGE}
${HOST_INSTALL_FILE} -m ${NONBINMODE} ${IMAGE} \
${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/ramdisk/
.include <bsd.prog.mk> .include <bsd.prog.mk>

4
etc/etc.amd64/Makefile.inc
View File

@ -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 # etc.amd64/Makefile.inc -- amd64-specific etc Makefile targets
# #
@ -16,9 +16,11 @@ BUILD_KERNELS= INSTALL INSTALL_XEN3_DOMU
INSTALLATION_DIRS+= installation/cdrom INSTALLATION_DIRS+= installation/cdrom
INSTALLATION_DIRS+= installation/misc INSTALLATION_DIRS+= installation/misc
INSTALLATION_DIRS+= installation/miniroot INSTALLATION_DIRS+= installation/miniroot
INSTALLATION_DIRS+= installation/ramdisk
snap_md_post: snap_md_post:
cd ${KERNSRCDIR}/arch/i386/stand/pxeboot && ${MAKE} release cd ${KERNSRCDIR}/arch/i386/stand/pxeboot && ${MAKE} release
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom '*.iso' ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/cdrom '*.iso'
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot '*.*' ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot '*.*'
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc '*.*' ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc '*.*'
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/ramdisk '*.*'

4
etc/etc.i386/Makefile.inc
View File

@ -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 # etc.i386/Makefile.inc -- i386-specific etc Makefile targets
# #
@ -26,6 +26,7 @@ INSTALLATION_DIRS+= installation/misc
INSTALLATION_DIRS+= installation/cdrom INSTALLATION_DIRS+= installation/cdrom
INSTALLATION_DIRS+= installation/floppy INSTALLATION_DIRS+= installation/floppy
INSTALLATION_DIRS+= installation/miniroot INSTALLATION_DIRS+= installation/miniroot
INSTALLATION_DIRS+= installation/ramdisk
# i386 specific distrib stuff # i386 specific distrib stuff
snap_md_post: snap_md_post:
@ -36,3 +37,4 @@ snap_md_post:
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/floppy '*.fs' ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/floppy '*.fs'
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot '*.*' ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/miniroot '*.*'
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc '*.*' ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/misc '*.*'
${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation/ramdisk '*.*'