Permalink
Browse files

Fix #23 by referencing git repo

  • Loading branch information...
kaihendry committed Sep 3, 2017
1 parent 494df7f commit 89dcd1c4a59667611c6b69e6f6960f9b7a3d0ab3
Showing with 1 addition and 7 deletions.
  1. +1 −7 webconverger/Makefile
View
@@ -17,18 +17,12 @@ endif
VERSION=$(shell cd chroot; git describe --always)
export SOURCE_DATE_EPOCH ?= $(shell git log -1 --pretty=%ct)

This comment has been minimized.

Show comment
Hide comment
@lamby

lamby Sep 3, 2017

Collaborator

Now you aren't exporting S_D_E for the other lb foo calls.

@lamby

lamby Sep 3, 2017

Collaborator

Now you aren't exporting S_D_E for the other lb foo calls.

This comment has been minimized.

Show comment
Hide comment
@kaihendry

kaihendry Sep 3, 2017

Member

I thought I was the only one using it in the xorriso target. I thought we are overriding:


~/webc/live-build$ grep -r SOURCE_DATE_EPOCH .
./scripts/build/binary_iso:XORRISO_OPTIONS="${XORRISO_OPTIONS} --modification-date=$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m%d%H%m%S00)"
./scripts/build/source_iso:XORRISO_OPTIONS="${XORRISO_OPTIONS} --modification-date=$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m%d%H%m%S00)"
./debian/changelog:  * Export SOURCE_DATE_EPOCH when running chroot commands. Closes: #832998
./debian/changelog:  * Set xorriso's "modification time" to SOURCE_DATE_EPOCH. Closes: #831379
./functions/chroot.sh:  # Only pass SOURCE_DATE_EPOCH if its already set
./functions/chroot.sh:  if [ "${SOURCE_DATE_EPOCH:-}" != "" ]
./functions/chroot.sh:          ENV="${ENV} SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH}"
@kaihendry

kaihendry Sep 3, 2017

Member

I thought I was the only one using it in the xorriso target. I thought we are overriding:


~/webc/live-build$ grep -r SOURCE_DATE_EPOCH .
./scripts/build/binary_iso:XORRISO_OPTIONS="${XORRISO_OPTIONS} --modification-date=$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m%d%H%m%S00)"
./scripts/build/source_iso:XORRISO_OPTIONS="${XORRISO_OPTIONS} --modification-date=$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%Y%m%d%H%m%S00)"
./debian/changelog:  * Export SOURCE_DATE_EPOCH when running chroot commands. Closes: #832998
./debian/changelog:  * Set xorriso's "modification time" to SOURCE_DATE_EPOCH. Closes: #831379
./functions/chroot.sh:  # Only pass SOURCE_DATE_EPOCH if its already set
./functions/chroot.sh:  if [ "${SOURCE_DATE_EPOCH:-}" != "" ]
./functions/chroot.sh:          ENV="${ENV} SOURCE_DATE_EPOCH=${SOURCE_DATE_EPOCH}"

This comment has been minimized.

Show comment
Hide comment
@kaihendry

kaihendry Sep 3, 2017

Member

Guess I must have screwed up something judging by the fact my ISOs aren't reproducible. 😢 https://travis-ci.org/Webconverger/webc

@kaihendry

kaihendry Sep 3, 2017

Member

Guess I must have screwed up something judging by the fact my ISOs aren't reproducible. 😢 https://travis-ci.org/Webconverger/webc

This comment has been minimized.

Show comment
Hide comment
@lamby

lamby Sep 4, 2017

Collaborator

Quite.

@lamby

lamby Sep 4, 2017

Collaborator

Quite.

build: TYPE=iso-hybrid
build: binary
build-hdd: TYPE=hdd
build-hdd: binary
ifneq ($(shell id -u),0)
SUDO=sudo env SOURCE_DATE_EPOCH=$(SOURCE_DATE_EPOCH)
endif
VDI=binary.vdi
build-vbox-hdd: build-hdd
# If there's already a vdi file, try to keep the UUID the same,
@@ -99,7 +93,7 @@ binary: clean
# "Clamp" the time to SOURCE_DATE_EPOCH when the file is more recent to keep
# the original times for files that have not been created or modified during
# the build process:
$(SUDO) find binary -newermt "@$(SOURCE_DATE_EPOCH)" -print0 | $(SUDO) xargs -0r touch --no-dereference --date="@$(SOURCE_DATE_EPOCH)"
$(SUDO) find binary -newermt "@$(shell git --git-dir=binary/live/filesystem.git log -1 --pretty=%ct)" -print0 | $(SUDO) xargs -0r touch --no-dereference --date="@$(shell git --git-dir=binary/live/filesystem.git log -1 --pretty=%ct)"
# Build either a .iso or .img file, depending on the configured
# image type

0 comments on commit 89dcd1c

Please sign in to comment.