Source: u-boot
Severity: wishlist
Tags: patch

Hello.

The attached patch continues your 8e9ee998 by also sharing the Make
dependency.
>From 024f17c638379559309c943fe3e91ed1643e3bf7 Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <[email protected]>
Date: Thu, 25 Mar 2021 19:26:53 +0100
Subject: Write only once that rockchip depends on rockchip_make_fit_atf

This follows 8e9ee998.

diff --git a/debian/targets.mk b/debian/targets.mk
index 8f39881e15..cda47c6ca2 100644
--- a/debian/targets.mk
+++ b/debian/targets.mk
@@ -1,6 +1,9 @@
 # Target architectures supported by u-boot in Debian.
 # debian/rules includes this Makefile snippet.
 
+# This dependency holds on both arm64 and armhf.
+# https://bugs.debian.org/cgi-bin/bugreport.cgi?att=0;bug=979483;msg=22
+u-boot-rockchip: debian/build/rockchip_make_fit_atf
 debian/build/rockchip_make_fit_atf: arch/arm/mach-rockchip/make_fit_atf.py
        mkdir -p debian/build
        sed '1 s,/usr/bin/env python.*,/usr/bin/python3,' \
@@ -57,8 +60,6 @@ ifeq (${DEB_HOST_ARCH},arm64)
   dpkg-gencontrol_args += "-Vu-boot-rockchip:Built-Using=$(shell dpkg-query 
-Wf \
     '$${source:Package} (= $${source:Version})' arm-trusted-firmware)"
 
-  u-boot-rockchip: debian/build/rockchip_make_fit_atf
-
   # Vagrant Cascadian <[email protected]>
   u-boot-rockchip_platforms += firefly-rk3399
   firefly-rk3399_assigns := BL31=/usr/lib/arm-trusted-firmware/rk3399/bl31.elf
@@ -353,9 +354,6 @@ else ifeq (${DEB_HOST_ARCH},armhf)
   # Silent a debhelper warning about an unused substvar.
   dpkg-gencontrol_args += -Vu-boot-rockchip:Built-Using=
 
-  # https://bugs.debian.org/cgi-bin/bugreport.cgi?att=0;bug=979483;msg=22
-  u-boot-rockchip: debian/build/rockchip_make_fit_atf
-
   # 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 \

Reply via email to