Page MenuHomeFreeBSD
Files F143456427

D49760.diff
No OneTemporary
Actions

D49760.diff
View Options

diff --git a/release/Makefile.inc1 b/release/Makefile.inc1
--- a/release/Makefile.inc1
+++ b/release/Makefile.inc1
@@ -1,6 +1,3 @@
-#
-#
-
# Figure out where the git binary is.
.for _P in /usr/bin /usr/local/bin
. if !defined(GIT_CMD) || empty(GIT_CMD)
@@ -24,13 +21,19 @@
GITCOUNT!= ${GIT_CMD} -C ${.CURDIR} rev-list --first-parent --count HEAD 2>/dev/null || true
. export GITCOUNT
. endif
+. if !defined(GITEPOCH) || empty(GITEPOCH)
+GITEPOCH!= ${GIT_CMD} -C ${.CURDIR} show -s --format=%ct HEAD 2>/dev/null || true
+. export GITEPOCH
+. endif
.else
GITBRANCH= nullbranch
GITREV= nullhash
GITCOUNT= nullcount
+GITEPOCH= 0
. export GITBRANCH
. export GITREV
. export GITCOUNT
+. export GITEPOCH
.endif
# Set the build date, primarily for snapshot builds.
diff --git a/release/Makefile.vm b/release/Makefile.vm
--- a/release/Makefile.vm
+++ b/release/Makefile.vm
@@ -181,6 +181,7 @@
QEMUSTATIC=${QEMUSTATIC} \
${WITHOUT_QEMU:DWITHOUT_QEMU=true} \
${NO_ROOT:DNO_ROOT=true} \
+ PKG_INSTALL_EPOCH=${PKG_INSTALL_EPOCH:U${GITEPOCH}} \
${.CURDIR}/scripts/mk-vmimage.sh \
-C ${.CURDIR}/tools/vmimage.subr \
-d ${.OBJDIR}/${.TARGET}-${FORMAT}-${FS} -F ${FS} \

File Metadata

Mime Type
text/plain
Expires
Sat, Jan 31, 4:05 PM (17 h, 45 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28121956
Default Alt Text
D49760.diff (1 KB)

Event Timeline