config: ext4: drop option to set maximum number of inodes

[openwrt/staging/mkresin.git] / include / image.mk

diff --git a/include/image.mk b/include/image.mk
index 13874bec34dde1b88fb302cd5cc8eda3e2064aee..8b183ab58a839bbf936526411f9aafcdc1366ba6 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -244,8 +244,7 @@ E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_PARTSIZE)*1024*1024)))
 define Image/mkfs/ext4
        $(STAGING_DIR_HOST)/bin/make_ext4fs \
                -l $(E2SIZE) -b $(CONFIG_TARGET_EXT4_BLOCKSIZE) \
-               -i $(CONFIG_TARGET_EXT4_MAXINODE) \
-               -m $(CONFIG_TARGET_EXT4_RESERVED_PCT) \
+               $(if $(CONFIG_TARGET_EXT4_RESERVED_PCT),-m $(CONFIG_TARGET_EXT4_RESERVED_PCT)) \
                $(if $(CONFIG_TARGET_EXT4_JOURNAL),,-J) \
                $(if $(SOURCE_DATE_EPOCH),-T $(SOURCE_DATE_EPOCH)) \
                $@ $(call mkfs_target_dir,$(1))/
@@ -287,13 +286,13 @@ target-dir-%: FORCE
        $(CP) $(TARGET_DIR_ORIG) $(mkfs_cur_target_dir)
        -mv $(mkfs_cur_target_dir)/etc/opkg $(mkfs_cur_target_dir).opkg
        echo 'src default file://$(PACKAGE_DIR_ALL)' > $(mkfs_cur_target_dir).conf
+       $(if $(mkfs_packages_remove), \
+               -$(call opkg,$(mkfs_cur_target_dir)) remove \
+                       $(mkfs_packages_remove))
        $(if $(call opkg_package_files,$(mkfs_packages_add)), \
                $(opkg_target) update && \
                $(opkg_target) install \
                        $(call opkg_package_files,$(mkfs_packages_add)))
-       $(if $(mkfs_packages_remove), \
-               $(call opkg,$(mkfs_cur_target_dir)) remove \
-                       $(mkfs_packages_remove))
        $(call prepare_rootfs,$(mkfs_cur_target_dir))
        -mv $(mkfs_cur_target_dir).opkg $(mkfs_cur_target_dir)/etc/opkg
        rm -f $(mkfs_cur_target_dir).conf