projects
/
openwrt-10.03
/
.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ar71xx: create combined images for the RS, RS-PRO and LS-SR71 boards, and add sysupgr...
[openwrt-10.03/.git]
/
target
/
linux
/
ar71xx
/
image
/
Makefile
diff --git
a/target/linux/ar71xx/image/Makefile
b/target/linux/ar71xx/image/Makefile
index 24b1fa36aa664e95fc9b04bf5ce2ef173c6d6235..30663f12cb4327f351590f68535c4920178d7df7 100644
(file)
--- 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) \
-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
endef
define Image/Build/Planex
@@
-431,6
+435,11
@@
endef
define Image/Build/squashfs
$(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
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
endef
define Image/Build