X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/65aeed311cbddeb66427150582239ff1623246d9..aadd1adef0a9576ecd676db6c96c86d76d545a4f:/include/image.mk?ds=sidebyside diff --git a/include/image.mk b/include/image.mk index 87d6815ee..ec0512f90 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) @@ -41,21 +44,26 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) ifeq ($(CONFIG_TARGET_ROOTFS_TGZ),y) define Image/mkfs/tgz - tar -zcf $(BIN_DIR)/openwrt-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 - ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y) - define Image/mkfs/ext2 - genext2fs -q -b 4096 -I 1500 -d $(BUILD_DIR)/root/ $(KDIR)/root.ext2 - $(call Image/Build,ext2) - endef - endif endif + +ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y) + E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_FSPART)*1024))) + + define Image/mkfs/ext2 + $(STAGING_DIR)/bin/genext2fs -U -b $(E2SIZE) -I $(CONFIG_TARGET_ROOTFS_MAXINODE) -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 @@ -67,10 +75,17 @@ define Image/mkfs/prepare endef define BuildImage -compile: +download: +prepare: +ifneq ($(IB),1) + compile: compile-targets $(call Build/Compile) +else + compile: +endif -install: +ifneq ($(IB),1) + install: compile install-targets $(call Image/Prepare) $(call Image/mkfs/prepare) $(call Image/BuildKernel) @@ -78,17 +93,25 @@ install: $(call Image/mkfs/squashfs) $(call Image/mkfs/tgz) $(call Image/mkfs/ext2) +else + install: compile install-targets + $(call Image/BuildKernel) + $(call Image/mkfs/jffs2) + $(call Image/mkfs/squashfs) + $(call Image/mkfs/tgz) + $(call Image/mkfs/ext2) +endif -clean: +ifneq ($(IB),1) + clean: clean-targets $(call Build/Clean) -endef +else + clean: +endif compile-targets: install-targets: clean-targets: +endef + -download: -prepare: -compile: compile-targets -install: compile install-targets -clean: clean-targets