[oe-commits] Martin Jansa : shr/merge: Move machinge specific config to shr. conf directly, add tar. gz to machine IMAGE_FSTYPES and select fribidi provider.

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: fc4c5f40c24ce80afd9a22a89504f68e86e9eaff
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=fc4c5f40c24ce80afd9a22a89504f68e86e9eaff

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Sat Oct 24 12:41:21 2009 +0000

shr/merge: Move machinge specific config to shr.conf directly, add tar.gz to machine IMAGE_FSTYPES and select fribidi provider.

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/distro/include/shr-autorev.inc |    4 ----
 conf/distro/shr.conf                |    5 +++++
 conf/machine/om-gta02.conf          |    2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc
index af06a76..23afe1b 100644
--- a/conf/distro/include/shr-autorev.inc
+++ b/conf/distro/include/shr-autorev.inc
@@ -1,9 +1,5 @@
 # SHR autorev include
 
-# We need to override some machine stuff as well; include the machine-
-# specific file here (if it exists).
-include conf/distro/include/shr-${MACHINE}.conf
-
 # Nail down some SRCREV's for the kernels.  There is a real potential problem
 # here, in that git hashes are hashes, not incrementing version numbers.  Thus
 # we need to have something else in the kernel version string that gets bumped
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index e55203f..46b9a84 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -24,6 +24,10 @@ DISTRO_PR = ".3"
 DISTRO_TYPE = "debug"
 DISTRO = "shr"
 
+# We need to override some machine stuff as well; include the machine-
+# specific file here (if it exists).
+include conf/distro/include/shr-${MACHINE}.conf
+
 require conf/distro/include/preferred-shr-versions.inc
 require conf/distro/include/shr-autorev.inc
 
@@ -62,6 +66,7 @@ PREFERRED_PROVIDER_gpsd = "fso-gpsd"
 PREFERRED_PROVIDER_e-wm-menu = "e-wm-menu-shr"
 PREFERRED_PROVIDER_openmoko-alsa-scenarios = "alsa-scenarii-shr"
 PREFERRED_PROVIDER_virtual/alsa-scenarios = "alsa-scenarii-shr"
+PREFERRED_PROVIDER_libfribidi = "fribidi"
 
 # Helper to say what image we built
 SHR_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/shr-version"
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 1a613d5..79f64c8 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -32,7 +32,7 @@ USE_VT = "0"
 ROOT_FLASH_SIZE = "256"
 
 # extra jffs2 tweaks
-IMAGE_FSTYPES += "jffs2 ubifs"
+IMAGE_FSTYPES += "tar.gz jffs2 ubifs"
 EXTRA_IMAGECMD_jffs2 = "--little-endian --eraseblock=0x20000 --pagesize=0x800 \
   --no-cleanmarkers --pad -n ; sumtool --eraseblock=0x20000 --no-cleanmarkers \
   --littleendian --pad \