summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIhar Hrachyshka <ihar.hrachyshka@gmail.com>2009-05-25 01:18:33 +0000
committerKoen Kooi <koen@openembedded.org>2009-05-31 11:59:54 +0200
commitd6606b5feead01f3f6b4e51d0d4cddb601ac7992 (patch)
treefa9ebf497d2dd360ed02aee4628d4f29737a6696
parent0e6b0d58f40668da496ff0209c93dd444e7b2fa0 (diff)
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@gmail.com> Acked-by: Phil Blundell <philb@gnu.org> Signed-off-by: Koen Kooi <koen@openembedded.org>
-rw-r--r--classes/gnome.bbclass8
1 files changed, 5 insertions, 3 deletions
diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass
index d2ca739e40..da88884dde 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/*
+}
+