hak5
/
openwrt
mirror of https://github.com/hak5/openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

make filesystem size selection generic (for ext2) 

SVN-Revision: 5221
lede-17.01
Felix Fietkau 2006-10-19 03:27:24 +00:00
parent d2e30add61
commit 002476016b
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Config.in
View File

@ -95,6 +95,11 @@ comment "Image Options"
source "target/image/*/Config.in" 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 endmenu
source "target/linux/Config.in" source "target/linux/Config.in"

5
include/image.mk
View File

@ -48,9 +48,12 @@ ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y)
endif endif
ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y) ifeq ($(CONFIG_TARGET_ROOTFS_EXT2FS),y)
E2SIZE=$(shell echo $$(($(CONFIG_TARGET_ROOTFS_SIZE)*1024)))
define Image/mkfs/ext2 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) $(call Image/Build,ext2)
endef endef
endif endif

5
target/image/x86/Config.in
View File

@ -14,7 +14,4 @@ config X86_GRUB_KERNELPART
depends X86_GRUB_IMAGES depends X86_GRUB_IMAGES
default 4 default 4
config X86_GRUB_FSPART
int "Filesystem partition size (in MB)"
depends X86_GRUB_IMAGES
default 16

2
target/image/x86/Makefile
View File

@ -40,7 +40,7 @@ ifeq ($(CONFIG_X86_GRUB_IMAGES),y)
-e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)))#g' \ -e 's#@CMDLINE@#$(strip $(call Image/cmdline/$(1)))#g' \
-e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \ -e 's#@BAUDRATE@#$(CONFIG_X86_GRUB_BAUDRATE)#g' \
./grub/menu.lst > $(KDIR)/root.grub/boot/grub/menu.lst ./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 endef
endif endif