From patchwork Fri Jun 7 17:53:48 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 166185 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp943724ili; Fri, 7 Jun 2019 10:54:39 -0700 (PDT) X-Google-Smtp-Source: APXvYqzr4On9V0LBjUNJZxg22/IiQeAW0VR2NdOy6JFxLq6fgaxZ/PjiyQLazHtSDe3xfYU+S3sH X-Received: by 2002:a17:90a:1706:: with SMTP id z6mr6849317pjd.108.1559930079738; Fri, 07 Jun 2019 10:54:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559930079; cv=none; d=google.com; s=arc-20160816; b=rpGY+VVk/PjNpBR+Y8S0Ns/havNmUc+QRmlCLD//mZrVqC5BqWWlzmMReMLpn+TcYy Pgfnd1SCtAJMKYtmwM2qOoBoLsYmRutLMS2RANk3nQ5+nyQnGYzz2oOoO3S+l+vLq4WM HRMSYKmZT2SxZZIjj0cGy6Ip7aHOtAOCbiF+Ka4YsYUDRJA0KXXKMPGDvlzr6VPcPQIk FqJ6L69dIbUln5KuBqNcr0511bIMlZOBwdUoI1Xe2PWqCPfU6HRPL6HUcvKg8aD7FGvM w7pX3LiC3gaC5yfAW4ddlIcrNbuitB/NQU/QJLPdkn2Ctuiwk7hRROfPkGuGYBuyhjxb xOIw== 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; bh=HCwh/An9Xz7JnwG8+1lp462Uup5buQnrz8OaVfF/GuE=; b=mDCWw1sy3yx3bdqH43n+j7neo53T3Ucg2SvJdvCQ3y4VU0wFTwX8ik2piXCnFzZoxU A/UGgOcnPXFKkX5xVxZuIB+jw3oz5819fLrCaqXUrX6ZvEFsxYmeCOu0afmrxG140LBy 5lGCSJCLMYTgiMvUlXkdhqlijidBh8KbY1cttCtdoSfe38MNX4wwpEuvrOwObBqJbIv5 fmFjGdHamu6M0njEiNR/5K7X/MSc2wITl6jkrO3MOVW58v5FjA3NM2zk9DXjyGKJO+/f jUJXAQRUpXghTWUfzKbeK7LchwNP1xrNibtl3/FxSt/YIphcFrzpS5GO2YSNb1A1B6gD fsXQ== 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=tHM6Houp; 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 bc10si2708727plb.43.2019.06.07.10.54.39; Fri, 07 Jun 2019 10:54:39 -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=tHM6Houp; 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 ec2-34-214-78-129.us-west-2.compute.amazonaws.com (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 806677E523; Fri, 7 Jun 2019 17:54:33 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by mail.openembedded.org (Postfix) with ESMTP id F3FF27E517 for ; Fri, 7 Jun 2019 17:53:55 +0000 (UTC) Received: by mail-wr1-f67.google.com with SMTP id n9so3039999wru.0 for ; Fri, 07 Jun 2019 10:53:57 -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:in-reply-to:references; bh=rpZRE8oOMDIzLWnwL/DdHwCIld5WXgqyT9RYWcNYnP4=; b=tHM6HouptrY243O4M4oxUnhudrxLJrJ4XVdDeh66AUXMyrnPMDh1Q7b705OfqeZzc8 fl9p84kTmBhAOvUrFoD/DjARY/12P0YTQOmKPHU5k/eexA4jr8ineS6o/7eO7ZcqKgIk Wexdz2HeDkp+dRvwhoQUQA16eTut3mp/0w72JIUuxxvWs9kK2k3viMRImnJ34qyQVwtr CBcF1kcD+LIg9ILr4m7ybBrrE3QjG5jXoh0dmEgT3BUy4xpd1+POG5aQGXW0PDbLXRG2 UD7Enj3Pbh3b/lgpspdpESIQ8MJpIJN3qWNH/480rqjXGxteLtaH2mviw6d8O8AzlY7A xc6A== 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=rpZRE8oOMDIzLWnwL/DdHwCIld5WXgqyT9RYWcNYnP4=; b=gZkgfo/Ed7REJYEVAR8g3O8FLV7ysKjIai7T2e6CjGbFfEbZc8LY+uBdCdb77PlXB+ IbcpBLN6jylck0K0r3uxV/dcSVpHYagq+E1u05quD8yopkDxrxjj1S3P3FRuLS7/bWIt OP63CYWIeZdXEI85SQLj6GuYWbzr36LZ40B0Rghn4sTHmWb9ZWexS59E3trTbUvtX0ih lqFwqwbWlG2qCrHBiXImSeL1R7uMCOT7/RIP/Z8Fr8nJGDZekuLEnIzxZ/rJYdkCXH7/ 5Qwz1l53RsT3/JrwJeVkzM2L6nuRE2NU2vlNYykdqpVCGICnXDXJ9ArGdoJ3alI/ughI N79w== X-Gm-Message-State: APjAAAXN59oaq8Nwi4PIOKkQj2h9L8eeDh74PBxJhK12OVGhKEtp8nfu IgNnQs5SarW4rkZy3UyYp4amZQDr1Do= X-Received: by 2002:a5d:68d2:: with SMTP id p18mr14569290wrw.56.1559930036426; Fri, 07 Jun 2019 10:53:56 -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 o13sm3495085wra.92.2019.06.07.10.53.55 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Jun 2019 10:53:55 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 7 Jun 2019 18:53:48 +0100 Message-Id: <20190607175348.9666-3-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20190607175348.9666-1-ross.burton@intel.com> References: <20190607175348.9666-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 3/3] parted: drop patch for linux <2.6.20 support 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 We don't really care about kernels this old anymore, so drop the patch. Signed-off-by: Ross Burton --- meta/recipes-extended/parted/files/syscalls.patch | 55 ----------------------- meta/recipes-extended/parted/parted_3.2.bb | 1 - 2 files changed, 56 deletions(-) delete mode 100644 meta/recipes-extended/parted/files/syscalls.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-extended/parted/files/syscalls.patch b/meta/recipes-extended/parted/files/syscalls.patch deleted file mode 100644 index 93205a0a804..00000000000 --- a/meta/recipes-extended/parted/files/syscalls.patch +++ /dev/null @@ -1,55 +0,0 @@ -Upstream-Status: Pending - ---- - libparted/arch/linux.c | 13 +++++++++++++ - 1 file changed, 13 insertions(+) - -Index: parted-3.2/libparted/arch/linux.c -=================================================================== ---- parted-3.2.orig/libparted/arch/linux.c -+++ parted-3.2/libparted/arch/linux.c -@@ -17,6 +17,8 @@ - - #define PROC_DEVICES_BUFSIZ 16384 - -+#include -+ - #include - #include - #include -@@ -1696,12 +1698,14 @@ linux_refresh_close (PedDevice* dev) - - #if SIZEOF_OFF_T < 8 - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) - static _syscall5(int,_llseek, - unsigned int, fd, - unsigned long, offset_high, - unsigned long, offset_low, - loff_t*, result, - unsigned int, origin) -+#endif - - loff_t - llseek (unsigned int fd, loff_t offset, unsigned int whence) -@@ -1709,11 +1713,20 @@ llseek (unsigned int fd, loff_t offset, - loff_t result; - int retval; - -+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) - retval = _llseek(fd, - ((unsigned long long)offset) >> 32, - ((unsigned long long)offset) & 0xffffffff, - &result, - whence); -+#else -+ retval = syscall(__NR__llseek, fd, -+ ((unsigned long long)offset) >> 32, -+ ((unsigned long long)offset) & 0xffffffff, -+ &result, -+ whence); -+#endif -+ - return (retval==-1 ? (loff_t) retval : result); - } - diff --git a/meta/recipes-extended/parted/parted_3.2.bb b/meta/recipes-extended/parted/parted_3.2.bb index 63f9f204e73..13d7d6676c7 100644 --- a/meta/recipes-extended/parted/parted_3.2.bb +++ b/meta/recipes-extended/parted/parted_3.2.bb @@ -8,7 +8,6 @@ PR = "r1" SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ file://no_check.patch \ - file://syscalls.patch \ file://fix-doc-mandir.patch \ file://fix-compile-failure-while-dis.patch \ file://0001-Include-fcntl.h-in-platform_defs.h.patch \