Changeset 27053


Ignore:
Timestamp:
2011-06-01T00:53:25+02:00 (7 years ago)
Author:
juhosg
Message:

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

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@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ar71xx/image/Makefile

    r27051 r27053  
    399399                dd if=$(KDIR)/root.$(1) bs=64k; \ 
    400400        ) > $(call imgname,$(1),$(2))-sysupgrade.bin 
    401         $(STAGING_DIR_HOST)/bin/mkdniimg \ 
    402                 -B $(6) -v OpenWrt.$(REVISION) \ 
    403                 -i $(call imgname,$(1),$(2))-sysupgrade.bin \ 
    404                 -o $(call imgname,$(1),$(2))-factory.img 
    405         $(STAGING_DIR_HOST)/bin/mkdniimg \ 
    406                 -B $(6) -v OpenWrt.$(REVISION) -r "NA" \ 
    407                 -i $(call imgname,$(1),$(2))-sysupgrade.bin \ 
    408                 -o $(call imgname,$(1),$(2))-factory-NA.img 
     401        for r in $(7) ; do \ 
     402                [ -n "$$$$r" ] && dashr="-$$$$r" || dashr= ; \ 
     403                $(STAGING_DIR_HOST)/bin/mkdniimg \ 
     404                        -B $(6) -v OpenWrt.$(REVISION) -r "$$$$r" $(8) \ 
     405                        -i $(call imgname,$(1),$(2))-sysupgrade.bin \ 
     406                        -o $(call imgname,$(1),$(2))-factory$$$$dashr.img; \ 
     407        done 
    409408endef 
    410409 
     
    460459 
    461460define Image/Build/Template/initramfs/initramfs 
    462         $(call Image/Build/$(1)/initramfs,initramfs,$(2),$(3),$(4),$(5),$(6),$(7)) 
     461        $(call Image/Build/$(1)/initramfs,initramfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) 
    463462endef 
    464463 
    465464define Image/Build/Template/all/squashfs 
    466         $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7)) 
     465        $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) 
    467466endef 
    468467 
    469468define Image/Build/Template/all/jffs2-64k 
    470         $(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7)) 
     469        $(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) 
    471470endef 
    472471 
    473472define Image/Build/Template/all/jffs2-128k 
    474         $(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7)) 
     473        $(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) 
    475474endef 
    476475 
    477476define Image/Build/Template/squashfs-only/squashfs 
    478         $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7)) 
     477        $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) 
    479478endef 
    480479 
    481480define Image/Build/Template/4k/squashfs 
    482         $(call Image/Build/$(1),squashfs-4k,$(2),$(3),$(4),$(5),$(6),$(7)) 
     481        $(call Image/Build/$(1),squashfs-4k,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) 
    483482endef 
    484483 
    485484define Image/Build/Template/64k/squashfs 
    486         $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7)) 
     485        $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) 
    487486endef 
    488487 
    489488define Image/Build/Template/64k/jffs2-64k 
    490         $(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7)) 
     489        $(call Image/Build/$(1),jffs2-64k,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) 
    491490endef 
    492491 
    493492define Image/Build/Template/128k/squashfs 
    494         $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7)) 
     493        $(call Image/Build/$(1),squashfs,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) 
    495494endef 
    496495 
    497496define Image/Build/Template/128k/jffs2-128k 
    498         $(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7)) 
     497        $(call Image/Build/$(1),jffs2-128k,$(2),$(3),$(4),$(5),$(6),$(7),$(8)) 
    499498endef 
    500499 
     
    717716wndr3700v2_mtdlayout=mtdparts=spi0.0:320k(u-boot)ro,128k(u-boot-env)ro,1024k(kernel),14848k(rootfs),64k(art)ro,15872k@0x70000(firmware) 
    718717define Image/Build/Profile/WNDR3700 
    719         $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700,$(wndr3700_cmdline),wndr3700_mtdlayout,3700,WNDR3700) 
    720         $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700v2,$(wndr3700v2_cmdline),wndr3700v2_mtdlayout,3701,WNDR3700v2) 
     718        $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700,$(wndr3700_cmdline),wndr3700_mtdlayout,3700,WNDR3700,"" NA,) 
     719        $(call Image/Build/Template/$(fs_64k)/$(1),Netgear,wndr3700v2,$(wndr3700v2_cmdline),wndr3700v2_mtdlayout,3701,WNDR3700v2,"",-H 29763654+16+64) 
    721720endef 
    722721 
Note: See TracChangeset for help on using the changeset viewer.