diff --git a/debian/changelog b/debian/changelog index 1749fe8..c510630 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +live-build (1:20171207) unstable; urgency=medium + + * Use $SOURCE_DATE_EPOCH when updating timestamps of manual pages in order + to make the package reproducible at build time. Closes: #879169 + Thanks to Chris Lamb for the patch. + * Accept kernels without initrd. Closes: #878430 + Thanks to Balint Reczey for the patch. + * Fix the way the .disk/mkisofs file is created. Closes: #881941 + Thanks to Daniel Reichelt for the patch. + + -- Raphaƫl Hertzog Thu, 07 Dec 2017 20:29:59 +0100 + live-build (1:20170920kali1) kali-dev; urgency=medium * Synchronize with Debian. Remaining changes: diff --git a/manpages/bin/update-version.sh b/manpages/bin/update-version.sh index d1d6994..53c440b 100755 --- a/manpages/bin/update-version.sh +++ b/manpages/bin/update-version.sh @@ -13,11 +13,11 @@ PROGRAM="LIVE\\\-BUILD" VERSION="$(cd .. && dpkg-parsechangelog -S Version)" -DATE="$(LC_ALL=C date +%Y\\\\-%m\\\\-%d)" +DATE="$(LC_ALL=C date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y\\\\-%m\\\\-%d)" -DAY="$(LC_ALL=C date +%d)" -MONTH="$(LC_ALL=C date +%m)" -YEAR="$(LC_ALL=C date +%Y)" +DAY="$(LC_ALL=C date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%d)" +MONTH="$(LC_ALL=C date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%m)" +YEAR="$(LC_ALL=C date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y)" echo "Updating version headers..." diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index f477efd..7955bcd 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -214,7 +214,11 @@ cat >> binary.sh << EOF mkdir -p binary/.disk -echo "xorriso -as mkisofs ${XORRISO_OPTIONS} -o ${IMAGE} binary" > binary/.disk/mkisofs +xorriso -as mkisofs ${XORRISO_OPTIONS} -o ${IMAGE} binary +EOF + +# retain the xorriso command used to create the image in the image itself +cat <<-EOF >binary/.disk/mkisofs xorriso -as mkisofs ${XORRISO_OPTIONS} -o ${IMAGE} binary EOF diff --git a/scripts/build/binary_linux-image b/scripts/build/binary_linux-image index 6227a24..12a6304 100755 --- a/scripts/build/binary_linux-image +++ b/scripts/build/binary_linux-image @@ -70,7 +70,7 @@ # Installing linux-image cp chroot/boot/"${LINUX}"-* "${DESTDIR}" -cp chroot/boot/initrd.img-* "${DESTDIR}" +cp chroot/boot/initrd.img-* "${DESTDIR}" 2>&1 || Echo_message "Skip installing missing initrd." case "${LB_INITRAMFS}" in live-boot)