KumiSystems/openwrtv4
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

apm821xx: rework image build code for MyBook Live

Browse source 
Eliminate redundant mkfs calls, preparation for upcoming image build
core rework

Signed-off-by: Felix Fietkau <nbd@nbd.name>
This commit is contained in:
Felix Fietkau 2016-07-21 19:36:13 +02:00
parent 3886644632
commit 39429b3d20
1 changed files with 13 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
target/linux/apm821xx/image/Makefile
View file

@ -194,20 +194,20 @@ define Build/hdd-img
endef endef
define Build/uRamdisk define Build/uRamdisk
$(call Image/mkfs/ext4) $(STAGING_DIR_HOST)/bin/mkimage \
gzip -9n -c $(KDIR)/root.ext4 > $(KDIR)/root.ext4.gz -A powerpc -T ramdisk -C gzip \
$(STAGING_DIR_HOST)/bin/mkimage -A powerpc -T ramdisk -C gzip -n "$(PROFILE) rootfs" \ -n "$(DEVICE_NAME) rootfs" \
-d $(KDIR)/root.ext4.gz \ -d $@ $@.new
$@.uRamdisk mv $@.new $@
endef endef
define Build/recovery-tar define Build/recovery-tar
sh ./mbl_gen_recovery_tar.sh \ sh ./mbl_gen_recovery_tar.sh \
--profile $(DEVICE_PROFILE) \ --profile $(DEVICE_PROFILE) \
--dtb $@.dtb \ --dtb $(word 1,$^).dtb \
--dtbname $(DEVICE_DTB) \ --dtbname $(DEVICE_DTB) \
--kernel $@ \ --kernel $(word 1,$^) \
--rootfs $@.uRamdisk \ --rootfs $@ \
$@ $@
endef endef
@ -215,12 +215,14 @@ define Device/MyBookLiveDefault
IMAGE_SIZE := 48m IMAGE_SIZE := 48m
BLOCKSIZE := 1024 BLOCKSIZE := 1024
DTB_SIZE := 16384 DTB_SIZE := 16384
KERNEL := kernel-bin | gzip | uImage gzip KERNEL := kernel-bin | dtb | gzip | uImage gzip
BOOT_SIZE := 8 BOOT_SIZE := 8
IMAGES := rootfs.img recovery.tar IMAGES := rootfs.img recovery.tar kernel.dtb
DEVICE_DTB := apollo3g.dtb DEVICE_DTB := apollo3g.dtb
FILESYSTEMS := ext4
IMAGE/kernel.dtb := append-dtb
IMAGE/rootfs.img := boot-script | dtb | boot-img | hdd-img IMAGE/rootfs.img := boot-script | dtb | boot-img | hdd-img
IMAGE/recovery.tar := kernel-bin | dtb | uRamdisk | recovery-tar IMAGE/recovery.tar := append-rootfs | gzip | uRamdisk | recovery-tar
endef endef
define Device/MyBookLiveSingle define Device/MyBookLiveSingle