[oe-commits] Ihar Hrachyshka : gnome.bbclass: remove unneeded scrollkeeper stuff from gnome packages.

git version control git at git.openembedded.org
Sun May 31 10:02:38 UTC 2009


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

Author: Ihar Hrachyshka <ihar.hrachyshka at gmail.com>
Date:   Mon May 25 01:18:33 2009 +0000

gnome.bbclass: remove unneeded scrollkeeper stuff from gnome packages.

Scrollkeeper generates its XML database for every package when
installing it. The problem is that while building it sees only specific
package scrollkeeper stuff so we get wrong scrollkeeper xml file
generated for every gnome.bbclass package. Including the file into every
gnome package results in package contents conflicts.

This patch removes a quick hack made by Koen with previous commit.

Signed-off-by: Ihar Hrachyshka <ihar.hrachyshka at gmail.com>
Acked-by: Phil Blundell <philb at gnu.org>
Signed-off-by: Koen Kooi <koen at openembedded.org>

---

 classes/gnome.bbclass |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass
index d2ca739..da88884 100644
--- a/classes/gnome.bbclass
+++ b/classes/gnome.bbclass
@@ -17,9 +17,11 @@ inherit autotools gtk-icon-cache pkgconfig gconf mime
 
 AUTOTOOLS_STAGE_PKGCONFIG = "1"
 
-PACKAGES =+ "${PN}-scrollkeeper-leftovers"
-FILES_${PN}-scrollkeeper-leftovers = "${localstatedir}/lib/scrollkeeper"
-
 gnome_stage_includes() {
 	autotools_stage_includes
 }
+
+do_install_append() {
+	rm -rf ${D}${localstatedir}/lib/scrollkeeper/*
+}
+





More information about the Openembedded-commits mailing list