diff options
author | Richard Purdie <rpurdie@linux.intel.com> | 2009-07-27 15:21:36 +0100 |
---|---|---|
committer | Richard Purdie <rpurdie@linux.intel.com> | 2009-07-27 15:21:36 +0100 |
commit | 7370f7e42cbe0c59f36cb78844aa57bfdda4b5e2 (patch) | |
tree | a2df5921bdca2baf5ba02795dd35ef4194785cae /meta | |
parent | dc50ffba552fb80d790ddf5620910eb8b3f94dc3 (diff) | |
download | poky-7370f7e42cbe0c59f36cb78844aa57bfdda4b5e2.tar.gz |
connman: Update patchset
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta')
3 files changed, 21 insertions, 8 deletions
diff --git a/meta/packages/connman/connman_git.bb b/meta/packages/connman/connman_git.bb index 9372e8d647..710d00fdc2 100644 --- a/meta/packages/connman/connman_git.bb +++ b/meta/packages/connman/connman_git.bb | |||
@@ -16,7 +16,8 @@ EXTRA_OECONF += " \ | |||
16 | ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant" | 16 | ac_cv_path_WPASUPPLICANT=/usr/sbin/wpa_supplicant" |
17 | 17 | ||
18 | SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git;protocol=git \ | 18 | SRC_URI = "git://git.kernel.org/pub/scm/network/connman/connman.git;protocol=git \ |
19 | file://connman-install-tests.patch;patch=1 \ | 19 | file://connman-install-tests-d52de88aff4771283b2ebee4f48a7af15862d0ae.patch;patch=1;rev=d52de88aff4771283b2ebee4f48a7af15862d0ae \ |
20 | file://connman-install-tests.patch;patch=1;notrev=d52de88aff4771283b2ebee4f48a7af15862d0ae \ | ||
20 | file://dbusperms.patch;patch=1 \ | 21 | file://dbusperms.patch;patch=1 \ |
21 | file://connman " | 22 | file://connman " |
22 | 23 | ||
diff --git a/meta/packages/connman/files/connman-install-tests-d52de88aff4771283b2ebee4f48a7af15862d0ae.patch b/meta/packages/connman/files/connman-install-tests-d52de88aff4771283b2ebee4f48a7af15862d0ae.patch new file mode 100644 index 0000000000..57df7196ec --- /dev/null +++ b/meta/packages/connman/files/connman-install-tests-d52de88aff4771283b2ebee4f48a7af15862d0ae.patch | |||
@@ -0,0 +1,13 @@ | |||
1 | Index: git/test/Makefile.am | ||
2 | =================================================================== | ||
3 | --- git.orig/test/Makefile.am 2009-05-21 12:07:39.000000000 +0100 | ||
4 | +++ git/test/Makefile.am 2009-05-21 17:29:33.000000000 +0100 | ||
5 | @@ -1,5 +1,7 @@ | ||
6 | |||
7 | -EXTRA_DIST = get-state list-profiles list-services \ | ||
8 | +testdir = $(pkgdatadir)/tests | ||
9 | + | ||
10 | +test_SCRIPTS = get-state list-profiles list-services \ | ||
11 | list-connections select-connection \ | ||
12 | list-devices enable-device disable-device start-scanning \ | ||
13 | list-networks select-network disable-network create-network \ | ||
diff --git a/meta/packages/connman/files/connman-install-tests.patch b/meta/packages/connman/files/connman-install-tests.patch index 57df7196ec..3deda9d72c 100644 --- a/meta/packages/connman/files/connman-install-tests.patch +++ b/meta/packages/connman/files/connman-install-tests.patch | |||
@@ -1,13 +1,12 @@ | |||
1 | Index: git/test/Makefile.am | 1 | Index: git/test/Makefile.am |
2 | =================================================================== | 2 | =================================================================== |
3 | --- git.orig/test/Makefile.am 2009-05-21 12:07:39.000000000 +0100 | 3 | --- git.orig/test/Makefile.am 2009-07-24 16:14:10.000000000 +0100 |
4 | +++ git/test/Makefile.am 2009-05-21 17:29:33.000000000 +0100 | 4 | +++ git/test/Makefile.am 2009-07-24 16:16:18.000000000 +0100 |
5 | @@ -1,5 +1,7 @@ | 5 | @@ -1,5 +1,6 @@ |
6 | |||
7 | -EXTRA_DIST = get-state list-profiles list-services \ | ||
8 | +testdir = $(pkgdatadir)/tests | 6 | +testdir = $(pkgdatadir)/tests |
9 | + | 7 | |
10 | +test_SCRIPTS = get-state list-profiles list-services \ | 8 | -EXTRA_DIST = get-state list-profiles list-services connect-service \ |
9 | +test_SCRIPTS = get-state list-profiles list-services connect-service \ | ||
11 | list-connections select-connection \ | 10 | list-connections select-connection \ |
12 | list-devices enable-device disable-device start-scanning \ | 11 | list-devices enable-device disable-device start-scanning \ |
13 | list-networks select-network disable-network create-network \ | 12 | list-networks select-network disable-network create-network \ |