All of lore.kernel.org
 help / color / mirror / Atom feed
* Another set of changes from world build
@ 2012-12-13 10:35 Marcin Juszkiewicz
  2012-12-13 10:35 ` [meta-oe][PATCH 1/7] modemmanager: update to 0.6.0.0 Marcin Juszkiewicz
                   ` (6 more replies)
  0 siblings, 7 replies; 11+ messages in thread
From: Marcin Juszkiewicz @ 2012-12-13 10:35 UTC (permalink / raw)
  To: openembedded-devel

My world build with all meta-openembedded layers gave me 56 failures. I fixed
some of them and will take a look at rest later.




^ permalink raw reply	[flat|nested] 11+ messages in thread

* [meta-oe][PATCH 1/7] modemmanager: update to 0.6.0.0
  2012-12-13 10:35 Another set of changes from world build Marcin Juszkiewicz
@ 2012-12-13 10:35 ` Marcin Juszkiewicz
  2012-12-13 17:17   ` Martin Jansa
  2012-12-13 10:35 ` [meta-oe][PATCH 2/7] samba: added gnu-configize for AArch64 support Marcin Juszkiewicz
                   ` (5 subsequent siblings)
  6 siblings, 1 reply; 11+ messages in thread
From: Marcin Juszkiewicz @ 2012-12-13 10:35 UTC (permalink / raw)
  To: openembedded-devel

All *.a files moved to -staticdev

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 .../dont-include-private-glib-headers.patch        | 94 ----------------------
 ...modemmanager_0.5.bb => modemmanager_0.6.0.0.bb} | 16 ++--
 2 files changed, 8 insertions(+), 102 deletions(-)
 delete mode 100644 meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch
 rename meta-oe/recipes-connectivity/networkmanager/{modemmanager_0.5.bb => modemmanager_0.6.0.0.bb} (59%)

diff --git a/meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch b/meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch
deleted file mode 100644
index 71dffc0..0000000
--- a/meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-From 28f64090dfa15097587bbea69209df10b8ab8593 Mon Sep 17 00:00:00 2001
-From: Aleksander Morgado <aleksander@lanedo.com>
-Date: Mon, 24 Oct 2011 19:09:11 +0000
-Subject: core: don't include private headers from glib
-
-The "glib/gtypes.h" is now considered private, and only "glib.h" should be
-included directly.
----
-diff --git a/src/mm-at-serial-port.h b/src/mm-at-serial-port.h
-index 5d5f13f..cec5dc3 100644
---- a/src/mm-at-serial-port.h
-+++ b/src/mm-at-serial-port.h
-@@ -18,7 +18,6 @@
- #define MM_AT_SERIAL_PORT_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- #include "mm-serial-port.h"
-diff --git a/src/mm-manager.h b/src/mm-manager.h
-index 1c98458..c6a64bd 100644
---- a/src/mm-manager.h
-+++ b/src/mm-manager.h
-@@ -17,7 +17,6 @@
- #ifndef MM_MANAGER_H
- #define MM_MANAGER_H
- 
--#include <glib/gtypes.h>
- #include <glib-object.h>
- #include <dbus/dbus-glib.h>
- #include "mm-modem.h"
-diff --git a/src/mm-modem-base.h b/src/mm-modem-base.h
-index 933aae1..be11af6 100644
---- a/src/mm-modem-base.h
-+++ b/src/mm-modem-base.h
-@@ -18,7 +18,6 @@
- #define MM_MODEM_BASE_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- #include "mm-port.h"
-diff --git a/src/mm-plugin-base.h b/src/mm-plugin-base.h
-index 4b0932c..5b049a4 100644
---- a/src/mm-plugin-base.h
-+++ b/src/mm-plugin-base.h
-@@ -17,7 +17,6 @@
- #define MM_PLUGIN_BASE_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- #define G_UDEV_API_IS_SUBJECT_TO_CHANGE
-diff --git a/src/mm-port.h b/src/mm-port.h
-index 4bcffd4..df935db 100644
---- a/src/mm-port.h
-+++ b/src/mm-port.h
-@@ -17,7 +17,6 @@
- #define MM_PORT_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- typedef enum {
-diff --git a/src/mm-qcdm-serial-port.h b/src/mm-qcdm-serial-port.h
-index 2786ee8..605016d 100644
---- a/src/mm-qcdm-serial-port.h
-+++ b/src/mm-qcdm-serial-port.h
-@@ -18,7 +18,6 @@
- #define MM_QCDM_SERIAL_PORT_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- #include "mm-serial-port.h"
-diff --git a/src/mm-serial-port.h b/src/mm-serial-port.h
-index eb12cbb..9450926 100644
---- a/src/mm-serial-port.h
-+++ b/src/mm-serial-port.h
-@@ -18,7 +18,6 @@
- #define MM_SERIAL_PORT_H
- 
- #include <glib.h>
--#include <glib/gtypes.h>
- #include <glib-object.h>
- 
- #include "mm-port.h"
---
-cgit v0.9.0.2-2-gbebe
diff --git a/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.5.bb b/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.6.0.0.bb
similarity index 59%
rename from meta-oe/recipes-connectivity/networkmanager/modemmanager_0.5.bb
rename to meta-oe/recipes-connectivity/networkmanager/modemmanager_0.6.0.0.bb
index 55e083a..a58685b 100644
--- a/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.5.bb
+++ b/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.6.0.0.bb
@@ -3,23 +3,23 @@ DEPENDS = "ppp udev glib-2.0"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
 
-PR = "r1"
+PR = "r0"
 
 inherit gnome gettext
 
-SRC_URI = "${GNOME_MIRROR}/ModemManager/${@gnome_verdir("${PV}")}/ModemManager-${PV}.tar.bz2 \
-file://dont-include-private-glib-headers.patch" 
+SRC_URI = "${GNOME_MIRROR}/ModemManager/${@gnome_verdir("${PV}")}/ModemManager-${PV}.tar.xz"
 
-SRC_URI[md5sum] = "cd04109506e88bf4c4cd3e7ce0034c08"
-SRC_URI[sha256sum] = "108de70537b1193634883fa6b3642b130a23f4c04d901cb15caeceb486af6152"
+SRC_URI[md5sum] = "f32640f6672d997ec0887307186e9639"
+SRC_URI[sha256sum] = "d4468300cf4aa7baf21c8564fa515e578056f34de5a64f452b053331f89e8ae2"
 
 S = "${WORKDIR}/ModemManager-${PV}"
 
 FILES_${PN}-dbg += "${libdir}/ModemManager/.debug \
                     ${libdir}/pppd/*/.debug"
-FILES_${PN}-dev += "${datadir}/dbus-1/interfaces \
-                    ${libdir}/ModemManager/*a \
-                    ${libdir}/pppd/*/*a"
+FILES_${PN}-dev += "${datadir}/dbus-1/interfaces"
+FILES_${PN}-staticdev += "\
+                          ${libdir}/ModemManager/*.a \
+                          ${libdir}/pppd/*/*.a"
 FILES_${PN} += "${datadir}/dbus-1/*services/ \
                 ${libdir}/ModemManager/*.so \
                 ${libdir}/pppd/*/*.so \
-- 
1.8.0




^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [meta-oe][PATCH 2/7] samba: added gnu-configize for AArch64 support
  2012-12-13 10:35 Another set of changes from world build Marcin Juszkiewicz
  2012-12-13 10:35 ` [meta-oe][PATCH 1/7] modemmanager: update to 0.6.0.0 Marcin Juszkiewicz
@ 2012-12-13 10:35 ` Marcin Juszkiewicz
  2012-12-13 10:35 ` [meta-oe][PATCH 3/7] dialog: " Marcin Juszkiewicz
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 11+ messages in thread
From: Marcin Juszkiewicz @ 2012-12-13 10:35 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 meta-oe/recipes-connectivity/samba/samba_3.6.8.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb b/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
index 7985199..4750ecb 100644
--- a/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
+++ b/meta-oe/recipes-connectivity/samba/samba_3.6.8.bb
@@ -50,6 +50,7 @@ EXTRA_OECONF += "\
 	"
 
 do_configure() {
+	gnu-configize --force
 	oe_runconf
 }
 
-- 
1.8.0




^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [meta-oe][PATCH 3/7] dialog: added gnu-configize for AArch64 support
  2012-12-13 10:35 Another set of changes from world build Marcin Juszkiewicz
  2012-12-13 10:35 ` [meta-oe][PATCH 1/7] modemmanager: update to 0.6.0.0 Marcin Juszkiewicz
  2012-12-13 10:35 ` [meta-oe][PATCH 2/7] samba: added gnu-configize for AArch64 support Marcin Juszkiewicz
@ 2012-12-13 10:35 ` Marcin Juszkiewicz
  2012-12-13 10:35 ` [meta-oe][PATCH 4/7] xterm: " Marcin Juszkiewicz
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 11+ messages in thread
From: Marcin Juszkiewicz @ 2012-12-13 10:35 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 meta-oe/recipes-extended/dialog/dialog.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-extended/dialog/dialog.inc b/meta-oe/recipes-extended/dialog/dialog.inc
index 03b0aa7..27e4e60 100644
--- a/meta-oe/recipes-extended/dialog/dialog.inc
+++ b/meta-oe/recipes-extended/dialog/dialog.inc
@@ -19,6 +19,7 @@ EXTRA_OECONF = "--with-ncurses \
                 --disable-rpath-hack"
 
 do_configure() {
+    gnu-configize --force
     sed -i 's,${cf_ncuconfig_root}6-config,${cf_ncuconfig_root}-config,g' -i configure
     oe_runconf
 }
-- 
1.8.0




^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [meta-oe][PATCH 4/7] xterm: added gnu-configize for AArch64 support
  2012-12-13 10:35 Another set of changes from world build Marcin Juszkiewicz
                   ` (2 preceding siblings ...)
  2012-12-13 10:35 ` [meta-oe][PATCH 3/7] dialog: " Marcin Juszkiewicz
@ 2012-12-13 10:35 ` Marcin Juszkiewicz
  2012-12-13 10:35 ` [meta-oe][PATCH 5/7] xorg-sgml-doctools: added LIC_FILES_CHKSUM Marcin Juszkiewicz
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 11+ messages in thread
From: Marcin Juszkiewicz @ 2012-12-13 10:35 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 meta-oe/recipes-graphics/xorg-app/xterm_277.bb | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_277.bb b/meta-oe/recipes-graphics/xorg-app/xterm_277.bb
index f68e23c..18abe35 100644
--- a/meta-oe/recipes-graphics/xorg-app/xterm_277.bb
+++ b/meta-oe/recipes-graphics/xorg-app/xterm_277.bb
@@ -15,6 +15,7 @@ EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \
                  --disable-setuid"
 
 do_configure() {
+        gnu-configize --force
         sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure
         oe_runconf
 }
-- 
1.8.0




^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [meta-oe][PATCH 5/7] xorg-sgml-doctools: added LIC_FILES_CHKSUM
  2012-12-13 10:35 Another set of changes from world build Marcin Juszkiewicz
                   ` (3 preceding siblings ...)
  2012-12-13 10:35 ` [meta-oe][PATCH 4/7] xterm: " Marcin Juszkiewicz
@ 2012-12-13 10:35 ` Marcin Juszkiewicz
  2012-12-13 11:03   ` Martin Jansa
  2012-12-13 10:35 ` [meta-oe][PATCH 6/7] florence: added gnome-doc-utils and libnotify to dependencies Marcin Juszkiewicz
  2012-12-13 10:35 ` [meta-oe][PATCH 7/7] florence: move to meta-gnome due to libnotify Marcin Juszkiewicz
  6 siblings, 1 reply; 11+ messages in thread
From: Marcin Juszkiewicz @ 2012-12-13 10:35 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb b/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb
index 502723c..a75c41d 100644
--- a/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb
+++ b/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb
@@ -1,4 +1,7 @@
 require xorg-doc-common.inc
+
+LIC_FILES_CHKSUM = "file://COPYING;md5=c8c6c808cd3c797a07b24e443af1c449"
+
 PE = "1"
 PR = "${INC_PR}.0"
 
-- 
1.8.0




^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [meta-oe][PATCH 6/7] florence: added gnome-doc-utils and libnotify to dependencies
  2012-12-13 10:35 Another set of changes from world build Marcin Juszkiewicz
                   ` (4 preceding siblings ...)
  2012-12-13 10:35 ` [meta-oe][PATCH 5/7] xorg-sgml-doctools: added LIC_FILES_CHKSUM Marcin Juszkiewicz
@ 2012-12-13 10:35 ` Marcin Juszkiewicz
  2012-12-13 10:35 ` [meta-oe][PATCH 7/7] florence: move to meta-gnome due to libnotify Marcin Juszkiewicz
  6 siblings, 0 replies; 11+ messages in thread
From: Marcin Juszkiewicz @ 2012-12-13 10:35 UTC (permalink / raw)
  To: openembedded-devel

gnome-doc-utils due to this:

| autoreconf: Entering directory `.'
| autoreconf: configure.ac: not using Gettext
| autoreconf: running: aclocal --system-acdir=/home/hrw/HDD/devel/canonical/aarch64/CLEAN/build/tmp-eglibc/work/aarch64-oe-linux/florence/0.5.1-r1/florence-0.5.1/aclocal-copy/ --automake-acdir=/home/hrw/HDD/devel/canonical/aarch64/CLEAN/build/tmp-eglibc/sysroots/x86_64-linux/usr/share/aclocal-1.12 --force
| autoreconf: configure.ac: tracing
| autoreconf: configure.ac: not using Libtool
| autoreconf: running: /home/hrw/HDD/devel/canonical/aarch64/CLEAN/build/tmp-eglibc/sysroots/x86_64-linux/usr/bin/autoconf --force
| autoreconf: running: /home/hrw/HDD/devel/canonical/aarch64/CLEAN/build/tmp-eglibc/sysroots/x86_64-linux/usr/bin/autoheader --force
| autoreconf: running: automake --foreign --add-missing --copy --force-missing
| gnome-doc-utils.make:63: error: HAVE_GNOME_DOC_UTILS does not appear in AM_CONDITIONAL
| docs/Makefile.am:1:   'gnome-doc-utils.make' included from here
| gnome-doc-utils.make:143: error: ENABLE_SK does not appear in AM_CONDITIONAL
| docs/Makefile.am:1:   'gnome-doc-utils.make' included from here
| gnome-doc-utils.make:192: error: ENABLE_SK does not appear in AM_CONDITIONAL
| docs/Makefile.am:1:   'gnome-doc-utils.make' included from here
| src/Makefile.am:6: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
| autoreconf: automake failed with exit status: 1
| ERROR: autoreconf execution failed.

libnotify due to:

| configure:7503: checking for LIBNOTIFY
| configure:7510: $PKG_CONFIG --exists --print-errors "libnotify"
| Package libnotify was not found in the pkg-config search path.
| Perhaps you should add the directory containing `libnotify.pc'
| to the PKG_CONFIG_PATH environment variable
| No package 'libnotify' found

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 meta-oe/recipes-support/florence/florence_0.5.1.bb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/meta-oe/recipes-support/florence/florence_0.5.1.bb b/meta-oe/recipes-support/florence/florence_0.5.1.bb
index dcbcefa..56d8914 100644
--- a/meta-oe/recipes-support/florence/florence_0.5.1.bb
+++ b/meta-oe/recipes-support/florence/florence_0.5.1.bb
@@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552"
 
 PR = "r1"
 
-DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf cairo intltool-native"
+DEPENDS = "gtk+ libxml2 libglade librsvg libxtst gconf cairo intltool-native gnome-doc-utils libnotify"
 
 SRC_URI = "http://switch.dl.sourceforge.net/project/florence/florence/0.5.1/florence-0.5.1.tar.bz2 \
            file://0001-Fix-glib-includes.patch"
-- 
1.8.0




^ permalink raw reply related	[flat|nested] 11+ messages in thread

* [meta-oe][PATCH 7/7] florence: move to meta-gnome due to libnotify
  2012-12-13 10:35 Another set of changes from world build Marcin Juszkiewicz
                   ` (5 preceding siblings ...)
  2012-12-13 10:35 ` [meta-oe][PATCH 6/7] florence: added gnome-doc-utils and libnotify to dependencies Marcin Juszkiewicz
@ 2012-12-13 10:35 ` Marcin Juszkiewicz
  6 siblings, 0 replies; 11+ messages in thread
From: Marcin Juszkiewicz @ 2012-12-13 10:35 UTC (permalink / raw)
  To: openembedded-devel

Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
---
 .../recipes-support/florence/files/0001-Fix-glib-includes.patch           | 0
 {meta-oe => meta-gnome}/recipes-support/florence/florence_0.5.1.bb        | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {meta-oe => meta-gnome}/recipes-support/florence/files/0001-Fix-glib-includes.patch (100%)
 rename {meta-oe => meta-gnome}/recipes-support/florence/florence_0.5.1.bb (100%)

diff --git a/meta-oe/recipes-support/florence/files/0001-Fix-glib-includes.patch b/meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch
similarity index 100%
rename from meta-oe/recipes-support/florence/files/0001-Fix-glib-includes.patch
rename to meta-gnome/recipes-support/florence/files/0001-Fix-glib-includes.patch
diff --git a/meta-oe/recipes-support/florence/florence_0.5.1.bb b/meta-gnome/recipes-support/florence/florence_0.5.1.bb
similarity index 100%
rename from meta-oe/recipes-support/florence/florence_0.5.1.bb
rename to meta-gnome/recipes-support/florence/florence_0.5.1.bb
-- 
1.8.0




^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [meta-oe][PATCH 5/7] xorg-sgml-doctools: added LIC_FILES_CHKSUM
  2012-12-13 10:35 ` [meta-oe][PATCH 5/7] xorg-sgml-doctools: added LIC_FILES_CHKSUM Marcin Juszkiewicz
@ 2012-12-13 11:03   ` Martin Jansa
  2012-12-13 11:20     ` Marcin Juszkiewicz
  0 siblings, 1 reply; 11+ messages in thread
From: Martin Jansa @ 2012-12-13 11:03 UTC (permalink / raw)
  To: openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 1172 bytes --]

On Thu, Dec 13, 2012 at 11:35:27AM +0100, Marcin Juszkiewicz wrote:
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>

This was already part of my previous pull request which was merged
yesterday, are you using latest meta-openembedded?

Cheers,

> ---
>  meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb | 3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb b/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb
> index 502723c..a75c41d 100644
> --- a/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb
> +++ b/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.7.bb
> @@ -1,4 +1,7 @@
>  require xorg-doc-common.inc
> +
> +LIC_FILES_CHKSUM = "file://COPYING;md5=c8c6c808cd3c797a07b24e443af1c449"
> +
>  PE = "1"
>  PR = "${INC_PR}.0"
>  
> -- 
> 1.8.0
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [meta-oe][PATCH 5/7] xorg-sgml-doctools: added LIC_FILES_CHKSUM
  2012-12-13 11:03   ` Martin Jansa
@ 2012-12-13 11:20     ` Marcin Juszkiewicz
  0 siblings, 0 replies; 11+ messages in thread
From: Marcin Juszkiewicz @ 2012-12-13 11:20 UTC (permalink / raw)
  To: openembedded-devel

W dniu 13.12.2012 12:03, Martin Jansa pisze:
> On Thu, Dec 13, 2012 at 11:35:27AM +0100, Marcin Juszkiewicz wrote:
>> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> 
> This was already part of my previous pull request which was merged
> yesterday, are you using latest meta-openembedded?

Oops, looks like I used tree before your changes landed. So my patch is
not needed.



^ permalink raw reply	[flat|nested] 11+ messages in thread

* Re: [meta-oe][PATCH 1/7] modemmanager: update to 0.6.0.0
  2012-12-13 10:35 ` [meta-oe][PATCH 1/7] modemmanager: update to 0.6.0.0 Marcin Juszkiewicz
@ 2012-12-13 17:17   ` Martin Jansa
  0 siblings, 0 replies; 11+ messages in thread
From: Martin Jansa @ 2012-12-13 17:17 UTC (permalink / raw)
  To: openembedded-devel

[-- Attachment #1: Type: text/plain, Size: 6955 bytes --]

On Thu, Dec 13, 2012 at 11:35:23AM +0100, Marcin Juszkiewicz wrote:
> All *.a files moved to -staticdev
> 
> Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
> ---
>  .../dont-include-private-glib-headers.patch        | 94 ----------------------
>  ...modemmanager_0.5.bb => modemmanager_0.6.0.0.bb} | 16 ++--
>  2 files changed, 8 insertions(+), 102 deletions(-)
>  delete mode 100644 meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch
>  rename meta-oe/recipes-connectivity/networkmanager/{modemmanager_0.5.bb => modemmanager_0.6.0.0.bb} (59%)
> 
> diff --git a/meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch b/meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch
> deleted file mode 100644
> index 71dffc0..0000000
> --- a/meta-oe/recipes-connectivity/networkmanager/modemmanager/dont-include-private-glib-headers.patch
> +++ /dev/null
> @@ -1,94 +0,0 @@
> -From 28f64090dfa15097587bbea69209df10b8ab8593 Mon Sep 17 00:00:00 2001
> -From: Aleksander Morgado <aleksander@lanedo.com>
> -Date: Mon, 24 Oct 2011 19:09:11 +0000
> -Subject: core: don't include private headers from glib
> -
> -The "glib/gtypes.h" is now considered private, and only "glib.h" should be
> -included directly.
> ----
> -diff --git a/src/mm-at-serial-port.h b/src/mm-at-serial-port.h
> -index 5d5f13f..cec5dc3 100644
> ---- a/src/mm-at-serial-port.h
> -+++ b/src/mm-at-serial-port.h
> -@@ -18,7 +18,6 @@
> - #define MM_AT_SERIAL_PORT_H
> - 
> - #include <glib.h>
> --#include <glib/gtypes.h>
> - #include <glib-object.h>
> - 
> - #include "mm-serial-port.h"
> -diff --git a/src/mm-manager.h b/src/mm-manager.h
> -index 1c98458..c6a64bd 100644
> ---- a/src/mm-manager.h
> -+++ b/src/mm-manager.h
> -@@ -17,7 +17,6 @@
> - #ifndef MM_MANAGER_H
> - #define MM_MANAGER_H
> - 
> --#include <glib/gtypes.h>
> - #include <glib-object.h>
> - #include <dbus/dbus-glib.h>
> - #include "mm-modem.h"
> -diff --git a/src/mm-modem-base.h b/src/mm-modem-base.h
> -index 933aae1..be11af6 100644
> ---- a/src/mm-modem-base.h
> -+++ b/src/mm-modem-base.h
> -@@ -18,7 +18,6 @@
> - #define MM_MODEM_BASE_H
> - 
> - #include <glib.h>
> --#include <glib/gtypes.h>
> - #include <glib-object.h>
> - 
> - #include "mm-port.h"
> -diff --git a/src/mm-plugin-base.h b/src/mm-plugin-base.h
> -index 4b0932c..5b049a4 100644
> ---- a/src/mm-plugin-base.h
> -+++ b/src/mm-plugin-base.h
> -@@ -17,7 +17,6 @@
> - #define MM_PLUGIN_BASE_H
> - 
> - #include <glib.h>
> --#include <glib/gtypes.h>
> - #include <glib-object.h>
> - 
> - #define G_UDEV_API_IS_SUBJECT_TO_CHANGE
> -diff --git a/src/mm-port.h b/src/mm-port.h
> -index 4bcffd4..df935db 100644
> ---- a/src/mm-port.h
> -+++ b/src/mm-port.h
> -@@ -17,7 +17,6 @@
> - #define MM_PORT_H
> - 
> - #include <glib.h>
> --#include <glib/gtypes.h>
> - #include <glib-object.h>
> - 
> - typedef enum {
> -diff --git a/src/mm-qcdm-serial-port.h b/src/mm-qcdm-serial-port.h
> -index 2786ee8..605016d 100644
> ---- a/src/mm-qcdm-serial-port.h
> -+++ b/src/mm-qcdm-serial-port.h
> -@@ -18,7 +18,6 @@
> - #define MM_QCDM_SERIAL_PORT_H
> - 
> - #include <glib.h>
> --#include <glib/gtypes.h>
> - #include <glib-object.h>
> - 
> - #include "mm-serial-port.h"
> -diff --git a/src/mm-serial-port.h b/src/mm-serial-port.h
> -index eb12cbb..9450926 100644
> ---- a/src/mm-serial-port.h
> -+++ b/src/mm-serial-port.h
> -@@ -18,7 +18,6 @@
> - #define MM_SERIAL_PORT_H
> - 
> - #include <glib.h>
> --#include <glib/gtypes.h>
> - #include <glib-object.h>
> - 
> - #include "mm-port.h"
> ---
> -cgit v0.9.0.2-2-gbebe
> diff --git a/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.5.bb b/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.6.0.0.bb
> similarity index 59%
> rename from meta-oe/recipes-connectivity/networkmanager/modemmanager_0.5.bb
> rename to meta-oe/recipes-connectivity/networkmanager/modemmanager_0.6.0.0.bb
> index 55e083a..a58685b 100644
> --- a/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.5.bb
> +++ b/meta-oe/recipes-connectivity/networkmanager/modemmanager_0.6.0.0.bb
> @@ -3,23 +3,23 @@ DEPENDS = "ppp udev glib-2.0"
>  LICENSE = "GPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
>  
> -PR = "r1"
> +PR = "r0"
>  
>  inherit gnome gettext
>  
> -SRC_URI = "${GNOME_MIRROR}/ModemManager/${@gnome_verdir("${PV}")}/ModemManager-${PV}.tar.bz2 \
> -file://dont-include-private-glib-headers.patch" 
> +SRC_URI = "${GNOME_MIRROR}/ModemManager/${@gnome_verdir("${PV}")}/ModemManager-${PV}.tar.xz"
>  
> -SRC_URI[md5sum] = "cd04109506e88bf4c4cd3e7ce0034c08"
> -SRC_URI[sha256sum] = "108de70537b1193634883fa6b3642b130a23f4c04d901cb15caeceb486af6152"
> +SRC_URI[md5sum] = "f32640f6672d997ec0887307186e9639"
> +SRC_URI[sha256sum] = "d4468300cf4aa7baf21c8564fa515e578056f34de5a64f452b053331f89e8ae2"
>  
>  S = "${WORKDIR}/ModemManager-${PV}"
>  
>  FILES_${PN}-dbg += "${libdir}/ModemManager/.debug \
>                      ${libdir}/pppd/*/.debug"
> -FILES_${PN}-dev += "${datadir}/dbus-1/interfaces \
> -                    ${libdir}/ModemManager/*a \
> -                    ${libdir}/pppd/*/*a"
> +FILES_${PN}-dev += "${datadir}/dbus-1/interfaces"
> +FILES_${PN}-staticdev += "\
> +                          ${libdir}/ModemManager/*.a \
> +                          ${libdir}/pppd/*/*.a"
>  FILES_${PN} += "${datadir}/dbus-1/*services/ \
>                  ${libdir}/ModemManager/*.so \
>                  ${libdir}/pppd/*/*.so \

It's better, it builds now :).

But FILES_* changes are not correct, keep *.la in PN-dev.

WARNING: QA Issue: modemmanager: Files/directories were installed but
not shipped
  /usr/lib/ModemManager/libmm-plugin-zte.la
  /usr/lib/ModemManager/libmm-plugin-mbm.la
  /usr/lib/ModemManager/libmm-plugin-moto-c.la
  /usr/lib/ModemManager/libmm-plugin-huawei.la
  /usr/lib/ModemManager/libmm-plugin-iridium.la
  /usr/lib/ModemManager/libmm-plugin-longcheer.la
  /usr/lib/ModemManager/libmm-plugin-option.la
  /usr/lib/ModemManager/libmm-plugin-x22x.la
  /usr/lib/ModemManager/libmm-plugin-wavecom.la
  /usr/lib/ModemManager/libmm-plugin-cinterion.la
  /usr/lib/ModemManager/libmm-plugin-novatel.la
  /usr/lib/ModemManager/libmm-plugin-generic.la
  /usr/lib/ModemManager/libmm-plugin-samsung.la
  /usr/lib/ModemManager/libmm-plugin-nokia.la
  /usr/lib/ModemManager/libmm-plugin-linktop.la
  /usr/lib/ModemManager/libmm-plugin-simtech.la
  /usr/lib/ModemManager/libmm-plugin-sierra.la
  /usr/lib/ModemManager/libmm-plugin-hso.la
  /usr/lib/ModemManager/libmm-plugin-anydata.la
  /usr/lib/ModemManager/libmm-plugin-gobi.la
  /usr/lib/pppd/2.4.5/mm-test-pppd-plugin.la

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

^ permalink raw reply	[flat|nested] 11+ messages in thread

end of thread, other threads:[~2012-12-13 17:32 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-12-13 10:35 Another set of changes from world build Marcin Juszkiewicz
2012-12-13 10:35 ` [meta-oe][PATCH 1/7] modemmanager: update to 0.6.0.0 Marcin Juszkiewicz
2012-12-13 17:17   ` Martin Jansa
2012-12-13 10:35 ` [meta-oe][PATCH 2/7] samba: added gnu-configize for AArch64 support Marcin Juszkiewicz
2012-12-13 10:35 ` [meta-oe][PATCH 3/7] dialog: " Marcin Juszkiewicz
2012-12-13 10:35 ` [meta-oe][PATCH 4/7] xterm: " Marcin Juszkiewicz
2012-12-13 10:35 ` [meta-oe][PATCH 5/7] xorg-sgml-doctools: added LIC_FILES_CHKSUM Marcin Juszkiewicz
2012-12-13 11:03   ` Martin Jansa
2012-12-13 11:20     ` Marcin Juszkiewicz
2012-12-13 10:35 ` [meta-oe][PATCH 6/7] florence: added gnome-doc-utils and libnotify to dependencies Marcin Juszkiewicz
2012-12-13 10:35 ` [meta-oe][PATCH 7/7] florence: move to meta-gnome due to libnotify Marcin Juszkiewicz

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.