[oe-commits] Sebastian Krzyszkowiak : shr-splash: don't use PROVIDES, as it' s not used when resolving runtime deps nor image content; use SHR_SPLASH_THEME variable instead

git version control git at git.openembedded.org
Mon Jul 12 09:20:22 UTC 2010


Module: openembedded.git
Branch: org.openembedded.dev
Commit: 03b0bfff034eaa5a052252f4a05063d0103f62b4
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=03b0bfff034eaa5a052252f4a05063d0103f62b4

Author: Sebastian Krzyszkowiak <seba.dos1 at gmail.com>
Date:   Thu Jul  8 12:16:34 2010 +0000

shr-splash: don't use PROVIDES, as it's not used when resolving runtime deps nor image content; use SHR_SPLASH_THEME variable instead

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 conf/compatibility-providers.conf |    1 -
 recipes/shr/shr-splash-theme.inc  |    2 --
 recipes/shr/shr-splash_git.bb     |    7 ++++---
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/conf/compatibility-providers.conf b/conf/compatibility-providers.conf
index 350521a..3c193d6 100644
--- a/conf/compatibility-providers.conf
+++ b/conf/compatibility-providers.conf
@@ -70,6 +70,5 @@ PREFERRED_PROVIDER_virtual/libusb0 ?= "libusb-compat"
 PREFERRED_PROVIDER_virtual/libx11 ?= "libx11"
 PREFERRED_PROVIDER_virtual/libx11-native ?= "libx11-native"
 PREFERRED_PROVIDER_virtual/psplash ?= "psplash-angstrom"
-PREFERRED_PROVIDER_virtual/shr-splash-theme ?= "shr-splash-theme-logo"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
 PREFERRED_PROVIDER_xserver ?= "xserver-xorg"
diff --git a/recipes/shr/shr-splash-theme.inc b/recipes/shr/shr-splash-theme.inc
index 9fb1fd2..63e275f 100644
--- a/recipes/shr/shr-splash-theme.inc
+++ b/recipes/shr/shr-splash-theme.inc
@@ -1,5 +1,3 @@
-RPROVIDES_${PN} = "virtual/shr-splash-theme"
-PROVIDES  = "virtual/shr-splash-theme"
 RDEPENDS_${PN} += "shr-splash"
 
 inherit update-alternatives
diff --git a/recipes/shr/shr-splash_git.bb b/recipes/shr/shr-splash_git.bb
index 42a13ab..d6bb5c4 100644
--- a/recipes/shr/shr-splash_git.bb
+++ b/recipes/shr/shr-splash_git.bb
@@ -3,9 +3,10 @@ SECTION = "x11/data"
 LICENSE = "MIT BSD"
 SRCREV = "0375bf2b66a053dd490774004c56b5d949f02ac8"
 PV = "1.2+gitr${SRCPV}"
-PR = "r6"
-DEPENDS = "virtual/shr-splash-theme"
-RRECOMMENDS_${PN} = "virtual/shr-splash-theme"
+PR = "r7"
+SHR_SPLASH_THEME ?= "shr-splash-theme-logo"
+DEPENDS = "${SHR_SPLASH_THEME}"
+RRECOMMENDS_${PN} = "${SHR_SPLASH_THEME}"
 
 inherit update-rc.d
 





More information about the Openembedded-commits mailing list