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

ar71xx/image: remove duplicated rootfs in new tplink initramfs images

Browse source 
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 <lynxis@fe80.eu>

SVN-Revision: 45491
This commit is contained in:
John Crispin 2015-04-18 10:19:28 +00:00
parent 09c4b0e8f3
commit d9ebcce56c
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
target/linux/ar71xx/image/Makefile
View file

@ -56,10 +56,20 @@ define Build/mktplinkfw
-k $(word 1,$^) \ -k $(word 1,$^) \
-r $@ \ -r $@ \
-o $@.new \ -o $@.new \
-j -X 0x40000 \
-a $(call rootfs_align,$(FILESYSTEM)) \ -a $(call rootfs_align,$(FILESYSTEM)) \
$(if $(findstring sysupgrade,$1),-j -X 0x40000 -s) \ $(if $(findstring sysupgrade,$1),-s)
$(if $(findstring factory,$1),-j -X 0x40000) \ @mv $@.new $@
$(if $(findstring initramfs,$1),-s -c) 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 $@.new \
-s \
-c
@mv $@.new $@ @mv $@.new $@
endef endef
@ -138,7 +148,7 @@ TARGET_DEVICES += wndr3700 wndr3700v2 wndr3800 wndr3800ch wndrmac wndrmacv2
define Device/tplink define Device/tplink
TPLINK_HWREV := 0x1 TPLINK_HWREV := 0x1
KERNEL := kernel-bin | patch-cmdline | lzma 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 IMAGES := sysupgrade.bin factory.bin
IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade IMAGE/sysupgrade.bin := append-rootfs | mktplinkfw sysupgrade
IMAGE/factory.bin := append-rootfs | mktplinkfw factory IMAGE/factory.bin := append-rootfs | mktplinkfw factory