summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-01-29 17:11:11 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-30 11:50:11 +0000
commit965c5afc8fd1ab280ecd82908826d520c275fd67 (patch)
tree4bb367378280b216097b27ea084b528a4cd80e17
parent58449f0e9cc4a05c88204cf8ba887b55467d886e (diff)
downloadpoky-965c5afc8fd1ab280ecd82908826d520c275fd67.tar.gz
ofono: use patch sent upstream instead of sed
Instead of using a sed to fix the hashbang in a test tool send a patch upstream and use that. This way we'll notice when the patch doesn't need to be applied anymore. (From OE-Core rev: 8b6c45dfdd6a7b469f5a0dd7308b25bdd4b1bf56) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-connectivity/ofono/ofono.inc3
-rw-r--r--meta/recipes-connectivity/ofono/ofono/use-python3.patch27
-rw-r--r--meta/recipes-connectivity/ofono/ofono_1.22.bb1
3 files changed, 28 insertions, 3 deletions
diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc
index 4443a95c2f..0472414b19 100644
--- a/meta/recipes-connectivity/ofono/ofono.inc
+++ b/meta/recipes-connectivity/ofono/ofono.inc
@@ -26,9 +26,6 @@ SYSTEMD_SERVICE_${PN} = "ofono.service"
26do_install_append() { 26do_install_append() {
27 install -d ${D}${sysconfdir}/init.d/ 27 install -d ${D}${sysconfdir}/init.d/
28 install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono 28 install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono
29
30 # Ofono still has one test tool that refers to Python 2 in the shebang
31 sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/ofono/test/set-ddr
32} 29}
33 30
34PACKAGES =+ "${PN}-tests" 31PACKAGES =+ "${PN}-tests"
diff --git a/meta/recipes-connectivity/ofono/ofono/use-python3.patch b/meta/recipes-connectivity/ofono/ofono/use-python3.patch
new file mode 100644
index 0000000000..7b84075257
--- /dev/null
+++ b/meta/recipes-connectivity/ofono/ofono/use-python3.patch
@@ -0,0 +1,27 @@
1set-ddr should use Python3 like all the other tests.
2
3Upstream-Status: Submitted
4Signed-off-by: Ross Burton <ross.burton@intel.com>
5
6From 17b69cd1da4c5c5f732acb38ca1602446c567ee7 Mon Sep 17 00:00:00 2001
7From: Ross Burton <ross.burton@intel.com>
8Date: Mon, 29 Jan 2018 11:31:25 +0000
9Subject: [PATCH] test/setddr: use Python 3
10
11All the other tests use Python 3, so this should to.
12---
13 test/set-ddr | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/test/set-ddr b/test/set-ddr
17index 5d061b95..33631f31 100755
18--- a/test/set-ddr
19+++ b/test/set-ddr
20@@ -1,4 +1,4 @@
21-#!/usr/bin/python
22+#!/usr/bin/python3
23
24 import sys
25 import dbus
26--
272.11.0
diff --git a/meta/recipes-connectivity/ofono/ofono_1.22.bb b/meta/recipes-connectivity/ofono/ofono_1.22.bb
index fd7ee15af1..e57eaa77eb 100644
--- a/meta/recipes-connectivity/ofono/ofono_1.22.bb
+++ b/meta/recipes-connectivity/ofono/ofono_1.22.bb
@@ -3,6 +3,7 @@ require ofono.inc
3SRC_URI = "\ 3SRC_URI = "\
4 ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ 4 ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \
5 file://ofono \ 5 file://ofono \
6 file://use-python3.patch \
6" 7"
7SRC_URI[md5sum] = "2a683ab8e98448ad8bc5dc9868d2893e" 8SRC_URI[md5sum] = "2a683ab8e98448ad8bc5dc9868d2893e"
8SRC_URI[sha256sum] = "8e34a6696c300c9841b55e8dff640bd3096e49f5dbe55bbebaa69a71676f687e" 9SRC_URI[sha256sum] = "8e34a6696c300c9841b55e8dff640bd3096e49f5dbe55bbebaa69a71676f687e"