diff options
| author | Ricardo Salveti de Araujo <ricardo.salveti@linaro.org> | 2012-09-23 16:58:50 -0300 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-09-24 08:30:57 -0600 |
| commit | 6f47c0f8180db4a1a36f426ff1d45d2ed91e54fd (patch) | |
| tree | 15b644eec8d1fd7e5bbe878e73a74c03ab516455 | |
| parent | eff7568913f8c6a3f0dd34fcc91aaedf4af57e05 (diff) | |
LINARO: always building and installing compatible dtbs fileslinaro-ubuntu-packaging-3.6
Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>
| -rw-r--r-- | debian/rules.d/2-binary-arch.mk | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk index 5f69e9dccad..1dfe74248e7 100644 --- a/debian/rules.d/2-binary-arch.mk +++ b/debian/rules.d/2-binary-arch.mk @@ -37,10 +37,9 @@ 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 $(dtb_target) + $(build_cd) $(kmake) $(build_O) $(conc_level) $(build_image) modules dtbs @touch $@ # Install the finished build @@ -52,7 +51,6 @@ 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 @@ -80,11 +78,11 @@ endif $(pkgdir)/boot/abi-$(abi_release)-$* install -m600 $(builddir)/build-$*/System.map \ $(pkgdir)/boot/System.map-$(abi_release)-$* - 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 + 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 ifeq ($(no_dumpfile),) makedumpfile -g $(pkgdir)/boot/vmcoreinfo-$(abi_release)-$* \ -x $(builddir)/build-$*/vmlinux |