CVS commit: src/distrib/amd64/uefi-installimage
Module Name:src
Committed By: tsutsui
Date: Fri Feb 22 22:20:18 UTC 2019
Modified Files:
src/distrib/amd64/uefi-installimage: Makefile.bootimage
Log Message:
Explicitly use ${TOOL_AWK} instead of system's awk.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 \
src/distrib/amd64/uefi-installimage/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.10 src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.11
--- src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.10 Fri Feb 22 22:13:58 2019
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage Fri Feb 22 22:20:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.10 2019/02/22 22:13:58 tsutsui Exp $
+# $NetBSD: Makefile.bootimage,v 1.11 2019/02/22 22:20:18 tsutsui Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -211,8 +211,8 @@ BSDPARTSECTORS!= expr ${IMAGESECTORS} -
FSOFFSET!= expr ${LABELSECTORS} + ${EFISECTORS}
SWAPOFFSET!= expr ${LABELSECTORS} + ${FSSECTORS} + ${EFISECTORS}
-BOOTDISK_UUID=`${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} show -i 2 | awk '/^GUID/ {print $$2}'`
-SWAPDISK_UUID=`${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} show -i 3 | awk '/^GUID/ {print $$2}'`
+BOOTDISK_UUID=`${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} show -i 2 | ${TOOL_AWK} '/^GUID/ {print $$2}'`
+SWAPDISK_UUID=`${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} show -i 3 | ${TOOL_AWK} '/^GUID/ {print $$2}'`
.endif
#
CVS commit: src/distrib/amd64/uefi-installimage
Module Name:src
Committed By: martin
Date: Sun Oct 7 10:33:44 UTC 2018
Modified Files:
src/distrib/amd64/uefi-installimage: Makefile.bootimage
Log Message:
Support .tar.xz format for sets.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 \
src/distrib/amd64/uefi-installimage/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.6 src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.7
--- src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.6 Thu Feb 16 03:47:23 2017
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage Sun Oct 7 10:33:44 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.6 2017/02/16 03:47:23 christos Exp $
+# $NetBSD: Makefile.bootimage,v 1.7 2018/10/07 10:33:44 martin Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -228,6 +228,7 @@ SETS_DEFAULT+= xbase xcomp xetc xfont xs
.endif
KERN_SET?= kern-GENERIC
+TAR_SUFF= ${"${USE_XZ_SETS:Uno}"!="no":?tar.xz:tgz}
SETS?= ${SETS_DEFAULT}
IMG_SETS= ${KERN_SET} ${SETS}
SETS_DIR?= ${RELEASEDIR}/${RELEASEMACHINEDIR}/binary/sets
@@ -257,12 +258,12 @@ ${TARGETFS}: prepare_md_post pre-targetf
fi;
@${MKDIR} ${MKDIRPERM} ${WORKDIR}
.for set in ${IMG_SETS}
- @if [ ! -f ${SETS_DIR}/${set}.tgz ]; then \
- echo "Missing ${SETS_DIR}/${set}.tgz, aborting"; \
+ @if [ ! -f ${SETS_DIR}/${set}.${TAR_SUFF} ]; then \
+ echo "Missing ${SETS_DIR}/${set}.${TAR_SUFF}, aborting";\
false; \
fi
- @echo Extracting ${set}.tgz ...
- @(cd ${WORKDIR}; ${TOOL_PAX} ${PAX_TIMESTAMP} -rnz -f ${SETS_DIR}/${set}.tgz .)
+ @echo Extracting ${set}.${TAR_SUFF} ...
+ @(cd ${WORKDIR}; ${TOOL_PAX} ${PAX_TIMESTAMP} -rnz -f ${SETS_DIR}/${set}.${TAR_SUFF} .)
.endfor
.if defined(SECONDARY_BOOT)
@echo Copying secondary boot...
CVS commit: src/distrib/amd64/uefi-installimage
Module Name:src
Committed By: joerg
Date: Wed Mar 28 22:38:48 UTC 2018
Modified Files:
src/distrib/amd64/uefi-installimage: Makefile
Log Message:
Bump image to 1550MB to unbreak the LLVM build.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/distrib/amd64/uefi-installimage/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/uefi-installimage/Makefile
diff -u src/distrib/amd64/uefi-installimage/Makefile:1.4 src/distrib/amd64/uefi-installimage/Makefile:1.5
--- src/distrib/amd64/uefi-installimage/Makefile:1.4 Fri Jan 5 01:33:11 2018
+++ src/distrib/amd64/uefi-installimage/Makefile Wed Mar 28 22:38:47 2018
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2018/01/05 01:33:11 pgoyette Exp $
+# $NetBSD: Makefile,v 1.5 2018/03/28 22:38:47 joerg Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-uefi-install # gives ${IMGBASE}.img
BOOTDISK= dk1 # unused (use GUID)
-INSTIMAGEMB?= 1500 # for all installation binaries
+INSTIMAGEMB?= 1550 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
CVS commit: src/distrib/amd64/uefi-installimage
Module Name:src
Committed By: pgoyette
Date: Fri Jan 5 01:33:11 UTC 2018
Modified Files:
src/distrib/amd64/uefi-installimage: Makefile
Log Message:
Bump size of uefi image - we've outgrown the old size
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/distrib/amd64/uefi-installimage/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/uefi-installimage/Makefile
diff -u src/distrib/amd64/uefi-installimage/Makefile:1.3 src/distrib/amd64/uefi-installimage/Makefile:1.4
--- src/distrib/amd64/uefi-installimage/Makefile:1.3 Mon Sep 18 14:42:16 2017
+++ src/distrib/amd64/uefi-installimage/Makefile Fri Jan 5 01:33:11 2018
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2017/09/18 14:42:16 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2018/01/05 01:33:11 pgoyette Exp $
.include
INSTIMGBASE= NetBSD-${DISTRIBVER}-amd64-uefi-install # gives ${IMGBASE}.img
BOOTDISK= dk1 # unused (use GUID)
-INSTIMAGEMB?= 1450 # for all installation binaries
+INSTIMAGEMB?= 1500 # for all installation binaries
PRIMARY_BOOT= bootxx_ffsv1
SECONDARY_BOOT= boot
CVS commit: src/distrib/amd64/uefi-installimage
Module Name:src
Committed By: christos
Date: Thu Feb 16 03:47:23 UTC 2017
Modified Files:
src/distrib/amd64/uefi-installimage: Makefile.bootimage
Log Message:
Add ${GPT_TIMESTAMP}
To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 \
src/distrib/amd64/uefi-installimage/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.5 src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.6
--- src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.5 Sat Feb 11 03:14:05 2017
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage Wed Feb 15 22:47:23 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.5 2017/02/11 08:14:05 pgoyette Exp $
+# $NetBSD: Makefile.bootimage,v 1.6 2017/02/16 03:47:23 christos Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -138,6 +138,7 @@
.if ${MKREPRO_TIMESTAMP:Uno} != "no"
MAKEFS_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
+GPT_TIMESTAMP=-T "${MKREPRO_TIMESTAMP}"
PAX_TIMESTAMP=--timestamp "${MKREPRO_TIMESTAMP}"
.endif
@@ -214,8 +215,8 @@ BSDPARTSECTORS!= expr ${IMAGESECTORS} -
FSOFFSET!= expr ${LABELSECTORS} + ${EFISECTORS}
SWAPOFFSET!= expr ${LABELSECTORS} + ${FSSECTORS} + ${EFISECTORS}
-BOOTDISK_UUID=`${TOOL_GPT} ${WORKMBR} show -i 2 | awk '/^GUID/ {print $$2}'`
-SWAPDISK_UUID=`${TOOL_GPT} ${WORKMBR} show -i 3 | awk '/^GUID/ {print $$2}'`
+BOOTDISK_UUID=`${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} show -i 2 | awk '/^GUID/ {print $$2}'`
+SWAPDISK_UUID=`${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} show -i 3 | awk '/^GUID/ {print $$2}'`
.endif
#
@@ -397,11 +398,11 @@ pre-targetfs:
@echo creating GPT header and partition entries...
${RM} -f ${WORKMBR}
${DD} if=/dev/zero of=${WORKMBR} seek=$$((${IMAGESECTORS} - 1)) count=1
- ${TOOL_GPT} ${WORKMBR} create
- ${TOOL_GPT} ${WORKMBR} add -a 1m -s ${EFISECTORS} -t efi -l "EFI system"
- ${TOOL_GPT} ${WORKMBR} add -a 1m -s ${FSSECTORS} -t ffs
+ ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} create
+ ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} add -a 1m -s ${EFISECTORS} -t efi -l "EFI system"
+ ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} add -a 1m -s ${FSSECTORS} -t ffs
.if ${OMIT_SWAPIMG} == "no"
- ${TOOL_GPT} ${WORKMBR} add -a 1m -s ${SWAPSECTORS} -t swap
+ ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} add -a 1m -s ${SWAPSECTORS} -t swap
.endif
${IMGBASE}.img: ${TARGETFS}
@@ -423,9 +424,9 @@ ${IMGBASE}.img: ${TARGETFS}
count=2048
${DD} if=${WORKMBR} count=${LABELSECTORS} | \
${CAT} - ${WORKEFI} ${TARGETFS} ${WORKGPT} > ${WORKIMG}
- ${TOOL_GPT} ${WORKIMG} biosboot -i 2\
+ ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKIMG} biosboot -i 2\
-c ${.OBJDIR}/${WORKDIR}/usr/mdec/gptmbr.bin
- ${TOOL_GPT} ${WORKIMG} set -a bootme -i 2
+ ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKIMG} set -a bootme -i 2
.else # USE_GPT == "no"
${IMGBASE}.img: ${TARGETFS} ${WORKLABEL}
.if ${USE_MBR} != "no"
CVS commit: src/distrib/amd64/uefi-installimage
Module Name:src
Committed By: pgoyette
Date: Sat Feb 11 08:14:05 UTC 2017
Modified Files:
src/distrib/amd64/uefi-installimage: Makefile.bootimage
Log Message:
Clean up another extraneous -f option
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/distrib/amd64/uefi-installimage/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.4 src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.5
--- src/distrib/amd64/uefi-installimage/Makefile.bootimage:1.4 Sat Feb 11 03:07:06 2017
+++ src/distrib/amd64/uefi-installimage/Makefile.bootimage Sat Feb 11 08:14:05 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootimage,v 1.4 2017/02/11 03:07:06 christos Exp $
+# $NetBSD: Makefile.bootimage,v 1.5 2017/02/11 08:14:05 pgoyette Exp $
#
# Copyright (c) 2009, 2010, 2011 Izumi Tsutsui. All rights reserved.
#
@@ -409,7 +409,7 @@ ${IMGBASE}.img: ${TARGETFS}
@${MKDIR} ${MKDIRPERM} ${EFIWORKDIR}/EFI/boot
.if !empty(EFIBOOT)
.for f in ${EFIBOOT}
- ${INSTALL} ${COPY} -m 0644 -f ${f} ${EFIWORKDIR}/EFI/boot/`basename ${f}`
+ ${INSTALL} ${COPY} -m 0644 ${f} ${EFIWORKDIR}/EFI/boot/`basename ${f}`
.endfor
.endif
${RM} -f ${WORKEFI}
