Page MenuHomeFreeBSD
Files F144449997

D50478.diff
No OneTemporary
Actions

D50478.diff
View Options

diff --git a/stand/common/newvers.sh b/stand/common/newvers.sh
--- a/stand/common/newvers.sh
+++ b/stand/common/newvers.sh
@@ -50,13 +50,17 @@
exit 1
fi
else
- t=`date`
+ t="${NEWVERS_DATE:-`date`}"
fi
r=`awk -F: ' /^[0-9]\.[0-9]+:/ { print $1; exit }' $1`
bootprog_info="FreeBSD/${3} ${2}, Revision ${r}\\n"
if [ -n "${include_metadata}" ]; then
bootprog_info="$bootprog_info(${t} ${u}@${h})\\n"
+ if [ -n "$BUILD_UTC" ]; then
+ # We can use what(1) to extract BUILD_UTC
+ bootprog_info="$bootprog_info\\0@(#)BUILD_UTC=$BUILD_UTC"
+ fi
fi
cat > $tempfile <<EOF
diff --git a/stand/defs.mk b/stand/defs.mk
--- a/stand/defs.mk
+++ b/stand/defs.mk
@@ -258,4 +258,6 @@
${ECHO} ${.TARGET} "->" $$path ; \
ln -fns $$path ${.TARGET}
.endif # !NO_OBJ
+
+.-include "local.defs.mk"
.endif # __BOOT_DEFS_MK__
diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile
--- a/stand/efi/loader/Makefile
+++ b/stand/efi/loader/Makefile
@@ -87,7 +87,7 @@
.endif
NEWVERSWHAT?= "EFI loader" ${MACHINE}
-VERSION_FILE= ${.CURDIR}/../loader/version
+VERSION_FILE?= ${.CURDIR}/../loader/version
HELP_FILENAME= loader.help.efi
# Always add MI sources
diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile
--- a/stand/i386/loader/Makefile
+++ b/stand/i386/loader/Makefile
@@ -16,7 +16,7 @@
PROG= ${LOADER}.sym
INTERNALPROG=
NEWVERSWHAT?= "bootstrap loader" x86
-VERSION_FILE= ${.CURDIR}/../loader/version
+VERSION_FILE?= ${.CURDIR}/../loader/version
#
# There's 640k - 40k maximum space, less however much memory the BIOS uses. A
# non-random survey suggests that 20k-25k is a good value for 'most' machines.

File Metadata

Mime Type
text/plain
Expires
Mon, Feb 9, 12:23 PM (11 h, 7 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28578265
Default Alt Text
D50478.diff (1 KB)

Event Timeline