Mon Sep 22 18:15:01 2008 UTC ()
Pull up following revision(s) (requested by tsutsui in ticket #1204):
distrib/hpcarm/Makefile 1.4 - 1.6
distrib/hpcarm/instkernel/Makefile 1.1
distrib/hpcarm/stand/Makefile 1.1 - 1.2
distrib/hpcmips/Makefile 1.29 - 1.33
distrib/hpcmips/instkernel/Makefile 1.1
distrib/hpcmips/stand/Makefile 1.1 - 1.2
distrib/hpcsh/Makefile 1.7 - 1.9
distrib/hpcsh/instkernel/Makefile 1.1
distrib/hpcsh/stand/Makefile 1.1 - 1.2
distrib/miniroot/Makefile 1.65 - 1.66
etc/etc.hpcarm/Makefile.inc 1.6 - 1.8
etc/etc.hpcmips/Makefile.inc 1.9 - 1.10
etc/etc.hpcsh/Makefile.inc 1.4 - 1.5
Build install kernels and standalone bootloaders in their own directories
so that parallel build works properly.
Change remaining instances of ${RELEASEDIR}/${MACHINES} to
${RELEASEDIR}/${RELEASEMACHINEDIR}
Add ${IMAGE}.gz to dependency list of release:: target as well as the one
in src/distrib/common/Makefile.image so that ${MAKESUMS} will be invoked
after the target image is installed into the releasedir, not before,
even if make -jN is specified.
XXX some ports do ${MAKESUMS} for installation/miniroot files
XXX in etc/etc.${MACHINE}/Makefile.inc later again.
- add INSTALLATION_DIRS+=installation/miniroot so that miniroot.fs.gz
image is installed properly
- INSTALL_IPAQ should be in BUILD_KERNELS rather than KERNEL_SETS
since it requires ramdisk image by mdsetimage(8) in src/distrib
Invoke ${MAKESUMS} for ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation files
as snap_md_post target in etc/etc.${MACHINE}/Makefile.inc rather than
as release target in distrib/${MACHINE}/Makefile so that builds for
release in distrib/${MACHINE}/Makefile don't have to be serialized.
(bouyer)
diff -r1.2.4.1 -r1.2.4.1.4.1 src/distrib/hpcarm/Makefile
diff -r0 -r1.1.10.2 src/distrib/hpcarm/instkernel/Makefile
diff -r0 -r1.2.4.2 src/distrib/hpcarm/stand/Makefile
diff -r1.27.4.1 -r1.27.4.1.2.1 src/distrib/hpcmips/Makefile
diff -r0 -r1.1.10.2 src/distrib/hpcmips/instkernel/Makefile
diff -r0 -r1.2.4.2 src/distrib/hpcmips/stand/Makefile
diff -r1.5.16.1 -r1.5.16.1.4.1 src/distrib/hpcsh/Makefile
diff -r0 -r1.1.10.2 src/distrib/hpcsh/instkernel/Makefile
diff -r0 -r1.2.4.2 src/distrib/hpcsh/stand/Makefile
diff -r1.63 -r1.63.20.1 src/distrib/miniroot/Makefile
diff -r1.5 -r1.5.8.1 src/etc/etc.hpcarm/Makefile.inc
diff -r1.8 -r1.8.20.1 src/etc/etc.hpcmips/Makefile.inc
diff -r1.3 -r1.3.20.1 src/etc/etc.hpcsh/Makefile.inc
--- src/distrib/hpcarm/Makefile 2007/03/09 06:59:45 1.2.4.1
+++ src/distrib/hpcarm/Makefile 2008/09/22 18:15:00 1.2.4.1.4.1
@@ -1,37 +1,12 @@
-# $NetBSD: Makefile,v 1.2.4.1 2007/03/09 06:59:45 riz Exp $
+# $NetBSD: Makefile,v 1.2.4.1.4.1 2008/09/22 18:15:00 bouyer Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-SUBDIR= cdroms
+SUBDIR= instkernel stand cdroms
+TARGETS+= release
iso_image:
${MAKEDIRTARGET} cdroms iso_image
.include <bsd.subdir.mk>
-.include <bsd.kernobj.mk>
-
-MINIROOTOBJ!= cd ${.CURDIR}/../miniroot && ${PRINTOBJDIR}
-MINIROOT= ${MINIROOTOBJ}/miniroot.fs
-
-MDSETTARGETS= INSTALL_IPAQ ${MINIROOT} netbsd-IPAQ
-MDSET_RELEASEDIR= installation
-
-HPCBOOTDIR= ${KERNSRCDIR}/arch/hpc/stand/binary/ARM
-HPCBOOT= hpcboot.exe
-
-.PATH: ${HPCBOOTDIR}
-
-UUDECODE_FILES= ${HPCBOOT}
-UUDECODE_FILES_RENAME_${HPCBOOT}= ${HPCBOOT}
-
-.include "${DISTRIBDIR}/common/Makefile.mdset"
-
-release:: check_RELEASEDIR .WAIT ${HPCBOOT}
- ${MAKEDIRTARGET} cdroms release
- ${INSTALL} -c -m ${NONBINMODE} \
- hpcboot.exe ${RELEASEDIR}/${MACHINE}/installation
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation '*.gz' '*.exe'
-
-.include <bsd.files.mk>
-.include <bsd.prog.mk>
# $NetBSD: Makefile,v 1.1.10.2 2008/09/22 18:15:00 bouyer Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include <bsd.kernobj.mk>
MINIROOTOBJ!= cd ${DISTRIBDIR}/miniroot && ${PRINTOBJDIR}
MINIROOT= ${MINIROOTOBJ}/miniroot.fs
MDSETTARGETS= INSTALL_IPAQ ${MINIROOT} netbsd-IPAQ
MDSET_RELEASEDIR= installation
.include "${DISTRIBDIR}/common/Makefile.mdset"
.include <bsd.prog.mk>
# $NetBSD: Makefile,v 1.2.4.2 2008/09/22 18:15:01 bouyer Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include <bsd.kernobj.mk>
HPCBOOTDIR= ${KERNSRCDIR}/arch/hpc/stand/binary/ARM
HPCBOOT= hpcboot.exe
.PATH: ${HPCBOOTDIR}
UUDECODE_FILES= ${HPCBOOT}
UUDECODE_FILES_RENAME_${HPCBOOT}= ${HPCBOOT}
release:: check_RELEASEDIR .WAIT ${HPCBOOT}
${INSTALL} -c -m ${NONBINMODE} \
${HPCBOOT} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
.include <bsd.files.mk>
.include <bsd.obj.mk>
--- src/distrib/hpcmips/Makefile 2007/09/17 18:26:13 1.27.4.1
+++ src/distrib/hpcmips/Makefile 2008/09/22 18:15:00 1.27.4.1.2.1
@@ -1,45 +1,12 @@
-# $NetBSD: Makefile,v 1.27.4.1 2007/09/17 18:26:13 msaitoh Exp $
+# $NetBSD: Makefile,v 1.27.4.1.2.1 2008/09/22 18:15:00 bouyer Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-SUBDIR= cdroms
+SUBDIR= instkernel stand cdroms
+TARGETS+= release
iso_image:
${MAKEDIRTARGET} cdroms iso_image
.include <bsd.subdir.mk>
-.include <bsd.kernobj.mk>
-
-MINIROOTOBJ!= cd ${.CURDIR}/../miniroot && ${PRINTOBJDIR}
-MINIROOT= ${MINIROOTOBJ}/miniroot.fs
-
-MDSETTARGETS= RAMDISK ${MINIROOT} netbsd \
- INSTALL_TX3912 ${MINIROOT} netbsd-TX3912
-MDSET_RELEASEDIR= installation
-
-PBSDBOOTDIR= ${KERNSRCDIR}/arch/${MACHINE}/stand/pbsdboot
-PBSDBOOT= pbsdboot.exe
-PBSDBOOT1= pbsdboot1.exe
-HPCBOOTDIR= ${KERNSRCDIR}/arch/hpc/stand/binary/MIPS
-HPCBOOT= hpcboot.exe
-
-.PATH: ${PBSDBOOTDIR} ${HPCBOOTDIR}
-
-UUDECODE_FILES= ${PBSDBOOT1} ${PBSDBOOT} ${HPCBOOT}
-UUDECODE_FILES_RENAME_${HPCBOOT}= ${HPCBOOT}
-
-.include "${DISTRIBDIR}/common/Makefile.mdset"
-
-release:: check_RELEASEDIR .WAIT ${PBSDBOOT1} ${PBSDBOOT} ${HPCBOOT}
- ${MAKEDIRTARGET} cdroms release
- ${INSTALL} -c -m ${NONBINMODE} \
- pbsdboot1.exe ${RELEASEDIR}/${MACHINE}/installation
- ${INSTALL} -c -m ${NONBINMODE} \
- pbsdboot.exe ${RELEASEDIR}/${MACHINE}/installation
- ${INSTALL} -c -m ${NONBINMODE} \
- hpcboot.exe ${RELEASEDIR}/${MACHINE}/installation
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation '*.gz' '*.exe'
-
-.include <bsd.files.mk>
-.include <bsd.prog.mk>
# $NetBSD: Makefile,v 1.1.10.2 2008/09/22 18:15:00 bouyer Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include <bsd.kernobj.mk>
MINIROOTOBJ!= cd ${DISTRIBDIR}/miniroot && ${PRINTOBJDIR}
MINIROOT= ${MINIROOTOBJ}/miniroot.fs
MDSETTARGETS= RAMDISK ${MINIROOT} netbsd \
INSTALL_TX3912 ${MINIROOT} netbsd-TX3912
MDSET_RELEASEDIR= installation
.include "${DISTRIBDIR}/common/Makefile.mdset"
.include <bsd.prog.mk>
# $NetBSD: Makefile,v 1.2.4.2 2008/09/22 18:15:01 bouyer Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include <bsd.kernobj.mk>
PBSDBOOTDIR= ${KERNSRCDIR}/arch/${MACHINE}/stand/pbsdboot
PBSDBOOT= pbsdboot.exe
PBSDBOOT1= pbsdboot1.exe
HPCBOOTDIR= ${KERNSRCDIR}/arch/hpc/stand/binary/MIPS
HPCBOOT= hpcboot.exe
.PATH: ${PBSDBOOTDIR} ${HPCBOOTDIR}
UUDECODE_FILES= ${PBSDBOOT1} ${PBSDBOOT} ${HPCBOOT}
UUDECODE_FILES_RENAME_${HPCBOOT}= ${HPCBOOT}
release: ${UUDECODE_FILES}
${INSTALL} -c -m ${NONBINMODE} \
${PBSDBOOT1} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
${INSTALL} -c -m ${NONBINMODE} \
${PBSDBOOT} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
${INSTALL} -c -m ${NONBINMODE} \
${HPCBOOT} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
.include <bsd.files.mk>
.include <bsd.obj.mk>
--- src/distrib/hpcsh/Makefile 2007/03/09 06:59:23 1.5.16.1
+++ src/distrib/hpcsh/Makefile 2008/09/22 18:15:00 1.5.16.1.4.1
@@ -1,46 +1,12 @@
-# $NetBSD: Makefile,v 1.5.16.1 2007/03/09 06:59:23 riz Exp $
+# $NetBSD: Makefile,v 1.5.16.1.4.1 2008/09/22 18:15:00 bouyer Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
-SUBDIR= cdroms
+SUBDIR= instkernel stand cdroms
+TARGETS+= release
iso_image:
${MAKEDIRTARGET} cdroms iso_image
.include <bsd.subdir.mk>
-.include <bsd.kernobj.mk>
-
-MINIROOTOBJ!= cd ${.CURDIR}/../miniroot && ${PRINTOBJDIR}
-MINIROOT= ${MINIROOTOBJ}/miniroot.fs
-
-MDSETTARGETS= RAMDISK ${MINIROOT} netbsd
-MDSET_RELEASEDIR= installation
-
-HPCBOOTDIR= ${KERNSRCDIR}/arch/hpc/stand
-HPCBOOT_SH3= ${HPCBOOTDIR}/binary/SH3
-HPCBOOT_SH4= ${HPCBOOTDIR}/binary/SH4
-
-UUDECODE_FILES= hpcboot-sh3.exe hpcboot-sh4.exe
-UUDECODE_FILES_RENAME_hpcboot-sh3.exe= hpcboot-sh3.exe
-UUDECODE_FILES_RENAME_hpcboot-sh4.exe= hpcboot-sh4.exe
-
-CLEANFILES+= hpcboot-sh3.exe.uue hpcboot-sh4.exe.uue
-
-hpcboot-sh3.exe.uue:
- cp ${HPCBOOT_SH3}/hpcboot.exe.uue hpcboot-sh3.exe.uue
-hpcboot-sh4.exe.uue:
- cp ${HPCBOOT_SH4}/hpcboot.exe.uue hpcboot-sh4.exe.uue
-
-release:: check_RELEASEDIR .WAIT hpcboot-sh3.exe hpcboot-sh4.exe
- ${MAKEDIRTARGET} cdroms release
- cp hpcboot-sh3.exe ${RELEASEDIR}/${MACHINE}/installation; \
- chmod ${NONBINMODE} ${RELEASEDIR}/${MACHINE}/installation/hpcboot-sh3.exe
- cp hpcboot-sh4.exe ${RELEASEDIR}/${MACHINE}/installation; \
- chmod ${NONBINMODE} ${RELEASEDIR}/${MACHINE}/installation/hpcboot-sh4.exe
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/installation '*.gz' '*.exe'
-
-.include "${DISTRIBDIR}/common/Makefile.mdset"
-
-.include <bsd.files.mk>
-.include <bsd.prog.mk>
# $NetBSD: Makefile,v 1.1.10.2 2008/09/22 18:15:00 bouyer Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include <bsd.kernobj.mk>
MINIROOTOBJ!= cd ${DISTRIBDIR}/miniroot && ${PRINTOBJDIR}
MINIROOT= ${MINIROOTOBJ}/miniroot.fs
MDSETTARGETS= RAMDISK ${MINIROOT} netbsd
MDSET_RELEASEDIR= installation
.include "${DISTRIBDIR}/common/Makefile.mdset"
.include <bsd.prog.mk>
# $NetBSD: Makefile,v 1.2.4.2 2008/09/22 18:15:00 bouyer Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
.include <bsd.kernobj.mk>
HPCBOOTDIR= ${KERNSRCDIR}/arch/hpc/stand
HPCBOOT_SH3DIR= ${HPCBOOTDIR}/binary/SH3
HPCBOOT_SH3= hpcboot-sh3.exe
HPCBOOT_SH4DIR= ${HPCBOOTDIR}/binary/SH4
HPCBOOT_SH4= hpcboot-sh4.exe
UUDECODE_FILES= hpcboot-sh3.exe hpcboot-sh4.exe
UUDECODE_FILES_RENAME_hpcboot-sh3.exe= hpcboot-sh3.exe
UUDECODE_FILES_RENAME_hpcboot-sh4.exe= hpcboot-sh4.exe
CLEANFILES+= hpcboot-sh3.exe.uue hpcboot-sh4.exe.uue
hpcboot-sh3.exe.uue:
cp ${HPCBOOT_SH3DIR}/hpcboot.exe.uue hpcboot-sh3.exe.uue
hpcboot-sh4.exe.uue:
cp ${HPCBOOT_SH4DIR}/hpcboot.exe.uue hpcboot-sh4.exe.uue
release:: ${UUDECODE_FILES}
${INSTALL} -c -m ${NONBINMODE} \
${HPCBOOT_SH3} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
${INSTALL} -c -m ${NONBINMODE} \
${HPCBOOT_SH4} ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation
.include <bsd.files.mk>
.include <bsd.obj.mk>
--- src/distrib/miniroot/Makefile 2003/01/03 15:34:33 1.63
+++ src/distrib/miniroot/Makefile 2008/09/22 18:15:00 1.63.20.1
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2003/01/03 15:34:33 lukem Exp $
+# $NetBSD: Makefile,v 1.63.20.1 2008/09/22 18:15:00 bouyer Exp $
.include <bsd.own.mk>
.include "${NETBSDSRCDIR}/distrib/common/Makefile.distrib"
@@ -37,7 +37,7 @@
.endif
.include "${DISTRIBDIR}/common/Makefile.image"
-release:: check_RELEASEDIR .WAIT
- ${MAKESUMS} -t ${RELEASEDIR}/${MACHINE}/${IMAGE_RELEASEDIR} ${IMAGE}.gz
+release:: check_RELEASEDIR .WAIT ${IMAGE}.gz
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/${IMAGE_RELEASEDIR} ${IMAGE}.gz
.include <bsd.prog.mk>
--- src/etc/etc.hpcarm/Makefile.inc 2005/12/30 11:37:06 1.5
+++ src/etc/etc.hpcarm/Makefile.inc 2008/09/22 18:15:01 1.5.8.1
@@ -1,6 +1,17 @@
-# $NetBSD: Makefile.inc,v 1.5 2005/12/30 11:37:06 rjs Exp $
+# $NetBSD: Makefile.inc,v 1.5.8.1 2008/09/22 18:15:01 bouyer Exp $
#
# etc.hpcarm/Makefile.inc -- hpcarm-specific etc Makefile targets
#
-KERNEL_SETS= IPAQ JORNADA720 INSTALL_IPAQ
+# If you change the list of distributed kernels, don't forget
+# to update the release documentation in distrib/notes/common/contents
+
+KERNEL_SETS= IPAQ JORNADA720
+
+BUILD_KERNELS= INSTALL_IPAQ
+
+INSTALLATION_DIRS+= installation/miniroot
+
+snap_md_post:
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation \
+ '*.gz' '*.exe'
--- src/etc/etc.hpcmips/Makefile.inc 2002/12/02 13:31:19 1.8
+++ src/etc/etc.hpcmips/Makefile.inc 2008/09/22 18:15:01 1.8.20.1
@@ -1,10 +1,17 @@
-# $NetBSD: Makefile.inc,v 1.8 2002/12/02 13:31:19 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.8.20.1 2008/09/22 18:15:01 bouyer Exp $
#
# etc.hpcmips/Makefile.inc -- hpcmips-specific etc Makefile targets
#
+# If you change the list of distributed kernels, don't forget
+# to update the release documentation in distrib/notes/common/contents
+
KERNEL_SETS= GENERIC TX3912
BUILD_KERNELS= RAMDISK INSTALL_TX3912
INSTALLATION_DIRS+= installation/miniroot
+
+snap_md_post:
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation \
+ '*.gz' '*.exe'
--- src/etc/etc.hpcsh/Makefile.inc 2002/12/06 09:09:06 1.3
+++ src/etc/etc.hpcsh/Makefile.inc 2008/09/22 18:15:00 1.3.20.1
@@ -1,10 +1,17 @@
-# $NetBSD: Makefile.inc,v 1.3 2002/12/06 09:09:06 jdolecek Exp $
+# $NetBSD: Makefile.inc,v 1.3.20.1 2008/09/22 18:15:00 bouyer Exp $
#
# etc.hpcsh/Makefile.inc -- hpcsh-specific etc Makefile targets
#
+# If you change the list of distributed kernels, don't forget
+# to update the release documentation in distrib/notes/common/contents
+
KERNEL_SETS= GENERIC HPW650PA
BUILD_KERNELS= RAMDISK
INSTALLATION_DIRS+= installation/miniroot
+
+snap_md_post:
+ ${MAKESUMS} -t ${RELEASEDIR}/${RELEASEMACHINEDIR}/installation \
+ '*.gz' '*.exe'