From 3a5dffbcbe92ef93f88173ec0baa6f78394c7b5f Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Tue, 6 Jan 2015 13:19:30 +0000 Subject: [PATCH] UBUNTU: [Debian] handle dts directories Handle the renaming of dts files into vendor directories. Also build all DTS files to trigger proper directory construction. BugLink: http://bugs.launchpad.net/bugs/1408004 Signed-off-by: Andy Whitcroft --- debian/rules.d/2-binary-arch.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index fc61565d8bf6..29a3d3bed29c 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -43,7 +43,7 @@ $(stampdir)/stamp-build-%: bldimg = $(call custom_override,build_image,$*) $(stampdir)/stamp-build-%: dtb_target = $(dtb_files_$*) $(stampdir)/stamp-build-%: $(stampdir)/stamp-prepare-% @echo Debug: $@ build_image $(build_image) bldimg $(bldimg) - $(build_cd) $(kmake) $(build_O) $(conc_level) $(bldimg) modules $(dtb_target) + $(build_cd) $(kmake) $(build_O) $(conc_level) $(bldimg) modules $(if $(dtb_target),dtbs) @touch $@ # Install the finished build @@ -107,6 +107,7 @@ endif if [ "$(dtb_files)" ]; then \ install -d $(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree; \ for dtb_file in $(dtb_files); do \ + install -d `dirname $(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree/$$dtb_file`; \ install -m644 $(builddir)/build-$*/arch/$(build_arch)/boot/dts/$$dtb_file \ $(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree/$$dtb_file; \ echo "device-tree/$$dtb_file ?" >> $(DEBIAN)/d-i/firmware/kernel-image; \ -- 2.39.2