Dear Dmitry,

Am Sonntag, den 21.08.2011, 12:00 +0400 schrieb Dmitry Eremin-Solenikov:
> During compilation gdu looks for several UDisks dbus xml files. However
> it looks for them in system root and not in sysroot, failing if those
> don't exist. Fix that.

could you paste the error message please?

> Signed-off-by: Dmitry Eremin-Solenikov <[email protected]>
> ---
>  .../gnome-disk-utility/fix-dbus-interfaces.patch   |   35 
> ++++++++++++++++++++
>  .../gnome-disk-utility_2.32.0.bb                   |    1 +
>  2 files changed, 36 insertions(+), 0 deletions(-)
>  create mode 100644 
> meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch
> 
> diff --git 
> a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch
>  
> b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch
> new file mode 100644
> index 0000000..1faadb1
> --- /dev/null
> +++ 
> b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility/fix-dbus-interfaces.patch

The patch header is missing [1]. You can also paste the error message in
here.

> @@ -0,0 +1,35 @@
> +Index: gnome-disk-utility-2.32.0/src/gdu/Makefile.am
> +===================================================================
> +--- gnome-disk-utility-2.32.0.orig/src/gdu/Makefile.am       2011-08-20 
> 01:59:16.000000000 +0400
> ++++ gnome-disk-utility-2.32.0/src/gdu/Makefile.am    2011-08-20 
> 02:08:18.000000000 +0400
> +@@ -14,20 +14,20 @@
> + gdu-marshal.c: gdu-marshal.list
> +     echo "#include \"gdu-marshal.h\"" > $@ && glib-genmarshal $< 
> --prefix=gdu_marshal --body >> $@
> + 
> +-udisks-daemon-glue.h: 
> /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml Makefile.am
> +-    dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client 
> --output=udisks-daemon-glue.h 
> /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml
> ++udisks-daemon-glue.h: 
> $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml
>  Makefile.am
> ++    dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client 
> --output=udisks-daemon-glue.h 
> $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.xml

Hardcoding the path is certainly not portable/good for cross
compilation. There should be another Aufomake(?) variable for looking up
the sysroot besides using `pkg-config`. I do not know what though. Who
distributes `org.freedesktop.UDisks.xml`? It looks like `udisk`.

Anybody else?

> +-udisks-device-glue.h: 
> /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml Makefile.am
> +-    dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client 
> --output=udisks-device-glue.h 
> /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml
> ++udisks-device-glue.h: 
> $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml
>  Makefile.am
> ++    dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client 
> --output=udisks-device-glue.h 
> $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Device.xml
> + 
> +-udisks-adapter-glue.h: 
> /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml Makefile.am
> +-    dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client 
> --output=udisks-adapter-glue.h 
> /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml
> ++udisks-adapter-glue.h: 
> $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml
>  Makefile.am
> ++    dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client 
> --output=udisks-adapter-glue.h 
> $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Adapter.xml
> + 
> +-udisks-expander-glue.h: 
> /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml Makefile.am
> +-    dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client 
> --output=udisks-expander-glue.h 
> /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml
> ++udisks-expander-glue.h: 
> $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml
>  Makefile.am
> ++    dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client 
> --output=udisks-expander-glue.h 
> $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Expander.xml
> + 
> +-udisks-port-glue.h: 
> /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml Makefile.am
> +-    dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client 
> --output=udisks-port-glue.h 
> /usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml
> ++udisks-port-glue.h: 
> $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml
>  Makefile.am
> ++    dbus-binding-tool --prefix=devkit_disks_daemon --mode=glib-client 
> --output=udisks-port-glue.h 
> $(PKG_CONFIG_SYSROOT_DIR)/usr/share/dbus-1/interfaces/org.freedesktop.UDisks.Port.xml
> + 
> + lib_LTLIBRARIES=libgdu.la
> + 
> diff --git 
> a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb 
> b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
> index f7945c5..ab1113c 100644
> --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
> +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_2.32.0.bb
> @@ -11,6 +11,7 @@ SRC_URI[archive.sha256sum] = 
> "03e461b6bda7f773f8018d25fa3213d3073d4dc83a76e6b39d
>  
>  SRC_URI += "\
>       file://disable-scrollkeeper.patch \
> +     file://fix-dbus-interfaces.patch \
>       "
>  
>  EXTRA_OECONF += "--disable-scrollkeeper"


Thanks,

Paul


[1] http://openembedded.org/index.php/Commit_Patch_Message_Guidelines

Attachment: signature.asc
Description: This is a digitally signed message part

_______________________________________________
Openembedded-devel mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

Reply via email to