From patchwork Fri Jun 7 17:53:46 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 166183 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp943102ili; Fri, 7 Jun 2019 10:54:01 -0700 (PDT) X-Google-Smtp-Source: APXvYqzWvXRZp5E2mY/KFnuSaBN05NFfOW7sy/E7vpJvs5ahCeULdL1uhIPsVkqQS/pOvv0owxw8 X-Received: by 2002:a17:902:2865:: with SMTP id e92mr56653423plb.264.1559930041197; Fri, 07 Jun 2019 10:54:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559930041; cv=none; d=google.com; s=arc-20160816; b=OONkdJxMb2WbbpPt2r2/gb371jyaHAt0O22tzvCpd0cJCQ09J+4V/r4JhpWiYl2r9w ujO7HGaTU39oC8oKK7XS8RKVxnTnEMrQAVA1YG/EAo7tomFaxX5AahBYvKG0VjsCHkSO C4xkkIYt8oBJq7LD8s00uju6uJk9rCzX9zn64vTfEhNTKYxRXnsObijgN+aG8yy3YHMj vUzSvUgF6AAwqwHCt7Ysg+qPakqxUBZXWm3s0mth7Zt8KodwH9OTzBvScerYJSo3NXmV 5JNb6OOMZ/7wEoy7WRO34Wy8/P6MWzj01H0RqWgwDTmg/kJgrU6cVPPTCOIzNn0T/uY7 DQ3A== 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=klfLKR/ICg8WWoz9cCy5dqtFFlqPqGSiP1CaWTkzpLs=; b=ltEdFPjg9KgWMDgyXd9yLBDDC4jbnYU7wb8CkSvzVFk/w2d3BPWaAXXN251aigFdtM Of814FTa9aCJfwQXgNBt2QljT4gTnRIg1YEp4fpthWsvbQOWNXSdwCI9Mnq7hzwKbh19 3YBMtb6U6YjMwRupJD0vogpk3XjqfqdTL2iP9XrJCPxWCIqmSSBi8tCcZRmfXxGAYhy7 EKLBkTNa9ppfHkhjJ6hlRl1YSGYBl+an5lbTERYLh82y5spHAqE/8dE3OdjbPuiBDKoI jyEENmAx7tXIbtGxu1iqtteobFMJGawzkUd2mrjEyfizPK63vM12ndvgkKq0hbvXCNxW F3Lw== 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=Qsd87OMO; 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 m2si2643687pgd.256.2019.06.07.10.54.00; Fri, 07 Jun 2019 10:54:01 -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=Qsd87OMO; 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 DEC457E506; Fri, 7 Jun 2019 17:53:54 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by mail.openembedded.org (Postfix) with ESMTP id 864827C86A for ; Fri, 7 Jun 2019 17:53:52 +0000 (UTC) Received: by mail-wm1-f66.google.com with SMTP id u8so2745608wmm.1 for ; Fri, 07 Jun 2019 10:53:53 -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=rbOBFHMBo1eW/VzNE8br1opikt7RQU0uuOi+Vp3C7lQ=; b=Qsd87OMOHJ3x/xvWiMA+miVfhLMeSRm9+pk+WyiPHJ/LlVvCXu8Bal8rnXgHfLbU3x E0+XQABDiyC/P+Sz5sfaE5MOjk24T/dPPhTA/WQ+8BkX8avBcAXr6g3hOIADtTlFabEd gC+BtghVdxDKHBu/gCWl8uGRonEBYNAuIdyT0h4/Wa6g3kxlVsUAkrKPBvfFq9oRC1IP wJdOo3IygiBjtFkJPI5X9LfMKPEWH/9C8mo0kzog0EbbYM9CJWQD8prIseYAwr1a/lg3 7LZm+SaxurLF3FxeUwC/UVNfS8pjcExiVVhF+pTVFxLazQeuNvg9psL+hebpj9XUE5qD xyYg== 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=rbOBFHMBo1eW/VzNE8br1opikt7RQU0uuOi+Vp3C7lQ=; b=Pc9o6e8ZKVbH7RCchA2rKBeDxu9MbWE2X4KvrFP6xa0G2Nah0a019pK0xUZWsKTyhs 9dd8ZbgWqe8hjwS9JkVRs86+kn/6TtygHDeSEhzR3gidF1Lwe3AY9VuMdrEOD/PmXsQ9 qOuMUebuHPq+AyiivxeV/DeyqD83/cRRTt7qQuSPBw8yW4g0/igtrwKG1ogsJ3ehVMeP GVxJiASUAww5Z1ArJ7sSH7lVKLwb1IZwgkSZj8B8MgvxcMGYoLM6UubqN1RkJggSbaT3 NmpPoMRa6MRcfoJ4DllA70gxa4ZDI16KIQnaeRpH8IREaJFEoq+ZZuxUWADatHGP7YEj vMIg== X-Gm-Message-State: APjAAAWAc49FtBpm8csqGUXgkfYYGPsIuyZ2/peqnw9fCwyA1oYr/Qt0 yleB/+ZwPBMpjwqrs/71G/ZoZE2n++o= X-Received: by 2002:a1c:188:: with SMTP id 130mr4437180wmb.18.1559930032839; Fri, 07 Jun 2019 10:53:52 -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.51 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Jun 2019 10:53:52 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 7 Jun 2019 18:53:46 +0100 Message-Id: <20190607175348.9666-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/3] libxslt: add comment saying when a workaround can be removed 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 Signed-off-by: Ross Burton --- meta/recipes-support/libxslt/libxslt_1.1.33.bb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 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-support/libxslt/libxslt_1.1.33.bb b/meta/recipes-support/libxslt/libxslt_1.1.33.bb index 28d404ca779..462eccf52fa 100644 --- a/meta/recipes-support/libxslt/libxslt_1.1.33.bb +++ b/meta/recipes-support/libxslt/libxslt_1.1.33.bb @@ -21,8 +21,9 @@ BINCONFIG = "${bindir}/xslt-config" inherit autotools pkgconfig binconfig-disabled lib_package -# We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header do_configure_prepend () { + # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header. + # This can be removed when upgrading to 1.1.34. sed -i -e 's/ansidecl.h//' ${S}/configure.ac # The timestamps in the 1.1.28 tarball are messed up causing this file to From patchwork Fri Jun 7 17:53:47 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 166184 Delivered-To: patch@linaro.org Received: by 2002:a92:9e1a:0:0:0:0:0 with SMTP id q26csp943630ili; Fri, 7 Jun 2019 10:54:34 -0700 (PDT) X-Google-Smtp-Source: APXvYqz+vLBUN6Yx2Gp01z+By2dfSK9ck2xFMvdgbs5i2RpKkEVkVIb8M5L3IoBdgVPn8Hwoy1di X-Received: by 2002:a17:902:b110:: with SMTP id q16mr49579005plr.218.1559930074372; Fri, 07 Jun 2019 10:54:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1559930074; cv=none; d=google.com; s=arc-20160816; b=SR9l57FSfrlbz0VRlU+TkSSJafO7T7pl1YKYXjf54ByyvFb8kaYB+ENq8Fm3CFzXBE HvgXpRUmQdplV6TK+zp4GiK7Py5iKSAPB4N08hepxWgmTxd5B9V5Aw+8SRWAfqCT9Qzd wG6A3pkfalTveLe7k77r5r9mPzOmfl/pAq0jYu5t+YVSFtJIMAti9tNbCpWy5gC8Gt/O iSFr6mZw74eCCOH4fXSBNvrt9XVmuj7pDOaAlHaTyXJyDjunUmWiG8hIOm4q1mweEzAh WA2F8vzCcvcA4NalkXL6AI9RrnLNak251QlZIEfMKjJRoXmdb7+8J+3Q2wDGkqSLgFy9 N5qw== 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=fXvhCzMxSnC/SOiQU8lp3CSBo2+M9BPgOop+E/Gtgug=; b=k/Km4tiEeJw7qsQ4U6TnPh0YritOX6Sa5M51ww4EQp4hJsgC39rdQ8Qs6/Lg8OVZzO D32TQGh30MhzWgBOYmPn2xhDZ1mySJH5GHKA3XD82syxPh3JzS96eMABSSwXrCUrW74S CVFA47RARnbz7j4p1lryS2YEc+/rEMETsk92sYlk8jn0Z6aK4YURP1RN1Tuf5VrAjU07 41rIaeFwHkjHw07n29/HBIzz/f7/1b2M0EeDcTlD5mmFadGmGUtov27WlropUmTxdxxQ kqLijbLsfUkx5014aMJm5L4+kz1tSwu/Gt+opl1O6YBveGVBcrs1iRQ8sL7XH3fqVSar 2tMQ== 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=1P1YSn5v; 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 f7si2616413pgr.536.2019.06.07.10.54.34; Fri, 07 Jun 2019 10:54:34 -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=1P1YSn5v; 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 3A1F47E513; Fri, 7 Jun 2019 17:54:32 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by mail.openembedded.org (Postfix) with ESMTP id 317E07E517 for ; Fri, 7 Jun 2019 17:53:55 +0000 (UTC) Received: by mail-wm1-f65.google.com with SMTP id x15so2904986wmj.3 for ; Fri, 07 Jun 2019 10:53:56 -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=Rkv56KslObqEucbTLCaoCIvEReNaZ5XGUvRRslW9Ilo=; b=1P1YSn5vdlbcKeK95pwXzXKX9w8WLh5jmc6LHVng3zVl8OJidRPJPq0cy3q6GUpOT6 HV1XXrpMJHQliU/dGYvUd7uo0FQXEH+h4XOSpnuTfHPT3H6fU/xVR4p7mG6POhP0yFGH 17xGhCZwpfXjt2qlQG7AVXtHvw6kgRYqQI1xk9OhPbGK8ILB33qFlTvsrDjeRr1SJ5/E CmeXHmfhhW5kWuVm5JRG8xZ3g3Ot+FdTJoNVvg44+jAZsEnGTh4NJtj7M5mxZfFAOtF8 BM5FoT6ORD8gRJp10YsEQ9li6nvZkExfH541RxOONs+8yQEnsXhUOMGxf3hO4kB9wEeW y/sQ== 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=Rkv56KslObqEucbTLCaoCIvEReNaZ5XGUvRRslW9Ilo=; b=FeEoQsfMHnc449U5OAVPsdy83A13O9Obz51iAxMmPLVB/KKsA62my+7/Dbdj7TF6uv yWiD5FYzVBlc9w6FeO4ufQGrRrdUeVxRAFznQToFuDWm5g/GXAkUxNMhMvWBa4q6cdkY 3tObYOH8gXs+hMdslyfqxsMcLFiO4OUJQ4zO1XzncIxo+0LYGieHVyaUcWuMkplXSyMI cEtCpmG1ywuU1QE5usaMWmkKiS3YtFAhbdc70s/NzSs8AKAzl4DqK/zukSerzsfG8V2F MrRlxdTEdNEpnzQOT+9jnkXlmPqticmJWLRMRqzePYlf3zFPMFXC7o53FTqoTu18O/dg FFbA== X-Gm-Message-State: APjAAAXXCA0QvLLpUY13vZcrmNy5Mb1J7g9Istk1+APMUGEaeNCwE+9A T4jPPLX6aFl91GVAzf4/h502D6Nxre8= X-Received: by 2002:a1c:a483:: with SMTP id n125mr4431709wme.172.1559930035282; Fri, 07 Jun 2019 10:53:55 -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.54 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 07 Jun 2019 10:53:54 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Fri, 7 Jun 2019 18:53:47 +0100 Message-Id: <20190607175348.9666-2-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 2/3] parted: swap patches for the commits that landed upstream 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 Several of the parted fixes are actually upstream in slightly different form. Signed-off-by: Ross Burton --- .../0001-Include-fcntl.h-in-platform_defs.h.patch | 34 +++++----- ...se-read-only-when-probing-devices-on-linu.patch | 44 ++++++------- ...x-Include-sys-sysmacros.h-for-major-macro.patch | 28 ++++++++ .../files/fix-compile-failure-while-dis.patch | 76 ++++++++++++++-------- .../parted/parted/parted-3.2-sysmacros.patch | 32 --------- meta/recipes-extended/parted/parted_3.2.bb | 2 +- 6 files changed, 119 insertions(+), 97 deletions(-) create mode 100644 meta/recipes-extended/parted/files/0001-linux-Include-sys-sysmacros.h-for-major-macro.patch delete mode 100644 meta/recipes-extended/parted/parted/parted-3.2-sysmacros.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/0001-Include-fcntl.h-in-platform_defs.h.patch b/meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch index b0376cefcf6..4070127d343 100644 --- a/meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch +++ b/meta/recipes-extended/parted/files/0001-Include-fcntl.h-in-platform_defs.h.patch @@ -1,29 +1,33 @@ -From d78dd087c4ec4715aab5fe115668e726046ecd76 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 13 Apr 2015 18:16:05 -0700 -Subject: [PATCH] Include fcntl.h in /platform_defs.h +Upstream-Status: Backport +Signed-off-by: Ross Burton -exposed when compiling using musl +From a3877115f1956949096d77aca5a703a47ed68397 Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sun, 3 May 2015 10:33:31 +0200 +Subject: [PATCH] libparted/fs/xfs/platform_defs.h: Include for + loff_t -Upstream-Status: Pending +This is needed for compilation with musl libc -Signed-off-by: Khem Raj +Suggested-by: Travis Tilley + +Signed-off-by: Brian C. Lane --- libparted/fs/xfs/platform_defs.h | 1 + 1 file changed, 1 insertion(+) diff --git a/libparted/fs/xfs/platform_defs.h b/libparted/fs/xfs/platform_defs.h -index 2b55752..32bd3d3 100644 +index 2b55752..a6ec8fb 100644 --- a/libparted/fs/xfs/platform_defs.h +++ b/libparted/fs/xfs/platform_defs.h -@@ -42,6 +42,7 @@ +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + #include #include #include - #include -+#include - #include - #include - -- -2.1.4 +2.11.0 diff --git a/meta/recipes-extended/parted/files/0001-libparted-Use-read-only-when-probing-devices-on-linu.patch b/meta/recipes-extended/parted/files/0001-libparted-Use-read-only-when-probing-devices-on-linu.patch index e522e1c6ef1..39107620d54 100644 --- a/meta/recipes-extended/parted/files/0001-libparted-Use-read-only-when-probing-devices-on-linu.patch +++ b/meta/recipes-extended/parted/files/0001-libparted-Use-read-only-when-probing-devices-on-linu.patch @@ -1,7 +1,8 @@ -From d6e15a60e84c1511523aa81272b7db7a6ec441d0 Mon Sep 17 00:00:00 2001 -From: Ovidiu Panait +From 843225aa9d5077bebdb08bbf9699c02aec0b83eb Mon Sep 17 00:00:00 2001 +From: "Brian C. Lane" Date: Tue, 26 Sep 2017 08:04:58 +0000 Subject: [PATCH] libparted: Use read only when probing devices on linux + (#1245144) When a device is opened for RW closing it can trigger other actions, @@ -25,17 +26,17 @@ Resolves: rhbz#1245144 Upstream-Status: Backport -Author: Brian C. Lane Signed-off-by: Ovidiu Panait + --- libparted/arch/linux.c | 62 +++++++++++++++++++++++++++++++++++--------------- 1 file changed, 44 insertions(+), 18 deletions(-) diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c -index f612617..0a06a54 100644 +index 7f12f58..4ddea58 100644 --- a/libparted/arch/linux.c +++ b/libparted/arch/linux.c -@@ -294,7 +294,9 @@ struct blkdev_ioctl_param { +@@ -292,7 +292,9 @@ struct blkdev_ioctl_param { static char* _device_get_part_path (PedDevice const *dev, int num); static int _partition_is_mounted_by_path (const char* path); static unsigned int _device_get_partition_range(PedDevice const* dev); @@ -46,7 +47,7 @@ index f612617..0a06a54 100644 static int _read_fd (int fd, char **buf) -@@ -913,7 +915,7 @@ init_ide (PedDevice* dev) +@@ -911,7 +913,7 @@ init_ide (PedDevice* dev) if (!_device_stat (dev, &dev_stat)) goto error; @@ -55,7 +56,7 @@ index f612617..0a06a54 100644 goto error; if (ioctl (arch_specific->fd, HDIO_GET_IDENTITY, &hdi)) { -@@ -982,11 +984,11 @@ init_ide (PedDevice* dev) +@@ -980,11 +982,11 @@ init_ide (PedDevice* dev) if (!_device_probe_geometry (dev)) goto error_close_dev; @@ -69,7 +70,7 @@ index f612617..0a06a54 100644 error: return 0; } -@@ -1119,7 +1121,7 @@ init_scsi (PedDevice* dev) +@@ -1117,7 +1119,7 @@ init_scsi (PedDevice* dev) char* vendor; char* product; @@ -78,7 +79,7 @@ index f612617..0a06a54 100644 goto error; if (ioctl (arch_specific->fd, SCSI_IOCTL_GET_IDLUN, &idlun) < 0) { -@@ -1133,7 +1135,7 @@ init_scsi (PedDevice* dev) +@@ -1131,7 +1133,7 @@ init_scsi (PedDevice* dev) goto error_close_dev; if (!_device_probe_geometry (dev)) goto error_close_dev; @@ -87,7 +88,7 @@ index f612617..0a06a54 100644 return 1; } -@@ -1155,11 +1157,11 @@ init_scsi (PedDevice* dev) +@@ -1153,11 +1155,11 @@ init_scsi (PedDevice* dev) if (!_device_probe_geometry (dev)) goto error_close_dev; @@ -101,7 +102,7 @@ index f612617..0a06a54 100644 error: return 0; } -@@ -1171,7 +1173,7 @@ init_file (PedDevice* dev) +@@ -1169,7 +1171,7 @@ init_file (PedDevice* dev) if (!_device_stat (dev, &dev_stat)) goto error; @@ -110,7 +111,7 @@ index f612617..0a06a54 100644 goto error; dev->sector_size = PED_SECTOR_SIZE_DEFAULT; -@@ -1198,7 +1200,7 @@ init_file (PedDevice* dev) +@@ -1196,7 +1198,7 @@ init_file (PedDevice* dev) goto error_close_dev; } @@ -119,7 +120,7 @@ index f612617..0a06a54 100644 dev->bios_geom.cylinders = dev->length / 4 / 32; dev->bios_geom.heads = 4; -@@ -1209,7 +1211,7 @@ init_file (PedDevice* dev) +@@ -1207,7 +1209,7 @@ init_file (PedDevice* dev) return 1; error_close_dev: @@ -128,7 +129,7 @@ index f612617..0a06a54 100644 error: return 0; } -@@ -1225,7 +1227,7 @@ init_dasd (PedDevice* dev, const char* model_name) +@@ -1223,7 +1225,7 @@ init_dasd (PedDevice* dev, const char* model_name) if (!_device_stat (dev, &dev_stat)) goto error; @@ -137,7 +138,7 @@ index f612617..0a06a54 100644 goto error; LinuxSpecific* arch_specific = LINUX_SPECIFIC (dev); -@@ -1265,11 +1267,11 @@ init_dasd (PedDevice* dev, const char* model_name) +@@ -1263,11 +1265,11 @@ init_dasd (PedDevice* dev, const char* model_name) dev->model = strdup (model_name); @@ -151,7 +152,7 @@ index f612617..0a06a54 100644 error: return 0; } -@@ -1284,7 +1286,7 @@ init_generic (PedDevice* dev, const char* model_name) +@@ -1282,7 +1284,7 @@ init_generic (PedDevice* dev, const char* model_name) if (!_device_stat (dev, &dev_stat)) goto error; @@ -160,7 +161,7 @@ index f612617..0a06a54 100644 goto error; ped_exception_fetch_all (); -@@ -1332,11 +1334,11 @@ init_generic (PedDevice* dev, const char* model_name) +@@ -1330,11 +1332,11 @@ init_generic (PedDevice* dev, const char* model_name) dev->model = strdup (model_name); @@ -174,7 +175,7 @@ index f612617..0a06a54 100644 error: return 0; } -@@ -1623,12 +1625,27 @@ retry: +@@ -1621,12 +1623,27 @@ retry: } static int @@ -203,7 +204,7 @@ index f612617..0a06a54 100644 if (arch_specific->fd == -1) { char* rw_error_msg = strerror (errno); -@@ -1697,6 +1714,15 @@ linux_refresh_close (PedDevice* dev) +@@ -1695,6 +1712,15 @@ linux_refresh_close (PedDevice* dev) return 1; } @@ -218,7 +219,4 @@ index f612617..0a06a54 100644 + #if SIZEOF_OFF_T < 8 - #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,20) --- -2.11.0 - + static _syscall5(int,_llseek, diff --git a/meta/recipes-extended/parted/files/0001-linux-Include-sys-sysmacros.h-for-major-macro.patch b/meta/recipes-extended/parted/files/0001-linux-Include-sys-sysmacros.h-for-major-macro.patch new file mode 100644 index 00000000000..01262e5452a --- /dev/null +++ b/meta/recipes-extended/parted/files/0001-linux-Include-sys-sysmacros.h-for-major-macro.patch @@ -0,0 +1,28 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 0b72b8eb41438b62eeb9e3548b0b8f3094a78681 Mon Sep 17 00:00:00 2001 +From: "Richard W.M. Jones" +Date: Sat, 24 Mar 2018 17:37:02 +0000 +Subject: [PATCH] linux: Include for major() macro. + +Since glibc 2.27 this header is required. +--- + libparted/arch/linux.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c +index 0f18904..a15854f 100644 +--- a/libparted/arch/linux.c ++++ b/libparted/arch/linux.c +@@ -41,6 +41,7 @@ + #include /* for uname() */ + #include + #include ++#include + #ifdef ENABLE_DEVICE_MAPPER + #include + #endif +-- +2.11.0 + diff --git a/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch b/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch index 68ab715f326..8c4d2ae66d1 100644 --- a/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch +++ b/meta/recipes-extended/parted/files/fix-compile-failure-while-dis.patch @@ -1,44 +1,68 @@ -From 060e74354774d36d2c11ef08e3e7ea9b9b6e23fb Mon Sep 17 00:00:00 2001 -From: Hongxu Jia -Date: Thu, 13 Nov 2014 11:29:33 +0800 -Subject: [PATCH] libparted/arch/linux.c: fix compile failure while - --disable-device-mapper +Upstream-Status: Backport +Signed-off-by: Ross Burton -While --disable-device-mapper, the MACRO ENABLE_DEVICE_MAPPER is -undef, but it missed to scope some device mapper functions. +From da3f129710929abe9a403901fa7d168355b0e95a Mon Sep 17 00:00:00 2001 +From: Felix Janda +Date: Sun, 3 May 2015 10:33:15 +0200 +Subject: [PATCH] libparted/arch/linux.c: Compile without ENABLE_DEVICE_MAPPER -Upstream-Status: Pending - -Signed-off-by: Hongxu Jia +Signed-off-by: Brian C. Lane --- - libparted/arch/linux.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) + libparted/arch/linux.c | 21 +++++++++++++++++---- + 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c -index 6fd73c5..2afa479 100644 +index a15854f..7f12f58 100644 --- a/libparted/arch/linux.c +++ b/libparted/arch/linux.c -@@ -2320,6 +2320,7 @@ zasprintf (const char *format, ...) +@@ -2305,6 +2305,7 @@ zasprintf (const char *format, ...) + return r < 0 ? NULL : resultp; + } + ++#ifdef ENABLE_DEVICE_MAPPER static char * dm_canonical_path (PedDevice const *dev) { -+#ifdef ENABLE_DEVICE_MAPPER - LinuxSpecific const *arch_specific = LINUX_SPECIFIC (dev); - - /* Get map name from devicemapper */ -@@ -2337,6 +2338,7 @@ dm_canonical_path (PedDevice const *dev) - dm_task_destroy (task); - return dev_name; +@@ -2327,14 +2328,21 @@ dm_canonical_path (PedDevice const *dev) err: -+#endif return NULL; } ++#endif + + static char* + _device_get_part_path (PedDevice const *dev, int num) + { +- char *devpath = (dev->type == PED_DEVICE_DM +- ? dm_canonical_path (dev) : dev->path); +- size_t path_len = strlen (devpath); ++ char *devpath; ++ size_t path_len; + char *result; ++#ifdef ENABLE_DEVICE_MAPPER ++ devpath = (dev->type == PED_DEVICE_DM ++ ? dm_canonical_path (dev) : dev->path); ++#else ++ devpath = dev->path; ++#endif ++ path_len = strlen (devpath); + /* Check for devfs-style /disc => /partN transformation + unconditionally; the system might be using udev with devfs rules, + and if not the test is harmless. */ +@@ -2350,8 +2358,10 @@ _device_get_part_path (PedDevice const *dev, int num) + ? "p" : ""); + result = zasprintf ("%s%s%d", devpath, p, num); + } ++#ifdef ENABLE_DEVICE_MAPPER + if (dev->type == PED_DEVICE_DM) + free (devpath); ++#endif + return result; + } -@@ -2957,13 +2959,15 @@ _disk_sync_part_table (PedDisk* disk) - unsigned long long *start, +@@ -2946,12 +2956,15 @@ _disk_sync_part_table (PedDisk* disk) unsigned long long *length); -- + +#ifdef ENABLE_DEVICE_MAPPER if (disk->dev->type == PED_DEVICE_DM) { add_partition = _dm_add_partition; @@ -53,5 +77,5 @@ index 6fd73c5..2afa479 100644 remove_partition = _blkpg_remove_partition; #ifdef BLKPG_RESIZE_PARTITION -- -1.9.1 +2.11.0 diff --git a/meta/recipes-extended/parted/parted/parted-3.2-sysmacros.patch b/meta/recipes-extended/parted/parted/parted-3.2-sysmacros.patch deleted file mode 100644 index 211e6c73400..00000000000 --- a/meta/recipes-extended/parted/parted/parted-3.2-sysmacros.patch +++ /dev/null @@ -1,32 +0,0 @@ -https://bugs.gentoo.org/580022 - -From dec8995fe80508374beba6356f6ecbba8ef6b18b Mon Sep 17 00:00:00 2001 -From: Mike Frysinger -Date: Tue, 21 Jun 2016 15:01:08 -0400 -Subject: [PATCH] include sysmacros.h for major/minor/makedev - -Linux C libs are moving away from including this header implicitly via -sys/types.h, so include it explicitly. - -Upstream-Status: Pending -Signed-off-by: Martin Jansa - ---- - libparted/arch/linux.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/libparted/arch/linux.c b/libparted/arch/linux.c -index 326b95619d31..e5c168be3c68 100644 ---- a/libparted/arch/linux.c -+++ b/libparted/arch/linux.c -@@ -37,6 +37,7 @@ - #include - #include - #include -+#include - #include - #include /* for uname() */ - #include --- -2.8.2 - diff --git a/meta/recipes-extended/parted/parted_3.2.bb b/meta/recipes-extended/parted/parted_3.2.bb index ceac52892db..63f9f204e73 100644 --- a/meta/recipes-extended/parted/parted_3.2.bb +++ b/meta/recipes-extended/parted/parted_3.2.bb @@ -15,7 +15,7 @@ SRC_URI = "${GNU_MIRROR}/parted/parted-${PV}.tar.xz \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://0002-libparted_fs_resize-link-against-libuuid-explicitly-.patch \ file://0001-Move-python-helper-scripts-used-only-in-tests-to-Pyt.patch \ - file://parted-3.2-sysmacros.patch \ + file://0001-linux-Include-sys-sysmacros.h-for-major-macro.patch \ file://run-ptest \ file://Makefile \ file://0001-libparted-Use-read-only-when-probing-devices-on-linu.patch \ 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 \