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
This commit is contained in:
parent
0df60cad7a
commit
b70cf9b465
|
@ -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>
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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_DOMU
|
|||
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 '*.*'
|
||||
|
|
|
@ -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 '*.*'
|
||||
|
|
Loading…
Reference in New Issue