Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into...

diff --git a/conf/machine/eten-m800.conf b/conf/machine/eten-m800.conf
index bdab484..6867cb5 100644 (file)
--- a/conf/machine/eten-m800.conf
+++ b/conf/machine/eten-m800.conf
@@ -23,3 +23,5 @@ IMAGE_FSTYPES += "tar.gz"
 
 # tune for S3C24x0
 include conf/machine/include/tune-arm920t.inc
+
+module_autoload_g_ether = "g_ether"

diff --git a/packages/fontconfig/fontconfig.inc b/packages/fontconfig/fontconfig.inc
index 252b843..9af3540 100644 (file)
--- a/packages/fontconfig/fontconfig.inc
+++ b/packages/fontconfig/fontconfig.inc
@@ -18,7 +18,7 @@ inherit autotools pkgconfig
 
 export HASDOCBOOK="no"
 
-EXTRA_OECONF = " --disable-docs"
+EXTRA_OECONF = " --disable-docs --with-cache-dir=/var/lib/fontconfig"
 EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
 
 # The tarball has some of the patched files as read only, which

diff --git a/packages/fontconfig/fontconfig_2.6.0.bb b/packages/fontconfig/fontconfig_2.6.0.bb
index 3f7eca4..d6c1019 100644 (file)
--- a/packages/fontconfig/fontconfig_2.6.0.bb
+++ b/packages/fontconfig/fontconfig_2.6.0.bb
@@ -24,7 +24,7 @@ inherit autotools pkgconfig
 
 export HASDOCBOOK="no"
 
-EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH}"
+EXTRA_OECONF = " --disable-docs --with-arch=${HOST_ARCH} --with-cache-dir=/var/lib/fontconfig"
 EXTRA_OEMAKE = "FC_LANG=fc-lang FC_GLYPHNAME=fc-glyphname"
 
 # The tarball has some of the patched files as read only, which

diff --git a/packages/linux/linux-eten_2.6.24+git.bb b/packages/linux/linux-eten_2.6.24+git.bb
index 867cbad..b980660 100644 (file)
--- a/packages/linux/linux-eten_2.6.24+git.bb
+++ b/packages/linux/linux-eten_2.6.24+git.bb
@@ -16,3 +16,5 @@ SRC_URI = "\
   file://defconfig \
 "
 S = "${WORKDIR}/git"
+
+CMDLINE = "root=/dev/mmcblk0p1 rootdelay=5"