summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-06-13 23:05:06 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2006-06-13 23:05:06 +0000
commit66d6210f275afe666d334ef50c41bb45b778cfa5 (patch)
tree8f67515aff2d9de4aa36877fde088b0cc434c0ef
parent78ef7e3248d3d7ed7c166175ef71640928179d49 (diff)
update aruba image building makefile for latest image.mk changes
git-svn-id: svn://svn.openwrt.org/openwrt/branches/buildroot-ng/openwrt@3940 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/image/aruba/Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/target/linux/image/aruba/Makefile b/target/linux/image/aruba/Makefile
index 14a923dd1a..ddfe8e7f9c 100644
--- a/target/linux/image/aruba/Makefile
+++ b/target/linux/image/aruba/Makefile
@@ -19,11 +19,12 @@ define Image/Prepare
$(MAKE) -C ../generic/lzma-loader $(LOADER_MAKEOPTS) clean compile
endef
-define Image/Build
+define Image/BuildKernel
./addVersion -n ArubaOS $(KDIR)/loader.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari version
-ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
+endef
+
+define Image/Build
ifeq ($(1),jffs2-64k)
-endif
@dd if=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL).ari of=$(KDIR)/image.tmp bs=655360 conv=sync
@cat $(KDIR)/root.$(1) >> $(KDIR)/image.tmp
@dd if=$(KDIR)/image.tmp of=$(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(patsubst jffs2-%,jffs2,$(1)).bin bs=3604480 conv=sync