Final commit

Final commit Final commit Final commit Final commit final commit final one made changes to clamp-changelog-entry-date made more changes removed the spurious files and made appropriate changes to scripts edited script edited script retrieved .txt files edited files ammended the file added files added and removed files Removed unnecessary files and updated .gitignore edited the script edited the script Replaced date with 1727261746 for reproducibility final changes Last commit final changes shellcheck-error fixes shellcheck change fixed clamp-changelog-entry-date Reverting to fixed-clamp-change final changes final changes shellcheck-error fixes shellcheck change fixed clamp-changelog-entry-date retrieved .txt files retrieved the .txt files and gitignore shellcheck-error fixes shellcheck change fixed clamp-changelog-entry-date Reverting to fixed-clamp-change final changes final changes shellcheck-error fixes shellcheck change fixed clamp-changelog-entry-date retrieved .txt files retrieved the .txt files and gitignore Delete new_rpm_header.txt Delete new_src_header.txt Delete e -i HEAD~5 Update .gitignore Delete qubesbuilder/.gitignore Delete qubesbuilder/dependencies-debian.txt Delete qubesbuilder/dependencies-fedora-qubes-executor.txt Delete qubesbuilder/dependencies-fedora.txt Delete e -i HEAD~5 Delete qubesbuilder/dependencies-debian.txt Delete qubesbuilder/.gitignore Delete qubesbuilder/dependencies-fedora-qubes-executor.txt Delete qubesbuilder/dependencies-fedora.txt Delete new_rpm_header.txt Update modify-changelog-for-build Update clamp-changelog-entry-date Update clamp-changelog-entry-date Update clamp-changelog-entry-date Update clamp-changelog-entry-date Update clamp-changelog-entry-date Update Makefile Update clamp-changelog-entry-date Update clamp-changelog-entry-date
QubesOS · Oct 21, 2024 · 936e43f · 936e43f
1 parent c302e71
commit 936e43f
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 8 deletions.
diff --git a/qubesbuilder/plugins/build_deb/scripts/create-local-repo b/qubesbuilder/plugins/build_deb/scripts/create-local-repo
@@ -73,6 +73,7 @@ gzip -9c "dists/$SUITE/main/binary-amd64/Packages" > "dists/$SUITE/main/binary-a
 
 DATE=$(LC_ALL=C date -u +"%a, %d %b %Y %H:%M:%S %Z")
 
+
 cat > "dists/$SUITE/Release" <<EOF
 Label: Qubes builder repo
 Suite: $SUITE

diff --git a/qubesbuilder/plugins/build_rpm/scripts/rpmbuildinfo b/qubesbuilder/plugins/build_rpm/scripts/rpmbuildinfo
@@ -71,7 +71,6 @@ Version: $(rpm -qp --queryformat '%{version}-%{release}' "$SRPM")
 Architecture: $(rpm -qp --queryformat '%{arch}' "$SRPM")
 Binary: $(printf '%s' "$RPMS" | xargs rpm -qp --qf "%{name} ")
 Build-Origin: $(getos)
-Build-Date: $(date -R)
 Build-Path: $(rpm --eval '%{_builddir}')
 EOF
 

diff --git a/qubesbuilder/plugins/installer/Makefile b/qubesbuilder/plugins/installer/Makefile
@@ -26,7 +26,9 @@ INSTALLER_DIR ?= $(PLUGINS_DIR)/installer
 SOURCES_DIR ?= $(BUILDER_DIR)/sources
 INSTALLER_KICKSTART ?= $(SOURCES_DIR)/qubes-release/conf/qubes-kickstart.cfg
 CREATEREPO := $(shell which createrepo_c createrepo 2>/dev/null |head -1)
-ISO_VERSION ?= $(shell date +%Y%m%d)
+
+
+ISO_VERSION ?= $(shell date -d @"$(SOURCE_DATE_EPOCH)" +%Y%m%d 2>/dev/null || date +%Y%m%d)
 COMPS_FILE ?= $(SOURCES_DIR)/qubes-release/comps/comps-dom0.xml
 QUBES_VERSION ?= $(shell cat $(SOURCES_DIR)/qubes-release/version)
 

diff --git a/qubesbuilder/plugins/source_deb/scripts/clamp-changelog-entry-date b/qubesbuilder/plugins/source_deb/scripts/clamp-changelog-entry-date
@@ -22,6 +22,7 @@
 
 # Clamp the topmost changelog entry date ("Build for ...") to the previous one
 # (actual meaningful entry)
+#Reverted clamp-changelog-entry-date
 
 CHANGELOG_PATH="$1"
 
@@ -30,9 +31,14 @@ if [ ! -r "$CHANGELOG_PATH" ]; then
     exit 1
 fi
 
-# get previous date
-PREVIOUS_DATE=$(grep '^ --' "$CHANGELOG_PATH" | head -n 2 | tail -n 1 | grep -o '  .*')
+# Set CURRENT_DATE based on SOURCE_DATE_EPOCH or fallback to previous date
+if [ -n "$SOURCE_DATE_EPOCH" ]; then
+    CURRENT_DATE=$(date -R -u -d "@$SOURCE_DATE_EPOCH")  # RFC 2822 format (e.g., Wed, 02 Oct 2002 15:00:00 +0200)
+else
+    # Get previous date from changelog
+    CURRENT_DATE=$(grep '^ --' "$CHANGELOG_PATH" | head -n 2 | tail -n 1 | grep -o '  .*')
+fi
 
-# replace topmost date
-sed -e "0,/^ --/s/^\( --.*\)\(  .*\)/\1$PREVIOUS_DATE/" -i "$CHANGELOG_PATH"
-touch --date="$PREVIOUS_DATE" "$CHANGELOG_PATH"
+# Replace the topmost date with CURRENT_DATE
+sed -e "0,/^ --/s/^\( --.*\)\(  .*\)/\1 $CURRENT_DATE/" -i "$CHANGELOG_PATH"
+touch --date="$CURRENT_DATE" "$CHANGELOG_PATH"
diff --git a/qubesbuilder/plugins/template/Makefile b/qubesbuilder/plugins/template/Makefile
@@ -45,7 +45,11 @@ fix_up := $(shell TEMPLATE_NAME=$(TEMPLATE_NAME) TEMPLATE_LABEL="$(TEMPLATE_LABE
 	$(BUILDER_DIR)/scripts/builder-fix-filenames)
 
 TEMPLATE_NAME := $(word 1,$(fix_up))
-TEMPLATE_TIMESTAMP ?= $(shell date -u +%Y%m%d%H%MZ)
+
+TEMPLATE_TIMESTAMP ?= $(shell date -u -d "@$(SOURCE_DATE_EPOCH)" +%Y%m%d%H%MZ 2>/dev/null || date -u +%Y%m%d%H%MZ)
+
+
+
 
 .PHONY: template-name prepare build build-rootimg build-rpm