diff options
| author | Fathi Boudra <fathi.boudra@linaro.org> | 2015-01-12 16:43:25 +0200 |
|---|---|---|
| committer | Fathi Boudra <fathi.boudra@linaro.org> | 2015-01-12 16:43:25 +0200 |
| commit | a65ebef1cc0254876e15879d4ccdcba91761462b (patch) | |
| tree | ea3b546f17247a0911f89eef9e1a3d861eb9844e | |
| parent | b3c94fb5124278791324c190e10919df224433e8 (diff) | |
Fix dtb files location
Since 3.19, a vendor subdir has been include on arm64 architecture.
e.g. arch/arm64/boot/dts/rtsm_ve-aemv8a.dtb moved to
arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dtb
Update the packging to reflect this change, without breaking assumption on
device tree files path prior to 3.19 changes.
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
| -rw-r--r-- | debian/rules.d/2-binary-arch.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 800352fc8cd..aaa9d96aed9 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -54,7 +54,7 @@ $(stampdir)/stamp-build-%: $(stampdir)/stamp-prepare-% make IMAGE=img-foundation.axf clean; \ make DTC=$(builddir)/build-$*/scripts/dtc/dtc \ IMAGE=img-foundation.axf \ - KERNEL_DTB=$(builddir)/build-$*/arch/arm64/boot/dts/foundation-v8.dtb; \ + KERNEL_DTB=`find $(builddir)/build-$*/arch/arm64/boot/dts/ -type f -name 'foundation-v8.dtb'`; \ ./configure \ --host=aarch64-linux-gnu \ --with-kernel-dir=$(builddir)/build-$* \ @@ -62,7 +62,7 @@ $(stampdir)/stamp-build-%: $(stampdir)/stamp-prepare-% make IMAGE=img.axf clean; \ make DTC=$(builddir)/build-$*/scripts/dtc/dtc \ IMAGE=img.axf \ - KERNEL_DTB=$(builddir)/build-$*/arch/arm64/boot/dts/rtsm_ve-aemv8a.dtb); \ + KERNEL_DTB=`find $(builddir)/build-$*/arch/arm64/boot/dts/ -type f -name 'rtsm_ve-aemv8a.dtb'`; \ fi @touch $@ @@ -106,7 +106,7 @@ endif if [ "$(dtb_files)" ]; then \ install -d $(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree; \ for dtb_file in $(dtb_files); do \ - install -m644 $(builddir)/build-$*/arch/$(build_arch)/boot/dts/$$dtb_file \ + install -m644 `find $(builddir)/build-$*/arch/$(build_arch)/boot/dts/ -type f -name "$$dtb_file"` \ $(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree/$$dtb_file || echo "no dtb to install"; \ done \ fi |