[oe-commits] Martin Jansa : Revert "vala.bbclass and assorted recipes: create own task for installing .vapi and .deps instead of using do_stage() "
git version control
git at git.openembedded.org
Mon Apr 26 14:36:25 UTC 2010
Module: openembedded.git
Branch: org.openembedded.dev
Commit: f15dd93fe454d377dac331ad45dd239b23c1eadc
URL: http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=f15dd93fe454d377dac331ad45dd239b23c1eadc
Author: Martin Jansa <Martin.Jansa at gmail.com>
Date: Mon Apr 26 16:34:35 2010 +0200
Revert "vala.bbclass and assorted recipes: create own task for installing .vapi and .deps instead of using do_stage()"
* This reverts commit a38e7ff2810e55455c7ff7b01d4882344b420e18.
* It was discussed on oe-devel ML and ACKed by Mickey
* Side effect of this was also: Everything rebuilt after it cannot be
found when used later (NOTE: Couldn't find shared library provider for
libfso-glib.so.0) and it's dropped from package RDEPENDS.
---
classes/vala.bbclass | 7 +------
recipes/freesmartphone/fso-alsa_git.bb | 6 +++++-
recipes/freesmartphone/libframeworkd-glib_git.bb | 7 ++++++-
recipes/freesmartphone/libfso-glib_git.bb | 6 +++++-
recipes/freesmartphone/libgsm0710_git.bb | 2 +-
recipes/freesmartphone/libgsm0710mux_git.bb | 2 +-
recipes/freesmartphone/libpersistence_git.bb | 2 +-
recipes/freesmartphone/mdbus2_git.bb | 6 +++++-
recipes/freesmartphone/mioctl_git.bb | 4 ++++
recipes/freesmartphone/mkdump_git.bb | 5 +++++
recipes/freesmartphone/msmcommd_git.bb | 5 ++++-
recipes/freesmartphone/mterm2_git.bb | 4 ++++
recipes/freesmartphone/zhone2_git.bb | 2 +-
13 files changed, 43 insertions(+), 15 deletions(-)
diff --git a/classes/vala.bbclass b/classes/vala.bbclass
index e6b601b..433b64e 100644
--- a/classes/vala.bbclass
+++ b/classes/vala.bbclass
@@ -6,19 +6,14 @@ DEPENDS += "vala-native"
FILES_${PN}-dev += "\
${datadir}/vala/vapi/*.vapi \
${datadir}/vala/vapi/*.deps \
- ${datadir}/gir-1.0 \
"
VALA_DONT_STAGE_VAPIS ?= "\(/config.vapi$\)\|\(/config.deps$\)"
# .vapi and .deps files are arch independent and need to be present in the
# staging datadir for the native vala compiler
-vala_do_stage_vapi() {
+do_stage_append() {
install -d ${STAGING_DATADIR_NATIVE}/vala/vapi
for VALAFILE in `find . -name "*.vapi" | grep -v "$VALA_DONT_STAGE_VAPIS"`; do install -m 0644 ${VALAFILE} ${STAGING_DATADIR_NATIVE}/vala/vapi/; done
for VALAFILE in `find . -name "*.deps" | grep -v "$VALA_DONT_STAGE_VAPIS"`; do install -m 0644 ${VALAFILE} ${STAGING_DATADIR_NATIVE}/vala/vapi/; done
}
-
-EXPORT_FUNCTIONS do_stage_vapi
-
-addtask stage_vapi after do_populate_staging before do_package
diff --git a/recipes/freesmartphone/fso-alsa_git.bb b/recipes/freesmartphone/fso-alsa_git.bb
index b83613e..8f5e173 100644
--- a/recipes/freesmartphone/fso-alsa_git.bb
+++ b/recipes/freesmartphone/fso-alsa_git.bb
@@ -11,4 +11,8 @@ PR = "r0"
SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
S = "${WORKDIR}/git/tools/fso-alsa"
-inherit autotools vala
+do_stage() {
+ :
+}
+
+inherit autotools_stage vala
diff --git a/recipes/freesmartphone/libframeworkd-glib_git.bb b/recipes/freesmartphone/libframeworkd-glib_git.bb
index 21cab5d..5fa47d8 100644
--- a/recipes/freesmartphone/libframeworkd-glib_git.bb
+++ b/recipes/freesmartphone/libframeworkd-glib_git.bb
@@ -10,4 +10,9 @@ PR = "r0"
SRC_URI = "${FREESMARTPHONE_GIT}/libframeworkd-glib.git;protocol=git;branch=master"
S = "${WORKDIR}/git"
-inherit autotools
+inherit autotools pkgconfig
+
+do_stage() {
+ autotools_stage_all
+}
+
diff --git a/recipes/freesmartphone/libfso-glib_git.bb b/recipes/freesmartphone/libfso-glib_git.bb
index d7de052..8984741 100644
--- a/recipes/freesmartphone/libfso-glib_git.bb
+++ b/recipes/freesmartphone/libfso-glib_git.bb
@@ -8,7 +8,11 @@ PV = "0.2.2+gitr${SRCPV}"
PE = "1"
PR = "r4"
-inherit autotools vala
+inherit autotools_stage pkgconfig vala
+
+PARALLEL_MAKE = ""
SRC_URI = "${FREESMARTPHONE_GIT}/libfso-glib.git;protocol=git;branch=master"
S = "${WORKDIR}/git"
+
+FILES_${PN}-dev += "${datadir}/gir-1.0/*.gir"
diff --git a/recipes/freesmartphone/libgsm0710_git.bb b/recipes/freesmartphone/libgsm0710_git.bb
index 2c78789..6b78c9f 100644
--- a/recipes/freesmartphone/libgsm0710_git.bb
+++ b/recipes/freesmartphone/libgsm0710_git.bb
@@ -9,4 +9,4 @@ PR = "r0"
SRC_URI = "${FREESMARTPHONE_GIT}/libgsm0710.git;protocol=git;branch=master"
S = "${WORKDIR}/git"
-inherit autotools vala
+inherit autotools_stage pkgconfig vala
diff --git a/recipes/freesmartphone/libgsm0710mux_git.bb b/recipes/freesmartphone/libgsm0710mux_git.bb
index fe94d21..f85be3c 100644
--- a/recipes/freesmartphone/libgsm0710mux_git.bb
+++ b/recipes/freesmartphone/libgsm0710mux_git.bb
@@ -11,4 +11,4 @@ PR = "r0"
SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
S = "${WORKDIR}/git/libgsm0710mux"
-inherit autotools vala
+inherit autotools_stage pkgconfig vala
diff --git a/recipes/freesmartphone/libpersistence_git.bb b/recipes/freesmartphone/libpersistence_git.bb
index ab1892e..0550045 100644
--- a/recipes/freesmartphone/libpersistence_git.bb
+++ b/recipes/freesmartphone/libpersistence_git.bb
@@ -13,4 +13,4 @@ SRC_URI = "\
"
S = "${WORKDIR}/git"
-inherit autotools vala
+inherit autotools_stage pkgconfig vala
diff --git a/recipes/freesmartphone/mdbus2_git.bb b/recipes/freesmartphone/mdbus2_git.bb
index dd0336c..76af519 100644
--- a/recipes/freesmartphone/mdbus2_git.bb
+++ b/recipes/freesmartphone/mdbus2_git.bb
@@ -12,4 +12,8 @@ PE = "1"
SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
S = "${WORKDIR}/git/tools/mdbus2"
-inherit autotools vala
+do_stage() {
+ :
+}
+
+inherit autotools_stage vala
diff --git a/recipes/freesmartphone/mioctl_git.bb b/recipes/freesmartphone/mioctl_git.bb
index e09c424..56bb1c4 100644
--- a/recipes/freesmartphone/mioctl_git.bb
+++ b/recipes/freesmartphone/mioctl_git.bb
@@ -10,4 +10,8 @@ PR = "r0"
SRC_URI = "${FREESMARTPHONE_GIT}/cornucopia.git;protocol=git;branch=master"
S = "${WORKDIR}/git/tools/mioctl"
+do_stage() {
+ :
+}
+
inherit autotools vala
diff --git a/recipes/freesmartphone/mkdump_git.bb b/recipes/freesmartphone/mkdump_git.bb
index b31f896..4d7be38 100644
--- a/recipes/freesmartphone/mkdump_git.bb
+++ b/recipes/freesmartphone/mkdump_git.bb
@@ -16,3 +16,8 @@ SRC_URI = "\
S = "${WORKDIR}/git/tools/mkdump"
inherit autotools vala
+
+do_stage() {
+ :
+}
+
diff --git a/recipes/freesmartphone/msmcommd_git.bb b/recipes/freesmartphone/msmcommd_git.bb
index 5330792..7177e50 100644
--- a/recipes/freesmartphone/msmcommd_git.bb
+++ b/recipes/freesmartphone/msmcommd_git.bb
@@ -12,8 +12,11 @@ PE = "1"
SRC_URI = "${FREESMARTPHONE_GIT}/msmcomm.git;protocol=git;branch=master"
S = "${WORKDIR}/git"
-inherit autotools vala
+inherit autotools_stage vala
+
+PARALLEL_MAKE = ""
PACKAGES =+ "${PN}-lib ${PN}-term"
FILES_${PN}-lib = "${libdir}/lib*.so.*"
FILES_${PN}-term = "${sbindir}/msmvterm"
+
diff --git a/recipes/freesmartphone/mterm2_git.bb b/recipes/freesmartphone/mterm2_git.bb
index a99f848..f459a4a 100644
--- a/recipes/freesmartphone/mterm2_git.bb
+++ b/recipes/freesmartphone/mterm2_git.bb
@@ -14,6 +14,10 @@ SRC_URI = "\
"
S = "${WORKDIR}/git/tools/mterm2"
+do_stage() {
+ :
+}
+
inherit autotools vala
FILES_${PN} += "${datadir}"
diff --git a/recipes/freesmartphone/zhone2_git.bb b/recipes/freesmartphone/zhone2_git.bb
index 78a533b..11402b4 100644
--- a/recipes/freesmartphone/zhone2_git.bb
+++ b/recipes/freesmartphone/zhone2_git.bb
@@ -18,7 +18,7 @@ SRC_URI[splash.md5sum] = "e198d5c83cc47a216562e435df0e03c3"
SRC_URI[splash.sha256sum] = "3e41bcf4ea50ab7406d3833e412a78ddb9afaab4b0a8cca1bf93755d1ce9a215"
S = "${WORKDIR}/git/zhone2"
-inherit autotools update-rc.d
+inherit autotools_stage update-rc.d
INITSCRIPT_NAME = "zhone2"
INITSCRIPT_PARAMS = "defaults 40"
More information about the Openembedded-commits
mailing list