[meta-gnome/meta-systemd 0/2] fixes for latest oe-core

[meta-gnome/meta-systemd 0/2] fixes for latest oe-core

[Andreas Müller]

Andreas Müller (2):
  orbit2: fix build after automake 1.13.4 update
  connman: follow oe-core to 1.18

 ...LAGS-instead-of-INCLUDES-and-fix-problem-.patch | 42 ++++++++++++++++++++++
 meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb  |  1 +
 ...connman_1.17.bbappend => connman_1.18.bbappend} |  0
 3 files changed, 43 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch
 rename meta-systemd/oe-core/recipes-connectivity/connman/{connman_1.17.bbappend => connman_1.18.bbappend} (100%)

-- 
1.8.3.1

[meta-gnome/meta-systemd 1/2] orbit2: fix build after automake 1.13.4 update

[Andreas Müller]

fixes:
| test/everything/Makefile.am:81: error: using '$(srcdir)' in TESTS is currently broken: '$(srcdir)/test.sh'
| test/inhibit/Makefile.am:4: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
| test/poa/Makefile.am:1: warning: 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS')
| autoreconf: automake failed with exit status: 1
| ERROR: autoreconf execution failed.
| WARNING: /home/superandy/tmp/oe-core-eglibc/work/x86_64-linux/orbit2-native/2.14.19-r0/temp/run.do_configure.14800:1 exit 1 from
|   exit 1
| ERROR: Function failed: do_configure (log file is located at /home/superandy/tmp/oe-core-eglibc/work/x86_64-linux/orbit2-native/2.14.19-r0/temp/log.do_configure.14800)
ERROR: Task 6208 (virtual:native:/home/superandy/data/oe-core/sources/meta-openembedded/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb, do_configure) failed with exit code '1'

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 ...LAGS-instead-of-INCLUDES-and-fix-problem-.patch | 42 ++++++++++++++++++++++
 meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb  |  1 +
 2 files changed, 43 insertions(+)
 create mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch

diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch b/meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch
new file mode 100644
index 0000000..7993abb
--- /dev/null
+++ b/meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch
@@ -0,0 +1,42 @@
+From d91dbb42dc3b6073720027f68827acd0abee6d75 Mon Sep 17 00:00:00 2001
+From: Kjartan Maraas <kmaraas@gnome.org>
+Date: Tue, 14 May 2013 13:29:53 +0200
+Subject: [PATCH] Use AM_CPPFLAGS instead of INCLUDES and fix problem using
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Upstream-Status: Backport [1]
+
+[1] https://git.gnome.org/browse/ORBit2/commit/test/everything/Makefile.am?id=d91dbb42dc3b6073720027f68827acd0abee6d75
+
+Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
+---
+ test/everything/Makefile.am | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/test/everything/Makefile.am b/test/everything/Makefile.am
+index 32beb36..cb4b1d6 100644
+--- a/test/everything/Makefile.am
++++ b/test/everything/Makefile.am
+@@ -10,7 +10,7 @@ EVERYTHING_IDLOUT =          \
+ 	$(EVERYTHING_BUILT)  \
+ 	everything-imodule.c
+ 
+-INCLUDES =                                 \
++AM_CPPFLAGS =                              \
+ 	-I$(top_srcdir)/include            \
+ 	-I$(top_builddir)/include          \
+ 	-I$(top_builddir)/src              \
+@@ -78,7 +78,7 @@ include $(top_srcdir)/Makefile.shared
+ BUILT_SOURCES = ${EVERYTHING_BUILT} everything-imodule.c
+ CLEANFILES = ${BUILT_SOURCES} iorfile
+ 
+-TESTS = $(srcdir)/test.sh
++TESTS = $(top_builddir)/test/everything/test.sh
+ 
+ EXTRA_DIST = $(IDL_FILES) test.sh $(included_src)
+ 
+-- 
+1.8.3.1
+
diff --git a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb
index 74b6c12..ba3982d 100644
--- a/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb
+++ b/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb
@@ -9,6 +9,7 @@ SRC_URI = " \
     file://configure-lossage.patch \
     file://pkgconfig-fix.patch \
     file://0001-linc2-src-Makefile.am-fix-build-with-glib-2.36.patch \
+    file://0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch \
 "
 SRC_URI[md5sum] = "7082d317a9573ab338302243082d10d1"
 SRC_URI[sha256sum] = "55c900a905482992730f575f3eef34d50bda717c197c97c08fa5a6eafd857550"
-- 
1.8.3.1

Re: [meta-gnome/meta-systemd 1/2] orbit2: fix build after automake 1.13.4 update

[Koen Kooi]

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

Op 15-10-13 02:03, Andreas Müller schreef:
> fixes: | test/everything/Makefile.am:81: error: using '$(srcdir)' in
> TESTS is currently broken: '$(srcdir)/test.sh' |
> test/inhibit/Makefile.am:4: warning: 'INCLUDES' is the old name for
> 'AM_CPPFLAGS' (or '*_CPPFLAGS') | test/poa/Makefile.am:1: warning:
> 'INCLUDES' is the old name for 'AM_CPPFLAGS' (or '*_CPPFLAGS') |
> autoreconf: automake failed with exit status: 1 | ERROR: autoreconf
> execution failed. | WARNING:
> /home/superandy/tmp/oe-core-eglibc/work/x86_64-linux/orbit2-native/2.14.19-r0/temp/run.do_configure.14800:1
> exit 1 from |   exit 1 | ERROR: Function failed: do_configure (log file
> is located at
> /home/superandy/tmp/oe-core-eglibc/work/x86_64-linux/orbit2-native/2.14.19-r0/temp/log.do_configure.14800)
>
> 
ERROR: Task 6208
(virtual:native:/home/superandy/data/oe-core/sources/meta-openembedded/meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb,
do_configure) failed with exit code '1'
> 
> Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>

Applied, thanks!

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
Comment: GPGTools - http://gpgtools.org

iD8DBQFSX9UDMkyGM64RGpERAsFSAKC5S+2nljBJc6tD6/vS+fD4letp3gCggZZp
K0RjMUV6W1SUOHVN6gkTjj8=
=ET3y
-----END PGP SIGNATURE-----

[meta-gnome/meta-systemd 2/2] connman: follow oe-core to 1.18

[Andreas Müller]

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../connman/{connman_1.17.bbappend => connman_1.18.bbappend}              | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename meta-systemd/oe-core/recipes-connectivity/connman/{connman_1.17.bbappend => connman_1.18.bbappend} (100%)

diff --git a/meta-systemd/oe-core/recipes-connectivity/connman/connman_1.17.bbappend b/meta-systemd/oe-core/recipes-connectivity/connman/connman_1.18.bbappend
similarity index 100%
rename from meta-systemd/oe-core/recipes-connectivity/connman/connman_1.17.bbappend
rename to meta-systemd/oe-core/recipes-connectivity/connman/connman_1.18.bbappend
-- 
1.8.3.1

Re: [meta-gnome/meta-systemd 0/2] fixes for latest oe-core

[Martin Jansa]

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

On Tue, Oct 15, 2013 at 02:03:12AM +0200, Andreas Müller wrote:
> Andreas Müller (2):
>   orbit2: fix build after automake 1.13.4 update
>   connman: follow oe-core to 1.18
> 
>  ...LAGS-instead-of-INCLUDES-and-fix-problem-.patch | 42 ++++++++++++++++++++++
>  meta-gnome/recipes-gnome/orbit2/orbit2_2.14.19.bb  |  1 +
>  ...connman_1.17.bbappend => connman_1.18.bbappend} |  0
>  3 files changed, 43 insertions(+)
>  create mode 100644 meta-gnome/recipes-gnome/orbit2/orbit2/0002-Use-AM_CPPFLAGS-instead-of-INCLUDES-and-fix-problem-.patch
>  rename meta-systemd/oe-core/recipes-connectivity/connman/{connman_1.17.bbappend => connman_1.18.bbappend} (100%)

Both are for oe-core/master, so I've created dora branch in meta-oe
repo, we need to find maintainer for dora release (I'll send separate
e-mail).

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

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