qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 03:58:35 +02:00
Code

ar71xx: stop producing -NA factory images and tag factory images with hd_id for WNDR3700v2

Browse Source 
NETGEAR doesn’t produce a distinct North American image for
WNDR3700v2, they use the same image worldwide. This is a change from
earlier models such as WNDR3700 (v1). NETGEAR's v2 images now contain
an "hd_id" parameter, as well. All observed WNDR3700v2, WNDR3800, and
WNDRMAC images use 29763654+16+64 as their hd_id value.

This patch changes the OpenWrt WNDR3700v2 "factory" image generation
to stop producing the extraneous -NA version and to tag the image with
the same hd_id used in NETGEAR's images.

There is no change to WNDR3700 (v1) image generation, as NETGEAR
continues to produce distinct -NA and worldwide images, neither of
which are tagged with hd_id.

Signed-off-by: Mark Mentovai <mark@moxienet.com>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27053 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
juhosg 2011-05-31 22:53:25 +00:00
parent 1d6170ac72
commit 68169c24f2
1 changed files with 19 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
target/linux/ar71xx/image/Makefile
View File

@ -398,14 +398,13 @@ define Image/Build/Netgear
dd if=$(KDIR)/vmlinux-$(2).uImage.squashfs bs=1024k conv=sync; \ dd if=$(KDIR)/vmlinux-$(2).uImage.squashfs bs=1024k conv=sync; \
dd if=$(KDIR)/root.$(1) bs=64k; \ dd if=$(KDIR)/root.$(1) bs=64k; \
) > $(call imgname,$(1),$(2))-sysupgrade.bin ) > $(call imgname,$(1),$(2))-sysupgrade.bin
$(STAGING_DIR_HOST)/bin/mkdniimg \ for r in $(7) ; do \
-B $(6) -v OpenWrt.$(REVISION) \ [ -n "$$$$r" ] && dashr="-$$$$r" || dashr= ; \
-i $(call imgname,$(1),$(2))-sysupgrade.bin \ $(STAGING_DIR_HOST)/bin/mkdniimg \
-o $(call imgname,$(1),$(2))-factory.img -B $(6) -v OpenWrt.$(REVISION) -r "$$$$r" $(8) \
$(STAGING_DIR_HOST)/bin/mkdniimg \ -i $(call imgname,$(1),$(2))-sysupgrade.bin \
-B $(6) -v OpenWrt.$(REVISION) -r "NA" \ -o $(call imgname,$(1),$(2))-factory$$$$dashr.img; \
-i $(call imgname,$(1),$(2))-sysupgrade.bin \ done
-o $(call imgname,$(1),$(2))-factory-NA.img
endef endef
define Image/Build/Netgear/initramfs define Image/Build/Netgear/initramfs
@ -459,43 +458,43 @@ define Image/Build/Zcomax
endef endef
define Image/Build/Template/initramfs/initramfs define Image/Build/Template/initramfs/initramfs
$(call Image/Build/$(1)/initramfs,initramfs,$(2),$(3),$(4),$(5),$(6),$(7)) $(call Image/Build/$(1)/initramfs,initramfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef endef
define Image/Build/Template/all/squashfs define Image/Build/Template/all/squashfs
$(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7)) $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef endef
define Image/Build/Template/all/jffs2-64k define Image/Build/Template/all/jffs2-64k
$(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7)) $(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef endef
define Image/Build/Template/all/jffs2-128k define Image/Build/Template/all/jffs2-128k
$(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7)) $(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef endef
define Image/Build/Template/squashfs-only/squashfs define Image/Build/Template/squashfs-only/squashfs
$(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7)) $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef endef
define Image/Build/Template/4k/squashfs define Image/Build/Template/4k/squashfs
$(call Image/Build/$(1),squashfs-4k,$(2),$(3),$(4),$(5),$(6),$(7)) $(call Image/Build/$(1),squashfs-4k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef endef
define Image/Build/Template/64k/squashfs define Image/Build/Template/64k/squashfs
$(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7)) $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef endef
define Image/Build/Template/64k/jffs2-64k define Image/Build/Template/64k/jffs2-64k
$(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7)) $(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef endef
define Image/Build/Template/128k/squashfs define Image/Build/Template/128k/squashfs
$(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7)) $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef endef
define Image/Build/Template/128k/jffs2-128k define Image/Build/Template/128k/jffs2-128k
$(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7)) $(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7),$(8))
endef endef
ap81_cmdline=board=AP81 console=ttyS0,115200 ap81_cmdline=board=AP81 console=ttyS0,115200
@ -716,8 +715,8 @@ wndr3700_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kerne
wndr3700v2_cmdline=board=WNDR3700v2 console=ttyS0,115200 wndr3700v2_cmdline=board=WNDR3700v2 console=ttyS0,115200
wndr3700v2_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),14848k(rootfs),64k(art)ro,15872k@0x70000(firmware) wndr3700v2_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),14848k(rootfs),64k(art)ro,15872k@0x70000(firmware)
define Image/Build/Profile/WNDR3700 define Image/Build/Profile/WNDR3700
$(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700,$(wndr3700_cmdline),wndr3700_mtdlayout,3700,WNDR3700) $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700,$(wndr3700_cmdline),wndr3700_mtdlayout,3700,WNDR3700,"" NA,)
$(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700v2,$(wndr3700v2_cmdline),wndr3700v2_mtdlayout,3701,WNDR3700v2) $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700v2,$(wndr3700v2_cmdline),wndr3700v2_mtdlayout,3701,WNDR3700v2,"",-H 29763654+16+64)
endef endef
ap96_cmdline=board=AP96 console=ttyS0,115200 ap96_cmdline=board=AP96 console=ttyS0,115200