Use VBoxManage instead of obsolete vditool to generate VirtualBox images.

[openwrt.git] / target / linux / ar71xx / image / Makefile

diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile
index a9c7dd6..0443995 100644 (file)
--- a/target/linux/ar71xx/image/Makefile
+++ b/target/linux/ar71xx/image/Makefile
@@ -39,14 +39,14 @@ endef
 define Image/Build/AP81
        cp $(KDIR)/vmlinux $(KDIR)/vmlinux-$(2)
        $(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux-$(2) '$(strip $(3))'
-       gzip -9 -c $(KDIR)/vmlinux-$(2) > $(KDIR)/vmlinux-$(2).bin.gz
-       mkimage -A mips -O linux -T kernel -a 0x80060000 -C gzip -e \
+       $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux-$(2) $(KDIR)/vmlinux-$(2).bin.lzma
+       mkimage -A mips -O linux -T kernel -a 0x80060000 -C lzma -e \
                0x80060000 \
                -n 'MIPS OpenWrt Linux-$(LINUX_VERSION)' \
-               -d $(KDIR)/vmlinux-$(2).bin.gz $(KDIR)/vmlinux-$(2).uImage
+               -d $(KDIR)/vmlinux-$(2).bin.lzma $(KDIR)/vmlinux-$(2).uImage
        ( \
-               dd if=$(KDIR)/vmlinux-$(2).uImage bs=1024k conv=sync; \
-               dd if=$(KDIR)/root.$(1) bs=2752k conv=sync; \
+               dd if=$(KDIR)/vmlinux-$(2).uImage bs=768k conv=sync; \
+               dd if=$(KDIR)/root.$(1) bs=3008k conv=sync; \
        ) > $(call imgname,$(1),$(2)).bin
        cp $(call imgname,$(1),$(2)).bin $(call imgname,$(1),$(2)).webui
        echo -n $(4) >> $(call imgname,$(1),$(2)).webui
@@ -59,6 +59,17 @@ define Image/Build/MyLoader
                $(call imgname,$(1),$(2)).img
 endef
 
+define Image/Build/UBNT
+       cp $(KDIR)/vmlinux $(KDIR)/vmlinux-$(2)
+       $(STAGING_DIR_HOST)/bin/patch-cmdline $(KDIR)/vmlinux-$(2) '$(strip $(3))'
+       $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux-$(2) $(KDIR)/vmlinux-$(2).bin.lzma
+       -$(STAGING_DIR_HOST)/bin/mkfwimage \
+               -B $(4) -v $(5).ar7100.OpenWrt \
+               -k $(KDIR)/vmlinux-$(2).bin.lzma \
+               -r $(BIN_DIR)/openwrt-$(BOARD)-root.$(1) \
+               -o $(BIN_DIR)/openwrt-$(BOARD)-ubnt-$(2)-$(1).bin
+endef
+
 define Image/Build/Template/Compex
        $(call Image/Build/MyLoader,$(1),$(2))
 endef
@@ -75,14 +86,34 @@ define Image/Build/Template/AP81/squashfs
        $(call Image/Build/Template/AP81,squashfs,$(1),$(2),$(3))
 endef
 
+define Image/Build/Template/UBNT
+       $(call Image/Build/UBNT,$(1),$(2),$(3),$(4),$(5))
+endef
+
+define Image/Build/Template/UBNT/squashfs
+       $(call Image/Build/Template/UBNT,squashfs,$(1),$(2),$(3))
+endef
+
 define Image/Build/Profile/WP543
        $(call Image/Build/Template/Compex/$(1),wp543)
 endef
 
+define Image/Build/Profile/DIR615C1
+       $(call Image/Build/Template/AP81/$(1),dir-615c1,board=TEW-632BRP,"AP81-AR9130-RT-070614-02")
+endef
+
 define Image/Build/Profile/TEW632BRP
        $(call Image/Build/Template/AP81/$(1),tew-632brp,board=TEW-632BRP,"AP81-AR9130-RT-070614-00")
 endef
 
+define Image/Build/Profile/TEW652BRP
+       $(call Image/Build/Template/AP81/$(1),tew-652brp,board=TEW-632BRP,"AP81-AR9130-RT-080609-05")
+endef
+
+define Image/Build/Profile/UBNTRS
+       $(call Image/Build/Template/UBNT,$(1),rs,board=UBNT-RS,RS,RSx)
+endef
+
 define Image/Build/squashfs
        $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
 endef
@@ -91,8 +122,11 @@ define Image/Build
        $(call Image/Build/$(1))
        dd if=$(KDIR)/root.$(1) of=$(IMGNAME)-root.$(1) bs=128k conv=sync
 
-       $(call Image/Build/Profile/WP543,$(1))
+       $(call Image/Build/Profile/DIR615C1,$(1))
        $(call Image/Build/Profile/TEW632BRP,$(1))
+       $(call Image/Build/Profile/TEW652BRP,$(1))
+       $(call Image/Build/Profile/UBNTRS,$(1))
+       $(call Image/Build/Profile/WP543,$(1))
 endef
 
 $(eval $(call BuildImage))