Tony Mancill pushed to branch master at Debian Java Maintainers / jtreg
Commits: 1f8fc943 by tony mancill at 2023-08-31T16:15:08-07:00 Apply reproducible builds patch (Closes: #1050944) - - - - - ea0c6ced by tony mancill at 2023-08-31T22:17:07-07:00 Use debhelper-compat 13 - - - - - bbd8bce8 by tony mancill at 2023-08-31T22:17:07-07:00 Use DEB_VERSION_UPSTREAM to parse VERSION and BUILD_NUMBER - - - - - 7a52634d by tony mancill at 2023-08-31T22:17:07-07:00 Prepare changelog for upload - - - - - 6 changed files: - debian/changelog - − debian/compat - debian/control - + debian/patches/reproducible-build.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,13 @@ +jtreg6 (6.2+1-2) unstable; urgency=medium + + * Team upload. + * Apply reproducible builds patch (Closes: #1050944) + Thank you to Chris Lamb and Vagrant Cascadian + * Use debhelper-compat 13 + * Use DEB_VERSION_UPSTREAM to parse VERSION and BUILD_NUMBER in d/rules + + -- tony mancill <[email protected]> Thu, 31 Aug 2023 22:16:15 -0700 + jtreg6 (6.2+1-1) unstable; urgency=medium * Team upload. ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -11 ===================================== debian/control ===================================== @@ -5,7 +5,7 @@ Maintainer: Debian Java Maintainers <[email protected] Uploaders: Guillaume Mazoyer <[email protected]>, Matthias Klose <[email protected]> Build-Depends: ant, - debhelper (>= 11), + debhelper-compat (= 13), default-jdk, help2man, javahelp2, ===================================== debian/patches/reproducible-build.patch ===================================== @@ -0,0 +1,29 @@ +Description: Make the build reproducible +Author: Chris Lamb <[email protected]> +Last-Update: 2023-08-31 + +--- jtreg6-6.2+1.orig/make/Rules.gmk ++++ jtreg6-6.2+1/make/Rules.gmk +@@ -55,6 +55,13 @@ $(CLASSDIR) $(BUILDDIR) $(BUILDDIR)/test + # default copyright; override as necessary + JAR_COPYRIGHT = -C $(TOPDIR) COPYRIGHT + ++DATE_FMT = %B %d, %Y ++ifdef SOURCE_DATE_EPOCH ++ BUILD_DATE ?= $(shell LC_ALL=C date -u -d "@$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" 2>/dev/null || LC_ALL=C date -u -r "$(SOURCE_DATE_EPOCH)" "$(DATE_FMT)" 2>/dev/null || LC_ALL=C date -u "$(DATE_FMT)") ++else ++ BUILD_DATE ?= $(shell date "$(DATE_FMT)") ++endif ++ + $(IMAGES_DIR)/%.jar: pkgsToFiles.sh + $(RM) $@ $(@:$(IMAGES_DIR)/%.jar=$(BUILDDIR)/jarData/%) + $(MKDIR) -p $(@D) +@@ -68,7 +75,7 @@ $(IMAGES_DIR)/%.jar: pkgsToFiles.sh + echo "$(@F:%.jar=%)-Build: $(BUILD_NUMBER)" ; \ + echo "$(@F:%.jar=%)-BuildJavaVersion: `$(JDKJAVA) -fullversion 2>&1 | awk '{print $$NF}' | \ + sed -e 's|^"\(.*\)"$$|Java(TM) 2 SDK, Version \1|'`" ; \ +- echo "$(@F:%.jar=%)-BuildDate: `/bin/date +'%B %d, %Y'`" ; \ ++ echo "$(@F:%.jar=%)-BuildDate: $(BUILD_DATE)" ; \ + ) \ + > $(@:$(IMAGES_DIR)/%.jar=$(BUILDDIR)/jarData/%/manifest.txt) + sh pkgsToFiles.sh $(CLASSDIR) $($(@F:%.jar=PKGS.JAR.%)) > $(@:$(IMAGES_DIR)/%.jar=$(BUILDDIR)/jarData/%/includes.txt) ===================================== debian/patches/series ===================================== @@ -2,3 +2,4 @@ add-release-options.patch launchers.patch add-jcommander-to-classpath.patch add-logger-to-classpath.patch +reproducible-build.patch ===================================== debian/rules ===================================== @@ -1,25 +1,26 @@ #!/usr/bin/make -f +include /usr/share/dpkg/pkg-info.mk + JAVA_HOME = /usr/lib/jvm/default-java -# version string has the form 6.1+N-D, the Debian release is not passed into the build -VERSION := $(shell dpkg-parsechangelog --show-field Version | sed 's/+.*//') -BUILD_NUMBER := $(shell dpkg-parsechangelog --show-field Version | sed 's/.*+\([0-9]*\).*/\1/') -DATE := $(shell dpkg-parsechangelog --show-field Date) +# version string has the form 6.x+N +VERSION := $(shell echo $(DEB_VERSION_UPSTREAM) | cut -f1 -d'+') +BUILD_NUMBER := $(shell echo $(DEB_VERSION_UPSTREAM) | cut -f2 -d'+') %: dh $@ --with javahelper override_dh_auto_build: cd make && \ - make ANT=/usr/share/ant \ + make ANT=/usr/share/ant \ ANT_JAR=/usr/share/java/ant.jar \ ASMTOOLS_JAR=/usr/share/java/asmtools.jar \ BUILDDIR=../dist \ BUILD_MILESTONE=src \ BUILD_NUMBER=$(BUILD_NUMBER) \ BUILD_VERSION=$(VERSION) \ - BUILD_VERSION_STRING="$(VERSION)+$(BUILD_NUMBER)" \ + BUILD_VERSION_STRING="$(DEB_VERSION_UPSTREAM)" \ GOOGLE_GUICE_JAR=/usr/share/java/guice.jar \ HAMCREST_JAR=/usr/share/java/hamcrest.jar \ JAVATEST_JAR=/usr/share/java/javatest.jar \ @@ -33,3 +34,9 @@ override_dh_auto_build: # Generate the manpages JT_HOME=./dist/jtreg/lib/ help2man --name="Regression Test Harness" --help-option="-help all" dist/jtreg/bin/jtdiff > jtdiff.1 JT_HOME=./dist/jtreg/lib/ help2man --name="Regression Test Harness" --help-option="-help all" dist/jtreg/bin/jtreg > jtreg.1 + +execute_before_dh_strip_nondeterminism: + find debian/ -type f -name jtreg.jar -print0 | xargs -0tr chmod u+w + +execute_after_dh_strip_nondeterminism: + find debian/ -type f -name jtreg.jar -print0 | xargs -0tr chmod u-w View it on GitLab: https://salsa.debian.org/java-team/jtreg/-/compare/034b4d1ef16ef32be0bb0dd9730b3f02a410b277...7a52634d7fa796b94d8a21672b60bd93a9e41d00 -- View it on GitLab: https://salsa.debian.org/java-team/jtreg/-/compare/034b4d1ef16ef32be0bb0dd9730b3f02a410b277...7a52634d7fa796b94d8a21672b60bd93a9e41d00 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
