X-Git-Url: http://git.ozo.com/?a=blobdiff_plain;ds=sidebyside;f=target%2Flinux%2Far71xx%2Fimage%2FMakefile;h=30663f12cb4327f351590f68535c4920178d7df7;hb=227b0b29bdd246463ce93b847dd380909a3a4ae0;hp=24b1fa36aa664e95fc9b04bf5ce2ef173c6d6235;hpb=916a84b6ef049bc04d6617ffc65a17fc76171a91;p=openwrt-10.03%2F.git diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 24b1fa36a..30663f12c 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -161,7 +161,11 @@ define Image/Build/UBNT -B $(4) -v $(5).$(6).OpenWrt.$(REVISION) \ -k $(KDIR)/vmlinux-$(2).lzma \ -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \ - -o $(call imgname,$(1),$(2)).bin + -o $(call imgname,$(1),$(2))-factory.bin + -sh $(TOPDIR)/scripts/combined-image.sh \ + "$(KDIR)/vmlinux-$(2).lzma" \ + "$(BIN_DIR)/openwrt-$(BOARD)-root.$(1)" \ + $(call imgname,$(1),$(2))-sysupgrade.bin endef define Image/Build/Planex @@ -431,6 +435,11 @@ endef define Image/Build/squashfs $(call prepare_generic_squashfs,$(KDIR)/root.squashfs) + dd if=$(KDIR)/root.squashfs of=$(KDIR)/root.squashfs-4k.tmp0 bs=4k conv=sync + $(call add_jffs2_mark,$(KDIR)/root.squashfs-4k.tmp0) + dd if=$(KDIR)/root.squashfs-4k.tmp0 of=$(IMGNAME)-root.squashfs-4k bs=4k conv=sync + $(call add_jffs2_mark,$(IMGNAME)-root.squashfs-4k) + rm -f $(KDIR)/root.squashfs-4k.tmp0 endef define Image/Build