diff options
author | Andreas Müller <schnitzeltony@googlemail.com> | 2013-03-29 22:19:58 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-04-02 18:11:06 +0100 |
commit | 69aaafe5efd08f27d9d4af40175237b735c86f4e (patch) | |
tree | 9ab4c90c7ddd8fc997c8da0ae8539a1f3acee902 | |
parent | e1dbbdc729802f1fa5e3a0e97f1bf916011d7d4f (diff) | |
download | poky-69aaafe5efd08f27d9d4af40175237b735c86f4e.tar.gz |
remove gtk-update-icon-cache-native virtuals
gtk-update-icon-cache-native is the only provider now
(From OE-Core rev: 7e437aa3e0ec862aac69a4434be0b2b652d26972)
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/classes/gtk-icon-cache.bbclass | 2 | ||||
-rw-r--r-- | meta/conf/distro/include/default-providers.inc | 1 | ||||
-rw-r--r-- | meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/meta/classes/gtk-icon-cache.bbclass b/meta/classes/gtk-icon-cache.bbclass index a5d642c954..6d205a1473 100644 --- a/meta/classes/gtk-icon-cache.bbclass +++ b/meta/classes/gtk-icon-cache.bbclass | |||
@@ -1,6 +1,6 @@ | |||
1 | FILES_${PN} += "${datadir}/icons/hicolor" | 1 | FILES_${PN} += "${datadir}/icons/hicolor" |
2 | 2 | ||
3 | DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} virtual/gtk-update-icon-cache-native" | 3 | DEPENDS += "${@['hicolor-icon-theme', '']['${BPN}' == 'hicolor-icon-theme']} gtk-update-icon-cache-native" |
4 | 4 | ||
5 | # | 5 | # |
6 | # On host, the postinstall MUST return 1 because we do not know if the intercept | 6 | # On host, the postinstall MUST return 1 because we do not know if the intercept |
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index e3a44e69fb..4b665225ac 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc | |||
@@ -12,7 +12,6 @@ PREFERRED_PROVIDER_virtual/update-alternatives ?= "opkg" | |||
12 | PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" | 12 | PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native" |
13 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" | 13 | PREFERRED_PROVIDER_virtual/libx11 ?= "libx11" |
14 | PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" | 14 | PREFERRED_PROVIDER_xf86-video-intel ?= "xf86-video-intel" |
15 | PREFERRED_PROVIDER_virtual/gtk-update-icon-cache-native ?= "gtk-update-icon-cache-native" | ||
16 | 15 | ||
17 | # | 16 | # |
18 | # Default virtual runtime providers | 17 | # Default virtual runtime providers |
diff --git a/meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb b/meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb index ea99c14901..93c30a75b1 100644 --- a/meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb +++ b/meta/recipes-gnome/gtk+/gtk-update-icon-cache-native_3.4.4.bb | |||
@@ -2,8 +2,6 @@ SUMMARY = "gtk-update-icon-cache built natively" | |||
2 | DESCRIPTION = "Just gtk-update-icon-cache built from GTK+ natively, for on-host postinst script execution." | 2 | DESCRIPTION = "Just gtk-update-icon-cache built from GTK+ natively, for on-host postinst script execution." |
3 | SECTION = "libs" | 3 | SECTION = "libs" |
4 | 4 | ||
5 | PROVIDES = "virtual/gtk-update-icon-cache-native" | ||
6 | |||
7 | DEPENDS = "gdk-pixbuf-native" | 5 | DEPENDS = "gdk-pixbuf-native" |
8 | 6 | ||
9 | LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" | 7 | LICENSE = "LGPLv2 & LGPLv2+ & LGPLv2.1+" |