From patchwork Mon Jan 29 17:11:11 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 126188 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp2609700ljd; Mon, 29 Jan 2018 09:11:56 -0800 (PST) X-Google-Smtp-Source: AH8x225wJyYy+pABCDIGlq1Jt8zrIjANRZO8JYD7euqriroVmL4EJazyOim0pssEKA/GkHKbw8Mg X-Received: by 2002:a17:902:121:: with SMTP id 30-v6mr21753034plb.288.1517245916414; Mon, 29 Jan 2018 09:11:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517245916; cv=none; d=google.com; s=arc-20160816; b=hUyteY6PUcSy1v84Vu0A55h+TCq3uGaGi+h2PBFPqtetlNn0Xd+Uh2kOl+bnWBhMm7 EaFw/HIiPKQNas9M7cQ1UCBjjB+JyqTq0nqWf1euNlLt8f2qaYAO0DqoEcFCUOkei0ra tLG8JPjNHm7K/tqV3DOOGD0Nrpk2cegXkKgaciHqMy2k3QxuqKHz92B2PTRQNV/WEbHt 5OocZKc/Khtp1vT0Syb5nqKGvYctN3ecR7ywnrcVDnUVJCr+o6dkojMrgXExnU5THqz2 Wv3Gx6xzCL8IcRF3RBCxTJST2yCNqBNlGFqewf6yxURPVPL3G06feXLJmd5LqBsmecqc 2WQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:mime-version :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:references:in-reply-to:message-id:date :to:from:dkim-signature:delivered-to:arc-authentication-results; bh=2sTx/acfRxMVXttbmg8bNN/pI5DOyba00h3S2SI8B4k=; b=n3/br+FqiarSKd3+CDbTwwWAPoQrpPS6UKGNYjmrAG0nXafCkR6mXCE9oqgX/l+DAw QkVB5SnlSlsJAfWBNTrfh8/ETAc11tJBQK54hfafTPTt68M3JDZfgRmU32V2V8dDwT+O 5jaWPQiHLpprQoiZJ9NTyOQZVH4RISJQy3KQpEGl8/0SmpEq4OaYARMvxr9XjfkQC+eY 66JGJnzuby26YANE7C2sxv1JHrSAp3QM7sEgJxfUoEUOXbe3kBijIjnrSe6vnhPWSKFp 3kQsaC0UnCR3fl1rkQFTMWBexvI1HWSIrCL1jHGKwSDph/XWh8IFiaSfCXF40NI9f5PP 4P/g== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=uozktDZX; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id n61-v6si136341plb.67.2018.01.29.09.11.56; Mon, 29 Jan 2018 09:11:56 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) client-ip=140.211.169.62; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel-com.20150623.gappssmtp.com header.s=20150623 header.b=uozktDZX; spf=pass (google.com: best guess record for domain of openembedded-core-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-core-bounces@lists.openembedded.org Received: from layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id A2C2578864; Mon, 29 Jan 2018 17:11:37 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr0-f195.google.com (mail-wr0-f195.google.com [209.85.128.195]) by mail.openembedded.org (Postfix) with ESMTP id 520357884B for ; Mon, 29 Jan 2018 17:11:23 +0000 (UTC) Received: by mail-wr0-f195.google.com with SMTP id g21so8036044wrb.13 for ; Mon, 29 Jan 2018 09:11:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel-com.20150623.gappssmtp.com; s=20150623; h=from:to:subject:date:message-id:in-reply-to:references; bh=0uUbKzEa5iDfr27lLrf5CdvomL+YKxdNQ8hx82aUjCo=; b=uozktDZX/sGCak9F/XWvJUH/vDjLMHXwOFfV2NdZM8v6Om8L0vNvaq0htWPXf/bTyc PsXiG6d41bSK7An+mpR2jXokE1MieBgGIKkycqAdpb6HBrMO3A02iyESkY0uFcKfkbtD j630XexolVjQvFVDzJ30dctZgOCBGAXxPss52WupkiuE8kgMi5LAVOqC53pUIJgT9J8u aQ286ZPvCIQh52LePKXt3+yZe6r46GHzrHJlYT+n9NzSr1fhUH1WUxJdMiz/p+vw2YBJ RDpn9OO8SiE6wfIeqpDVpCDGz2uF3kS93J3CqZ9zohLScK347/MS7erZEht6F+PKgIha CWlg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=0uUbKzEa5iDfr27lLrf5CdvomL+YKxdNQ8hx82aUjCo=; b=cSGtIf1F9DBA0lu+XXNcXNByCSaJhE/ko0T/hM2n6XB5ixLP5YjJ2WjcBsjmdIrcg+ ICD/7KVeqcvdKbDShDB1IsIt2fFWjLk+rQLhedfSZeZLQoG9xn9rANUE6zGxSHS5E02/ mMgCtFABRtbespx2rw37h4SweIEaEB1NI2jAFnkLJeba7d+I2BtI/zBzQDt2OyOqf7Ha ypy857CtAsrdO7ug9Ytd2Iv5l9AO6dUnYGdOIjFJ2/Gf3KsO0kskqjcjdETebcEq0vLw tyJrDqSjvYNdoeDK27mf1hvOy/46R2rIJeCk+LqMjs7zZuP7mB8I22I3QxQD+DIE6Fy5 rdCA== X-Gm-Message-State: AKwxyteqRl7JgLRWxKSgoftXPW+mB59al90x4c9Q86zKYfBzVWtwC/Ea nTA41cRD4PIm8TbeYuzjaNZqkNWQ X-Received: by 10.223.185.124 with SMTP id b57mr19387172wrg.13.1517245883877; Mon, 29 Jan 2018 09:11:23 -0800 (PST) Received: from flashheart.burtonini.com (home.burtonini.com. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id e16sm11515244wre.5.2018.01.29.09.11.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 29 Jan 2018 09:11:23 -0800 (PST) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 29 Jan 2018 17:11:11 +0000 Message-Id: <20180129171111.14502-5-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180129171111.14502-1-ross.burton@intel.com> References: <20180129171111.14502-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 5/5] ofono: use patch sent upstream instead of sed X-BeenThere: openembedded-core@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Patches and discussions about the oe-core layer List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: openembedded-core-bounces@lists.openembedded.org Errors-To: openembedded-core-bounces@lists.openembedded.org 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. Signed-off-by: Ross Burton --- meta/recipes-connectivity/ofono/ofono.inc | 3 --- .../ofono/ofono/use-python3.patch | 27 ++++++++++++++++++++++ meta/recipes-connectivity/ofono/ofono_1.22.bb | 1 + 3 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-connectivity/ofono/ofono/use-python3.patch -- 2.11.0 -- _______________________________________________ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core diff --git a/meta/recipes-connectivity/ofono/ofono.inc b/meta/recipes-connectivity/ofono/ofono.inc index 4443a95c2f7..0472414b199 100644 --- a/meta/recipes-connectivity/ofono/ofono.inc +++ b/meta/recipes-connectivity/ofono/ofono.inc @@ -26,9 +26,6 @@ SYSTEMD_SERVICE_${PN} = "ofono.service" do_install_append() { install -d ${D}${sysconfdir}/init.d/ install -m 0755 ${WORKDIR}/ofono ${D}${sysconfdir}/init.d/ofono - - # Ofono still has one test tool that refers to Python 2 in the shebang - sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/ofono/test/set-ddr } PACKAGES =+ "${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 00000000000..7b84075257a --- /dev/null +++ b/meta/recipes-connectivity/ofono/ofono/use-python3.patch @@ -0,0 +1,27 @@ +set-ddr should use Python3 like all the other tests. + +Upstream-Status: Submitted +Signed-off-by: Ross Burton + +From 17b69cd1da4c5c5f732acb38ca1602446c567ee7 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Mon, 29 Jan 2018 11:31:25 +0000 +Subject: [PATCH] test/setddr: use Python 3 + +All the other tests use Python 3, so this should to. +--- + test/set-ddr | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/set-ddr b/test/set-ddr +index 5d061b95..33631f31 100755 +--- a/test/set-ddr ++++ b/test/set-ddr +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python3 + + import sys + import dbus +-- +2.11.0 diff --git a/meta/recipes-connectivity/ofono/ofono_1.22.bb b/meta/recipes-connectivity/ofono/ofono_1.22.bb index fd7ee15af1d..e57eaa77eb9 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 SRC_URI = "\ ${KERNELORG_MIRROR}/linux/network/${BPN}/${BP}.tar.xz \ file://ofono \ + file://use-python3.patch \ " SRC_URI[md5sum] = "2a683ab8e98448ad8bc5dc9868d2893e" SRC_URI[sha256sum] = "8e34a6696c300c9841b55e8dff640bd3096e49f5dbe55bbebaa69a71676f687e"