Skip to contentSkip to conversation

dbus-glib: corrected native and cross recipe.

PATCH In review Alessandro Sappia 2 participants 3 messages Jul 26, 2011

lore
Share & tools
lore
#0 lore raw

PATCH v4 1/1 dbus-glib: corrected native and cross recipe.

* dbus-glib require some source files generated during native build in order to build on target.

---
 recipes/dbus/dbus-glib.inc     |    8 ++++----
 recipes/dbus/dbus-glib_0.86.bb |    7 +------
 2 files changed, 5 insertions(+), 10 deletions(-)
recipes/dbus/dbus-glib.inc +4 -4
index c1c1813..7208e91 100644
@@ -21,19 +21,19 @@ inherit autotools pkgconfig gettext
 
 BBCLASSEXTEND = "native"
 
-do_configure_prepend() {
+do_configure() {
         install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml ${S}/tools/
         install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/
-
+        autotools_do_configure
 }
 
 do_configure_virtclass-native() {
         autotools_do_configure
 }
 
-do_install_virtclass-native() {
-        autotools_do_install
+do_install_append_virtclass-native() {
         install -d ${D}${datadir}/dbus
+        install -m 0644 dbus-bus-introspect.xml ${D}${datadir}/dbus
         install -m 0644 tools/dbus-glib-bindings.h ${D}${datadir}/dbus
 }
 
recipes/dbus/dbus-glib_0.86.bb +1 -6
index ce87d5d..ff9a2d6 100644
@@ -1,14 +1,9 @@
 require dbus-glib.inc
 
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
 
 SRC_URI_virtclass-native += "file://run-with-tmp-session-bus.patch"
 
-do_install_virtclass-native_prepend() {
-        install -d ${D}${datadir}/dbus
-        install -m 0644 dbus-bus-introspect.xml ${D}${datadir}/dbus
-}
-
 SRC_URI[md5sum] = "cd0ab148fb0c786fc88be49d19971f50"
 SRC_URI[sha256sum] = "5351a6e7f38ffc641c34b4a4cdd9bed1c1dc7043a501096bac00a2876ea90bdc"
 
Signature · 1 line
1.7.4.1
#1 lore raw

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Op 26-07-11 11:21, Alessandro Sappia schreef:

Quoted 6 lines

* dbus-glib require some source files generated during native build in order to build on target.

recipes/dbus/dbus-glib.inc index c1c1813..7208e91 100644 --- a/recipes/dbus/dbus-glib.inc +++ b/recipes/dbus/dbus-glib.inc @@ -21,19 +21,19 @@ inherit autotools pkgconfig gettext renamed from recipes/dbus/dbus-glib.inc +0 -0
Quoted 7 lines

BBCLASSEXTEND = "native"

-do_configure_prepend() { +do_configure() { install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml ${S}/tools/ install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/ - + autotools_do_configure }

do_configure_virtclass-native() { autotools_do_configure }

-do_install_virtclass-native() { - autotools_do_install +do_install_append_virtclass-native() { install -d ${D}${datadir}/dbus + install -m 0644 dbus-bus-introspect.xml ${D}${datadir}/dbus install -m 0644 tools/dbus-glib-bindings.h ${D}${datadir}/dbus }

Out of curiousity, why are you mixing the 2 styles (append/prepend vs replacement) in this commit? -----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)

iD8DBQFOLotJMkyGM64RGpERAtxQAJ9fx8JYvkmBFWQfT2l7psyH1YVZtACgjhtM PrBwskppuQwnIaNDdwCqFQU=
=G6gv
-----END PGP SIGNATURE-----

#2 lore raw
In reply to Alessandro Sappia

Koen Kooi - 2011-07-26 09:39:21

Quoted 11 lines

Op 26-07-11 11:21, Alessandro Sappia schreef:

Quoted 8 lines

* dbus-glib require some source files generated during native build in order to build on target.

recipes/dbus/dbus-glib.inc index c1c1813..7208e91 100644 --- a/recipes/dbus/dbus-glib.inc +++ b/recipes/dbus/dbus-glib.inc @@ -21,19 +21,19 @@ inherit autotools pkgconfig gettext renamed from recipes/dbus/dbus-glib.inc +0 -0

BBCLASSEXTEND = "native"

Quoted 8 lines
Quoted 5 lines

-do_configure_prepend() { +do_configure() { install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml ${S}/tools/ install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/ - + autotools_do_configure }

do_configure_virtclass-native() { autotools_do_configure }

-do_install_virtclass-native() { - autotools_do_install +do_install_append_virtclass-native() { install -d ${D}${datadir}/dbus + install -m 0644 dbus-bus-introspect.xml ${D}${datadir}/dbus install -m 0644 tools/dbus-glib-bindings.h ${D}${datadir}/dbus }

Out of curiousity, why are you mixing the 2 styles (append/prepend vs replacement) in this commit?

This is because, didn't checked why, do_configure_prepend() didn't worked seamless, while do_install_append works fine for me. Before further investigation occurs, as this build is needed for those starting now to build I wrote this way. A better solution would be available if a virtclass-cross would exists, while now we have just virtclass-sdk and virtclass-native.

Are you OK with the patch ?

Regards,

Alessandro