Module Name: src
Committed By: christos
Date: Fri Feb 10 16:43:59 UTC 2017
Modified Files:
src/distrib/amd64/cdroms: Makefile.cdrom
src/distrib/amd64/uefi-installimage: Makefile.bootimage
Makefile.installimage
src/distrib/common: Makefile.bootcd
src/distrib/common/bootimage: Makefile.bootimage Makefile.installimage
Makefile.liveimage
src/distrib/i386/cdroms: Makefile.cdrom
src/distrib/ofppc/cdroms/installcd: Makefile
src/distrib/sparc64/cdroms/installcd: Makefile
src/distrib/vax/cdroms/installcd: Makefile
Log Message:
Initial pass to be unaffected by build umask on build artifacts
1. ${MKDIR} -> ${MKDIR} ${MKDIRPERM}
2. ${CP} -> ${INSTALL} ${COPY} -m <perm>
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/distrib/amd64/cdroms/Makefile.cdrom
cvs rdiff -u -r1.1 -r1.2 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage \
src/distrib/amd64/uefi-installimage/Makefile.installimage
cvs rdiff -u -r1.35 -r1.36 src/distrib/common/Makefile.bootcd
cvs rdiff -u -r1.13 -r1.14 src/distrib/common/bootimage/Makefile.bootimage
cvs rdiff -u -r1.4 -r1.5 src/distrib/common/bootimage/Makefile.installimage
cvs rdiff -u -r1.3 -r1.4 src/distrib/common/bootimage/Makefile.liveimage
cvs rdiff -u -r1.40 -r1.41 src/distrib/i386/cdroms/Makefile.cdrom
cvs rdiff -u -r1.4 -r1.5 src/distrib/ofppc/cdroms/installcd/Makefile
cvs rdiff -u -r1.27 -r1.28 src/distrib/sparc64/cdroms/installcd/Makefile
cvs rdiff -u -r1.15 -r1.16 src/distrib/vax/cdroms/installcd/Makefile
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/cdroms/Makefile.cdrom
diff -u src/distrib/amd64/cdroms/Makefile.cdrom:1.21 src/distrib/amd64/cdroms/Makefile.cdrom:1.22
--- src/distrib/amd64/cdroms/Makefile.cdrom:1.21 Tue Jan 24 06:27:55 2017
+++ src/distrib/amd64/cdroms/Makefile.cdrom Fri Feb 10 11:43:59 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.21 2017/01/24 11:27:55 nonaka Exp $
+# $NetBSD: Makefile.cdrom,v 1.22 2017/02/10 16:43:59 christos Exp $
.include <bsd.own.mk>
.include <bsd.endian.mk>
@@ -22,8 +22,8 @@ CD_SETS+= modules
${EFIBOOTIMG}: ${DESTDIR}/usr/mdec/bootx64.efi ${DESTDIR}/usr/mdec/bootia32.efi
${RM} -f ${EFIBOOTIMG}
${RM} -rf efiboot/EFI/boot
- ${MKDIR} efiboot/EFI/boot
- ${CP} ${.ALLSRC} efiboot/EFI/boot/
+ ${MKDIR} ${MKDIRPERM} efiboot/EFI/boot
+ ${INSTALL} ${COPY} -m 0444 ${.ALLSRC} efiboot/EFI/boot/
${TOOL_MAKEFS} -M 1m -m 1m -B ${TARGET_ENDIANNESS} \
-t msdos -o F=12,c=1 ${EFIBOOTIMG} efiboot
@@ -33,6 +33,6 @@ image_md_pre: ${EFIBOOTIMG}
${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
${INSTALL} ${COPY} ${.CURDIR}/../etc.rc cdrom/etc/rc
${INSTALL} ${COPY} -m 0555 ${.CURDIR}/../install.sh cdrom/install.sh
- ${MKDIR} cdrom/mnt2 cdrom/targetroot
+ ${MKDIR} ${MKDIRPERM} cdrom/mnt2 cdrom/targetroot
${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom/usr/share/sysinst/catalog/
- ${MKDIR} cdrom/var
+ ${MKDIR} ${MKDIRPERM} cdrom/var
Index: src/distrib/amd64/uefi-installimage/Makefile.bootimage
diff -u src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.1 src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.2
--- src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.1 Tue Jan 24 06:16:50 2017
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage Fri Feb 10 11:43:59 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.1 2017/01/24 11:16:50 nonaka Exp $
+# $NetBSD: Makefile.bootimage,v 1.2 2017/02/10 16:43:59 christos Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -149,7 +149,6 @@ TIMESTAMP=-T ${NETBSDSRCDIR}/sys/sys/par
# should be defined elsewhere?
CAT?= cat
CHMOD?= chmod
-CP?= cp
DD?= dd
MKDIR?= mkdir -p
RM?= rm
@@ -254,7 +253,7 @@ ${TARGETFS}: prepare_md_post pre-targetf
echo "Missing ${RELEASEDIR}/${RELEASEMACHINEDIR}, aborting"; \
false; \
fi;
- @${MKDIR} ${WORKDIR}
+ @${MKDIR} ${MKDIRPERM} ${WORKDIR}
.for set in ${IMG_SETS}
@if [ ! -f ${SETS_DIR}/${set}.tgz ]; then \
echo "Missing ${SETS_DIR}/${set}.tgz, aborting"; \
@@ -265,7 +264,7 @@ ${TARGETFS}: prepare_md_post pre-targetf
.endfor
.if defined(SECONDARY_BOOT)
@echo Copying secondary boot...
- ${CP} -f ${WORKDIR}/usr/mdec/${SECONDARY_BOOT} ${WORKDIR}
+ ${INSTALL} ${COPY} -m 0444 ${WORKDIR}/usr/mdec/${SECONDARY_BOOT} ${WORKDIR}
.endif
@echo Preparing /etc/fstab ...
.if ${USE_GPT} != "no"
@@ -290,11 +289,11 @@ ${TARGETFS}: prepare_md_post pre-targetf
< ${FSTAB_IN} > ${WORKFSTAB}
.endif
.endif # USE_GPT != "no"
- ${CP} ${WORKFSTAB} ${WORKDIR}/etc/fstab
+ ${INSTALL} ${COPY} -m 0644 ${WORKFSTAB} ${WORKDIR}/etc/fstab
@echo Setting rc_configured=YES in /etc/rc.conf ...
${TOOL_SED} "s/rc_configured=NO/rc_configured=YES/" \
< ${WORKDIR}/etc/rc.conf > ${WORKRCCONF}
- ${CP} ${WORKRCCONF} ${WORKDIR}/etc/rc.conf
+ ${INSTALL} ${COPY} -m 0644 ${WORKRCCONF} ${WORKDIR}/etc/rc.conf
.if defined(IMGDIR_EXTRA)
@echo Copying extra dirs...
.for _SRCDIR _TARGET in ${IMGDIR_EXTRA}
@@ -302,7 +301,7 @@ ${TARGETFS}: prepare_md_post pre-targetf
echo "${_SRCDIR} is not directory, aborting"; \
false; \
fi
- ${MKDIR} ${WORKDIR}/${_TARGET}
+ ${MKDIR} ${MKDIRPERM} ${WORKDIR}/${_TARGET}
(cd ${_SRCDIR} ; \
${TOOL_PAX} -rw -pe -v \
${IMGDIR_EXCLUDE} \
@@ -317,8 +316,8 @@ ${TARGETFS}: prepare_md_post pre-targetf
false; \
fi
@if [ -f ${_SRC} ]; then \
- echo ${CP} ${_SRC} ${WORKDIR}/${_TARGET}; \
- ${CP} ${_SRC} ${WORKDIR}/${_TARGET}; \
+ echo ${INSTALL} ${COPY} -m 0644 ${_SRC} ${WORKDIR}/${_TARGET}; \
+ ${INSTALL} ${COPY} -m 0644 ${_SRC} ${WORKDIR}/${_TARGET}; \
fi
.endfor
.endif
@@ -406,10 +405,10 @@ pre-targetfs:
${IMGBASE}.img: ${TARGETFS}
@echo create EFI system partition...
- @${MKDIR} ${EFIWORKDIR}/EFI/boot
+ @${MKDIR} ${MKDIRPERM} ${EFIWORKDIR}/EFI/boot
.if !empty(EFIBOOT)
.for f in ${EFIBOOT}
- ${CP} -f ${f} ${EFIWORKDIR}/EFI/boot/`basename ${f}`
+ ${INSTALL} ${COPY} -m 0644 -f ${f} ${EFIWORKDIR}/EFI/boot/`basename ${f}`
.endfor
.endif
${RM} -f ${WORKEFI}
@@ -455,7 +454,7 @@ ${IMGBASE}.img: ${TARGETFS} ${WORKLABEL}
${DD} if=${WORKMBR} count=${LABELSECTORS} | \
${CAT} - ${TARGETFS} > ${WORKIMG}
.else # USE_MBR == "no"
- ${CP} ${TARGETFS} ${WORKIMG}
+ ${INSTALL} ${COPY} -m 0644 ${TARGETFS} ${WORKIMG}
.endif # USE_MBR != "no"
.endif # USE_GPT != "no"
.if ${OMIT_SWAPIMG} == "no"
Index: src/distrib/amd64/uefi-installimage/Makefile.installimage
diff -u src/distrib/amd64/uefi-installimage/Makefile.installimage:1.1 src/distrib/amd64/uefi-installimage/Makefile.installimage:1.2
--- src/distrib/amd64/uefi-installimage/Makefile.installimage:1.1 Tue Jan 24 06:16:50 2017
+++ src/distrib/amd64/uefi-installimage/Makefile.installimage Fri Feb 10 11:43:59 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.installimage,v 1.1 2017/01/24 11:16:50 nonaka Exp $
+# $NetBSD: Makefile.installimage,v 1.2 2017/02/10 16:43:59 christos Exp $
#
# Common Makefile to create a bootable installation image for USB flash etc.
#
@@ -62,7 +62,7 @@ INSTIMG_RELEASEDIR?= ${RELEASEMACHINEDIR
MKDIR?= mkdir -p
install_image: check_INSTIMGBASE check_RELEASEDIR ${IMGBASE}.img.gz
- ${MKDIR} ${INSTIMG_RELEASEDIR}
+ ${MKDIR} ${MKDIRPERM} ${INSTIMG_RELEASEDIR}
${RELEASE_INSTALL} ${IMGBASE}.img.gz ${INSTIMG_RELEASEDIR}
# note ${MAKESUM} will be calculated in src/etc/Makefile
Index: src/distrib/common/Makefile.bootcd
diff -u src/distrib/common/Makefile.bootcd:1.35 src/distrib/common/Makefile.bootcd:1.36
--- src/distrib/common/Makefile.bootcd:1.35 Sun Jun 19 04:44:34 2016
+++ src/distrib/common/Makefile.bootcd Fri Feb 10 11:43:59 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootcd,v 1.35 2016/06/19 08:44:34 isaki Exp $
+# $NetBSD: Makefile.bootcd,v 1.36 2017/02/10 16:43:59 christos Exp $
#
# Makefile snipped to create a CD/DVD ISO
#
@@ -87,7 +87,6 @@ mtunpriv="-U"
.endif
# Stuff that should come from elsewhere - XXX where? - HF
-CP?= cp
RM?= rm
MKDIR?= mkdir -p
CHMOD?= chmod
@@ -143,16 +142,16 @@ BOOT2=boot
.endif
prepare:
- ${MKDIR} "${CUROBJDIR}/cdrom"
+ ${MKDIR} ${MKDIRPERM} "${CUROBJDIR}/cdrom"
.if defined(CDKERNELS)
.for kernel target in ${CDKERNELS}
- ${CP} ${_INSTKERNELNOBJDIR}/${kernel} cdrom/${target}
+ ${INSTALL} ${COPY} -m 0644 ${_INSTKERNELNOBJDIR}/${kernel} cdrom/${target}
.endfor
.if exists(${DESTDIR}/usr/mdec/bootxx_cd9660)
${RM} -f cdrom/${BOOT2}
- ${CP} ${DESTDIR}/usr/mdec/${BOOT2} cdrom/${BOOT2}
+ ${INSTALL} ${COPY} -m 0644 ${DESTDIR}/usr/mdec/${BOOT2} cdrom/${BOOT2}
${RM} -f bootxx.${MACHINE}
- ${CP} ${DESTDIR}/usr/mdec/bootxx_cd9660 bootxx.${MACHINE}
+ ${INSTALL} ${COPY} -m 0644 ${DESTDIR}/usr/mdec/bootxx_cd9660 bootxx.${MACHINE}
${CHMOD} +w bootxx.${MACHINE}
.if defined(CDBOOTOPTIONS)
${TOOL_INSTALLBOOT} -m${MACHINE} -e ${CDBOOTOPTIONS} bootxx.${MACHINE}
@@ -178,7 +177,7 @@ copy-releasedir:
echo "Missing ${RELEASEDIR}/${RELEASEMACHINEDIR}, aborting"; \
exit 1; \
fi; \
- ${MKDIR} "${CUROBJDIR}/cdrom/${MACHINE}"; \
+ ${MKDIR} ${MKDIRPERM} "${CUROBJDIR}/cdrom/${MACHINE}"; \
release_destdir="${CUROBJDIR}/cdrom/${MACHINE}"; \
cd ${RELEASEDIR}/${RELEASEMACHINEDIR}; \
echo Copying $$(pwd) to $$release_destdir ...; \
@@ -193,7 +192,7 @@ copy-releasedir:
echo "Missing ${RELEASEDIR}/source, aborting"; \
exit 1; \
fi; \
- ${MKDIR} "${CUROBJDIR}/cdrom/source"; \
+ ${MKDIR} ${MKDIRPERM} "${CUROBJDIR}/cdrom/source"; \
release_destdir="${CUROBJDIR}/cdrom/source"; \
cd ${RELEASEDIR}/source; \
echo Copying $$(pwd) to $$release_destdir ...; \
@@ -230,7 +229,7 @@ copy-releasedir:
release_destdir="${CUROBJDIR}/cdrom"; \
if [ -f $${cde} ]; then \
echo Copying $${cde} to $$release_destdir ...; \
- ${CP} -f $${cde} $${release_destdir}; \
+ ${INSTALL} ${COPY} -m 0644 -f $${cde} $${release_destdir}; \
elif [ -d $${cde} ]; then \
cd $${cde}; \
echo Copying $$(pwd) to $$release_destdir ...; \
@@ -245,7 +244,7 @@ copy-releasedir:
done; \
fi
.if !empty(CD_SETS)
- ${MKDIR} "${CUROBJDIR}/cdrom/etc/mtree"
+ ${MKDIR} ${MKDIRPERM} "${CUROBJDIR}/cdrom/etc/mtree"
.for set in ${CD_SETS}
if [ -f ${CUROBJDIR:Q}/cdrom/etc/mtree/set.${set} ]; then \
${CHMOD} +w ${CUROBJDIR:Q}/cdrom/etc/mtree/set.${set}; \
@@ -289,7 +288,7 @@ image:
.if ${CDRELEASE} == false
release: prepare .WAIT prepare_md_post .WAIT copy-releasedir .WAIT image_md_pre .WAIT image .WAIT image_md_post
- ${MKDIR} ${RELEASEDIR}/${CDROMS_RELEASEDIR}
+ ${MKDIR} ${MKDIRPERM} ${RELEASEDIR}/${CDROMS_RELEASEDIR}
${RELEASE_INSTALL} ${CDIMAGE} ${RELEASEDIR}/${CDROMS_RELEASEDIR}
iso_image:
@@ -297,7 +296,7 @@ iso_image:
release:
iso_image: prepare .WAIT prepare_md_post .WAIT copy-releasedir .WAIT image_md_pre .WAIT image .WAIT image_md_post
- ${MKDIR} ${RELEASEDIR}/${CDROMS_RELEASEDIR}
+ ${MKDIR} ${MKDIRPERM} ${RELEASEDIR}/${CDROMS_RELEASEDIR}
${RELEASE_INSTALL} ${CDIMAGE} ${RELEASEDIR}/${CDROMS_RELEASEDIR}
.endif
Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.13 src/distrib/common/bootimage/Makefile.bootimage:1.14
--- src/distrib/common/bootimage/Makefile.bootimage:1.13 Tue Jan 24 13:01:07 2017
+++ src/distrib/common/bootimage/Makefile.bootimage Fri Feb 10 11:43:59 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.13 2017/01/24 18:01:07 christos Exp $
+# $NetBSD: Makefile.bootimage,v 1.14 2017/02/10 16:43:59 christos Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -140,7 +140,6 @@ MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP
# should be defined elsewhere?
CAT?= cat
CHMOD?= chmod
-CP?= cp
DD?= dd
MKDIR?= mkdir -p
RM?= rm
@@ -229,7 +228,7 @@ ${TARGETFS}: prepare_md_post
echo "Missing ${RELEASEDIR}/${RELEASEMACHINEDIR}, aborting"; \
false; \
fi;
- @${MKDIR} ${WORKDIR}
+ @${MKDIR} ${MKDIRPERM} ${WORKDIR}
.for set in ${IMG_SETS}
@if [ ! -f ${SETS_DIR}/${set}.tgz ]; then \
echo "Missing ${SETS_DIR}/${set}.tgz, aborting"; \
@@ -240,15 +239,15 @@ ${TARGETFS}: prepare_md_post
.endfor
.if defined(SECONDARY_BOOT)
@echo Copying secondary boot...
- ${CP} -f ${WORKDIR}/usr/mdec/${SECONDARY_BOOT} ${WORKDIR}
+ ${INSTALL} ${COPY} -m 0644 -f ${WORKDIR}/usr/mdec/${SECONDARY_BOOT} ${WORKDIR}
.endif
@echo Preparing /etc/fstab ...
${TOOL_SED} "s/@@BOOTDISK@@/${BOOTDISK}/" < ${FSTAB_IN} > ${WORKFSTAB}
- ${CP} ${WORKFSTAB} ${WORKDIR}/etc/fstab
+ ${INSTALL} ${COPY} -m 0644 ${WORKFSTAB} ${WORKDIR}/etc/fstab
@echo Setting rc_configured=YES in /etc/rc.conf ...
${TOOL_SED} "s/rc_configured=NO/rc_configured=YES/" \
< ${WORKDIR}/etc/rc.conf > ${WORKRCCONF}
- ${CP} ${WORKRCCONF} ${WORKDIR}/etc/rc.conf
+ ${INSTALL} ${COPY} -m 0644 ${WORKRCCONF} ${WORKDIR}/etc/rc.conf
.if defined(IMGDIR_EXTRA)
@echo Copying extra dirs...
.for _SRCDIR _TARGET in ${IMGDIR_EXTRA}
@@ -256,7 +255,7 @@ ${TARGETFS}: prepare_md_post
echo "${_SRCDIR} is not directory, aborting"; \
false; \
fi
- ${MKDIR} ${WORKDIR}/${_TARGET}
+ ${MKDIR} ${MKDIRPERM} ${WORKDIR}/${_TARGET}
(cd ${_SRCDIR} ; \
${TOOL_PAX} -rw -pe -v \
${IMGDIR_EXCLUDE} \
@@ -271,8 +270,8 @@ ${TARGETFS}: prepare_md_post
false; \
fi
@if [ -f ${_SRC} ]; then \
- echo ${CP} ${_SRC} ${WORKDIR}/${_TARGET}; \
- ${CP} ${_SRC} ${WORKDIR}/${_TARGET}; \
+ echo ${INSTALL} ${COPY} -m 0644 ${_SRC} ${WORKDIR}/${_TARGET}; \
+ ${INSTALL} ${COPY} -m 0644 ${_SRC} ${WORKDIR}/${_TARGET}; \
fi
.endfor
.endif
@@ -371,7 +370,7 @@ ${IMGBASE}.img: ${TARGETFS} ${WORKLABEL}
${DD} if=${WORKMBR} count=${LABELSECTORS} | \
${CAT} - ${TARGETFS} > ${WORKIMG}
.else
- ${CP} ${TARGETFS} ${WORKIMG}
+ ${INSTALL} ${COPY} -m 0644 ${TARGETFS} ${WORKIMG}
.endif
.if ${OMIT_SWAPIMG} == "no"
${DD} if=/dev/zero of=${WORKSWAP} seek=$$((${SWAPSECTORS} - 1)) count=1
Index: src/distrib/common/bootimage/Makefile.installimage
diff -u src/distrib/common/bootimage/Makefile.installimage:1.4 src/distrib/common/bootimage/Makefile.installimage:1.5
--- src/distrib/common/bootimage/Makefile.installimage:1.4 Sat Nov 3 10:25:32 2012
+++ src/distrib/common/bootimage/Makefile.installimage Fri Feb 10 11:43:59 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.installimage,v 1.4 2012/11/03 14:25:32 tsutsui Exp $
+# $NetBSD: Makefile.installimage,v 1.5 2017/02/10 16:43:59 christos Exp $
#
# Common Makefile to create a bootable installation image for USB flash etc.
#
@@ -62,7 +62,7 @@ INSTIMG_RELEASEDIR?= ${RELEASEMACHINEDIR
MKDIR?= mkdir -p
install_image: check_INSTIMGBASE check_RELEASEDIR ${IMGBASE}.img.gz
- ${MKDIR} ${INSTIMG_RELEASEDIR}
+ ${MKDIR} ${MKDIRPERM} ${INSTIMG_RELEASEDIR}
${RELEASE_INSTALL} ${IMGBASE}.img.gz ${INSTIMG_RELEASEDIR}
# note ${MAKESUM} will be calculated in src/etc/Makefile
Index: src/distrib/common/bootimage/Makefile.liveimage
diff -u src/distrib/common/bootimage/Makefile.liveimage:1.3 src/distrib/common/bootimage/Makefile.liveimage:1.4
--- src/distrib/common/bootimage/Makefile.liveimage:1.3 Sat Nov 3 10:25:32 2012
+++ src/distrib/common/bootimage/Makefile.liveimage Fri Feb 10 11:43:59 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.liveimage,v 1.3 2012/11/03 14:25:32 tsutsui Exp $
+# $NetBSD: Makefile.liveimage,v 1.4 2017/02/10 16:43:59 christos Exp $
#
# Common Makefile to create a bootable FS image for USB flash or emulators
#
@@ -43,7 +43,7 @@ LIVEIMG_RELEASEDIR?= ${RELEASEMACHINEDIR
MKDIR?= mkdir -p
live_image: check_LIVEIMGBASE check_RELEASEDIR ${IMGBASE}.img.gz
- ${MKDIR} ${LIVEIMG_RELEASEDIR}
+ ${MKDIR} ${MKDIRPERM} ${LIVEIMG_RELEASEDIR}
${RELEASE_INSTALL} ${IMGBASE}.img.gz ${LIVEIMG_RELEASEDIR}
# note ${MAKESUM} will be calculated in src/etc/Makefile
Index: src/distrib/i386/cdroms/Makefile.cdrom
diff -u src/distrib/i386/cdroms/Makefile.cdrom:1.40 src/distrib/i386/cdroms/Makefile.cdrom:1.41
--- src/distrib/i386/cdroms/Makefile.cdrom:1.40 Sun Jul 19 06:16:55 2015
+++ src/distrib/i386/cdroms/Makefile.cdrom Fri Feb 10 11:43:59 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.cdrom,v 1.40 2015/07/19 10:16:55 martin Exp $
+# $NetBSD: Makefile.cdrom,v 1.41 2017/02/10 16:43:59 christos Exp $
.include <bsd.own.mk>
@@ -21,6 +21,6 @@ image_md_pre:
${INSTALL} ${COPY} ${.CURDIR}/../etc.ttys cdrom/etc/ttys
${INSTALL} ${COPY} ${.CURDIR}/../etc.rc cdrom/etc/rc
${INSTALL} ${COPY} -m 0555 ${.CURDIR}/../install.sh cdrom/install.sh
- ${MKDIR} cdrom/mnt2 cdrom/targetroot
+ ${MKDIR} ${MKDIRPERM} cdrom/mnt2 cdrom/targetroot
${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom/usr/share/sysinst/catalog/
- ${MKDIR} cdrom/var
+ ${MKDIR} ${MKDIRPERM} cdrom/var
Index: src/distrib/ofppc/cdroms/installcd/Makefile
diff -u src/distrib/ofppc/cdroms/installcd/Makefile:1.4 src/distrib/ofppc/cdroms/installcd/Makefile:1.5
--- src/distrib/ofppc/cdroms/installcd/Makefile:1.4 Tue Feb 5 14:05:40 2008
+++ src/distrib/ofppc/cdroms/installcd/Makefile Fri Feb 10 11:43:59 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/02/05 19:05:40 garbled Exp $
+# $NetBSD: Makefile,v 1.5 2017/02/10 16:43:59 christos Exp $
CDBASE= ofppccd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
@@ -12,8 +12,8 @@ prepare_md_post:
# install ofwboot as ofwboot.ofppc
${HOST_INSTALL_FILE} -m ${BINMODE} ${DESTDIR}/usr/mdec/ofwboot \
${.OBJDIR}/cdrom/ofwboot.ofppc
- ${MKDIR} ${.OBJDIR}/cdrom/nbsd
- ${MKDIR} ${.OBJDIR}/cdrom/ppc
+ ${MKDIR} ${MKDIRPERM} ${.OBJDIR}/cdrom/nbsd
+ ${MKDIR} ${MKDIRPERM} ${.OBJDIR}/cdrom/ppc
${HOST_INSTALL_FILE} -m ${BINMODE} ${DESTDIR}/usr/mdec/ofwboot \
${.OBJDIR}/cdrom/nbsd/ofwboot
${DESTDIR}/usr/mdec/mkbootinfo "NetBSD/${MACHINE} ${DISTRIBVERS}" \
Index: src/distrib/sparc64/cdroms/installcd/Makefile
diff -u src/distrib/sparc64/cdroms/installcd/Makefile:1.27 src/distrib/sparc64/cdroms/installcd/Makefile:1.28
--- src/distrib/sparc64/cdroms/installcd/Makefile:1.27 Sun Jul 19 06:16:56 2015
+++ src/distrib/sparc64/cdroms/installcd/Makefile Fri Feb 10 11:43:59 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2015/07/19 10:16:56 martin Exp $
+# $NetBSD: Makefile,v 1.28 2017/02/10 16:43:59 christos Exp $
.include <bsd.own.mk>
@@ -23,7 +23,7 @@ image_md_pre:
${INSTALL} ${COPY} ${.CURDIR}/etc.ttys cdrom/etc/ttys
${INSTALL} ${COPY} ${.CURDIR}/etc.rc cdrom/etc/rc
${INSTALL} ${COPY} -m 0555 ${.CURDIR}/install.sh cdrom/install.sh
- ${MKDIR} cdrom/mnt2 cdrom/targetroot
+ ${MKDIR} ${MKDIRPERM} cdrom/mnt2 cdrom/targetroot
${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom/usr/share/sysinst/catalog/
image_md_post:
Index: src/distrib/vax/cdroms/installcd/Makefile
diff -u src/distrib/vax/cdroms/installcd/Makefile:1.15 src/distrib/vax/cdroms/installcd/Makefile:1.16
--- src/distrib/vax/cdroms/installcd/Makefile:1.15 Thu May 28 05:51:31 2015
+++ src/distrib/vax/cdroms/installcd/Makefile Fri Feb 10 11:43:59 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2015/05/28 09:51:31 martin Exp $
+# $NetBSD: Makefile,v 1.16 2017/02/10 16:43:59 christos Exp $
CDBASE= vaxcd # gives ${CDBASE}.iso
CDRELEASE= true # include $RELEASEDIR/$MACHINE
CDKERNELS= ${RELEASEDIR}/${MACHINE}/binary/kernel/netbsd-GENERIC.gz netbsd.gz
@@ -12,15 +12,15 @@ SYSINSTDIR!= cd ${.CURDIR}/../../../../u
# prepare mutliuser install environment
image_md_pre:
${RM} -f cdrom/boot
- ${CP} ${DESTDIR}/usr/mdec/boot cdrom/boot
+ ${INSTALL} ${COPY} -m 0444 ${DESTDIR}/usr/mdec/boot cdrom/boot
${RM} -f bootxx.${MACHINE}
- ${CP} ${DESTDIR}/usr/mdec/xxboot bootxx.${MACHINE}
+ ${INSTALL} ${COPY} -m 0444 ${DESTDIR}/usr/mdec/xxboot bootxx.${MACHINE}
${RM} -f cdrom/etc/gettytab cdrom/etc/ttys cdrom/etc/rc
${HOST_LN} -fs /tmp/gettytab cdrom/etc/gettytab
${INSTALL} ${COPY} ${.CURDIR}/etc.ttys cdrom/etc/ttys
${INSTALL} ${COPY} ${.CURDIR}/etc.rc cdrom/etc/rc
${INSTALL} ${COPY} -m 0555 ${.CURDIR}/install.sh cdrom/install.sh
- ${MKDIR} cdrom/mnt2 cdrom/targetroot
+ ${MKDIR} ${MKDIRPERM} cdrom/mnt2 cdrom/targetroot
${INSTALL} ${COPY} ${SYSINSTDIR}/sysinstmsgs.?? cdrom/usr/share/sysinst/catalog/
${TOOL_GZIP} -d -f cdrom/netbsd.gz
