From patchwork Thu May 17 21:42:09 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: 915821 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="sWV4qzqb"; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=darbyshire-bryant.me.uk header.i=@darbyshire-bryant.me.uk header.b="X2mYj687"; 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 40n4Xh0KpMz9s1w for ; Fri, 18 May 2018 07:42:43 +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=Vx2crbSgdDryxj4DqhkpI6gZt86KWs2PNaPELy/LgjM=; b=sWV4qzqb+fvPuV mkn0kpO/mj2CvFN3ounnG/iF8DeEww8xbHAhBbNyTXR5fHmz25Ae1fBwauDj/0Vkk4hR/DUwxBvrY 81bvRIDg1ZyFKa7cb1dPqdRdjmgn0gaQoLAD5nTlZe9wj37OLXaZo2fPbk4mcWq2JB3rLC6O5CAKm a8Qw1TrHt0JzaWpeG9+6b6i+rlygX+Q9CHHBAwkxPdwbhR9NYlb5pC0Y+bxEg2A8YoX79OCfB3QSr 9HDu+JoLCjp0MfnIqPPOE91Km1JLZdQK/yEEeM+g6B6+aLGMr/Gy+hZ0k6GMMthUfhWMy/NhRb8uK cMMO6nWhx3GoAvtj8wlg==; 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 1fJQfY-0002rk-L2; Thu, 17 May 2018 21:42:40 +0000 Received: from mail-he1eur01on0622.outbound.protection.outlook.com ([2a01:111:f400:fe1e::622] helo=EUR01-HE1-obe.outbound.protection.outlook.com) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fJQfT-0002md-Co for openwrt-devel@lists.openwrt.org; Thu, 17 May 2018 21:42:38 +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=OTTm8QVb5L9Vv1/VtpxEeO6VdxvVBqpob8baw2jeocs=; b=X2mYj6876MDWt3n3f1aV5EhF8B8uZGoI59LMioVsRiSFvcJvZY/nCaELp1WWvXLHs2lQdcF4ihpgv0GpYYKwhlmtQqXrsLADZ5tmwaqsTMvwLRBsu0TRPB4vXA9OJDajtPIlbjD2eff5lm1pIW8AskeAZ7jyFgDAnaofugxHcpI= 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 VI1PR07MB4254.eurprd07.prod.outlook.com (2603:10a6:802:65::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.797.5; Thu, 17 May 2018 21:42:19 +0000 From: Kevin Darbyshire-Bryant To: openwrt-devel@lists.openwrt.org Date: Thu, 17 May 2018 22:42:09 +0100 Message-Id: <20180517214209.78922-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: LO2P265CA0073.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:8::13) To VI1PR07MB4254.eurprd07.prod.outlook.com (2603:10a6:802:65::19) 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:VI1PR07MB4254; X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB4254; 3:p5VsL+0ib/qKZUdlSAzNl96X8GTlNtbv7d1pMY6f+A/I5RukpSAuzPEy5ihvUX+WcGQrbNd+5fWhADGYpVw4Eiv8Q/7P+777K/9bCIAfzMXPd0+Z2FH8BgUOl+x1jmTr2+ca5chlDJZCO97Khf0ZK3wx9x7NQ90UHp1vlNOlPKPYsviKKtSxII0FMFnP7B18sJ/rMlQxbrcekh+NNW7+/WltKZEZDAjOMjkpskdZb8X1AiyuHEzOlXL3yvPdtUlR; 25:/hHTDj//iIkA4DgwMKaOFtxF+A2QLWae6pkwvAGUcvUutB8rllH7ieCTODLlnFwABrtg9ONwuQOXS2DyeWxncU1Kvp0d8WXrYcc/9aV1Ezakrka9cH5Xjc/56O6hPu7Jw5Hp5PPCoatk6xONV49sWClK2QsN8Nmhg4I1Zwu/4uB5TxJp+QYzZulesVPdt/W9mUuCMChlu+Jwzjss/34XhSM1du9CFiizn+9S+m0BwUxoi45Rkzct2iDf8h6pHD+gUvuIL3iGfSwIUoEZ/EyRKXpn/BKx+9azhfGDSXsBQCcG6S5G8QoGHCgtRPKoJXUYZRqGnNhKg+3RuOutun7/5g==; 31:OqC3hcHZ1m+BEacgO9yvlpJAdKkgOcsO/t2GTdgpbCuwaKngSP0kUDNrAwzOK39ribCnZIsO/7/oE6+pitOmL+aXPJs8PGC9Y9OIIPfeN7FwPBXGzK/DgNn0zVsbbg9BmZpgbP0QwbKOOY75ofiHueFo8sqMg6zQknc/k1oA1uSsSOTZDrXIXcI+QKyFWct1adltilh4Z9GSwZxkxAwQTg7MugmqLGhUkJbEL79uxRc= X-MS-TrafficTypeDiagnostic: VI1PR07MB4254: 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)(5005006)(8121501046)(93006095)(93001095)(3231254)(944501410)(52105095)(3002001)(10201501046)(149027)(150027)(6041310)(2016111802025)(20161123564045)(20161123558120)(20161123560045)(20161123562045)(6072148)(6043046)(201708071742011)(7699016); SRVR:VI1PR07MB4254; BCL:0; PCL:0; RULEID:; SRVR:VI1PR07MB4254; X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB4254; 4:MqYWGOaaS0mAbzG+kUx6Z+MYr7rybGxRyXbdSHyFtDhyRwhNj/vEuH9LoUbrOrgQFx9Ks8H6p8pQew7ya0mEe/avw4F3W0au8B6CxAzWpICe37+k0oAryoA+MxlIa4xV7z2PWKc70xHL6ELiwJmy9qgCF1fFW4Q4bfRuHGIxmwcLJBJy5ZJ6MBmnxOAOqQ8F82kGMpgo1P9UQV1S+jqlSu5L6jxAnJNLHVrHk4GormjUs+c/sjaxMsCksG9x3xgFrPtQcm0B3Wh/+zcoz3+mSQ== X-Forefront-PRVS: 067553F396 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(396003)(39380400002)(376002)(39830400003)(366004)(346002)(199004)(189003)(3846002)(956004)(16526019)(186003)(59450400001)(7736002)(48376002)(26005)(1076002)(2361001)(486006)(386003)(6116002)(2616005)(97736004)(50226002)(5660300001)(53936002)(305945005)(6306002)(2906002)(4326008)(107886003)(6916009)(316002)(6666003)(16586007)(476003)(8676002)(478600001)(81156014)(81166006)(6486002)(25786009)(106356001)(105586002)(50466002)(8936002)(2351001)(74482002)(66066001)(47776003)(36756003)(51416003)(1857600001)(52116002)(7696005)(68736007); DIR:OUT; SFP:1101; SCL:1; SRVR:VI1PR07MB4254; H:Kevins-MBP.lan.darbyshire-bryant.me.uk; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX: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; VI1PR07MB4254; 23:obd5Cz6zf3H7mkgFVIhrqRmdOOC3XFPBZ3JZ5mIDe?= 1g5sFzm2pURMTu4XrkvwMYqFH8pk/p3WZ+H9I7mS+/fdhvN3Bnozv0O+j8yisySp0NGWazprdnPODMWMCgO8czVyBMoREhRfb8XtG4EGuK9ryaXx2CuTJaMLG+VrP6Nq5p+9yTEFXmAWeFQMD0fuloE/JPtpYilOCH2dVyI9NoMftIzXBTLemz/FZGZ/mg9aRzdGQ+SEqE2uHtY1zPgikn7MADSE726Rmap1baHwmst4ImdMxfaBgjQprfq4RttdoTmgWg7isx8riYowS+tvScLwY+s03tr0t6Ygus+/9lIEwPs+HuYxAM/rul7PighiI3ryAkx4lDw3tpt/LGO548EXxdSqdYNVnAGeA+IwiX60L8KLIG87QHCFFnlvIMNQBIJ6u/ggDHSXmlWk9DX+uwJQc6ZI+JqufzkEQsH6Eb4Mxq5q5rHaNXtRctuVNytJJwIPcRwEmJuo/L41Ba/6J5fVzxugditCYN3hOz2eH690xbP9JRkFF/43k0OIzRHorytckinm4pQawSD3mFaFsZGj+Cjz2DRCgN7swXNHdnmM+6X6aQ8mI9SuqL6wj4EJGXebPTSnMKpYZGd1okK3Zag5/4r5QpTrr7mDU7vfP3D9EAi8Y4YLOdTQfv+4SP+uhzO4FkJAqtn9g5Jt+IVCUsJzIMsR+6C7K49d89ruwtaxAOUAFk02Ukkb5tslf5co4Qdt+dERNj+7zeYRR0/sf3CZVQX7jZFgmZEYDCOK3sZrw+9zKZ+VS5a6sdFBSeO1lQwE+RGoZcmWM6RI2DEm5JgWuLdRpiVtslPJuQhLimbrv8OzrRfENp0hIN37vdhlaAs0mOQ4TwszGBzE5QYFDga3CQr1N5qphV6uuUmtKyOC4hwuE5x7nVX74P472ANaKcfQcAddL3b9FsifDM1RLyTWckfMWYG8I/2r8QuLftwcitVehVwXGMlHOa+3aSRtmRokdPppJhy7dSCX+bgj6KuNutq1TmIchf01UC41BGBK7d57iW56gxpmpcPEfcXgEYReWorwer7IGGcyX5iEmsqEdWXTBQkM14dKwTrNiCn/oUe9IM9wq45n1Pd3lirxWoQnszWjrXKY2xvCL/yIqFGzu7GRGAKkv+HudTKF9BPiZPs3osym15J/SgOwOmTcnR8z/Y3e/z9lYYucqWV0+mOBLAQunxj6P4+kVQO3WyQ/GlEtdkgtP02QfkQxii5JyA= X-Microsoft-Antispam-Message-Info: oUpsdq2gTR0yZ4iBA2PL7E/5wZB7syjeVj771ym8OCeJTW2y3qHDAwMd5MKkSN0O5Eq1KDSHdBHXu2ulMW9dj5QGbYt2vOdMINE8ismRC8qJQOF/pZEqHau4uQnX20U6gnItIyeO3f2FBwwX9L65HFWUlw1nnM4HUhCaN79S8+pgk2tpox6jHW23VOi43cCz X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB4254; 6:vr5aM5xU/eb5uHpjoy7jc1PmcnWVuuy3EEF3rS2qIvNm1OGmRlt1ZhBQh9ZU5u9u3YO2+Aslrd7HFtF0K/94DknEYRZNdDHNh1YQ/w37wRGIOCDTVMvJ0bKd4UeTjPzUfGf/cuWn3UwtY5k5SCTCkkdfPp5TYUW+QaxkPnCZAoIuNZ72Rrc2mPzRAJM0UU3IH8QJsIxmO7aQLHOVq7mH7CKGJSe8U7DDPG/GVwG74Dntl/VPseBsrax0r6AvtR/4RcuQ+/oYgZ/ejqwmSVQddmDzPftX0ER+LCRrrmaJSI/aWvr5kStuFkHM5Ufd0pcursrK7k22GoOR55sJz8bXkqK+2qeZiXNBmC3Y07N7LWATPVCXCLa3+VAxOoFB+Vjj4l1Q2+1VJQI0vp0S2K/I8i+lV9CqxRsH8eUjLKnO2uAaduGac9K4/kH4TQhtptVtsX4T2TuUdXGDPFHhenPO+A==; 5:in1mIpzKfiGoRTRwvMkO3f2lC4g9giNYVfBTXGOpZb1FrwQ8nItpikCffvZdrBS3STIwJt04PEtdV/A951PGPLooBJz64C1u2gmG0HJMdI5mkJ5nFER5AG5gAU9CJyS+47FmvfQMJjKNhQekTmGHhLVYYcCPwx9yjhbGrq3sa0U=; 24:uYRIAOOtajWad1mJjdNa6xzpDwQ61gKK8D3n7bk4im5USj7wn1nG5Oa3Mo7lr0vf70m9KuxrzH2Bvi0TCZy8TTaSQv1SR2DlGgF3YVDCebk= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; VI1PR07MB4254; 7:ZMIRKe0emZLyBXnh7wjvr6EC6stWI/P0AtXmPfDTPSHdnz/o6G0xSqtD0ree1vIj5FyvEXjNf3iy1uPw7dWj1+A9TEzRFzlDpQRayMNgVaHYbiPFTEl3tDgxBE10HiaGnOJZYaMhUO9LQ5dfkHDFuJbJMLnoJ9rrQjrjhsTYnUy2Zq5VXwjn+Tc/CSpzp8KqtCwz72vMcY9XcRr0rG3lmbqJBusBNbW4o58k0z5MNn+8DOp9xs8D3M3DKtTtGJhC X-MS-Office365-Filtering-Correlation-Id: e2ac21fd-6b31-4f22-87a7-08d5bc3f1100 X-OriginatorOrg: darbyshire-bryant.me.uk X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 May 2018 21:42:19.5595 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: e2ac21fd-6b31-4f22-87a7-08d5bc3f1100 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 9151708b-c553-406f-8e56-694f435154a4 X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR07MB4254 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20180517_144235_633862_0678C638 X-CRM114-Status: UNSURE ( 7.31 ) 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 [2a01:111:f400:fe1e:0:0:0:622 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] 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 --- package/network/services/wireguard/Makefile | 3 ++- .../services/wireguard/patches/100-portability.patch | 19 ------------------- 2 files changed, 2 insertions(+), 20 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..08412f75db 100644 --- a/package/network/services/wireguard/Makefile +++ b/package/network/services/wireguard/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/kernel.mk PKG_NAME:=wireguard PKG_VERSION:=0.0.20180514 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE:=WireGuard-$(PKG_VERSION).tar.xz PKG_SOURCE_URL:=https://git.zx2c4.com/WireGuard/snapshot/ @@ -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