From patchwork Wed Oct 3 11:52:26 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 148052 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp6364066lji; Wed, 3 Oct 2018 04:52:33 -0700 (PDT) X-Google-Smtp-Source: ACcGV63RDGWcMpTXqkWgTi6QSf2MC1cbHOgeTMq2VAsjUrCzNjc8KBkIqUwc7WM3eUjNFx6HGNQl X-Received: by 2002:a65:668d:: with SMTP id b13-v6mr1033498pgw.163.1538567553574; Wed, 03 Oct 2018 04:52:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1538567553; cv=none; d=google.com; s=arc-20160816; b=UlSGGovMOLqREpLI/T+BpXQ8Qx8LC9HMGddqGM066/ph7fReb4BnbBIeHVG5e0n1dN q/ZfVBd2KY2LKsB0f2zRbnq6SoGQOQdnTeJb4NzV0fO1G6E1ACTI7kUXiruAyQsIV1LK 4HnkXFZKA21YQvAStTkCThBw5yyP5g+g/tOKNUgpzrHpzc4YUFeSDNNaqd+CzkHtPljV KWTXimhr/p/ghMZyYeNB2fq6bSL/yifT34SVylbw6Mxm6JfLkWslpdbduJRlqf/xphXB QWSfzxp0EAbTitkdH8rjRFJrnPR9jRyNobP+/FEWT9o325NldicAKqHzPn8TnCC6CTlq WjUA== 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:message-id:date:to:from:dkim-signature :delivered-to; bh=m6/wD6ibYhjLkayxWGEPp12h5IL8yzTSL6QHiEC47JU=; b=aKhgltffsi+fDYIy5qY8PO7kIkgidAiRNcJpo3zksFfofyd5epeLwNcFC3kyHdugn7 MZWEC0oplzGs/RwUFZ+LSyPaUm1kshc16xCIXqYZ1cDXEiO1WsOXfLEOpCmqXf7dcHFW Oo847fYuPfLoxyoeIHvqMrgQ8hZ7qiJnIHBbuo6V6Q652OtTiKCf025JO9JhnUG4+hi/ Y3DrKWy4YB8RebPDekzligCfOm1tKCaWd5/MStbLUkSXoxjJ2EJMbRqiFNIBHtg5FjEZ a2EX9HHFF5SGnbxnfCCK3VzNuWoXWk1WTUaVXRDWjhBv0r4kPqeUA+DPtEW0ZbIljVbO f3yw== 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=ycNRd0kO; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id 31-v6si1470687plj.160.2018.10.03.04.52.33; Wed, 03 Oct 2018 04:52:33 -0700 (PDT) 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=ycNRd0kO; 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; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 14533745D8; Wed, 3 Oct 2018 11:52:31 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f68.google.com (mail-wm1-f68.google.com [209.85.128.68]) by mail.openembedded.org (Postfix) with ESMTP id 7778971C42 for ; Wed, 3 Oct 2018 11:52:29 +0000 (UTC) Received: by mail-wm1-f68.google.com with SMTP id 143-v6so5400427wmf.1 for ; Wed, 03 Oct 2018 04:52:30 -0700 (PDT) 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; bh=yW7iEH2wxFJtyNQew3VXpeufMzMKIh8+C5H6ZAQrLSE=; b=ycNRd0kOrO3Y2q2ER1gL5otfD4y9CtfadpuOFp5rB4tVkwwSusrFG4lGpGuVcdqixO pdYi3SBM/J0F274yOnkWcMpYpsZfgM9RNgHSrBPApO+JV9C0Km+m2ujSFejtDNBF9VxG 2i2SsSFCHMmm41/dA0oSA3A3rXU6V4SDxzLTnyI71mV1Iho6n9hddq0tEov0+4/wgxBV DswuZ2cRhiUKNbPHPMdlD8L3Xn0DK9j34Rgwf42kmFaFB6J4VeDH7cw66W3LjdtklOfy OXH1r+83rfpqRx1hmf9yYCUTK7f+ef8O9SilVwbYxGwhgpowUhBxh/8GO3panteSJqEE fKFA== 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; bh=yW7iEH2wxFJtyNQew3VXpeufMzMKIh8+C5H6ZAQrLSE=; b=sP57vpNa4a6usWrFydYZ4/JbIRZaRjBM1Qqju0SwAjYiMRxR2Xj8GhnqIjYmydT1BR iCrspCEkEDfaDetgljV9DZIunusT9GFxggOdtdjs59Ppb6/NXfxw65DZW3hOKT9KOZyY bhHUnhpX44atlr4rbYeES4KxA8xS3iUSke1nUGZdGi2aEcpRZonF94jyG1jzyuNKwv1H kN2jS8EPAddQ9b5yZQ1nCfrWt9xvgABA46MoHKhUTW9jxv7DzdSMIFbQ5yqdeAfZEc10 54TK52B3dLuWKSQuKtGovVdYRg/0HkROR6IiVaAkh4bK2Xh2TwYa088SGSBdbBaJhvGV 78zw== X-Gm-Message-State: ABuFfojCe6az/hHxFCylYrll4j2x21tqstoeaGh1+0EMDTM+Db5pvfXn i6f7OeOV8XTmJ+tdn60Tfnx6vs38sOo= X-Received: by 2002:a1c:6504:: with SMTP id z4-v6mr1177451wmb.130.1538567549734; Wed, 03 Oct 2018 04:52:29 -0700 (PDT) Received: from flashheart.burtonini.com (35.106.2.81.in-addr.arpa. [81.2.106.35]) by smtp.gmail.com with ESMTPSA id z10-v6sm1199022wrv.22.2018.10.03.04.52.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Oct 2018 04:52:29 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Wed, 3 Oct 2018 12:52:26 +0100 Message-Id: <20181003115226.20823-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH] connman: neaten patches 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 The upstreamable include-tweaking patches contained fragments that should be in the not-upstreamable musl-specific res_ninit replacement, so move them to the right patch. Signed-off-by: Ross Burton --- .../0002-resolve-musl-does-not-implement-res_ninit.patch | 8 ++++++++ meta/recipes-connectivity/connman/connman/includes.patch | 12 +++--------- 2 files changed, 11 insertions(+), 9 deletions(-) -- 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/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch index 05934277105..639ccfa2a20 100644 --- a/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch +++ b/meta/recipes-connectivity/connman/connman/0002-resolve-musl-does-not-implement-res_ninit.patch @@ -17,6 +17,14 @@ diff --git a/gweb/gresolv.c b/gweb/gresolv.c index 5cf7a9a..3ad8e70 100644 --- a/gweb/gresolv.c +++ b/gweb/gresolv.c +@@ -36,6 +36,7 @@ + #include + #include + #include ++#include + + #include "gresolv.h" + @@ -875,8 +875,6 @@ GResolv *g_resolv_new(int index) resolv->index = index; resolv->nameserver_list = NULL; diff --git a/meta/recipes-connectivity/connman/connman/includes.patch b/meta/recipes-connectivity/connman/connman/includes.patch index 55cb187931b..dcce5bea122 100644 --- a/meta/recipes-connectivity/connman/connman/includes.patch +++ b/meta/recipes-connectivity/connman/connman/includes.patch @@ -300,20 +300,14 @@ diff --git a/gweb/gresolv.c b/gweb/gresolv.c index 8a51a9f..d55027c 100644 --- a/gweb/gresolv.c +++ b/gweb/gresolv.c -@@ -23,11 +23,13 @@ - #include - #endif - -+#include - #include - #include - #include +@@ -29,6 +29,7 @@ #include #include -+#include #include ++#include #include #include + #include diff --git a/plugins/wifi.c b/plugins/wifi.c index 9d56671..148131d 100644 --- a/plugins/wifi.c