Package: dh-builtusing Followup-For: Bug #1067242 Hello.
Dh-builtusing/0.0.8 fixes an independently reported issue with Multi-Arch: foreign dependencies. This may help at least for crust-firmware. Dh-builtusing/0.0.10 adds an option producing debugging information, and autopgkgtests several multiarch configurations. It seems I can’t reproduce #1067242. My last attempt was on amdahl.debian.org with dh-builtusing/0.0.8. Could you please try again with the attached commits or a similar configuration?
>From 209b7d6b7eb8b7a91491024c1ff23cb96583b4f3 Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez <[email protected]> Date: Sun, 14 Sep 2025 18:06:51 +0200 Subject: [PATCH 1/2] Delegate the Built-Using field to the dh-builtusing debhelper tool Apply b8d39410 again, which was reverted in 7b96b82b. --- debian/control | 10 ++++++---- debian/rules | 2 +- debian/targets.mk | 18 ------------------ 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/debian/control b/debian/control index 19afb47e50..b2038d74de 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: bison, debhelper-compat (= 13), device-tree-compiler, + dh-sequence-builtusing, flex, libgnutls28-dev, libpython3-dev:native [linux-any], @@ -194,7 +195,8 @@ Description: A boot loader for omap systems Package: u-boot-sunxi Architecture: armhf arm64 Multi-Arch: same -Built-Using: ${u-boot-sunxi:Built-Using} +Built-Using: ${dh-builtusing:arm-trusted-firmware} [arm64], + ${dh-builtusing:crust-firmware} [arm64], Depends: ${misc:Depends} Recommends: u-boot-tools [arm64] Suggests: arm-trusted-firmware [arm64] @@ -267,7 +269,7 @@ Description: A boot loader for marvell systems Package: u-boot-rockchip Architecture: armhf arm64 Multi-Arch: same -Built-Using: ${u-boot-rockchip:Built-Using} +Built-Using: ${dh-builtusing:arm-trusted-firmware} [arm64] Depends: ${misc:Depends} Recommends: python3, u-boot-tools [arm64] Suggests: arm-trusted-firmware [arm64] @@ -321,7 +323,7 @@ Package: u-boot-sifive Architecture: riscv64 Multi-Arch: same Depends: ${misc:Depends} -Built-Using: ${u-boot-sifive:Built-Using} +Built-Using: ${dh-builtusing:opensbi} Description: A boot loader for SiFive systems Das U-Boot is a cross-platform bootloader for embedded systems, used as the default boot loader by several board vendors. It is @@ -358,7 +360,7 @@ Package: u-boot-starfive Architecture: riscv64 Multi-Arch: same Depends: ${misc:Depends} -Built-Using: ${u-boot-starfive:Built-Using} +Built-Using: ${dh-builtusing:opensbi} Description: A boot loader for Starfive systems Das U-Boot is a cross-platform bootloader for embedded systems, used as the default boot loader by several board vendors. It is diff --git a/debian/rules b/debian/rules index aa0afdf9d5..75f5e4bc28 100755 --- a/debian/rules +++ b/debian/rules @@ -162,6 +162,6 @@ override_dh_clean: find . -type d -name __pycache__ -delete override_dh_gencontrol: - dh_gencontrol -- $(dpkg-gencontrol_args) $(foreach package,\ + dh_gencontrol -- $(foreach package,\ u-boot-qemu $(subarchs),\ '-V$(package):platforms=$(subst $() ,$${Newline},$($(package)_platforms))') diff --git a/debian/targets.mk b/debian/targets.mk index b2e75219c1..a1e2cb4f95 100644 --- a/debian/targets.mk +++ b/debian/targets.mk @@ -56,9 +56,6 @@ ifeq (${DEB_HOST_ARCH},arm64) # u-boot-rockchip - dpkg-gencontrol_args += "-Vu-boot-rockchip:Built-Using=$(shell dpkg-query -Wf \ - '$${source:Package} (= $${source:Version})' arm-trusted-firmware)" - # Vagrant Cascadian <[email protected]> u-boot-rockchip_platforms += firefly-rk3399 firefly-rk3399_assigns := BL31=/usr/lib/arm-trusted-firmware/rk3399/bl31.elf @@ -168,9 +165,6 @@ ifeq (${DEB_HOST_ARCH},arm64) u-boot-sunxi_assigns = \ SCP=$(or $(wildcard /usr/lib/crust-firmware/$(platform).bin),/dev/null) - dpkg-gencontrol_args += "-Vu-boot-sunxi:Built-Using=$(shell dpkg-query -Wf \ - '$${source:Package} (= $${source:Version})' arm-trusted-firmware)" - u-boot-sunxi_platforms += a64-olinuxino a64-olinuxino_assigns := BL31=/usr/lib/arm-trusted-firmware/sun50i_a64/bl31.bin a64-olinuxino_targets := arch/arm/dts/sun50i-a64-olinuxino.dtb \ @@ -431,9 +425,6 @@ else ifeq (${DEB_HOST_ARCH},armhf) # u-boot-rockchip - # Silent a debhelper warning about an unused substvar. - dpkg-gencontrol_args += -Vu-boot-rockchip:Built-Using= - # Vagrant Cascadian <[email protected]>, 2GB and 4GB variants u-boot-rockchip_platforms += firefly-rk3288 firefly-rk3288_targets := idbloader.img spl/u-boot-spl.bin u-boot.bin \ @@ -535,9 +526,6 @@ else ifeq (${DEB_HOST_ARCH},armhf) # u-boot-sunxi - # Silent a debhelper warning about an unused substvar. - dpkg-gencontrol_args += -Vu-boot-sunxi:Built-Using= - # Christian Kastner <[email protected]> u-boot-sunxi_platforms += A10-OLinuXino-Lime A10-OLinuXino-Lime_targets := u-boot-sunxi-with-spl.bin uboot.elf @@ -660,9 +648,6 @@ else ifeq (${DEB_HOST_ARCH},riscv64) # u-boot-sifive - dpkg-gencontrol_args += "-Vu-boot-sifive:Built-Using=$(shell dpkg-query -Wf \ - '$${source:Package} (= $${source:Version})' opensbi)" - # Hector Oron <[email protected]> u-boot-sifive_platforms += sifive_unleashed sifive_unleashed_targets := u-boot.bin uboot.elf spl/u-boot-spl.bin u-boot.itb @@ -675,9 +660,6 @@ else ifeq (${DEB_HOST_ARCH},riscv64) # u-boot-starfive - dpkg-gencontrol_args += "-Vu-boot-starfive:Built-Using=$(shell dpkg-query -Wf \ - '$${source:Package} (= $${source:Version})' opensbi)" - # Anatoliy Gunya <[email protected]> u-boot-starfive_platforms += starfive_visionfive2 starfive_visionfive2_targets := u-boot.bin uboot.elf spl/u-boot-spl.bin.normal.out u-boot.itb -- 2.47.3
>From 8b59927993eecf6bdcea6769614293beba1f1cbe Mon Sep 17 00:00:00 2001 From: Nicolas Boulenguez <[email protected]> Date: Thu, 25 Sep 2025 21:22:37 +0200 Subject: [PATCH 2/2] Attempt to build with dh-builtusing --logorrheic --- debian/changelog | 6 ++++++ debian/control | 1 + debian/rules | 3 +++ 3 files changed, 10 insertions(+) diff --git a/debian/changelog b/debian/changelog index 8f97b3a70c..58672702ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +u-boot (2025.01-4~0~20250915~0) UNRELEASED; urgency=medium + + * Attempt to build with dh-builtusing --logorrheic. + + -- Nicolas Boulenguez <[email protected]> Mon, 15 Sep 2025 18:17:16 +0000 + u-boot (2025.01-3) unstable; urgency=medium [ Marek Vasut ] diff --git a/debian/control b/debian/control index b2038d74de..1666674cc5 100644 --- a/debian/control +++ b/debian/control @@ -8,6 +8,7 @@ Build-Depends: bison, debhelper-compat (= 13), device-tree-compiler, + dh-builtusing (>= 0.0.10), dh-sequence-builtusing, flex, libgnutls28-dev, diff --git a/debian/rules b/debian/rules index 75f5e4bc28..74b6d74041 100755 --- a/debian/rules +++ b/debian/rules @@ -165,3 +165,6 @@ override_dh_gencontrol: dh_gencontrol -- $(foreach package,\ u-boot-qemu $(subarchs),\ '-V$(package):platforms=$(subst $() ,$${Newline},$($(package)_platforms))') + +override_dh_builtusing: + dh_builtusing --logorrheic -- 2.47.3
