[PATCH 0/2] Fix build failures on de0-nano-soc-buster

[Uladzimir Bely]

The patches are aimed to reduce number of currently unbuildable
machine/distro combinations.

First patch allows libubootenv to use buster version of debhelper.

Second one is just a "quick fix" that ignores some debug symbols.
Actually, there might be a more robust solution but it would take
more time to debug and implement.

Uladzimir Bely (2):
Fix libubootenv build for debian-buster
Fix u-boot build for u-boot-de0-nano-soc for buster:

.../u-boot/u-boot-de0-nano-soc_2020.10.bb | 8 ++++++
.../0001-Use-debhelper-12-for-buster.patch | 25 +++++++++++++++++++
.../libubootenv/libubootenv_0.3.5-0.1.bb | 1 +
3 files changed, 34 insertions(+)
create mode 100644 meta/recipes-bsp/libubootenv/files/0001-Use-debhelper-12-for-buster.patch

--
2.52.0

[Zhihang Wei]

These patches aim to reduce the number of currently unbuildable
machine/distro combinations.

The 1st patch allows libubootenv to use the buster version of debhelper.

The 2nd patch is a workaround that ignores some debug symbols.

Changes in v2:
- Fix syntax.
- Add missing SOB.

Uladzimir Bely (2):
Fix libubootenv build for debian-buster
Fix u-boot build for u-boot-de0-nano-soc for buster

.../u-boot/u-boot-de0-nano-soc_2020.10.bb | 8 ++++++
.../0001-Use-debhelper-12-for-buster.patch | 25 +++++++++++++++++++
.../libubootenv/libubootenv_0.3.5-0.1.bb | 1 +
3 files changed, 34 insertions(+)
create mode 100644 meta/recipes-bsp/libubootenv/files/0001-Use-debhelper-12-for-buster.patch

--

2.39.5

[Zhihang Wei]

From: Uladzimir Bely <ub...@ilbers.de>

Targets like de0-nano-soc-buster fail when building libobootenv-0.3.5
since it stricty depends on debhelper-compat 13 that is missing in
buster.

Fixes the following error:
| The following packages have unmet dependencies:
| sbuild-build-depends-main-dummy:armhf : Depends: debhelper-compat:armhf (= 13)
|
| Execute external solver...
| Some packages could not be installed. This may mean that you have
| requested an impossible situation or if you are using the unstable
| distribution that some required packages have not yet been created
| or been moved out of Incoming.
| The following information may help to resolve the situation:
|
| The following packages have unmet dependencies:
| sbuild-build-depends-main-dummy:armhf : Depends: debhelper-compat:armhf (= 13)
| Depends: cmake:armhf
| Depends: zlib1g-dev:armhf but it is not going to be installed
| Depends: libyaml-dev:armhf but it is not going to be installed
| Depends: graphviz:armhf
| Depends: doxygen:armhf
| E: External solver failed with: The following packages have unmet dependencies:
| apt-get failed.

Apply a patch to depend on lower (12) version of debhelper for buster.

Signed-off-by: Uladzimir Bely <ub...@ilbers.de>
Signed-off-by: Zhihang Wei <w...@ilbers.de>
---

.../0001-Use-debhelper-12-for-buster.patch | 25 +++++++++++++++++++
.../libubootenv/libubootenv_0.3.5-0.1.bb | 1 +

2 files changed, 26 insertions(+)
create mode 100644 meta/recipes-bsp/libubootenv/files/0001-Use-debhelper-12-for-buster.patch

diff --git a/meta/recipes-bsp/libubootenv/files/0001-Use-debhelper-12-for-buster.patch b/meta/recipes-bsp/libubootenv/files/0001-Use-debhelper-12-for-buster.patch
new file mode 100644
index 00000000..391cb7df
--- /dev/null
+++ b/meta/recipes-bsp/libubootenv/files/0001-Use-debhelper-12-for-buster.patch
@@ -0,0 +1,25 @@
+From 4351a77d97468682a8839ca5007033908521c67d Mon Sep 17 00:00:00 2001
+From: Uladzimir Bely <uladzim...@ilbers.de>
+Date: Mon, 16 Feb 2026 11:30:16 +0300
+Subject: [PATCH] Use debhelper 12 for buster
+
+---
+ debian/control | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/debian/control b/debian/control
+index 1cb6b62..b1f227e 100644
+--- a/debian/control
++++ b/debian/control
+@@ -2,7 +2,7 @@ Source: libubootenv
+ Priority: optional
+ Maintainer: Nobuhiro Iwamatsu <iwam...@debian.org>
+ Uploaders: SZ Lin (林上智) <sz...@debian.org>
+-Build-Depends: debhelper-compat (= 13), cmake, zlib1g-dev, libyaml-dev, graphviz, doxygen
++Build-Depends: debhelper-compat (= 12), cmake, zlib1g-dev, libyaml-dev, graphviz, doxygen
+ Standards-Version: 4.6.0.1
+ Section: utils
+ Rules-Requires-Root: no
+--
+2.52.0
+
diff --git a/meta/recipes-bsp/libubootenv/libubootenv_0.3.5-0.1.bb b/meta/recipes-bsp/libubootenv/libubootenv_0.3.5-0.1.bb
index 1a4c3b1d..28425bae 100644
--- a/meta/recipes-bsp/libubootenv/libubootenv_0.3.5-0.1.bb
+++ b/meta/recipes-bsp/libubootenv/libubootenv_0.3.5-0.1.bb
@@ -20,6 +20,7 @@ SRCREV = "32dcabeea9ed5342a2d1bb254bb4839e2e68ee5e"

DEB_BUILD_OPTIONS += "nocheck"

+SRC_URI:append:buster = " file://0001-Use-debhelper-12-for-buster.patch"

CHANGELOG_V ?= "${PV}+isar-${SRCREV}"

--
2.39.5

[Zhihang Wei]

From: Uladzimir Bely <ub...@ilbers.de>

Workaround the following build error:

make[1]: Leaving directory '/<<PKGBUILDDIR>>'
dh_install
dh_installdocs
dh_installchangelogs
dh_perl
dh_link
dh_strip_nondeterminism
dh_compress
dh_fixperms
dh_missing
dh_dwz
dwz: Too few files for multifile optimization
arm-linux-gnueabihf-objcopy: 'debian/u-boot-tools/usr/lib/debug/.dwz/arm-linux-gnueabihf/u-boot-tools.debug': No such file
dh_dwz: arm-linux-gnueabihf-objcopy --compress-debug-sections debian/u-boot-tools/usr/lib/debug/.dwz/arm-linux-gnueabihf/u-boot-tools.debug returned exit code 1
make: *** [debian/rules:34: binary] Error 2

Buster uses an older debhelper version. Ignore the missing debug
symbols file.

Signed-off-by: Uladzimir Bely <ub...@ilbers.de>
Signed-off-by: Zhihang Wei <w...@ilbers.de>
---

.../recipes-bsp/u-boot/u-boot-de0-nano-soc_2020.10.bb | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2020.10.bb b/meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2020.10.bb
index feecd96d..1e470518 100644
--- a/meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2020.10.bb
+++ b/meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2020.10.bb
@@ -9,3 +9,11 @@ require u-boot-${PV}.inc
U_BOOT_TOOLS_PACKAGE = "1"

COMPATIBLE_MACHINE = "^(de0-nano-soc)$"
+
+do_prepare_build:append:buster() {
+ echo =-=-=
+cat << _EOF_ >> ${S}/debian/rules
+override_dh_dwz:
+ dh_dwz || :
+_EOF_
+}
--
2.39.5