Author: blogic Date: 2015-04-18 12:19:28 +0200 (Sat, 18 Apr 2015) New Revision: 45491
Modified: trunk/target/linux/ar71xx/image/Makefile Log: ar71xx/image: remove duplicated rootfs in new tplink initramfs images The new building code included the rootfs twice when building tplink initramfs images. To make it more readable move initramfs into an own build step Build/mktplinkfw-initramfs. Signed-off-by: Alexander Couzens <[email protected]> Modified: trunk/target/linux/ar71xx/image/Makefile =================================================================== --- trunk/target/linux/ar71xx/image/Makefile 2015-04-18 10:19:23 UTC (rev 45490) +++ trunk/target/linux/ar71xx/image/Makefile 2015-04-18 10:19:28 UTC (rev 45491) @@ -56,13 +56,23 @@ -k $(word 1,$^) \ -r $@ \ -o [email protected] \ + -j -X 0x40000 \ -a $(call rootfs_align,$(FILESYSTEM)) \ - $(if $(findstring sysupgrade,$1),-j -X 0x40000 -s) \ - $(if $(findstring factory,$1),-j -X 0x40000) \ - $(if $(findstring initramfs,$1),-s -c) + $(if $(findstring sysupgrade,$1),-s) @mv [email protected] $@ endef +# -c combined image +define Build/mktplinkfw-initramfs + $(STAGING_DIR_HOST)/bin/mktplinkfw \ + -H $(TPLINK_HWID) -W $(TPLINK_HWREV) -F $(TPLINK_FLASHLAYOUT) -N OpenWrt -V $(REVISION) \ + -k $@ \ + -o [email protected] \ + -s \ + -c + @mv [email protected] $@ +endef + DEVICE_VARS += TPLINK_HWID TPLINK_HWREV TPLINK_FLASHLAYOUT define Device/Default @@ -138,7 +148,7 @@ define Device/tplink TPLINK_HWREV := 0x1 KERNEL := kernel-bin | patch-cmdline | lzma - KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | mktplinkfw initramfs + KERNEL_INITRAMFS := kernel-bin | patch-cmdline | lzma | mktplinkfw-initramfs IMAGES := sysupgrade.bin factory.bin IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade IMAGE/factory.bin := append-rootfs | mktplinkfw factory _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
