On Tue, Jun 15, 2021 at 12:16:03AM +0200, Holger Levsen wrote: > A full diff is attached. a classic, now! -- cheers, Holger ⢀⣴⠾⠻⢶⣦⠀ ⣾⠁⢠⠒⠀⣿⡁ holger@(debian|reproducible-builds|layer-acht).org ⢿⡄⠘⠷⠚⠋⠀ OpenPGP: B8BF54137B09D35CF026FE9D 091AB856069AAA1C ⠈⠳⣄ We are done with ‘world leaders’. Countries are on fire. Cities are drowning. People are dying. This is what scientists and activists have been warning the world and politicians about. It’s here. We ARE facing the impacts of the climate crisis. Forget about the future, it’s now. fridays for future - https://nitter.net/fff_digital/status/1304520941012242432
diff -Nru debian-installer-netboot-images-20210415/debian/changelog debian-installer-netboot-images-20210606+fixed1/debian/changelog
--- debian-installer-netboot-images-20210415/debian/changelog 2021-04-15 13:23:35.000000000 +0200
+++ debian-installer-netboot-images-20210606+fixed1/debian/changelog 2021-06-10 06:50:59.000000000 +0200
@@ -1,3 +1,23 @@
+debian-installer-netboot-images (20210606+fixed1) unstable; urgency=medium
+
+ * Fix regression introduced while fixing error reporting in the previous
+ upload (oh, the irony), fixing the FTBFS.
+ * Strip +fixed.* suffix when setting VERSION in debian/rules, to cope
+ with this follow-up upload for the same D-I version (20210606).
+
+ -- Cyril Brulebois <kibi@debian.org> Thu, 10 Jun 2021 06:50:59 +0200
+
+debian-installer-netboot-images (20210606) unstable; urgency=medium
+
+ * Update for D-I Bullseye RC 2.
+ * Fix error reporting when no fallback suite is defined: exit
+ immediately instead of building empty packages.
+ * Drop unused shared-lib-without-dependency-information lintian
+ overrides.
+ * Add myself to Uploaders.
+
+ -- Cyril Brulebois <kibi@debian.org> Mon, 07 Jun 2021 17:47:04 +0200
+
debian-installer-netboot-images (20210415) unstable; urgency=medium
* Team upload.
diff -Nru debian-installer-netboot-images-20210415/debian/control debian-installer-netboot-images-20210606+fixed1/debian/control
--- debian-installer-netboot-images-20210415/debian/control 2021-04-15 13:22:35.000000000 +0200
+++ debian-installer-netboot-images-20210606+fixed1/debian/control 2021-06-07 17:46:51.000000000 +0200
@@ -8,7 +8,7 @@
Section: misc
Priority: optional
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
-Uploaders: Didier Raboud <odyx@debian.org>
+Uploaders: Didier Raboud <odyx@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends: debhelper-compat (= 13),
wget,
debian-archive-keyring,
diff -Nru debian-installer-netboot-images-20210415/debian/control.in debian-installer-netboot-images-20210606+fixed1/debian/control.in
--- debian-installer-netboot-images-20210415/debian/control.in 2021-04-15 13:22:35.000000000 +0200
+++ debian-installer-netboot-images-20210606+fixed1/debian/control.in 2021-06-07 17:45:11.000000000 +0200
@@ -2,7 +2,7 @@
Section: misc
Priority: optional
Maintainer: Debian Install System Team <debian-boot@lists.debian.org>
-Uploaders: Didier Raboud <odyx@debian.org>
+Uploaders: Didier Raboud <odyx@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends: debhelper-compat (= 13),
wget,
debian-archive-keyring,
diff -Nru debian-installer-netboot-images-20210415/debian/lintian-overrides.in debian-installer-netboot-images-20210606+fixed1/debian/lintian-overrides.in
--- debian-installer-netboot-images-20210415/debian/lintian-overrides.in 2021-02-15 18:47:48.000000000 +0100
+++ debian-installer-netboot-images-20210606+fixed1/debian/lintian-overrides.in 2021-06-07 17:31:06.000000000 +0200
@@ -3,7 +3,6 @@
debian-installer-##IDENTIFIER##: statically-linked-binary
debian-installer-##IDENTIFIER##: unstripped-binary-or-object
debian-installer-##IDENTIFIER##: embedded-library
-debian-installer-##IDENTIFIER##: shared-lib-without-dependency-information
debian-installer-##IDENTIFIER##: library-not-linked-against-libc
debian-installer-##IDENTIFIER##: shlib-with-executable-stack
debian-installer-##IDENTIFIER##: missing-depends-line
diff -Nru debian-installer-netboot-images-20210415/debian/rules debian-installer-netboot-images-20210606+fixed1/debian/rules
--- debian-installer-netboot-images-20210415/debian/rules 2021-02-15 18:59:29.000000000 +0100
+++ debian-installer-netboot-images-20210606+fixed1/debian/rules 2021-06-10 06:50:56.000000000 +0200
@@ -4,7 +4,7 @@
export DISTRIBUTION_FALLBACK?=
export KFREEBSD_KERNEL_MAJOR?=11
-export VERSION?=$(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
+export VERSION?=$(shell dpkg-parsechangelog | sed -n 's/^Version: //p' | sed 's/+fixed.*//')
# Don't forget to recreate debian/control after editing these lines: $ debian/rules debian/control
export MAJOR_VERSION=11
@@ -17,12 +17,17 @@
override_dh_auto_install: $(SUPPORTED_ARCHITECTURES:%=get-images-%)
get-images-%:
- if ! ./get-images.sh $* && [ -n "$(DISTRIBUTION_FALLBACK)" ]; then\
- echo; echo; echo; \
- echo "Version not found in $(DISTRIBUTION), falling back to $(DISTRIBUTION_FALLBACK)"; \
- echo; echo; echo; \
- sleep 5; \
- DISTRIBUTION=$(DISTRIBUTION_FALLBACK) ./get-images.sh $*; \
+ if ! ./get-images.sh $*; then \
+ if [ -n "$(DISTRIBUTION_FALLBACK)" ]; then \
+ echo; echo; echo; \
+ echo "Version not found in $(DISTRIBUTION), falling back to $(DISTRIBUTION_FALLBACK)"; \
+ echo; echo; echo; \
+ sleep 5; \
+ DISTRIBUTION=$(DISTRIBUTION_FALLBACK) ./get-images.sh $*; \
+ else \
+ echo "Version not found in $(DISTRIBUTION), no fallback defined"; \
+ exit 1; \
+ fi \
fi
override_dh_lintian: $(SUPPORTED_ARCHITECTURES:%=debian/debian-installer-${MAJOR_VERSION}-netboot-%.lintian-overrides)
Attachment:
signature.asc
Description: PGP signature