From patchwork Thu May 17 22:08:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin 'ldir' Darbyshire-Bryant X-Patchwork-Id: 915831 X-Patchwork-Delegate: blogic@openwrt.org Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=darbyshire-bryant.me.uk Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Zi1fqTH5"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=darbyshire-bryant.me.uk header.i=@darbyshire-bryant.me.uk header.b="bhU/sglh"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 40n56q4qC6z9s29 for ; Fri, 18 May 2018 08:08:49 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:Message-Id:Date:To :From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References: List-Owner; bh=6klG2IfnlJbolyl1/1Agf4J+ugjAK4EAbg+/oLTSS9Y=; b=Zi1fqTH5jcFMGo sjlY0u4rsUMl1yWcu7JbHzgXuuEV6dE3ECCZD7bYvVFtQhRvxl5J+ZdvIZj6liJdjHkPPgar5NzCl yLUi6VHMw6Qpq9XlZVwKR4yj/oqCM4pFaGaaQjBvjsFPsQhebe6U/ndGU4wwU5/EiHBA+mN4teFWa qgxpy/tmjMemiIPUxp5qsvpfbYbPMcJ7fcv6kI9BCltrrw7jUeg1gGyN5YkG1XrwmvidapZOSUojN AO18kpHm8AY9PhEFPJX13KhIu6L7Rk6AacJnIe51nwlZZ0l+9zhH22rcqqyVFayEdBOEDXgUPrHLd swX2li7WLrYOBP+XzaUA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJR4j-0004GP-E6; Thu, 17 May 2018 22:08:41 +0000 Received: from mail-eopbgr40086.outbound.protection.outlook.com ([40.107.4.86] helo=EUR03-DB5-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJR4g-0004FJ-KC for openwrt-devel@lists.openwrt.org; Thu, 17 May 2018 22:08:40 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=darbyshire-bryant.me.uk; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=9PkV1ZOaHC+c+DnXEa2bWDNbyHbbjWJh4ZeIY6wH8Io=; b=bhU/sglhUmieS9Eg9ou9hNI6ZakdLxFBgGS77s386G/29qzeUP21fvm9dAflclPkJxzqny109TPupvwZd/kgDvAkPnwsg69MBgeLK0g9C86dJLqq+OPokaIgfacpghWCFBaj3mHm0Z40GPJO7Ax8qg+eJRtqXhP7yjB5l9Ll+NY= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kevin@darbyshire-bryant.me.uk; Received: from Kevins-MBP.lan.darbyshire-bryant.me.uk (151.231.154.194) by DB6PR07MB4248.eurprd07.prod.outlook.com (2603:10a6:6:51::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.776.10; Thu, 17 May 2018 22:08:25 +0000 From: Kevin Darbyshire-Bryant To: openwrt-devel@lists.openwrt.org Date: Thu, 17 May 2018 23:08:21 +0100 Message-Id: <20180517220821.82148-1-ldir@darbyshire-bryant.me.uk> X-Mailer: git-send-email 2.15.1 (Apple Git-101) MIME-Version: 1.0 X-Originating-IP: [151.231.154.194] X-ClientProxiedBy: LNXP265CA0084.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:76::24) To DB6PR07MB4248.eurprd07.prod.outlook.com (2603:10a6:6:51::21) X-MS-PublicTrafficType: Email X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(7021125)(5600026)(4534165)(7022125)(4603075)(4627221)(201702281549075)(7048125)(7024125)(7027125)(7028125)(7023125)(2017052603328)(7153060)(7193020); SRVR:DB6PR07MB4248; X-Microsoft-Exchange-Diagnostics: 1; DB6PR07MB4248; 3:eyaPFCIEjK61OeS4xv6sfnrPNB5/lX3lMViUeISGUnmie0QDgwhyHfC+1OisUXvXpHS3/42j5PzOhUmfHPyMaPtLl1vTUHnvoM0fcgmynHpwwk03jTBRPoDoJn7x/iAn7M6y56gvMxUxnIlSJIgMpelvwaPuCSIVPldcf+EkqHzVg+t1aii83qUBA1cYohp7C0NJpXA+ZX9DEAmzLTfzvfCpQ1uiTbCDhL66OTCIenkE0KMdP4xMTnUbhEnNcJSE; 25:WosUow5yuUOh0zgVCmwbTusMdxc4XhH2yF8Nje/vuxQYqhJusR2BAHtR3+0nnCZ5UsgzUGdDnAMduG+H5SP/8gwS7729mPczpRODFOczdd/DlVeY3r/oeLnVHITgZMHxgyic2tMtP2rZsLD0hwznuxdAv71hjBK73oE5m5CF/4a4U0qDs1GygrQMVpspUvufBtVVm5NNO/KL+L/1BE+YqulYtNIJfjpxKd2FPsJ5tzDMSAPo7xoHheuSjCrH/eyzHYCTWw0sYr36qDU/aRtU2ozctAgeap/lQ/EQmZSs8QA/VckWkHSkcsvPz0M905+aVxmbQfOyZPPEPqafiyxqNA==; 31:3qNHrDcF8Zc7/QRhzIXhR4+98R1co7tH/0MpwotITE1plPACSMHRd/HyEaiOXJs4xY/dsbdg4PFv8OnA0MLsN9k4SJbbB08EQBl1slZbhC8o46A9Jzw8TSKiIy/VX3g/8tQtZJw2xwMX9LH71SsAmAB+Egosg6wvwcfM059fS27mT0BqUYCd/OsiKXzya20eAYnQP24/xBkl6/5JrYZeYBdOMN7M4e1KyuEeF5f9QmI= X-MS-TrafficTypeDiagnostic: DB6PR07MB4248: X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040522)(2401047)(8121501046)(5005006)(3231254)(944501410)(52105095)(10201501046)(3002001)(93006095)(93001095)(149027)(150027)(6041310)(20161123560045)(20161123558120)(20161123564045)(20161123562045)(2016111802025)(6072148)(6043046)(201708071742011)(7699016); SRVR:DB6PR07MB4248; BCL:0; PCL:0; RULEID:; SRVR:DB6PR07MB4248; X-Microsoft-Exchange-Diagnostics: 1; DB6PR07MB4248; 4:7kma+tIaj8gNCD6QmnScg9ln7Q3pnHyhu8ENFHID5ugaSEpyJwlHFUk4990DhTIrAQS7uOhUbkzq8ZjReIotHQYTubtlgDN5agWjlbDVhqDXkje4VJiGqxU1g3WX5JO1i64AUWYD7eXd0/Sc6h/zn1Wx1JYIg9K+S9cSYJV4QvcGpXnVbhPRuK6F6WUPnyQVd44R4/s3OaHgn/RZgv+/5dNA9E56E4hheMnahJrjBKni4TtJ3bXkbj1Vnnfhc9PPoFqU7lQRJ8kEOcoLj0dZcA== X-Forefront-PRVS: 067553F396 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(366004)(39380400002)(39830400003)(346002)(396003)(376002)(189003)(199004)(52116002)(6666003)(2351001)(6916009)(50226002)(2361001)(74482002)(68736007)(5660300001)(8936002)(476003)(81156014)(51416003)(7696005)(956004)(81166006)(50466002)(2616005)(48376002)(486006)(97736004)(53936002)(6486002)(59450400001)(105586002)(186003)(1076002)(26005)(106356001)(16526019)(386003)(8676002)(305945005)(36756003)(478600001)(7736002)(66066001)(107886003)(25786009)(6116002)(4326008)(47776003)(316002)(16586007)(2906002)(3846002); DIR:OUT; SFP:1101; SCL:1; SRVR:DB6PR07MB4248; H:Kevins-MBP.lan.darbyshire-bryant.me.uk; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; Received-SPF: None (protection.outlook.com: darbyshire-bryant.me.uk does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DB6PR07MB4248; 23:HlQjEWGCXTV9MOEkm0LQMJjpEuY7UIIAhqAiVMaQ0?= 6qzDsY8GKohmPnIYBbjBvBGb7CYsKL6kyR3A2mzWtGXfJfJiH5XUhrrR0XLqHNy/cOtVW766VYIrtUT8gBnq6p+cXDIiofLmpGOuanNLTX8OIwp7fVpDhIAONaO+q0yoqPkW7uW0JwTa1VLuliNEx8kq8ABDBYf6+gr+qpXvxEq+4WcRaAYSKYD7AOlZdoAbxtpZEPCesflZaB6lnloq0s66htWDVc36zDTgTqt6VSfljAX7fkc4E2FRIgDtYkOUbFPrdwb+UcG+jmcExbW2o/R+kirDpLVUbLVPAiSFltcAZTZ18Bl7Z9xODm3hfEZMVc61BLzgqQIqkPl2q7JhjfCxN01ecrjeEHmopOswi0BcwKgxodNjbiJ4LmhOVUm3ERlJW/LAXryRGZHCZQjoJfvbKo7YkddVqseEYzBekxQTnh4+mCse5M64cIQ/I6ukQBa0zRQtFh0oqn/bj8FLJCln24Xbg6EuDbs2BCc1ARKvbyPrF2MJu8SBp+94jWTYUiBFZlsDNiK6kQ7ye72kV8T3se6uYAvWwZlWm7sOB3pMLbHiL45y4Ixo8r95sGszNg8UuOdhYXZAN1kxo3ZTIbKNuynUrH6X3EYf+7m6TljQghNwWVEa+9yskTxrvWxn7QnG2yyJ/qv1iIpXy0iQwP3/2Vb2UpaVW/+PLuqBcHnhVT5rOsjPnyzxWm050vWOTJ4LeTLYsX0UwRGIBhE8WybUXQwBGQEOq2jDHs4hgT4K/cSDQQoSTGP5jUOowPSdJlDWumE1bXLTx1TCptLVtgMI3ZCymWRU6IIkbkvkjoDCbl6rA0B2fKB2LG+3QhkAkZKKN/iKz8n2XquB27PmaBuOdAqR1IL1YyUHRIK3TaeAGzTapSzEiF4fZGrWpJiLkJEiZXXXibRvqpt+oa0uHqB2Cb1sqIpu8T1su6Hz2YFV/wKDn8h7huVtXhUoXvKSuFwLFvC2Dzi83xtW+OtMiU0CrxpkMnsYDDq9zjOPusQ9mztflEy8mAsrJR7n3io2M1uKSvs6wNBgNGDXYdZatwdZVlGKTugP19Beovm6AFmfBc+lOG1KmpCN+knjfjEYQEZWL7sKxg4USytilmzY7FF0RbKdreJZG4qHVe9A1tiGBZtF2s1dIo2jz9sm6Thb6bcR9ZezmSkJhTwTNZwzArf X-Microsoft-Antispam-Message-Info: NOSKarY3BKsqT5l9dxio6DFbyXRht98jqiUsBNpCB+ivtxbImlY13iStsn9x/VZrhpLRj6NIEWLT5u4wTfKWVfW4RHgl4gyXRm8iJ9h2Yg5+8SJX7x+Wjsofu1XmnJvq1VKVks3T9b1GH86x1jaUdCHFkf6dGYW86CFaR/O57XeFXSY2tqF3VSsmjSBL1Ms5 X-Microsoft-Exchange-Diagnostics: 1; DB6PR07MB4248; 6:bj2f7TcFbTheQuqSCELRE8fCYwH9O9fJ68QITT84C0DBDRCnyKOBrTFy3VSJs9souyBS5xysUmREJB3Y6+VI4dwafa7a/8b1L1CMMscckAWkvoSQA3gGPj66ez8NXb0xHXkmcIEiDMQ4VHuLmw82qWPhloY4gDVq+iefWUlj0hbrROXJ8MsjrAdLAbJJnRQpP4XwLYxYHWEJc00TX49LZas9+TAHnf4+qvE4zJdW6WDacuH0KFhhQhqtsydvtpfDC3qHEMc5MPiLHdTBk5X827z7/w/dTqHs1PBGTGJYxUhCUQZtoax92fr7310oxiWGzue+b5viLaM06k2PKE/6akJy9IvxwgGBkE04JY5qV9GcWn4uXfesiYexiCc9+lj0WyQuBxgjHKKSJsTnQWKBTG3lqTImkMxg8QeRfefYObe5HcX7VvPGcyuSROucx1XQzrJ+qZwVmu4RgCvxR2pabw==; 5:Bx252WnxTm+vGKqo/tEFF1yDB9sas+GABSt00eUMvgDiXylZOUS7COh6yXQQWWEcSSwkpZSLvUhDnLYaTxtk9M9q+z5p5tUE1jKHLd1m8cVANo0SaC2CBEBYJLnVXXHXUUhFhSb6weXo0Nd64iRcDBXdETyWWQ9dGAnFbC0fI/o=; 24:uciqdhx0kpkchgUSperm9BeTtvWFULzomhPLO0CtaoLB05Es/W7xqotZg5Ygj8bUcfiYHZTHW2uYR804I5kgTuP3jom0We3L/6dG7Vu+6v4= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; DB6PR07MB4248; 7:S+YXICJPk24jntLOHHW+LBZ4TbpoLZH0zyZYX8pKEfhgqLGYWqyyrLOaGTaBCl7LPv/UAsboDlxTk/IyBo3MMiAuhEBdqib1/YQzlQhK3Gl9bVxXtf89GCjr6PXNWRkmujb+LYutOzOR6sBXJtvjxt9NvUyEiiDQY9CeOHnq+pv3txT6oCbnmPezO9XwQrKyAkHdzGqW5em0w8wHMY/X3AbBOpm2H1AbdV4XJXje9F2FPgPHeKiUJfCqcT/ylUug X-MS-Office365-Filtering-Correlation-Id: e7f228ff-d5ed-4055-e2b9-08d5bc42b624 X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2018 22:08:25.1746 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e7f228ff-d5ed-4055-e2b9-08d5bc42b624 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 9151708b-c553-406f-8e56-694f435154a4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB6PR07MB4248 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180517_150838_813555_1E9182B9 X-CRM114-Status: UNSURE ( 7.36 ) X-CRM114-Notice: Please train this message. X-Spam-Score: -0.1 (/) X-Spam-Report: SpamAssassin version 3.4.1 on bombadil.infradead.org summary: Content analysis details: (-0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, no trust [40.107.4.86 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -0.0 SPF_HELO_PASS SPF: HELO matches SPF record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature Subject: [OpenWrt-Devel] [PATCH v2] wireguard: no longer need portability patch X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Kevin Darbyshire-Bryant Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Drop package/network/services/wireguard/patches/100-portability.patch Instead pass 'PLATFORM=linux' to make since we are always building FOR linux. Signed-off-by: Kevin Darbyshire-Bryant --- V2 - actually I don't need to bump the package version as this doesn't really change anything in the binary sense package/network/services/wireguard/Makefile | 1 + .../services/wireguard/patches/100-portability.patch | 19 ------------------- 2 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 package/network/services/wireguard/patches/100-portability.patch diff --git a/package/network/services/wireguard/Makefile b/package/network/services/wireguard/Makefile index 5ca7b7da57..770efe4948 100644 --- a/package/network/services/wireguard/Makefile +++ b/package/network/services/wireguard/Makefile @@ -60,6 +60,7 @@ include $(INCLUDE_DIR)/package-defaults.mk # Used by Build/Compile/Default MAKE_PATH:=src/tools +MAKE_VARS += PLATFORM=linux define Build/Compile $(MAKE) $(KERNEL_MAKEOPTS) M="$(PKG_BUILD_DIR)/src" modules diff --git a/package/network/services/wireguard/patches/100-portability.patch b/package/network/services/wireguard/patches/100-portability.patch deleted file mode 100644 index 33a7373cc7..0000000000 --- a/package/network/services/wireguard/patches/100-portability.patch +++ /dev/null @@ -1,19 +0,0 @@ -tools: fix portability issue - -Check if the compiler defines __linux__, instead of assuming that the -host OS is the same as the target OS. - -Signed-off-by: Felix Fietkau ---- ---- a/src/tools/Makefile -+++ b/src/tools/Makefile -@@ -36,6 +36,9 @@ endif - endif - - PLATFORM ?= $(shell uname -s | tr '[:upper:]' '[:lower:]') -+ifeq ($(strip $(shell echo __linux__ | $(CC) -E - | grep -v '^\#')),1) -+PLATFORM := linux -+endif - - CFLAGS ?= -O3 - CFLAGS += -std=gnu11 -D_GNU_SOURCE