[oe-commits] Julien 'Ainulindale' Cassignol : shr-autorev.inc, shr.conf: Moved PREFERRED_PROVIDERs to their appropriate location.

[git version control]

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

Author: Julien 'Ainulindale' Cassignol <ainulindale at gmail.com>
Date:   Wed Jun  3 11:45:26 2009 +0200

shr-autorev.inc, shr.conf: Moved PREFERRED_PROVIDERs to their appropriate location.

---

 conf/distro/include/shr-autorev.inc |    9 ---------
 conf/distro/shr.conf                |    7 +++++++
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/conf/distro/include/shr-autorev.inc b/conf/distro/include/shr-autorev.inc
index a7ca175..b0a22bb 100644
--- a/conf/distro/include/shr-autorev.inc
+++ b/conf/distro/include/shr-autorev.inc
@@ -4,9 +4,6 @@
 # specific file here (if it exists).
 include conf/distro/include/shr-${MACHINE}.conf
 
-DISTRO_INITSCRIPTS = "initscripts-shr"
-DISTRO_DEV_MANAGER = "udev"
-
 # 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
@@ -15,10 +12,6 @@ DISTRO_DEV_MANAGER = "udev"
 SRCREV_pn-linux-eten = "df9715883efa3e6a88866813168fabb1c16b0b7a"
 SRCREV_pn-linux-openmoko-shr-devel = "f16c3431a1a7510eb3504ec5d96677dd0fac4cd6"
 
-PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr"
-PREFERRED_PROVIDER_frameworkd = "frameworkd"
-PREFERRED_PROVIDER_gpsd = "fso-gpsd"
-
 PREFERRED_VERSION_shared-mime-info = "0.51"
 PREFERRED_VERSION_navit = "0.1.0+svnrev${SRCREV}"
 PREFERRED_VERSION_libosip2 = "2.2.2"
@@ -27,7 +20,6 @@ PREFERRED_VERSION_midori = "0.1.2"
 PREFERRED_VERSION_obexftp = "0.22"
 PREFERRED_VERSION_glib-2.0 = "2.18.3"
 PREFERRED_VERSION_mokomaze = "0.5.1"
-PREFERRED_PROVIDER_e-wm-menu = "e-wm-menu-shr"
 PREFERRED_VERSION_glib-2.0 = "2.18.3"
 PREFERRED_VERSION_calc = "0.0.1"
 
@@ -48,7 +40,6 @@ SRCREV_pn-python-pytrc = "${AUTOREV}"
 SRCREV_pn-zhone = "${AUTOREV}"
 
 #SHR stuff
-PREFERRED_PROVIDER_virtual/shr-splash-theme = "shr-splash-theme-simple"
 SRCREV_pn-libhito = "${AUTOREV}"
 SRCREV_pn-neod = "${AUTOREV}"
 SRCREV_pn-shr-settings = "29cc9e80246082f21899bd732bf649d33895c26d"
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 07bb8fa..798261f 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -37,6 +37,8 @@ AB_DEPLOY_EXTRA ?= ""
 DEPLOY_DIR_IMAGE = "${DEPLOY_DIR}/images/${MACHINE_ARCH}/${AB_DEPLOY_EXTRA}"
 
 IMAGE_INITSCRIPTS = "initscripts-shr"
+DISTRO_INITSCRIPTS = "initscripts-shr"
+DISTRO_DEV_MANAGER = "udev"
 
 # We try to minimize the distro features in the default image.
 DISTRO_FEATURES = "wifi ppp alsa ext2 vfat usbhost"
@@ -77,6 +79,11 @@ PREFERRED_PROVIDER_midpath = "midpath-openmoko"
 PREFERRED_PROVIDER_virtual/libqte2 = "qte"
 
 PREFERRED_PROVIDER_virtual/shr-splash-theme = "shr-splash-theme-dontpanic"
+PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr"
+PREFERRED_PROVIDER_frameworkd = "frameworkd"
+PREFERRED_PROVIDER_gpsd = "fso-gpsd"
+PREFERRED_PROVIDER_e-wm-menu = "e-wm-menu-shr"
+
 # Helper to say what image we built
 SHR_VERSION_FILE = "${IMAGE_ROOTFS}/${sysconfdir}/shr-version"
 ROOTFS_POSTPROCESS_COMMAND += "OLD_PWD=$PWD; cd `dirname '${FILE_DIRNAME}'`; echo Tag Name: `git tag|tail -n 1`> ${SHR_VERSION_FILE};cd $OLD_PWD;"