diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2011-01-17 13:54:41 +0100 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2011-01-17 15:12:41 +0100 |
| commit | 1f4d72bf332d3e843c42767d3e34f5b953c22c33 (patch) | |
| tree | df90a428963f34a5bff2b7fbcb07fd0257271f6c /conf | |
| parent | a410a3ea8edabce31b5386c99dce998c78d2ff4c (diff) | |
| download | openembedded-1f4d72bf332d3e843c42767d3e34f5b953c22c33.tar.gz | |
frameworkd: merge frameworkd-config-shr_git.bb to frameworkd_git.bb and cleanup
* move init.d file and all config files applied in OE to frameworkd repo
* drop PREFERRED_PROVIDER_frameworkd-config as only one provider exists now
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/compatibility-providers.conf | 2 | ||||
| -rw-r--r-- | conf/distro/shr.conf | 1 |
2 files changed, 0 insertions, 3 deletions
diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf index 9ab1bb9864..befbb80fc5 100644 --- a/conf/compatibility-providers.conf +++ b/conf/compatibility-providers.conf @@ -13,8 +13,6 @@ PREFERRED_PROVIDER_dbus-glib ?= "dbus-glib" PREFERRED_PROVIDER_esound ?= "pulseaudio" #PREFERRED_PROVIDER_e-wm-menu ?= "e-wm-menu-shr" PREFERRED_PROVIDER_e-wm-menu ?= "e-wm-menu" -#PREFERRED_PROVIDER_frameworkd-config ?= "frameworkd-config-shr" -PREFERRED_PROVIDER_frameworkd-config ?= "frameworkd-config" PREFERRED_PROVIDER_gconf ?= "gconf" #PREFERRED_PROVIDER_gconf ?= "gconf-dbus" PREFERRED_PROVIDER_gdk-pixbuf-csource-native ?= "gtk+-native" diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf index 7670caa491..59ad0be135 100644 --- a/conf/distro/shr.conf +++ b/conf/distro/shr.conf @@ -176,7 +176,6 @@ PREFERRED_PROVIDER_atd = "atd-over-fso" PREFERRED_PROVIDER_opkg = "opkg" # virtual/libgl is used ie in xorg-xserver which is not MACHINE_ARCH so we need to keep it consistent across multiple machines using same xorg-xserver PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" -PREFERRED_PROVIDER_frameworkd-config = "frameworkd-config-shr" ############################################################################# # PREFERRED VERSIONS |