Module Name: src
Committed By: tsutsui
Date: Fri Feb 22 22:13:58 UTC 2019
Modified Files:
src/distrib/amd64/uefi-installimage: Makefile.bootimage
src/distrib/common/bootimage: Makefile.bootimage
Log Message:
Reduce diffs between common and amd64 uefi Makefile.bootimage files.
No functional change.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 \
src/distrib/amd64/uefi-installimage/Makefile.bootimage
cvs rdiff -u -r1.20 -r1.21 src/distrib/common/bootimage/Makefile.bootimage
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/uefi-installimage/Makefile.bootimage
diff -u src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.9 src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.10
--- src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.9 Sat Dec 15 18:03:17 2018
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage Fri Feb 22 22:13:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.9 2018/12/15 18:03:17 gson Exp $
+# $NetBSD: Makefile.bootimage,v 1.10 2019/02/22 22:13:58 tsutsui Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -224,8 +224,6 @@ SETS_DEFAULT+= xbase xcomp xetc xfont xs
.endif
KERN_SET?= kern-GENERIC
-COMPRESS_PROGRAM=${"${USE_XZ_SETS:Uno}"!="no":?${TOOL_XZ}:${TOOL_GZIP}}
-TAR_SUFF= ${"${USE_XZ_SETS:Uno}"!="no":?tar.xz:tgz}
SETS?= ${SETS_DEFAULT}
IMG_SETS= ${KERN_SET} ${SETS}
SETS_DIR?= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
@@ -241,6 +239,8 @@ WORKFSTAB?= work.fstab
WORKRCCONF?= work.rc.conf
WORKFS?= work.rootfs
TARGETFS?= imgroot.fs
+COMPRESS_PROGRAM=${"${USE_XZ_SETS:Uno}"!="no":?${TOOL_XZ}:${TOOL_GZIP}}
+TAR_SUFF= ${"${USE_XZ_SETS:Uno}"!="no":?tar.xz:tgz}
CLEANFILES+= ${WORKSPEC} ${WORKFSTAB} ${WORKRCCONF} ${WORKFS}
CLEANFILES+= ${TARGETFS}
@@ -373,7 +373,8 @@ WORKLABEL?= work.diskproto
WORKIMG?= work.img
EFIWORKDIR?= work.efidir
-CLEANFILES+= ${WORKMBR} ${WORKSWAP} ${WORKEFI} ${WORKGPT}
+CLEANFILES+= ${WORKMBR} ${WORKSWAP}
+CLEANFILES+= ${WORKEFI} ${WORKGPT}
CLEANFILES+= ${WORKLABEL}.tmp ${WORKLABEL}
CLEANFILES+= ${WORKIMG} ${IMGBASE}.img
@@ -423,7 +424,7 @@ ${IMGBASE}.img: ${TARGETFS}
count=2048
${DD} if=${WORKMBR} count=${LABELSECTORS} | \
${CAT} - ${WORKEFI} ${TARGETFS} ${WORKGPT} > ${WORKIMG}
- ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKIMG} biosboot -i 2 \
+ ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKIMG} biosboot -i 2 \
-c ${.OBJDIR}/${WORKDIR}/usr/mdec/gptmbr.bin
${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKIMG} set -a bootme -i 2
.else # USE_GPT == "no"
Index: src/distrib/common/bootimage/Makefile.bootimage
diff -u src/distrib/common/bootimage/Makefile.bootimage:1.20 src/distrib/common/bootimage/Makefile.bootimage:1.21
--- src/distrib/common/bootimage/Makefile.bootimage:1.20 Sat Dec 15 18:03:17 2018
+++ src/distrib/common/bootimage/Makefile.bootimage Fri Feb 22 22:13:58 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.20 2018/12/15 18:03:17 gson Exp $
+# $NetBSD: Makefile.bootimage,v 1.21 2019/02/22 22:13:58 tsutsui Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -240,7 +240,7 @@ ${TARGETFS}: prepare_md_post
.endfor
.if defined(SECONDARY_BOOT)
@echo Copying secondary boot...
- ${INSTALL} ${COPY} -m 0644 ${WORKDIR}/usr/mdec/${SECONDARY_BOOT} ${WORKDIR}
+ ${INSTALL} ${COPY} -m 0444 ${WORKDIR}/usr/mdec/${SECONDARY_BOOT} ${WORKDIR}
.endif
@echo Preparing /etc/fstab ...
${TOOL_SED} < ${FSTAB_IN} > ${WORKFSTAB}
@@ -258,7 +258,7 @@ ${TARGETFS}: prepare_md_post
fi
${MKDIR} ${MKDIRPERM} ${WORKDIR}/${_TARGET}
(cd ${_SRCDIR} ; \
- ${TOOL_PAX} -rw -pe -v ${PAX_TIMESTAMP} \
+ ${TOOL_PAX} ${PAX_TIMESTAMP} -rw -pe -v \
${IMGDIR_EXCLUDE} \
. ${.OBJDIR}/${WORKDIR}/${_TARGET} )
.endfor
@@ -271,8 +271,8 @@ ${TARGETFS}: prepare_md_post
false; \
fi
@if [ -f ${_SRC} ]; then \
- echo ${INSTALL} ${COPY} -m 0644 ${_SRC} ${WORKDIR}/${_TARGET}; \
- ${INSTALL} ${COPY} -m 0644 ${_SRC} ${WORKDIR}/${_TARGET}; \
+ echo ${INSTALL} ${COPY} -m 0644 ${_SRC} ${WORKDIR}/${_TARGET}; \
+ ${INSTALL} ${COPY} -m 0644 ${_SRC} ${WORKDIR}/${_TARGET}; \
fi
.endfor
.endif
@@ -370,9 +370,9 @@ ${IMGBASE}.img: ${TARGETFS} ${WORKLABEL}
.endif
${DD} if=${WORKMBR} count=${LABELSECTORS} | \
${CAT} - ${TARGETFS} > ${WORKIMG}
-.else
+.else # USE_MBR == "no"
${INSTALL} ${COPY} -m 0644 ${TARGETFS} ${WORKIMG}
-.endif
+.endif # USE_MBR != "no"
.if ${OMIT_SWAPIMG} == "no"
${DD} if=/dev/zero of=${WORKSWAP} seek=$$((${SWAPSECTORS} - 1)) count=1
${CAT} ${WORKSWAP} >> ${WORKIMG}
