From 39429b3d208dd00fd46e5d2a42257f128241b82b Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 21 Jul 2016 19:36:13 +0200 Subject: [PATCH] apm821xx: rework image build code for MyBook Live Eliminate redundant mkfs calls, preparation for upcoming image build core rework Signed-off-by: Felix Fietkau --- target/linux/apm821xx/image/Makefile | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/target/linux/apm821xx/image/Makefile b/target/linux/apm821xx/image/Makefile index 94fcd58fb3..bee0e1c8d5 100644 --- a/target/linux/apm821xx/image/Makefile +++ b/target/linux/apm821xx/image/Makefile @@ -194,20 +194,20 @@ define Build/hdd-img endef define Build/uRamdisk - $(call Image/mkfs/ext4) - gzip -9n -c $(KDIR)/root.ext4 > $(KDIR)/root.ext4.gz - $(STAGING_DIR_HOST)/bin/mkimage -A powerpc -T ramdisk -C gzip -n "$(PROFILE) rootfs" \ - -d $(KDIR)/root.ext4.gz \ - $@.uRamdisk + $(STAGING_DIR_HOST)/bin/mkimage \ + -A powerpc -T ramdisk -C gzip \ + -n "$(DEVICE_NAME) rootfs" \ + -d $@ $@.new + mv $@.new $@ endef define Build/recovery-tar sh ./mbl_gen_recovery_tar.sh \ --profile $(DEVICE_PROFILE) \ - --dtb $@.dtb \ + --dtb $(word 1,$^).dtb \ --dtbname $(DEVICE_DTB) \ - --kernel $@ \ - --rootfs $@.uRamdisk \ + --kernel $(word 1,$^) \ + --rootfs $@ \ $@ endef @@ -215,12 +215,14 @@ define Device/MyBookLiveDefault IMAGE_SIZE := 48m BLOCKSIZE := 1024 DTB_SIZE := 16384 - KERNEL := kernel-bin | gzip | uImage gzip + KERNEL := kernel-bin | dtb | gzip | uImage gzip BOOT_SIZE := 8 - IMAGES := rootfs.img recovery.tar + IMAGES := rootfs.img recovery.tar kernel.dtb DEVICE_DTB := apollo3g.dtb + FILESYSTEMS := ext4 + IMAGE/kernel.dtb := append-dtb 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 define Device/MyBookLiveSingle -- 2.30.2