Control: tags 979295 -pending Still undecided, patch attached.
On the one hand, I like this patch because it is much more standard... on the other hand, it is a fairly large number of files to edit for a single package change... live well, vagrant
From a95e59af9c775b39ed4f04e97a6cda9de2eaad7b Mon Sep 17 00:00:00 2001
From: Nicolas Boulenguez <nico...@debian.org>
Date: Sat, 5 Dec 2020 14:49:17 +0100
Subject: [PATCH 5/7] Use specific dh tools for docs and examples instead of
dh_install
---
debian/bin/u-boot-install-targets | 4 ----
debian/u-boot-amlogic.docs | 5 +++++
debian/u-boot-amlogic.install | 8 +-------
debian/u-boot-exynos.docs | 1 +
debian/u-boot-exynos.install | 2 +-
debian/u-boot-mvebu.docs | 1 +
debian/u-boot-mvebu.install | 2 +-
debian/u-boot-omap.docs | 1 +
debian/u-boot-omap.install | 2 +-
debian/u-boot-rockchip.docs | 1 +
debian/u-boot-rockchip.install | 2 +-
debian/u-boot-sifive.docs | 1 +
debian/u-boot-sifive.install | 2 +-
debian/u-boot-sunxi.docs | 1 +
debian/u-boot-sunxi.install | 2 +-
debian/u-boot-tools.examples | 3 +++
debian/u-boot-tools.install | 4 ----
17 files changed, 21 insertions(+), 21 deletions(-)
create mode 100644 debian/u-boot-amlogic.docs
create mode 100644 debian/u-boot-exynos.docs
create mode 100644 debian/u-boot-mvebu.docs
create mode 100644 debian/u-boot-omap.docs
create mode 100644 debian/u-boot-rockchip.docs
create mode 100644 debian/u-boot-sifive.docs
create mode 100644 debian/u-boot-sunxi.docs
create mode 100644 debian/u-boot-tools.examples
diff --git a/debian/bin/u-boot-install-targets b/debian/bin/u-boot-install-targets
index d5e996eea4..2eee8e76f8 100755
--- a/debian/bin/u-boot-install-targets
+++ b/debian/bin/u-boot-install-targets
@@ -1,10 +1,6 @@
#!/bin/sh
target=$1
-docs="$2"
subarch_install_file="debian/build/targets.${target}"
if [ -f "${subarch_install_file}" ]; then
cat "${subarch_install_file}"
fi
-for doc in ${docs} ; do
- echo ${doc} /usr/share/doc/u-boot-${target}/
-done
diff --git a/debian/u-boot-amlogic.docs b/debian/u-boot-amlogic.docs
new file mode 100644
index 0000000000..25c5b53d55
--- /dev/null
+++ b/debian/u-boot-amlogic.docs
@@ -0,0 +1,5 @@
+doc/board/amlogic/khadas-vim.rst
+doc/board/amlogic/khadas-vim2.rst
+doc/board/amlogic/libretech-cc.rst
+doc/board/amlogic/nanopi-k2.rst
+doc/board/amlogic/odroid-c2.rst
diff --git a/debian/u-boot-amlogic.install b/debian/u-boot-amlogic.install
index 68ef25b381..17ec78ee51 100755
--- a/debian/u-boot-amlogic.install
+++ b/debian/u-boot-amlogic.install
@@ -1,8 +1,2 @@
#!/bin/sh
-debian/bin/u-boot-install-targets amlogic "
- doc/board/amlogic/khadas-vim.rst
- doc/board/amlogic/khadas-vim2.rst
- doc/board/amlogic/libretech-cc.rst
- doc/board/amlogic/nanopi-k2.rst
- doc/board/amlogic/odroid-c2.rst
- "
+debian/bin/u-boot-install-targets amlogic
diff --git a/debian/u-boot-exynos.docs b/debian/u-boot-exynos.docs
new file mode 100644
index 0000000000..98917094d0
--- /dev/null
+++ b/debian/u-boot-exynos.docs
@@ -0,0 +1 @@
+doc/README.odroid
diff --git a/debian/u-boot-exynos.install b/debian/u-boot-exynos.install
index ebff56afc9..e4408cf003 100755
--- a/debian/u-boot-exynos.install
+++ b/debian/u-boot-exynos.install
@@ -1,2 +1,2 @@
#!/bin/sh
-debian/bin/u-boot-install-targets exynos "doc/README.odroid"
+debian/bin/u-boot-install-targets exynos
diff --git a/debian/u-boot-mvebu.docs b/debian/u-boot-mvebu.docs
new file mode 100644
index 0000000000..72d9327c60
--- /dev/null
+++ b/debian/u-boot-mvebu.docs
@@ -0,0 +1 @@
+doc/README.marvell
diff --git a/debian/u-boot-mvebu.install b/debian/u-boot-mvebu.install
index 40de60aa00..96c98cef78 100755
--- a/debian/u-boot-mvebu.install
+++ b/debian/u-boot-mvebu.install
@@ -1,2 +1,2 @@
#!/bin/sh
-debian/bin/u-boot-install-targets mvebu "doc/README.marvell"
+debian/bin/u-boot-install-targets mvebu
diff --git a/debian/u-boot-omap.docs b/debian/u-boot-omap.docs
new file mode 100644
index 0000000000..4bb758ec82
--- /dev/null
+++ b/debian/u-boot-omap.docs
@@ -0,0 +1 @@
+doc/README.nokia_rx51
diff --git a/debian/u-boot-omap.install b/debian/u-boot-omap.install
index a28a041c5d..8a9873e043 100755
--- a/debian/u-boot-omap.install
+++ b/debian/u-boot-omap.install
@@ -1,2 +1,2 @@
#!/bin/sh
-debian/bin/u-boot-install-targets omap "doc/README.nokia_rx51"
+debian/bin/u-boot-install-targets omap
diff --git a/debian/u-boot-rockchip.docs b/debian/u-boot-rockchip.docs
new file mode 100644
index 0000000000..d86f757aad
--- /dev/null
+++ b/debian/u-boot-rockchip.docs
@@ -0,0 +1 @@
+doc/README.rockchip
diff --git a/debian/u-boot-rockchip.install b/debian/u-boot-rockchip.install
index 356aca3b1a..89856b7c6c 100755
--- a/debian/u-boot-rockchip.install
+++ b/debian/u-boot-rockchip.install
@@ -1,5 +1,5 @@
#!/bin/sh
-debian/bin/u-boot-install-targets rockchip "doc/README.rockchip"
+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-sifive.docs b/debian/u-boot-sifive.docs
new file mode 100644
index 0000000000..8bc76e5db7
--- /dev/null
+++ b/debian/u-boot-sifive.docs
@@ -0,0 +1 @@
+doc/board/sifive/fu540.rst
diff --git a/debian/u-boot-sifive.install b/debian/u-boot-sifive.install
index a9a510a1ca..5b20c3f900 100755
--- a/debian/u-boot-sifive.install
+++ b/debian/u-boot-sifive.install
@@ -1,2 +1,2 @@
#!/bin/sh
-debian/bin/u-boot-install-targets sifive "doc/board/sifive/fu540.rst"
+debian/bin/u-boot-install-targets sifive
diff --git a/debian/u-boot-sunxi.docs b/debian/u-boot-sunxi.docs
new file mode 100644
index 0000000000..4b2502415d
--- /dev/null
+++ b/debian/u-boot-sunxi.docs
@@ -0,0 +1 @@
+board/sunxi/README.sunxi64
diff --git a/debian/u-boot-sunxi.install b/debian/u-boot-sunxi.install
index 7774d48f49..73835d69b4 100755
--- a/debian/u-boot-sunxi.install
+++ b/debian/u-boot-sunxi.install
@@ -1,5 +1,5 @@
#!/bin/sh
-debian/bin/u-boot-install-targets sunxi "board/sunxi/README.sunxi64"
+debian/bin/u-boot-install-targets sunxi
cp board/sunxi/mksunxi_fit_atf.sh debian/build/mksunxi_fit_atf
echo debian/build/mksunxi_fit_atf /usr/bin/
diff --git a/debian/u-boot-tools.examples b/debian/u-boot-tools.examples
new file mode 100644
index 0000000000..c81654994a
--- /dev/null
+++ b/debian/u-boot-tools.examples
@@ -0,0 +1,3 @@
+# example env configs
+debian/env-configs/*.config
+tools/env/fw_env.config
diff --git a/debian/u-boot-tools.install b/debian/u-boot-tools.install
index 47e333dbdb..efa9af7d79 100644
--- a/debian/u-boot-tools.install
+++ b/debian/u-boot-tools.install
@@ -6,7 +6,3 @@ debian/build/tools/tools/mksunxiboot usr/bin
# install config
debian/build/tools/config usr/share/doc/u-boot-tools
-
-# example env configs
-debian/env-configs/*.config usr/share/doc/u-boot-tools/examples
-tools/env/fw_env.config usr/share/doc/u-boot-tools/examples
--
2.20.1
signature.asc
Description: PGP signature
