X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/f52d66ff00b24111f87c274d3d7085ef2e1d27b1..fb8b4548a0193022e19c6c920d925fd9c8d73343:/include/image.mk?ds=inline diff --git a/include/image.mk b/include/image.mk index 065167918..702434ec8 100644 --- a/include/image.mk +++ b/include/image.mk @@ -4,6 +4,9 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # + +include $(INCLUDE_DIR)/prereq.mk +include $(INCLUDE_DIR)/kernel.mk KDIR:=$(BUILD_DIR)/linux-$(KERNEL)-$(BOARD) ifneq ($(CONFIG_BIG_ENDIAN),y) @@ -48,16 +51,19 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) endif + ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y) + E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_FSPART)*1024))) + define Image/mkfs/ext2 - $(STAGING_DIR)/bin/genext2fs -q -b 8192 -I 1500 -d $(BUILD_DIR)/root/ $(KDIR)/root.ext2 + $(STAGING_DIR)/bin/genext2fs -U -b $(E2SIZE) -I 1500 -d $(BUILD_DIR)/root/ $(KDIR)/root.ext2 $(call Image/Build,ext2) endef endif define Image/mkfs/prepare/default - find $(BUILD_DIR)/root -type f -not -perm +0100 | xargs chmod 0644 + 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 @@ -69,10 +75,12 @@ define Image/mkfs/prepare endef define BuildImage -compile: +download: +prepare: +compile: compile-targets $(call Build/Compile) -install: +install: compile install-targets $(call Image/Prepare) $(call Image/mkfs/prepare) $(call Image/BuildKernel) @@ -81,16 +89,12 @@ install: $(call Image/mkfs/tgz) $(call Image/mkfs/ext2) -clean: +clean: clean-targets $(call Build/Clean) -endef compile-targets: install-targets: clean-targets: +endef + -download: -prepare: -compile: compile-targets -install: compile install-targets -clean: clean-targets