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 #