Patchwork [v2] dbus-glib: install required files for target on native build

login
register
mail settings
Submitter Alessandro Sappia
Date July 6, 2011, 11:56 a.m.
Message ID <1309953417-8572-1-git-send-email-a.sappia@biotechware.com>
Download mbox | patch
Permalink /patch/7089/
State New, archived
Headers show

Comments

Alessandro Sappia - July 6, 2011, 11:56 a.m.
dbus-glib-native and dbus-glib were not compiling. This patch corrects
dbus-glib-native to install required files in order to let dbus-glib
to compile on target.

Signed-off-by: Alessandro Sappia <a.sappia@biotechware.com>
---
 recipes/dbus/dbus-glib.inc     |    4 ++--
 recipes/dbus/dbus-glib_0.86.bb |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)
Henning Heinold - July 6, 2011, 12:11 p.m.
On Wed, Jul 06, 2011 at 01:56:57PM +0200, Alessandro Sappia wrote:
> dbus-glib-native and dbus-glib were not compiling. This patch corrects
> dbus-glib-native to install required files in order to let dbus-glib
> to compile on target.
> 
> Signed-off-by: Alessandro Sappia <a.sappia@biotechware.com>
> ---
>  recipes/dbus/dbus-glib.inc     |    4 ++--
>  recipes/dbus/dbus-glib_0.86.bb |    4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/recipes/dbus/dbus-glib.inc b/recipes/dbus/dbus-glib.inc
> index c1c1813..d3db9f0 100644
> --- a/recipes/dbus/dbus-glib.inc
> +++ b/recipes/dbus/dbus-glib.inc
> @@ -21,10 +21,10 @@ 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
>  }
^^^^^^^^^^^^^

Why you changed this? The code in resulting shellfile should be looking the same,
but using the prepend is normaly the better way.

>  
>  do_configure_virtclass-native() {
> diff --git a/recipes/dbus/dbus-glib_0.86.bb b/recipes/dbus/dbus-glib_0.86.bb
> index ce87d5d..1cef831 100644
> --- a/recipes/dbus/dbus-glib_0.86.bb
> +++ b/recipes/dbus/dbus-glib_0.86.bb
> @@ -1,10 +1,10 @@
>  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() {
> +do_install_append_virtclass-native() {
>          install -d ${D}${datadir}/dbus
>          install -m 0644 dbus-bus-introspect.xml ${D}${datadir}/dbus
>  }

I hope this works, there was some problems with the whole introspection stuff.

Bye henning
Alessandro Sappia - July 6, 2011, 12:36 p.m.
Il giorno mer, 06/07/2011 alle 14.11 +0200, Henning Heinold ha scritto:
> On Wed, Jul 06, 2011 at 01:56:57PM +0200, Alessandro Sappia wrote:
> > dbus-glib-native and dbus-glib were not compiling. This patch corrects
> > dbus-glib-native to install required files in order to let dbus-glib
> > to compile on target.
> > 
> > Signed-off-by: Alessandro Sappia <a.sappia@biotechware.com>
> > ---
> >  recipes/dbus/dbus-glib.inc     |    4 ++--
> >  recipes/dbus/dbus-glib_0.86.bb |    4 ++--
> >  2 files changed, 4 insertions(+), 4 deletions(-)
> > 
> > diff --git a/recipes/dbus/dbus-glib.inc b/recipes/dbus/dbus-glib.inc
> > index c1c1813..d3db9f0 100644
> > --- a/recipes/dbus/dbus-glib.inc
> > +++ b/recipes/dbus/dbus-glib.inc
> > @@ -21,10 +21,10 @@ 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
> >  }
> ^^^^^^^^^^^^^
> 
> Why you changed this? The code in resulting shellfile should be looking the same,
> but using the prepend is normaly the better way.
> 
Because later in the file there is do_configure_virtclass-native()
function.
The whole things is:
do_comfigure() is for cross compilation targets, while
do_configure_virtclass-native() is for native
OE enviroment.

This is because the do_configure_prepend() was executed also on native
target, which we need to avoid.

If there was a virtclass-cross available (is it there ?) the patch may
be simplified in

do_configure_prepend_virtclass-cross(){
  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/
}

I'd like more to do this way, but this requires the definition of
virtclass-cross (or whatever the name it is if such a class exists
already): I wasn't able to find the correct virtclass for writing the
patch this way.

> >  
> >  do_configure_virtclass-native() {
> > diff --git a/recipes/dbus/dbus-glib_0.86.bb b/recipes/dbus/dbus-glib_0.86.bb
> > index ce87d5d..1cef831 100644
> > --- a/recipes/dbus/dbus-glib_0.86.bb
> > +++ b/recipes/dbus/dbus-glib_0.86.bb
> > @@ -1,10 +1,10 @@
> >  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() {
> > +do_install_append_virtclass-native() {
> >          install -d ${D}${datadir}/dbus
> >          install -m 0644 dbus-bus-introspect.xml ${D}${datadir}/dbus
> >  }
> 
> I hope this works, there was some problems with the whole introspection stuff.
> 
> Bye henning
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Patch

diff --git a/recipes/dbus/dbus-glib.inc b/recipes/dbus/dbus-glib.inc
index c1c1813..d3db9f0 100644
--- a/recipes/dbus/dbus-glib.inc
+++ b/recipes/dbus/dbus-glib.inc
@@ -21,10 +21,10 @@  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() {
diff --git a/recipes/dbus/dbus-glib_0.86.bb b/recipes/dbus/dbus-glib_0.86.bb
index ce87d5d..1cef831 100644
--- a/recipes/dbus/dbus-glib_0.86.bb
+++ b/recipes/dbus/dbus-glib_0.86.bb
@@ -1,10 +1,10 @@ 
 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() {
+do_install_append_virtclass-native() {
         install -d ${D}${datadir}/dbus
         install -m 0644 dbus-bus-introspect.xml ${D}${datadir}/dbus
 }