On Sat, 2014-10-11 at 08:47 +0100, Ian Campbell wrote:
> On Wed, 2014-10-01 at 00:47 +0200, Karsten Merker wrote:
> > +.PHONY: hd-media_dtbs
> > +hd-media_dtbs: $(TEMP_DTBS)
> > + mkdir -p $(SOME_DEST)/$(EXTRANAME)dtbs
> > + set -ex ; for dtb in $(TEMP_DTBS)/*.dtb ; do \
> > + tgt=$(SOME_DEST)/$(EXTRANAME)dtbs/$$(basename $$dtb); \
> > + cp $$dtb $$tgt ; \
> > + update-manifest $$tgt "Device Tree Blob: $$(basename
> > $$dtb)";\
> > + done
> > + cp boot/README.device-tree $(SOME_DEST)/$(EXTRANAME)dtbs/README
> > + update-manifest $(SOME_DEST)/$(EXTRANAME)dtbs/README "Device Tree
> > Blobs README"
>
> This results in
> http://d-i.debian.org/daily-images/armhf/daily/hd-media/dtbs/ which I
> don't think is needed since we already have
> http://d-i.debian.org/daily-images/armhf/daily/device-tree/ as a common
> place to publish the dtbs.
>
> I think it would be best to put these in a temporary location for the
> purposes of including in the hd-media tarball only. Or maybe it is
> possible to depend on the output of the existing device-tree flavour,
> I've not checked into that possibility.
How about this patch, it seems to do what I meant here.
Ian.
commit cca80bb7adae24b525790fd0d9ba6c8c5c6bc370
Author: Ian Campbell <i...@debian.org>
Date: Fri Oct 24 21:37:59 2014 +0100
armhf: Don't publish dtbs dir with hd-media
Include them in the hd-media.tar.gz but not ion unpacked form
diff --git a/build/config/armhf/hd-media.cfg b/build/config/armhf/hd-media.cfg
index 31d3583..ec119df 100644
--- a/build/config/armhf/hd-media.cfg
+++ b/build/config/armhf/hd-media.cfg
@@ -3,28 +3,24 @@ FLAVOUR_SUPPORTED = ""
GZIPPED = .gz
EXTRANAME = hd-media/
-TARGET = $(KERNEL) $(INITRD) hd-media_dtbs hd-media_bootscript hd-media_tarball
+TARGET = $(KERNEL) $(INITRD) hd-media_bootscript hd-media_tarball
MANIFEST-INITRD = "Initrd for use on USB memory sticks"
MANIFEST-KERNEL = "Kernel for use on USB memory sticks"
-.PHONY: hd-media_dtbs
-hd-media_dtbs: $(TEMP_DTBS)
- mkdir -p $(SOME_DEST)/$(EXTRANAME)dtbs
- set -ex ; for dtb in $(TEMP_DTBS)/*.dtb ; do \
- tgt=$(SOME_DEST)/$(EXTRANAME)dtbs/$$(basename $$dtb); \
- cp $$dtb $$tgt ; \
- update-manifest $$tgt "Device Tree Blob: $$(basename $$dtb)";\
- done
- cp boot/README.device-tree $(SOME_DEST)/$(EXTRANAME)dtbs/README
- update-manifest $(SOME_DEST)/$(EXTRANAME)dtbs/README "Device Tree
Blobs README"
-
.PHONY: hd-media_bootscript
hd-media_bootscript:
mkimage -T script -A arm -d boot/arm/bootscr.mainline_common
$(SOME_DEST)/$(EXTRANAME)boot.scr
update-manifest $(SOME_DEST)/$(EXTRANAME)boot.scr "Universal boot
script for mainline u-boot (>= v2014.10)"
.PHONY: hd-media_tarball
-hd-media_tarball: $(KERNEL) $(INITRD) hd-media_dtbs hd-media_bootscript
- tar -C $(SOME_DEST)/$(EXTRANAME) -zcf $(TEMP)/hd-media.tar.gz boot.scr
initrd.gz vmlinuz dtbs/
+hd-media_tarball: $(KERNEL) $(INITRD) $(TEMP_DTBS) hd-media_bootscript
+ -rm -rf $(TEMP)/hd-media
+ mkdir $(TEMP)/hd-media
+ cp $(KERNEL) $(TEMP)/hd-media/vmlinuz
+ cp $(INITRD) $(TEMP)/hd-media/initrd.gz
+ cp $(SOME_DEST)/$(EXTRANAME)boot.scr $(TEMP)/hd-media/boot.scr
+ cp -r $(TEMP_DTBS) $(TEMP)/hd-media/dtbs/
+ cp boot/README.device-tree $(TEMP)/hd-media/dtbs/README
+ tar -C $(TEMP)/hd-media -zcf $(TEMP)/hd-media.tar.gz boot.scr initrd.gz
vmlinuz dtbs/
mv $(TEMP)/hd-media.tar.gz $(SOME_DEST)/$(EXTRANAME)
--
To UNSUBSCRIBE, email to debian-arm-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: https://lists.debian.org/1414183169.3584.11.ca...@hellion.org.uk
