make filesystem size selection generic (for ext2)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5221 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/Config.in b/Config.in
index bdd5547d9420589b43fe9d8209dc164e2535af8f..f53d71de00e0473c79f9aaa38d39decaaac8dae5 100644 (file)
--- a/Config.in
+++ b/Config.in
@@ -95,6 +95,11 @@ comment "Image Options"
 
 source "target/image/*/Config.in"
 
+       config TARGET_ROOTFS_FSPART
+               int "Filesystem part size (in MB)"
+               depends X86_GRUB_IMAGES || TARGET_ROOTFS_EXT2FS
+               default 16
+
 endmenu
 
 source "target/linux/Config.in"

diff --git a/include/image.mk b/include/image.mk
index c738146851d58b2ae2709ddb9c16a1b487ba9b8d..13b722981a7df29807b11a39ac78793c4888034d 100644 (file)
--- a/include/image.mk
+++ b/include/image.mk
@@ -48,9 +48,12 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
   
 endif
 
+
 ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y)
+  E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_SIZE)*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 -q -b $(E2SIZE) -I 1500 -d $(BUILD_DIR)/root/ $(KDIR)/root.ext2
                $(call Image/Build,ext2)
   endef
 endif

diff --git a/target/image/x86/Config.in b/target/image/x86/Config.in
index fa61468c967abf16bae2fb1c240d1e479aec09f6..88d8d37c3b216a5a5be783b7af5f419a2ce9cf13 100644 (file)
--- a/target/image/x86/Config.in
+++ b/target/image/x86/Config.in
@@ -14,7 +14,4 @@ config X86_GRUB_KERNELPART
        depends X86_GRUB_IMAGES
        default 4
 
-config X86_GRUB_FSPART
-       int "Filesystem partition size (in MB)"
-       depends X86_GRUB_IMAGES
-       default 16
+

diff --git a/target/image/x86/Makefile b/target/image/x86/Makefile
index b836f3ace6f20a4e3635b8a5b361f2c4ae2e16e0..086024545396d6a917d31baae7f454690b828606 100644 (file)
--- a/target/image/x86/Makefile
+++ b/target/image/x86/Makefile
@@ -40,7 +40,7 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
                -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)))#g' \
                -e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \
                ./grub/menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst
-       PATH="$(STAGING_DIR)/usr/sbin:$(STAGING_DIR)/bin:$(PATH)" ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_X86_GRUB_FSPART) $(KDIR)/root.$(1)
+       PATH="$(STAGING_DIR)/usr/sbin:$(STAGING_DIR)/bin:$(PATH)" ./gen_image.sh $(BIN_DIR)/openwrt-$(BOARD)-$(KERNEL)-$(1).image $(CONFIG_X86_GRUB_KERNELPART) $(KDIR)/root.grub $(CONFIG_TARGET_ROOTFS_FSPART) $(KDIR)/root.$(1)
   endef
 endif