summaryrefslogtreecommitdiffstats
path: root/meta/recipes-core
diff options
context:
space:
mode:
authorChong Lu <Chong.Lu@windriver.com>2014-11-24 14:07:48 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-12-03 12:23:57 +0000
commit1654f385da498678d50e6c353417c7e14fe6afc7 (patch)
treea78825c17d12947f7d5ea4413e7a9758012498a3 /meta/recipes-core
parent89a8e1c4e16d3b158502581e37968571813d1297 (diff)
downloadpoky-1654f385da498678d50e6c353417c7e14fe6afc7.tar.gz
dbus-glib: Upgrade to 0.102
Remove obsolete_automake_macros.patch, since upstream has merged it. (From OE-Core rev: 5873734b21735f9fb598c7d8e67ce8cef9ddb39c) Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r--meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch15
-rw-r--r--meta/recipes-core/dbus/dbus-glib.inc1
-rw-r--r--meta/recipes-core/dbus/dbus-glib/no-examples.patch (renamed from meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch)0
-rw-r--r--meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch (renamed from meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch)57
-rw-r--r--meta/recipes-core/dbus/dbus-glib_0.100.2.bb5
-rw-r--r--meta/recipes-core/dbus/dbus-glib_0.102.bb5
6 files changed, 38 insertions, 45 deletions
diff --git a/meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch b/meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch
deleted file mode 100644
index 40e3b12b5d..0000000000
--- a/meta/recipes-core/dbus/dbus-glib-0.100.2/obsolete_automake_macros.patch
+++ /dev/null
@@ -1,15 +0,0 @@
1Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=59003]
2
3Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
4diff -Nurd dbus-glib-0.100/configure.ac dbus-glib-0.100/configure.ac
5--- dbus-glib-0.100/configure.ac 2012-06-25 19:26:39.000000000 +0300
6+++ dbus-glib-0.100/configure.ac 2013-01-03 04:53:22.314976758 +0200
7@@ -8,7 +8,7 @@
8
9 AM_INIT_AUTOMAKE([1.9])
10
11-AM_CONFIG_HEADER(config.h)
12+AC_CONFIG_HEADERS(config.h)
13
14 # Honor aclocal flags
15 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
diff --git a/meta/recipes-core/dbus/dbus-glib.inc b/meta/recipes-core/dbus/dbus-glib.inc
index 6c60d9e408..abd013247c 100644
--- a/meta/recipes-core/dbus/dbus-glib.inc
+++ b/meta/recipes-core/dbus/dbus-glib.inc
@@ -13,7 +13,6 @@ DEPENDS_class-native = "glib-2.0-native dbus-native"
13SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \ 13SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
14 file://no-examples.patch \ 14 file://no-examples.patch \
15 file://test-install-makefile.patch \ 15 file://test-install-makefile.patch \
16 file://obsolete_automake_macros.patch \
17" 16"
18 17
19inherit autotools pkgconfig gettext 18inherit autotools pkgconfig gettext
diff --git a/meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch b/meta/recipes-core/dbus/dbus-glib/no-examples.patch
index fbb4967828..fbb4967828 100644
--- a/meta/recipes-core/dbus/dbus-glib-0.100.2/no-examples.patch
+++ b/meta/recipes-core/dbus/dbus-glib/no-examples.patch
diff --git a/meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch b/meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch
index 2e8e178bb7..027c82b27e 100644
--- a/meta/recipes-core/dbus/dbus-glib-0.100.2/test-install-makefile.patch
+++ b/meta/recipes-core/dbus/dbus-glib/test-install-makefile.patch
@@ -3,26 +3,46 @@ Change Makefile.am to install regression tests for test package purpose.
3Upstream-Status: Inappropriate [test not install is for purpose from upstream] 3Upstream-Status: Inappropriate [test not install is for purpose from upstream]
4 4
5Signed-off-by: Yao Zhao <yao.zhao@windriver.com> 5Signed-off-by: Yao Zhao <yao.zhao@windriver.com>
6Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
7---
8 test/Makefile.am | 3 ++-
9 test/core/Makefile.am | 3 ++-
10 test/interfaces/Makefile.am | 3 ++-
11 3 files changed, 6 insertions(+), 3 deletions(-)
6 12
7diff --git a/test/Makefile.am b/test/Makefile.am 13diff --git a/test/Makefile.am b/test/Makefile.am
8index 7ba11a8..249f0e7 100644 14index 379c8c3..6580927 100644
9--- a/test/Makefile.am 15--- a/test/Makefile.am
10+++ b/test/Makefile.am 16+++ b/test/Makefile.am
11@@ -13,7 +13,8 @@ else 17@@ -48,7 +48,8 @@ TESTS = \
12 TEST_BINARIES= 18 $(test_scripts) \
13 endif 19 $(NULL)
14 20
15-noinst_PROGRAMS= $(TEST_BINARIES) 21-noinst_PROGRAMS = \
16+testdir = $(datadir)/@PACKAGE@/tests 22+testdir = $(datadir)/@PACKAGE@/tests
17+test_PROGRAMS= $(TEST_BINARIES) 23+test_PROGRAMS = \
24 $(test_programs) \
25 $(test_related_programs) \
26 $(NULL)
27diff --git a/test/core/Makefile.am b/test/core/Makefile.am
28index e4bceb4..54b077d 100644
29--- a/test/core/Makefile.am
30+++ b/test/core/Makefile.am
31@@ -64,7 +64,8 @@ endif
18 32
19 test_service_SOURCES= \ 33 ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
20 test-service.c 34 ## build even when not doing "make check"
35-noinst_PROGRAMS = \
36+testdir = $(datadir)/@PACKAGE@/tests/core
37+test_PROGRAMS = \
38 test-dbus-glib \
39 test-error-mapping \
40 test-service-glib \
21diff --git a/test/interfaces/Makefile.am b/test/interfaces/Makefile.am 41diff --git a/test/interfaces/Makefile.am b/test/interfaces/Makefile.am
22index 3cb2c39..e6de67d 100644 42index a94d08d..707dcac 100644
23--- a/test/interfaces/Makefile.am 43--- a/test/interfaces/Makefile.am
24+++ b/test/interfaces/Makefile.am 44+++ b/test/interfaces/Makefile.am
25@@ -39,7 +39,8 @@ if DBUS_BUILD_TESTS 45@@ -57,7 +57,8 @@ if DBUS_BUILD_TESTS
26 46
27 ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we 47 ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
28 ## build even when not doing "make check" 48 ## build even when not doing "make check"
@@ -32,17 +52,6 @@ index 3cb2c39..e6de67d 100644
32 52
33 test_service_SOURCES = \ 53 test_service_SOURCES = \
34 test-interfaces.c \ 54 test-interfaces.c \
35diff --git a/test/core/Makefile.am b/test/core/Makefile.am 55--
36index ef6cb26..9786c3a 100644 561.9.1
37--- a/test/core/Makefile.am 57
38+++ b/test/core/Makefile.am
39@@ -46,7 +46,8 @@ endif
40
41 ## we use noinst_PROGRAMS not check_PROGRAMS for TESTS so that we
42 ## build even when not doing "make check"
43-noinst_PROGRAMS = \
44+testdir = $(datadir)/@PACKAGE@/tests/core
45+test_PROGRAMS = \
46 test-dbus-glib \
47 test-service-glib \
48 $(THREAD_APPS) \
diff --git a/meta/recipes-core/dbus/dbus-glib_0.100.2.bb b/meta/recipes-core/dbus/dbus-glib_0.100.2.bb
deleted file mode 100644
index c1bb06a1b4..0000000000
--- a/meta/recipes-core/dbus/dbus-glib_0.100.2.bb
+++ /dev/null
@@ -1,5 +0,0 @@
1require dbus-glib.inc
2
3
4SRC_URI[md5sum] = "ad0920c7e3aad669163bb59171cf138e"
5SRC_URI[sha256sum] = "a5bb42da921f51c28161e0e54a5a8241d94a1c0499a14007150e9ce743da6ac5"
diff --git a/meta/recipes-core/dbus/dbus-glib_0.102.bb b/meta/recipes-core/dbus/dbus-glib_0.102.bb
new file mode 100644
index 0000000000..d798ebfac0
--- /dev/null
+++ b/meta/recipes-core/dbus/dbus-glib_0.102.bb
@@ -0,0 +1,5 @@
1require dbus-glib.inc
2
3
4SRC_URI[md5sum] = "f76b8558fd575d0106c3a556eaa49184"
5SRC_URI[sha256sum] = "6964ed585bb8149a14ab744b5ded5e77cf71ec5446e6dcc5fcf5eebcc52df29c"