Skip to content

Commit

Permalink
sunxi-6.11: Fix build dtb package
Browse files Browse the repository at this point in the history
Armbian uses subdirectories <overlay> for arm
and <allwinner/overlay> for arm64.
Delete the vendor's directory if the target architecture
is an arm.
  • Loading branch information
The-going authored and igorpecovnik committed Nov 20, 2024
1 parent 17a33c1 commit 45162c2
Showing 1 changed file with 10 additions and 7 deletions.
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
From 0184e44b9caf2fa96cc058f0bb34fd5ca4ca4498 Mon Sep 17 00:00:00 2001
From 9834ff87ee93495982c223bea78206bda5955e89 Mon Sep 17 00:00:00 2001
From: The-going <48602507+The-going@users.noreply.github.com>
Date: Tue, 1 Feb 2022 21:04:08 +0300
Subject: scripts: add overlay compilation support

---
.gitignore | 1 +
scripts/Makefile.dtbinst | 9 ++++++++-
scripts/Makefile.dtbinst | 12 +++++++++++-
scripts/Makefile.lib | 12 +++++++++++-
3 files changed, 20 insertions(+), 2 deletions(-)
3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 58fdbb35e2f1..0d683e66d33b 100644
Expand All @@ -22,7 +22,7 @@ index 58fdbb35e2f1..0d683e66d33b 100644
*.so.dbg
*.su
diff --git a/scripts/Makefile.dtbinst b/scripts/Makefile.dtbinst
index 9d920419a62c..b66af344040d 100644
index 9d920419a62c..d0703c2148cf 100644
--- a/scripts/Makefile.dtbinst
+++ b/scripts/Makefile.dtbinst
@@ -23,6 +23,11 @@ $(dst)/%: $(obj)/%
Expand All @@ -37,14 +37,17 @@ index 9d920419a62c..b66af344040d 100644

ifdef CONFIG_ARCH_WANT_FLAT_DTB_INSTALL

@@ -33,7 +38,9 @@ endef
@@ -33,7 +38,12 @@ endef

$(foreach d, $(sort $(dir $(dtbs))), $(eval $(call gen_install_rules,$(d))))

-dtbs := $(notdir $(dtbs))
+# Armbian uses subdirectories <overlay> but not <allwinner/overlay>.
+# delete the vendor's directory
+# Armbian uses subdirectories <overlay> for arm
+# and <allwinner/overlay> for arm64.
+# delete the vendor's directory if the target architecture is an arm.
+ifdef CONFIG_ARM
+dtbs := $(patsubst $(vendor)%,%,$(dtbs))
+endif

endif # CONFIG_ARCH_WANT_FLAT_DTB_INSTALL

Expand Down

0 comments on commit 45162c2

Please sign in to comment.