summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Clobus <rclobus@rclobus.nl>2020-10-04 13:49:06 +0200
committerLuca Boccassi <bluca@debian.org>2021-01-15 09:22:29 +0000
commit9d2405166970c02b978cef817dd15c9cec9ed615 (patch)
tree629e1e50491f6b5ae08fc255ce179493bb0ecce7
parent95cd662f4e91438cc179a282c31a8b71ceb49715 (diff)
downloadvyos-live-build-9d2405166970c02b978cef817dd15c9cec9ed615.tar.gz
vyos-live-build-9d2405166970c02b978cef817dd15c9cec9ed615.zip
SOURCE_DATE_EPOCH is always set
-rwxr-xr-xscripts/build/binary_iso4
-rwxr-xr-xscripts/build/source_iso4
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso
index ca0b39ef3..990af86a0 100755
--- a/scripts/build/binary_iso
+++ b/scripts/build/binary_iso
@@ -99,12 +99,12 @@ fi
if [ -n "${LB_ISO_VOLUME}" ] && [ "${LB_ISO_VOLUME}" != "none" ]
then
- LB_ISO_VOLUME="$(echo "${LB_ISO_VOLUME}" | sed "s|@ISOVOLUME_TS@|$(date $DATE_UTC_OPTION +%Y%m%d-%H:%M --date @${SOURCE_DATE_EPOCH:-$(date +%s)})|")"
+ LB_ISO_VOLUME="$(echo "${LB_ISO_VOLUME}" | sed "s|@ISOVOLUME_TS@|$(date $DATE_UTC_OPTION -d@${SOURCE_DATE_EPOCH} +%Y%m%d-%H:%M)|")"
XORRISO_OPTIONS="${XORRISO_OPTIONS} -V \"${LB_ISO_VOLUME}\""
fi
# Set an explicit modification date
-XORRISO_OPTIONS="${XORRISO_OPTIONS} --modification-date=$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m%d%H%M%S00)"
+XORRISO_OPTIONS="${XORRISO_OPTIONS} --modification-date=$(date --utc -d@${SOURCE_DATE_EPOCH} +%Y%m%d%H%M%S00)"
# Enable BIOS bootloader selection
case "${LB_BOOTLOADER_BIOS}" in
diff --git a/scripts/build/source_iso b/scripts/build/source_iso
index c5aa66bb5..56aa48caf 100755
--- a/scripts/build/source_iso
+++ b/scripts/build/source_iso
@@ -90,12 +90,12 @@ fi
if [ -n "${LB_ISO_VOLUME}" ] && [ "${LB_ISO_VOLUME}" != "none" ]
then
- LB_ISO_VOLUME="$(echo "${LB_ISO_VOLUME}" | sed "s|@ISOVOLUME_TS@|$(date $DATE_UTC_OPTION +%Y%m%d-%H:%M --date @${SOURCE_DATE_EPOCH:-$(date +%s)})|")"
+ LB_ISO_VOLUME="$(echo "${LB_ISO_VOLUME}" | sed "s|@ISOVOLUME_TS@|$(date $DATE_UTC_OPTION -d@${SOURCE_DATE_EPOCH} +%Y%m%d-%H:%M)|")"
XORRISO_OPTIONS="${XORRISO_OPTIONS} -V \"${LB_ISO_VOLUME}\""
fi
# Set an explicit modification date
-XORRISO_OPTIONS="${XORRISO_OPTIONS} --modification-date=$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m%d%H%M%S00)"
+XORRISO_OPTIONS="${XORRISO_OPTIONS} --modification-date=$(date --utc -d@${SOURCE_DATE_EPOCH} +%Y%m%d%H%M%S00)"
# Moving image
mv source chroot