diff options
| author | Koen Kooi <koen@openembedded.org> | 2008-11-20 14:59:39 +0100 |
|---|---|---|
| committer | Koen Kooi <koen@openembedded.org> | 2008-11-20 14:59:39 +0100 |
| commit | ce670d0593ba6979788373d7763690ab084cb642 (patch) | |
| tree | 47fabfeddc9f98f569dcb9f4d4fce0224d07781b | |
| parent | aaf739e6a8f76ca2cb2ed51cf12734951d0f167b (diff) | |
| parent | 94c3438f511b4faa735064be8c563da8631b34c7 (diff) | |
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
| -rw-r--r-- | conf/machine/eten-m800.conf | 2 | ||||
| -rw-r--r-- | packages/fontconfig/fontconfig.inc | 2 | ||||
| -rw-r--r-- | packages/fontconfig/fontconfig_2.6.0.bb | 2 | ||||
| -rw-r--r-- | packages/linux/linux-eten_2.6.24+git.bb | 2 |
4 files changed, 6 insertions, 2 deletions
diff --git a/conf/machine/eten-m800.conf b/conf/machine/eten-m800.conf index bdab484a45..6867cb50b3 100644 --- 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 252b843340..9af3540080 100644 --- 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 3f7eca4b4e..d6c1019c1e 100644 --- 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 867cbadc82..b980660810 100644 --- 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" |