diff options
| author | John Rigby <john.rigby@linaro.org> | 2012-06-15 17:41:12 -0600 |
|---|---|---|
| committer | John Rigby <john.rigby@linaro.org> | 2012-06-24 17:34:23 -0600 |
| commit | a440aaff856e810cc27e32eaa56992a6d0e9075b (patch) | |
| tree | ae195e97f4a52640755851912a2ba89b1ed37c46 | |
| parent | fd40e2dfd1a6d3dcd12e4d4b2471d823552cea52 (diff) | |
LINARO: deal with no d-i
Signed-off-by: John Rigby <john.rigby@linaro.org>
| -rwxr-xr-x | debian/rules | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/debian/rules b/debian/rules index c348f3acb31..c47ce37ee73 100755 --- a/debian/rules +++ b/debian/rules @@ -113,10 +113,10 @@ debian/control: $(DEBIAN)/control.stub $(builddir)/kernel-versions $(builddir)/package-list \ $(builddir)/$(DEBIAN) mkdir -p $(builddir)/modules/$(arch)/ - cp $(DEBIAN)/d-i/modules/* $(builddir)/modules/$(arch)/ + cp $(DEBIAN)/d-i/modules/* $(builddir)/modules/$(arch)/ || true mkdir -p $(builddir)/firmware/$(arch)/ - cp $(DEBIAN)/d-i/firmware/* $(builddir)/firmware/$(arch)/ - cp $(DEBIAN)/d-i/package-list $(DEBIAN)/d-i/kernel-versions $(builddir)/ + cp $(DEBIAN)/d-i/firmware/* $(builddir)/firmware/$(arch)/ || true + cp $(DEBIAN)/d-i/package-list $(DEBIAN)/d-i/kernel-versions $(builddir)/ || echo true touch $(builddir)/modules/$(arch)/kernel-image # kernel-wedge needs to poke around in $(DEBIAN)/ ln -nsf $(CURDIR)/debian $(builddir)/debian @@ -128,7 +128,7 @@ debian/control: $(DEBIAN)/control.stub fi if [ -d $(DEBIAN)/d-i/firmware-$(arch) ]; then \ cp $(DEBIAN)/d-i/firmware-$(arch)/* \ - $(builddir)/firmware/$(arch)/; \ + $(builddir)/firmware/$(arch)/ || true; \ fi # Remove unwanted stuff for this architecture @@ -226,12 +226,12 @@ debian/control: $(DEBIAN)/control.stub if [ ! -d $(builddir)/modules/$(build_arch) ]; then \ mkdir -p $(builddir)/modules/$(build_arch); \ cp $(builddir)/modules/$(arch)/* \ - $(builddir)/modules/$(build_arch); \ + $(builddir)/modules/$(build_arch) || true; \ fi if [ ! -d $(builddir)/firmware/$(build_arch) ]; then \ mkdir -p $(builddir)/firmware/$(build_arch); \ cp $(builddir)/firmware/$(arch)/* \ - $(builddir)/firmware/$(build_arch); \ + $(builddir)/firmware/$(build_arch) || true; \ fi cp $(DEBIAN)/control.stub debian/control.stub |