Import Debian changes 2024.01+dfsg-7

debian/changelog

+u-boot (2024.01+dfsg-7) unstable; urgency=medium
+
+  * debian/control: Bump versioned dependency on arm-trusted-firmware to
+    2.10.10 or newer.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Thu, 09 Jan 2025 11:14:04 -0800
+
+u-boot (2024.01+dfsg-6) unstable; urgency=medium
+
+  * Use system dtc from device-tree-compiler (Closes: #1091125)
+  * debian/control: Move device-tree-compiler from Build-Depends-Arch to
+    Build-Depends.
+  * debian/control: Mark python3-libfdt, python3-jsonschema, and
+    python3-yaml as native to fix cross-building.
+  * debian/control: Update to Standards-Version 4.7.0.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Thu, 02 Jan 2025 13:47:07 -0800
+
 u-boot (2024.01+dfsg-5) unstable; urgency=medium
 
   * Upload to unstable.

debian/control

@@ -7,17 +7,18 @@ Build-Depends:
  bc,
  bison,
  debhelper-compat (= 13),
+ device-tree-compiler,
  flex,
  libpython3-dev:native [linux-any],
  libssl-dev,
  python3:any [linux-any],
+ python3-libfdt:native,
  python3-pyelftools [linux-any],
  python3-setuptools [linux-any],
  swig [linux-any],
 Build-Depends-Arch:
- arm-trusted-firmware (>= 2.9~) [arm64],
+ arm-trusted-firmware (>= 2.10.10) [arm64],
  crust-firmware (>= 0.3-2~) [arm64],
- device-tree-compiler,
  gcc-arm-linux-gnueabihf [arm64],
  libfdt-dev:native [arm64],
  libgnutls28-dev,
@@ -27,8 +28,8 @@ Build-Depends-Arch:
  libssl-dev:native,
  lzop [armhf],
  opensbi (>= 1.3) [riscv64],
- python3-jsonschema [arm64],
- python3-yaml [arm64],
+ python3-jsonschema:native [arm64],
+ python3-yaml:native [arm64],
  uuid-dev,
  uuid-dev:native [arm64],
 Build-Depends-Indep:
@@ -42,7 +43,7 @@ Build-Depends-Indep:
  gcc-mips64el-linux-gnuabi64 [!mips64el],
  gcc-mipsel-linux-gnu [!mipsel],
 Rules-Requires-Root: no
-Standards-Version: 4.6.2
+Standards-Version: 4.7.0
 Homepage: https://www.denx.de/wiki/U-Boot/
 Vcs-Browser: https://salsa.debian.org/debian/u-boot
 Vcs-Git: https://salsa.debian.org/debian/u-boot.git

debian/rules

 #!/usr/bin/make -f
 
+# Use the system dtc from device-tree-compiler
+export DTC=/usr/bin/dtc
+
 # Disable branch hardening to fix build failure of arch:all build
 # https://bugs.debian.org/1052724
 export DEB_BUILD_MAINT_OPTIONS=hardening=-branch

debian/salsa-ci.yml

@@ -9,6 +9,8 @@ variables:
   SALSA_CI_DISABLE_BLHC: 1
   # Enable arch:arm64 builds
   SALSA_CI_DISABLE_BUILD_PACKAGE_ARM64: 0
+  # Enable arm64 crossbuilding
+  SALSA_CI_DISABLE_CROSSBUILD_ARM64: 0
 
 blhc:
   allow_failure: true