Source: u-boot
Severity: wishlist
Tags: patch
This simplifies the build, compared to several *.install executable
files. The debian/*.install files now only contain meaningful
information, and the installed targets are visible in logs.
>From 4a2ba0ebff8ffb23eb26e6b5653e19d2f0121ddb Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <[email protected]>
Date: Sun, 17 Jan 2021 15:53:43 +0100
Subject: Store all dh_install commands into the same file
This simplifies the build, compared to several *.install executable
files. The debian/*.install files now only contain meaningful
information, and the installed targets are visible in logs.
diff --git a/debian/bin/u-boot-install-targets
b/debian/bin/u-boot-install-targets
deleted file mode 100755
index 2eee8e76f8..0000000000
--- a/debian/bin/u-boot-install-targets
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-target=$1
-subarch_install_file="debian/build/targets.${target}"
-if [ -f "${subarch_install_file}" ]; then
- cat "${subarch_install_file}"
-fi
diff --git a/debian/rules b/debian/rules
index df9871234f..c170810d2b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -97,8 +97,8 @@ build-targets: configs/novena-rawsd_defconfig
configs/am335x_boneblack_defconfig
esac; \
for target in $$targets; do \
chmod -x $$builddir/$$target; \
- echo $$builddir/$$target /usr/lib/u-boot/$$platform/ \
- >> debian/build/targets.$$subarch; \
+ echo dh_install -p$$subpackage $$builddir/$$target
/usr/lib/u-boot/$$platform/ \
+ >> debian/build/targets; \
echo $$platform >> debian/build/platforms.$$subpackage;
\
done ; \
done
@@ -124,6 +124,13 @@ override_dh_auto_test-indep:
# Do not spend time searching for an install target in Makefile.
override_dh_auto_install:
+# override_ would require to test notools, which is unrelated.
+# The file may not exist (-arch build on amd64 for example)
+execute_after_dh_install:
+ if [ -e debian/build/targets ]; then \
+ sh -ev debian/build/targets; \
+ fi
+
# override_ would require to test notools, which is unrelated.
.PHONY: execute_after_dh_installdocs
execute_after_dh_installdocs: $(patsubst
debian/build/platforms.%,installdocs-%,\
diff --git a/debian/u-boot-amlogic.install b/debian/u-boot-amlogic.install
deleted file mode 100755
index 17ec78ee51..0000000000
--- a/debian/u-boot-amlogic.install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-debian/bin/u-boot-install-targets amlogic
diff --git a/debian/u-boot-exynos.install b/debian/u-boot-exynos.install
deleted file mode 100755
index e4408cf003..0000000000
--- a/debian/u-boot-exynos.install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-debian/bin/u-boot-install-targets exynos
diff --git a/debian/u-boot-imx.install b/debian/u-boot-imx.install
deleted file mode 100755
index cc4eb34ec3..0000000000
--- a/debian/u-boot-imx.install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-debian/bin/u-boot-install-targets imx
diff --git a/debian/u-boot-mvebu.install b/debian/u-boot-mvebu.install
deleted file mode 100755
index 96c98cef78..0000000000
--- a/debian/u-boot-mvebu.install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-debian/bin/u-boot-install-targets mvebu
diff --git a/debian/u-boot-omap.install b/debian/u-boot-omap.install
deleted file mode 100755
index 8a9873e043..0000000000
--- a/debian/u-boot-omap.install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-debian/bin/u-boot-install-targets omap
diff --git a/debian/u-boot-qcom.install b/debian/u-boot-qcom.install
deleted file mode 100755
index 0ff7e5bfac..0000000000
--- a/debian/u-boot-qcom.install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-debian/bin/u-boot-install-targets qcom
diff --git a/debian/u-boot-qemu.install b/debian/u-boot-qemu.install
deleted file mode 100755
index 5dca5d720e..0000000000
--- a/debian/u-boot-qemu.install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-debian/bin/u-boot-install-targets qemu
diff --git a/debian/u-boot-rockchip.install b/debian/u-boot-rockchip.install
index 89856b7c6c..5c3ae10859 100755
--- a/debian/u-boot-rockchip.install
+++ b/debian/u-boot-rockchip.install
@@ -1,5 +1,4 @@
#!/bin/sh
-debian/bin/u-boot-install-targets rockchip
cp arch/arm/mach-rockchip/make_fit_atf.py debian/build/rockchip_make_fit_atf
sed -i -e 's,/usr/bin/env python.*,/usr/bin/python3,g'
debian/build/rockchip_make_fit_atf
echo debian/build/rockchip_make_fit_atf /usr/bin/
diff --git a/debian/u-boot-rpi.install b/debian/u-boot-rpi.install
deleted file mode 100755
index 36cbec1358..0000000000
--- a/debian/u-boot-rpi.install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-debian/bin/u-boot-install-targets rpi
diff --git a/debian/u-boot-sifive.install b/debian/u-boot-sifive.install
deleted file mode 100755
index 5b20c3f900..0000000000
--- a/debian/u-boot-sifive.install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-debian/bin/u-boot-install-targets sifive
diff --git a/debian/u-boot-sunxi.install b/debian/u-boot-sunxi.install
old mode 100755
new mode 100644
index ad5a39aa6f..c739d234d1
--- a/debian/u-boot-sunxi.install
+++ b/debian/u-boot-sunxi.install
@@ -1,4 +1 @@
-#!/bin/sh
-debian/bin/u-boot-install-targets sunxi
-
-echo debian/bin/u-boot-install-sunxi /usr/bin/
+debian/bin/u-boot-install-sunxi usr/bin
diff --git a/debian/u-boot-tegra.install b/debian/u-boot-tegra.install
deleted file mode 100755
index 15b8ab96d9..0000000000
--- a/debian/u-boot-tegra.install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-debian/bin/u-boot-install-targets tegra
diff --git a/debian/u-boot.install b/debian/u-boot.install
deleted file mode 100755
index aff6d5de57..0000000000
--- a/debian/u-boot.install
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-debian/bin/u-boot-install-targets -
