diff options
| author | John Rigby <john.rigby@linaro.org> | 2012-09-28 21:15:27 -0600 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-09-28 21:15:27 -0600 |
| commit | 0d2efc0998ebe2dc65b38793be275a1c21499c6b (patch) | |
| tree | 6fc25c8eba1ba091f2efe712e4f952331c4056fc | |
| parent | 04fb285c62b31fcf75cad4c3e075efdb12695601 (diff) | |
Revert "LINARO: always building and installing compatible dtbs files"
This reverts commit 6f47c0f8180db4a1a36f426ff1d45d2ed91e54fd.
Conflicts:
debian/rules.d/2-binary-arch.mk
| -rw-r--r-- | debian/rules.d/2-binary-arch.mk | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index f306ecea106..a1913359c99 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -37,9 +37,10 @@ build-%: $(stampdir)/stamp-build-% # Do the actual build, including image and modules $(stampdir)/stamp-build-%: target_flavour = $* +$(stampdir)/stamp-build-%: dtb_target = $(notdir $(dtb_file_$*)) $(stampdir)/stamp-build-%: $(stampdir)/stamp-prepare-% @echo Debug: $@ - $(build_cd) $(kmake) $(build_O) $(conc_level) $(build_image) $(modules_target) dtbs + $(build_cd) $(kmake) $(build_O) $(conc_level) $(build_image) $(modules_target) $(dtb_target) @touch $@ # Install the finished build @@ -51,6 +52,7 @@ install-%: basepkg = $(hdrs_pkg_name) install-%: hdrdir = $(CURDIR)/debian/$(basepkg)-$*/usr/src/$(basepkg)-$* install-%: target_flavour = $* install-%: dtb_file=$(dtb_file_$*) +install-%: dtb_target=$(notdir $(dtb_file_$*)) install-%: checks-% @echo Debug: $@ dh_testdir @@ -78,11 +80,11 @@ endif $(pkgdir)/boot/abi-$(abi_release)-$* install -m600 $(builddir)/build-$*/System.map \ $(pkgdir)/boot/System.map-$(abi_release)-$* - install -d $(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree; \ - install -m644 $(builddir)/build-$*/arch/$(build_arch)/boot/*.dtb \ - $(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree/ || \ - echo "No dtb files for this platform" > \ - $(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree/README + if [ "$(dtb_target)" ]; then \ + install -d $(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree; \ + install -m644 $(builddir)/build-$*/$(dtb_file) \ + $(pkgdir)/lib/firmware/$(abi_release)-$*/device-tree/$(dtb_target); \ + fi ifeq ($(no_dumpfile),) makedumpfile -g $(pkgdir)/boot/vmcoreinfo-$(abi_release)-$* \ -x $(builddir)/build-$*/vmlinux |