Author: jogo Date: 2015-09-04 16:45:09 +0200 (Fri, 04 Sep 2015) New Revision: 46791
Modified: trunk/include/image.mk trunk/target/linux/ar71xx/image/Makefile Log: image: move netgear-image to top and rename to -dni Use the same naming as netgear-chk. Signed-off-by: Jonas Gorski <[email protected]> Modified: trunk/include/image.mk =================================================================== --- trunk/include/image.mk 2015-09-04 14:45:04 UTC (rev 46790) +++ trunk/include/image.mk 2015-09-04 14:45:09 UTC (rev 46791) @@ -308,6 +308,15 @@ mv [email protected] $@ endef +define Build/netgear-dni + $(STAGING_DIR_HOST)/bin/mkdniimg \ + -B $(NETGEAR_BOARD_ID) -v OpenWrt.$(REVISION) \ + $(if $(NETGEAR_HW_ID),-H $(NETGEAR_HW_ID)) \ + -r "$(1)" \ + -i $@ -o [email protected] + mv [email protected] $@ +endef + define Build/fit $(TOPDIR)/scripts/mkits.sh \ -D $(DEVICE_NAME) -o [email protected] -k $@ \ Modified: trunk/target/linux/ar71xx/image/Makefile =================================================================== --- trunk/target/linux/ar71xx/image/Makefile 2015-09-04 14:45:04 UTC (rev 46790) +++ trunk/target/linux/ar71xx/image/Makefile 2015-09-04 14:45:09 UTC (rev 46791) @@ -37,15 +37,6 @@ $(call Build/uImage,$(1) -M $(NETGEAR_KERNEL_MAGIC)) endef -define Build/netgear-image - $(STAGING_DIR_HOST)/bin/mkdniimg \ - -B $(NETGEAR_BOARD_ID) -v OpenWrt.$(REVISION) \ - $(if $(NETGEAR_HW_ID),-H $(NETGEAR_HW_ID)) \ - -r "$(1)" \ - -i $@ -o [email protected] - mv [email protected] $@ -endef - # combine kernel and rootfs into one image # -a align the rootfs start on an <align> bytes boundary # -j add jffs2 end-of-filesystem markers @@ -198,8 +189,8 @@ KERNEL := kernel-bin | patch-cmdline | lzma -d20 | netgear-uImage lzma IMAGE/default = append-kernel $$$$(BLOCKSIZE) | netgear-squashfs | append-rootfs | pad-rootfs IMAGE/sysupgrade.bin = $$(IMAGE/default) | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.img = $$(IMAGE/default) | netgear-image | check-size $$$$(IMAGE_SIZE) - IMAGE/factory-NA.img = $$(IMAGE/default) | netgear-image NA | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.img = $$(IMAGE/default) | netgear-dni | check-size $$$$(IMAGE_SIZE) + IMAGE/factory-NA.img = $$(IMAGE/default) | netgear-dni NA | check-size $$$$(IMAGE_SIZE) endef define Device/wndr3700v2 _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
