X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/4dd22e79dbd45667b38357a18003ce3b4f2a7664..e6eea2873036e3fbf5c47e912fba320be041b0fa:/include/image.mk?ds=sidebyside diff --git a/include/image.mk b/include/image.mk index 78e1a2fdc..84549c554 100644 --- a/include/image.mk +++ b/include/image.mk @@ -7,6 +7,7 @@ include $(INCLUDE_DIR)/prereq.mk include $(INCLUDE_DIR)/kernel.mk +include $(INCLUDE_DIR)/host.mk KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) ifneq ($(CONFIG_BIG_ENDIAN),y) @@ -37,14 +38,17 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x10000 -o $(KDIR)/root.jffs2-64k -d $(BUILD_DIR)/root $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x20000 -o $(KDIR)/root.jffs2-128k -d $(BUILD_DIR)/root + $(STAGING_DIR)/bin/mkfs.jffs2 $(JFFS2OPTS) -e 0x40000 -o $(KDIR)/root.jffs2-256k -d $(BUILD_DIR)/root # add End-of-Filesystem markers $(call add_jffs2_mark,$(KDIR)/root.jffs2-64k) $(call add_jffs2_mark,$(KDIR)/root.jffs2-128k) + $(call add_jffs2_mark,$(KDIR)/root.jffs2-256k) $(call Image/Build,jffs2-64k) $(call Image/Build,jffs2-128k) + $(call Image/Build,jffs2-256k) endef endif @@ -58,12 +62,13 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y) define Image/mkfs/tgz - tar -zcf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ . + $(TAR) -zcf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-rootfs.tgz --owner=root --group=root -C $(BUILD_DIR)/root/ . endef endif else define Image/BuildKernel cp $(KDIR)/vmlinux.elf $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-vmlinux.elf + $(call Image/Build/Initramfs) endef endif @@ -79,9 +84,9 @@ endif define Image/mkfs/prepare/default - find $(BUILD_DIR)/root -type f -not -perm +0100 -not -name 'ssh_host*' | xargs chmod 0644 - find $(BUILD_DIR)/root -type f -perm +0100 | xargs chmod 0755 - find $(BUILD_DIR)/root -type d | xargs chmod 0755 + find $(BUILD_DIR)/root -type f -not -perm +0100 -not -name 'ssh_host*' | $(XARGS) chmod 0644 + find $(BUILD_DIR)/root -type f -perm +0100 | $(XARGS) chmod 0755 + find $(BUILD_DIR)/root -type d | $(XARGS) chmod 0755 mkdir -p $(BUILD_DIR)/root/tmp chmod 0777 $(BUILD_DIR)/root/tmp endef