[oe-commits] Koen Kooi : gnome: split out gnomebase.bbclass that doesn' t have gconf and gmime depends
git version control
git at git.openembedded.org
Fri Apr 16 21:14:55 UTC 2010
Module: openembedded.git
Branch: shr/unstable
Commit: afe441d2c653dff06855d5c8977018d65b87564c
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=afe441d2c653dff06855d5c8977018d65b87564c
Author: Koen Kooi <koen at openembedded.org>
Date: Thu Apr 15 08:40:36 2010 +0200
gnome: split out gnomebase.bbclass that doesn't have gconf and gmime depends
---
classes/gnome.bbclass | 33 +--------------------------------
classes/gnomebase.bbclass | 30 ++++++++++++++++++++++++++++++
classes/recipe_sanity.bbclass | 2 +-
3 files changed, 32 insertions(+), 33 deletions(-)
diff --git a/classes/gnome.bbclass b/classes/gnome.bbclass
index 57ff367..d5fbe26 100644
--- a/classes/gnome.bbclass
+++ b/classes/gnome.bbclass
@@ -1,34 +1,3 @@
-def gnome_verdir(v):
- import re
- m = re.match("^([0-9]+)\.([0-9]+)", v)
- return "%s.%s" % (m.group(1), m.group(2))
+inherit gnomebase gtk-icon-cache gconf mime
-SECTION ?= "x11/gnome"
-SRC_URI = "${GNOME_MIRROR}/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.bz2;name=archive"
-
-DEPENDS += "gnome-common"
-
-FILES_${PN} += "${datadir}/application-registry \
- ${datadir}/mime-info \
- ${datadir}/mime/packages \
- ${datadir}/mime/application \
- ${datadir}/gnome-2.0 \
- ${datadir}/polkit* \
-"
-
-FILES_${PN}-doc += "${datadir}/devhelp"
-
-inherit autotools gtk-icon-cache pkgconfig gconf mime
-
-AUTOTOOLS_STAGE_PKGCONFIG = "1"
-
-gnome_stage_includes() {
- autotools_stage_includes
-}
-
-do_install_append() {
- rm -rf ${D}${localstatedir}/lib/scrollkeeper/*
- rm -rf ${D}${localstatedir}/scrollkeeper/*
- rm -f ${D}${datadir}/applications/*.cache
-}
diff --git a/classes/gnomebase.bbclass b/classes/gnomebase.bbclass
new file mode 100644
index 0000000..b50504f
--- /dev/null
+++ b/classes/gnomebase.bbclass
@@ -0,0 +1,30 @@
+def gnome_verdir(v):
+ import re
+ m = re.match("^([0-9]+)\.([0-9]+)", v)
+ return "%s.%s" % (m.group(1), m.group(2))
+
+SECTION ?= "x11/gnome"
+SRC_URI = "${GNOME_MIRROR}/${BPN}/${@gnome_verdir("${PV}")}/${BPN}-${PV}.tar.bz2;name=archive"
+
+DEPENDS += "gnome-common"
+
+FILES_${PN} += "${datadir}/application-registry \
+ ${datadir}/mime-info \
+ ${datadir}/mime/packages \
+ ${datadir}/mime/application \
+ ${datadir}/gnome-2.0 \
+ ${datadir}/polkit* \
+"
+
+FILES_${PN}-doc += "${datadir}/devhelp"
+
+inherit autotools pkgconfig
+
+AUTOTOOLS_STAGE_PKGCONFIG = "1"
+
+do_install_append() {
+ rm -rf ${D}${localstatedir}/lib/scrollkeeper/*
+ rm -rf ${D}${localstatedir}/scrollkeeper/*
+ rm -f ${D}${datadir}/applications/*.cache
+}
+
diff --git a/classes/recipe_sanity.bbclass b/classes/recipe_sanity.bbclass
index 127806e..daae4ae 100644
--- a/classes/recipe_sanity.bbclass
+++ b/classes/recipe_sanity.bbclass
@@ -51,7 +51,7 @@ def can_use_autotools_base(cfgdata, d):
if not bb.data.inherits_class("autotools", d):
return False
- for i in ["autoreconf"] + ["%s_do_configure" % cls for cls in ["gnome", "e", "autotools", "autotools_stage", "efl", "gpephone", "openmoko", "openmoko2", "xfce", "xlibs"]]:
+ for i in ["autoreconf"] + ["%s_do_configure" % cls for cls in ["gnomebase", "gnome", "e", "autotools", "autotools_stage", "efl", "gpephone", "openmoko", "openmoko2", "xfce", "xlibs"]]:
if cfg.find(i) != -1:
return False
More information about the Openembedded-commits
mailing list