misc/57910: [RB] amd64/x86_64 Makefile.bootimage: Fix typo preventing reproducible builds

[jbglaw%lug-owl.de@localhost]

>Number:         57910
>Category:       misc
>Synopsis:       [RB] amd64/x86_64 Makefile.bootimage: Fix typo preventing reproducible builds
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    misc-bug-people
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Thu Feb 08 16:55:00 +0000 2024
>Originator:     Jan-Benedict Glaw
>Release:        current
>Organization:
>Environment:
>Description:
Using my CI builds, I tracked down an issue with amd64 reproducibility.
>How-To-Repeat:
Build twice, compare artifacts.
>Fix:
diff --git a/distrib/common/bootimage/Makefile.bootimage b/distrib/common/bootimage/Makefile.bootimage
index 85902a92f984..5f5a0ecaeed5 100644
--- a/distrib/common/bootimage/Makefile.bootimage
+++ b/distrib/common/bootimage/Makefile.bootimage
@@ -235,8 +235,8 @@ FSCYLINDERS!=       expr ${FSSECTORS} / \( ${HEADS} \* ${SECTORS} \)
 SWAPCYLINDERS!=        expr ${SWAPSECTORS} / \( ${HEADS} \* ${SECTORS} \) || true
 
 .if ${USE_GPT} != "no"
-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}'`
+BOOTDISK_UUID=`${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} show -i 2 | ${TOOL_AWK} '/^GUID/ {print $$2}'`
+SWAPDISK_UUID=`${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} show -i 3 | ${TOOL_AWK} '/^GUID/ {print $$2}'`
 .endif
 
 #
@@ -525,11 +525,11 @@ ${WORKMBR}:
        @echo creating GPT header and partition entries...
        ${RM} -f ${WORKMBR}
        ${DD} if=/dev/zero of=${WORKMBR} seek=$$((${IMAGESECTORS} - 1)) count=1
-       ${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
+       ${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} create
+       ${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} add -a 1m -s ${EFISECTORS} -t efi -l "EFI system"
+       ${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} add -a 1m -s ${FSSECTORS} -t ffs
 .  if ${SWAPSECTORS} != 0
-       ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKMBR} add -a 1m -s ${SWAPSECTORS} -t swap
+       ${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKMBR} add -a 1m -s ${SWAPSECTORS} -t swap
 .  endif
 .elif ${USE_MBR} != "no"
        @echo creating MBR labels...
@@ -584,10 +584,10 @@ ${IMGBASE}.img:   ${TARGET_BLOCKS}
        ${CAT} ${TARGET_BLOCKS} > ${WORKIMG}
 .if ${USE_GPT} != "no"
 .if ${USE_GPTMBR} != "no"
-       ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKIMG} biosboot -i 2          \
+       ${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKIMG} biosboot -i 2           \
            -c ${.OBJDIR}/${WORKDIR}/usr/mdec/gptmbr.bin
 .endif
-       ${TOOL_GPT} ${GPT_TIMESSTAMP} ${WORKIMG} set -a bootme -i 2
+       ${TOOL_GPT} ${GPT_TIMESTAMP} ${WORKIMG} set -a bootme -i 2
 .endif # USE_GPT != "no"
 .if ${USE_SUNLABEL} != "no"
        @echo Creating sun disklabel...