summaryrefslogtreecommitdiffstats
path: root/target/linux/x86
diff options
context:
space:
mode:
authorkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-22 12:12:39 +0000
committerkaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-11-22 12:12:39 +0000
commit0835d732ce79bc5d764dfeaf1d3ae6d04b767763 (patch)
tree546b7bb3d3fec36635a8979ef611f64be31743d8 /target/linux/x86
parent1823498df79bd7feafd6b0460eb84630cb8cc580 (diff)
switch from ext2 to ext4 (w/o) journaling
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@24084 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/x86')
-rw-r--r--target/linux/x86/Makefile4
-rw-r--r--target/linux/x86/config-default2
-rw-r--r--target/linux/x86/image/Config.in8
-rw-r--r--target/linux/x86/image/Makefile14
4 files changed, 14 insertions, 14 deletions
diff --git a/target/linux/x86/Makefile b/target/linux/x86/Makefile
index 3cbed9542..5ff1d246f 100644
--- a/target/linux/x86/Makefile
+++ b/target/linux/x86/Makefile
@@ -9,10 +9,10 @@ include $(TOPDIR)/rules.mk
ARCH:=i386
BOARD:=x86
BOARDNAME:=x86
-FEATURES:=squashfs jffs2 ext2 vdi vmdk pcmcia targz
+FEATURES:=squashfs jffs2 ext4 vdi vmdk pcmcia targz
SUBTARGETS=generic olpc xen_domu ep80579 net5501 kvm_guest geos
-LINUX_VERSION:=2.6.32.25
+LINUX_VERSION:=2.6.36
include $(INCLUDE_DIR)/target.mk
diff --git a/target/linux/x86/config-default b/target/linux/x86/config-default
index 0b0981b89..eff0b2800 100644
--- a/target/linux/x86/config-default
+++ b/target/linux/x86/config-default
@@ -101,7 +101,7 @@ CONFIG_EARLY_PRINTK=y
CONFIG_ELF_CORE=y
# CONFIG_ELPLUS is not set
# CONFIG_EUROTECH_WDT is not set
-CONFIG_EXT2_FS=y
+CONFIG_EXT4_FS=y
CONFIG_FIRMWARE_IN_KERNEL=y
CONFIG_FIRMWARE_MEMMAP=y
CONFIG_FIX_EARLYCON_MEM=y
diff --git a/target/linux/x86/image/Config.in b/target/linux/x86/image/Config.in
index 8467f48a4..3557e63c2 100644
--- a/target/linux/x86/image/Config.in
+++ b/target/linux/x86/image/Config.in
@@ -1,7 +1,7 @@
config X86_GRUB_IMAGES
bool "Build GRUB images (Linux x86 or x86_64 host only)"
depends TARGET_x86 && !TARGET_x86_olpc
- depends TARGET_ROOTFS_EXT2FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
+ depends TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
select PACKAGE_grub
default y
@@ -35,21 +35,21 @@ config X86_VDI_IMAGES
bool "Build VirtualBox image files (VDI)"
depends X86_GRUB_IMAGES
depends TARGET_x86_generic
- depends TARGET_ROOTFS_EXT2FS
+ depends TARGET_ROOTFS_EXT4FS
select PACKAGE_kmod-pcnet32
config X86_VMDK_IMAGES
bool "Build VMware image files (VMDK)"
depends X86_GRUB_IMAGES
depends TARGET_x86_generic
- depends TARGET_ROOTFS_EXT2FS
+ depends TARGET_ROOTFS_EXT4FS
select PACKAGE_kmod-e1000
config OLPC_BOOTSCRIPT_IMAGES
bool "Build images with bootscript"
depends TARGET_x86_olpc
- depends TARGET_ROOTFS_EXT2FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
+ depends TARGET_ROOTFS_EXT4FS || TARGET_ROOTFS_ISO || TARGET_ROOTFS_JFFS2 || TARGET_ROOTFS_SQUASHFS
config TARGET_IMAGES_PAD
diff --git a/target/linux/x86/image/Makefile b/target/linux/x86/image/Makefile
index b5297bbff..57d7b0b46 100644
--- a/target/linux/x86/image/Makefile
+++ b/target/linux/x86/image/Makefile
@@ -35,8 +35,8 @@ ifneq ($(CONFIG_X86_GRUB_IMAGES),)
BOOTOPTS:=$(call qstrip,$(CONFIG_X86_GRUB_BOOTOPTS))
- define Image/cmdline/ext2
- root=$(ROOTPART) rootfstype=ext2 rootwait
+ define Image/cmdline/ext4
+ root=$(ROOTPART) rootfstype=ext4 rootwait
endef
define Image/cmdline/jffs2-64k
@@ -88,8 +88,8 @@ ROOTDELAY=10
ifneq ($(CONFIG_OLPC_BOOTSCRIPT_IMAGES),)
- define Image/cmdline/ext2
- root=$(ROOTPART) rootfstype=ext2 rootwait
+ define Image/cmdline/ext4
+ root=$(ROOTPART) rootfstype=ext4 rootwait
endef
define Image/cmdline/jffs2-64k
@@ -141,7 +141,7 @@ endef
ifneq ($(CONFIG_X86_VDI_IMAGES),)
define Image/Build/vdi
# left here because the image builder doesnt need these
- ifeq ($(1),ext2)
+ ifeq ($(1),ext4)
rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vdi || true
qemu-img convert -f raw -O vdi \
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
@@ -155,7 +155,7 @@ endif
ifneq ($(CONFIG_X86_VMDK_IMAGES),)
define Image/Build/vmdk
# left here because the image builder doesnt need these
- ifeq ($(1),ext2)
+ ifeq ($(1),ext4)
rm $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).vmdk || true
qemu-img convert -f raw -O vmdk \
$(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img \
@@ -184,7 +184,7 @@ define Image/Build
endif
$(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
$(CP) $(KDIR)/bzImage $(BIN_DIR)/$(IMG_PREFIX)-vmlinuz
- ifeq ($(1),ext2)
+ ifeq ($(1),ext4)
gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-combined-$(1).img
gzip -f9 $(BIN_DIR)/$(IMG_PREFIX)-rootfs-$(1).img
endif