e-wm,efl: create e-base.bbclass with common settings and EFL_SRCREV

* include it from e.bbclass, efl.bbclass and now also python-efl.inc
* also use BPN instead of "${@bb.data.getVar('PN', d, 1).replace('-native', '')}"

Acked-by: Klaus Kurzmann <mok@fluxnetz.de>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

diff --git a/classes/e-base.bbclass b/classes/e-base.bbclass
new file mode 100644 (file)
index 0000000..81f6b8a
--- /dev/null
+++ b/classes/e-base.bbclass
@@ -0,0 +1,8 @@
+HOMEPAGE = "http://www.enlightenment.org"
+SRCNAME ?= "${BPN}"
+
+EFL_SRCREV ?= "54714"
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=${SRCNAME};proto=http"
+S = "${WORKDIR}/${SRCNAME}"
+
+ARM_INSTRUCTION_SET = "arm"

diff --git a/classes/e.bbclass b/classes/e.bbclass
index 5db0749..88a1f6a 100644 (file)
--- a/classes/e.bbclass
+++ b/classes/e.bbclass
@@ -1,13 +1,6 @@
-HOMEPAGE = "http://www.enlightenment.org"
 SECTION = "e/apps"
-SRCNAME ?= "${PN}"
 
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=${SRCNAME};proto=http"
-S = "${WORKDIR}/${SRCNAME}"
-
-ARM_INSTRUCTION_SET = "arm"
-
-inherit autotools pkgconfig binconfig
+inherit e-base autotools pkgconfig binconfig
 
 do_prepsources () {
        make clean distclean || true

diff --git a/classes/efl.bbclass b/classes/efl.bbclass
index f148e9c..518444e 100644 (file)
--- a/classes/efl.bbclass
+++ b/classes/efl.bbclass
@@ -1,17 +1,11 @@
 SECTION = "e/libs"
-HOMEPAGE = "http://www.enlightenment.org"
 LICENSE = "MIT BSD"
-SRCNAME = "${@bb.data.getVar('PN', d, 1).replace('-native', '')}"
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk;module=${SRCNAME};proto=http"
-S = "${WORKDIR}/${SRCNAME}"
 DEPENDS += "pkgconfig-native"
 
 # revision 0d93ec84b30bc1bee2caaee72d667f87bc468a70 made SRCDATE and hence PV go backwards, so we need to up PE to unbreak builds and feeds :(
 PE = "2"
 
-ARM_INSTRUCTION_SET = "arm"
-
-inherit autotools
+inherit e-base autotools
 
 # evas-native looks at this var, so keep it
 AUTOTOOLS_STAGE_PKGCONFIG = "1"

diff --git a/conf/distro/include/sane-srcrevs.inc b/conf/distro/include/sane-srcrevs.inc
index 9531ae4..e69de29 100644 (file)
--- a/conf/distro/include/sane-srcrevs.inc
+++ b/conf/distro/include/sane-srcrevs.inc
@@ -1,3 +0,0 @@
-# only SRCREVs included in more recipes should be here, otherwise put sane SRCREV to recipe directly
-
-EFL_SRCREV ?= "54714"

diff --git a/recipes/efl1/libeflvala_svn.bb b/recipes/efl1/libeflvala_svn.bb
index 22159e6..35f6872 100644 (file)
--- a/recipes/efl1/libeflvala_svn.bb
+++ b/recipes/efl1/libeflvala_svn.bb
@@ -7,11 +7,11 @@ PV = "0.5.0+svnr${SRCPV}"
 PR = "r1"
 PE = "1"
 SRCREV = "${EFL_SRCREV}"
+SRCNAME = "vala"
 
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/BINDINGS;module=vala;proto=http"
-S = "${WORKDIR}/vala"
+inherit e-base autotools pkgconfig vala
 
-inherit autotools pkgconfig vala
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/BINDINGS;module=${SRCNAME};proto=http"
 
 PACKAGES =+ "${PN}-examples"
 FILES_${PN}-examples = "${datadir}/libeflvala ${bindir}/*"

diff --git a/recipes/python/python-efl.inc b/recipes/python/python-efl.inc
index 1b4a88f..5fc6b9c 100644 (file)
--- a/recipes/python/python-efl.inc
+++ b/recipes/python/python-efl.inc
@@ -1,7 +1,6 @@
 DESCRIPTION = "${PN} bindings"
 LICENSE = "BSD"
 AUTHOR = "Gustavo Sverzut Barbieri <barbieri@gmail.com>"
-HOMEPAGE = "http://www.enlightenment.org"
 # NOTE: Due to a bug in distutils, even if we don't use pyrex but cython,
 # we need to build pyrex otherwise cython doesn't get called to build
 # the extension modules.
@@ -14,10 +13,9 @@ PR = "ml1"
 export BUILD_SYS
 export HOST_SYS
 
-inherit autotools pkgconfig distutils-base
+inherit e-base autotools pkgconfig distutils-base
 
-SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/BINDINGS/python;module=${PN};proto=http"
-S = "${WORKDIR}/${PN}"
+SRC_URI = "svn://svn.enlightenment.org/svn/e/trunk/BINDINGS/python;module=${SRCNAME};proto=http"
 
 do_configure_prepend() {
        # prefix CYTHON_.*_INCLUDEDIR with path to STAGING_DIR_HOST also use $PKG_CONFIG instead of pkg-config directly