From: Gabor Juhos Date: Sun, 14 Oct 2012 16:24:22 +0000 (+0000) Subject: ar71xx: unbreak building images for OpenMesh OM2P/OM2P-LC X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=62ab2b0da6bee65657ebb4b77204afdcda7d6159;p=openwrt%2Fstaging%2Fluka.git ar71xx: unbreak building images for OpenMesh OM2P/OM2P-LC Commit r33248 introduced a regression by passing the board name plus 'board=' in the third argument. The board name string has to be put into the image as identifier of the image type. [juhosg: fix OpenMesh template instead of use of string substitution] Signed-off-by: Marek Lindner Signed-off-by: Gabor Juhos SVN-Revision: 33767 --- diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 569bdc9ef0..2e3c184131 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -641,7 +641,7 @@ define Image/Build/OpenMesh "$(KDIR_TMP)/vmlinux-$(2).uImage" \ "$(KDIR)/root.$(1)" -sh $(TOPDIR)/scripts/combined-ext-image.sh \ - "$(3)" "$(call factoryname,$(1),$(2))" \ + "$(4)" "$(call factoryname,$(1),$(2))" \ "$(BUILD_DIR)/om2p-fwupgrade.cfg" "fwupgrade.cfg" \ "$(KDIR_TMP)/vmlinux-$(2).uImage" "kernel" \ "$(KDIR)/root.$(1)" "rootfs" @@ -781,7 +781,7 @@ $(eval $(call SingleProfile,Netgear,$(fs_64k),WNDR3800,wndr3800,WNDR3700,ttyS0,1 $(eval $(call SingleProfile,Netgear,$(fs_64k),WNDRMAC,wndrmac,WNDR3700,ttyS0,115200,$$(wndr3700v2_mtdlayout),3701,WNDRMAC,"",-H 29763654+16+64)) $(eval $(call SingleProfile,Netgear,$(fs_64k),WNDRMACV2,wndrmacv2,WNDR3700,ttyS0,115200,$$(wndr3700v2_mtdlayout),3701,WNDRMACv2,"",-H 29763654+16+128)) -$(eval $(call SingleProfile,OpenMesh,$(fs_squash),OM2P,om2p,OM2P)) +$(eval $(call SingleProfile,OpenMesh,$(fs_squash),OM2P,om2p,,,,OM2P)) $(eval $(call SingleProfile,PB4X,$(fs_128k),ALL0305,all0305,ALL0305,ttyS0,115200)) $(eval $(call SingleProfile,PB4X,$(fs_128k),EAP7660D,eap7660d,EAP7660D,ttyS0,115200))