From patchwork Wed Nov 7 20:06:37 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Khem Raj X-Patchwork-Id: 150449 Delivered-To: patch@linaro.org Received: by 2002:a2e:299d:0:0:0:0:0 with SMTP id p29-v6csp5609399ljp; Wed, 7 Nov 2018 12:06:52 -0800 (PST) X-Google-Smtp-Source: AJdET5cv1HFNxqHMTqeBV+pMoQa8lh/jl8xrf/bfHZHYH20ctIqL5CmicnsyiYEYrmC/+uln/8RU X-Received: by 2002:a63:a064:: with SMTP id u36mr1398433pgn.145.1541621212015; Wed, 07 Nov 2018 12:06:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1541621212; cv=none; d=google.com; s=arc-20160816; b=kORkUm+12iJsW2XDNM611LDqIzrLweRaj2ar2ymdRkX0KW72nr+HNQ8tkGo4/y9J/L /YsU+Cu5D66UICA0fQGLNS0Q4XxAFjgmmGXRv/z9p24Q/sGQisiRzGnYnC5sAP+v3d1M /UE4fgPS9Q3E1CMQO2Covyp3LMS3dReUioS/R7Wk6lTJFNwP1vZ9vJ5/loxoe9Y4hmy/ VRuYqT5PcnLes4UNDV8FuN+zKkAZ29SToRzTzWArcS3hE7G0tzlGjA0Yuzc1HrvTHYFb Y3i4zASNKRq/+4MrUOlzXY9fG22oA+BBlRauD1IkPqWXLitQHd/AW+tjqdoaajgZQYoA ghYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :mime-version:message-id:date:to:from:dkim-signature:delivered-to; bh=nSfQONyVYQlJ6saqzsZSTjm+BnLY5LsUfycyJ7QQ9cg=; b=0qP5fyAT0MtlYcN7vpWhoGKvmsRFxnm3XkS8lCcQdsK9kWySq766qhH7YAUw+jOqzK svzQQx6HrSim+SP0YiURT8b6ztAISXoSm4z9rCyb+AEU5AARw5MlG8eGZelZco2RlGvH 04u39AR74Aq48tvkb0/qr4ZIuRC170D7yQVCflbRwinoitcPWpBukptJAVAbF4HG6QY/ 5dRrfyMQZQvfzhQf2BPdSby0hCIovIBYWu4rQZ96B+A6d2IZeL8BLslSJDhK6d7jh0+e 6wfvPv0nw35bzP6Y9n0+Q66nh5ZrgD5arS3fcwFaLvSHQOdQI9UNKiwCVCjd2+H3DDWu Fx7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20161025 header.b=bSlkjKJK; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from mail.openembedded.org (mail.openembedded.org. [140.211.169.62]) by mx.google.com with ESMTP id y7-v6si1482445pgi.256.2018.11.07.12.06.51; Wed, 07 Nov 2018 12:06:52 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of openembedded-devel-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=@gmail.com header.s=20161025 header.b=bSlkjKJK; spf=pass (google.com: best guess record for domain of openembedded-devel-bounces@lists.openembedded.org designates 140.211.169.62 as permitted sender) smtp.mailfrom=openembedded-devel-bounces@lists.openembedded.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from 165.28.230.35.bc.googleusercontent.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id E98156FFD7; Wed, 7 Nov 2018 20:06:48 +0000 (UTC) X-Original-To: openembedded-devel@lists.openembedded.org Delivered-To: openembedded-devel@lists.openembedded.org Received: from mail-pl1-f193.google.com (mail-pl1-f193.google.com [209.85.214.193]) by mail.openembedded.org (Postfix) with ESMTP id A56666067C for ; Wed, 7 Nov 2018 20:06:46 +0000 (UTC) Received: by mail-pl1-f193.google.com with SMTP id w22-v6so5027792plk.0 for ; Wed, 07 Nov 2018 12:06:48 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=boplyzxNomz9o38OufNs1JQe11XxE5aqocLI+68sAo8=; b=bSlkjKJK3oDLrg/W3zqvADywIgd+XZwaq9fPU1aozMnneY48yYk8Tjk/pP9raE+pSA sPnXzZ1lZyVu+z4PX6MlAGlxLOOICPyWAwEINw0OIyteEGri/z/6xmSZ5wX9WkuAkgph HFYjoB3bziGnsPouCOZRMM5ajM0zdEE6aqBiiQL7GUbkocVi2QYrFaIGz4QpE4ook9N3 X0lgLtwPvcsUsqJ4PcQAGj5Oq69XpsTlw5HyAxYNYEBAk/6JNA4K2XucOkcIx1FFoXcV fW739X3mtj15oiZ4xBqieRK+PpOcsSnhWLtuJgKvHe/BZEr0r3g2HQiL8GeufEBPSkUp /mqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=boplyzxNomz9o38OufNs1JQe11XxE5aqocLI+68sAo8=; b=AfYfaYwgdPNsPRSVwVeCt039JVEjCGheAm4oCR0/PgLRFJrjtbs0WcOkSJe7g/puD+ rpzubBnqxtvSuo2b+Q8Rh81KiK/+9cF9hqixgFkmVT+J3b6m/FN2fcw+5tWVGnRRaucU 5yodUyn8p7FO0Vc5D0b7KGoxc4RkgAmWc3Bh3arrKaNHjXBp6Htk0JJk3lWTg2pu+aLK CVO/OrG+x75RsJHDUAOHnhLILKpkHV+JKtfCN6OLRpLHoS8mWR02bN8XVVvp7AtRlKPT pVO7ddbqIE5PMLsqWqjbWXjNjFOrFy0Sot3F7KpKeqvCq6Jshnbs2WTF5T/KjgqGyiws R1ig== X-Gm-Message-State: AGRZ1gJc68QRXE2vCaDNug2qqYr/i8ls7lRIsS9BFQBxISyzm8ASYBi3 l87LWGIcZHVeryp4txXu+VcxnX5O1bU= X-Received: by 2002:a17:902:1122:: with SMTP id d31-v6mr1649071pla.259.1541621206960; Wed, 07 Nov 2018 12:06:46 -0800 (PST) Received: from localhost.localdomain ([2601:646:877f:9499::5b3d]) by smtp.gmail.com with ESMTPSA id m7-v6sm1252698pgq.59.2018.11.07.12.06.46 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 07 Nov 2018 12:06:46 -0800 (PST) From: Khem Raj To: openembedded-devel@lists.openembedded.org Date: Wed, 7 Nov 2018 12:06:37 -0800 Message-Id: <20181107200637.22770-1-raj.khem@gmail.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 Subject: [oe] [meta-networking][PATCH] networkmanager: Fix build with musl X-BeenThere: openembedded-devel@lists.openembedded.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Using the OpenEmbedded metadata to build Distributions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: openembedded-devel-bounces@lists.openembedded.org Errors-To: openembedded-devel-bounces@lists.openembedded.org Remove redundant header includes Signed-off-by: Khem Raj Cc: Andreas Müller --- ...-net-ethernet.h-and-linux-if_ether.h.patch | 53 +++++++++++++++++++ .../networkmanager/networkmanager_1.14.4.bb | 1 + 2 files changed, 54 insertions(+) create mode 100644 meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch new file mode 100644 index 0000000000..0c415bce7e --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch @@ -0,0 +1,53 @@ +From 3f4b6319701834182304c4079119780f4ae5b49b Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 7 Nov 2018 11:30:44 -0800 +Subject: [PATCH] Do not include net/ethernet.h and linux/if_ether.h + +They conflict when used together especially with musl +removing them still keeps it working so it seems they are redundant + +Signed-off-by: Khem Raj +--- + shared/n-acd/src/n-acd.c | 1 - + src/platform/wpan/nm-wpan-utils.h | 2 -- + src/settings/nm-settings-connection.h | 2 -- + 3 files changed, 5 deletions(-) + +diff --git a/shared/n-acd/src/n-acd.c b/shared/n-acd/src/n-acd.c +index 9164f95..9538e50 100644 +--- a/shared/n-acd/src/n-acd.c ++++ b/shared/n-acd/src/n-acd.c +@@ -23,7 +23,6 @@ + #include + #include + #include +-#include + #include + #include + #include +diff --git a/src/platform/wpan/nm-wpan-utils.h b/src/platform/wpan/nm-wpan-utils.h +index f7d0c03..e1c81f5 100644 +--- a/src/platform/wpan/nm-wpan-utils.h ++++ b/src/platform/wpan/nm-wpan-utils.h +@@ -20,8 +20,6 @@ + #ifndef __WPAN_UTILS_H__ + #define __WPAN_UTILS_H__ + +-#include +- + #include "nm-dbus-interface.h" + #include "platform/nm-netlink.h" + +diff --git a/src/settings/nm-settings-connection.h b/src/settings/nm-settings-connection.h +index e796b71..c01fef6 100644 +--- a/src/settings/nm-settings-connection.h ++++ b/src/settings/nm-settings-connection.h +@@ -22,8 +22,6 @@ + #ifndef __NETWORKMANAGER_SETTINGS_CONNECTION_H__ + #define __NETWORKMANAGER_SETTINGS_CONNECTION_H__ + +-#include +- + #include "nm-dbus-object.h" + #include "nm-connection.h" + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb index 3ce2a2f89d..348ce9e7a2 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.14.4.bb @@ -28,6 +28,7 @@ SRC_URI = " \ file://0001-sd-lldp.h-Remove-net-ethernet.h-seems-to-be-over-spe.patch \ file://0002-Fixed-configure.ac-Fix-pkgconfig-sysroot-locations.patch \ file://0003-Do-not-create-settings-settings-property-documentati.patch \ + file://0001-Do-not-include-net-ethernet.h-and-linux-if_ether.h.patch \ file://musl/0001-musl-basic.patch \ file://musl/0002-musl-dlopen-configure-ac.patch \ file://musl/0003-musl-network-support.patch \