From patchwork Mon Sep 10 13:31:20 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 146302 Delivered-To: patch@linaro.org Received: by 2002:a50:c01b:0:0:0:0:0 with SMTP id r27-v6csp2699504edb; Mon, 10 Sep 2018 06:32:03 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZ9lWZE3vtkK1uYmzVONqYExUE4co0LxJDS+nPFKATULnjKSQEKWid3QFRLVymzno2DK6A1 X-Received: by 2002:a17:902:8f93:: with SMTP id z19-v6mr21730936plo.263.1536586322964; Mon, 10 Sep 2018 06:32:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536586322; cv=none; d=google.com; s=arc-20160816; b=qsyUJofNH1q4vYjVH4IHWcol3kgzre7MelXmbz9BohRueSNnB591b6VlKw/AJtI32s fYF3M8RDG69GAFB861lkyDM+sv8yZfkqPjXDQEVPxbeLYdiKO3TaH5aIGNhYpGUeWo/j ICbYajjWUc3RPeuTiCAFqnSjJ3YXTCAflFhkabSwTyOPmUqUdscOm09xURDo4nfmz6Qr 0EvtRGn+DQ6W5oWxJvpljnXO7jH6BZxISCqZv6CJZYkgBDx8Vv+N694Y0lFwQ1GkqbI+ Y1KCJr5pNRqy/sypnnSPdolpi+B/RUlTXAIALrdNZ3BXbTZJt58YTNLppkq7F4V0Xe8L UU6w== 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=Ig+Xi0rn4jYItQ6XvgWK16t3PkaQbA4N2gXy0s3UAMg=; b=jTWDSndXAZKswTxr26gyL0AaXKZRbLZcApieWtzkcDM7jsVPTg9rskQtVAJLcipWaE b/fEHeBQTsi2WRUUlqnbdnpD+aY6ASV+ExoP9lUTU99JowmLVFG+hr8pHoeKpUOHPFka kK8Ydt88Yl2Sqhl+riZ+lUJFdgD13DaqCIJQjPeedBL4ZKcZa8m6mw7TSJ94S+iBmtwM xgLHs4/Wc52ew5O67YxY7YEwcaKvx2XKD/ZkecYLZytsHfjSedJdvevDuOqJQyTg91bf qVzaLmoxxX9W8VkQWlsyLTzncbnGN5BQgA1MMulujgApavAhmZDS8r/9ETKwywlg29Hm mNLw== 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="msRW/NC8"; 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 v4-v6si16188185plb.400.2018.09.10.06.32.02; Mon, 10 Sep 2018 06:32:02 -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="msRW/NC8"; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id 243A879803; Mon, 10 Sep 2018 13:31:58 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f68.google.com (mail-wr1-f68.google.com [209.85.221.68]) by mail.openembedded.org (Postfix) with ESMTP id 6B38A797DC for ; Mon, 10 Sep 2018 13:31:34 +0000 (UTC) Received: by mail-wr1-f68.google.com with SMTP id z96-v6so21960963wrb.8 for ; Mon, 10 Sep 2018 06:31:35 -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=vvYtUa/jxFAvJwlnxecKhQF/hl+Gf/SMjXCAAmg+q6Y=; b=msRW/NC8hhhrrrV/OnIC5G8SYJLUYzUn99lXlAqJ3qXX1XnoNvv2OcXOp+iszqfS8k 2y+v0p0KS7HgSel2YSL/uRR9f4li1HBQhlXez6U+WEVX6w5dnl8Oozu98ih4ws0DYTd7 0ye/zIlHPJ+8ELld+bquHRkOYxziHIFtaZrjG+Q3R9Je9F4GUmWczQmkqJmfzhPetcJN 52+zWoCRG2REiNhZZbi+3L2V4JFR+XIYZke1U9u97iaabEe5j2DyPR4igrwsvhvRxiGk EucyUqV1ZlFSiCkfnKd8CPSg/DTAEjFQ8ggH8qMMtKpYtLU/aychV1jc3QvyUrHSOceN e9hg== 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=vvYtUa/jxFAvJwlnxecKhQF/hl+Gf/SMjXCAAmg+q6Y=; b=XAqXRdWVmkCdx+0ZOT00/ZckQaZVX2tH7myTGrdK/5WaP/HuPU4SaiWuEl+9f3eObS Eor8vpBaHDQ5XsMuuKAybyOdFqKudUQNoSV83Gm7zlkSO/qJB6qDZlROvlMAW1M5IkBm jKpXfwE4Zz+fLMFVT5K15+zCZCckHspDls25Ozkf0X3piTEI/tr1pExSrQ3bxkE85VJ9 pg1NFLvk1pE+xWVP0kpjvnR5Eu4St/sJDe8c7lJikwZkQxHL3AzWbp6yfg/Km+4pGtMO AnidAkqYaOX6RCLBUHD6ej829mNunRhdtMVKiWNB2x/3AVCPjknRBqXZ2EOtZLGoo6RV SU9Q== X-Gm-Message-State: APzg51DaorZ+OR6s+tYP3XVXZhBq0WIApQOXUQocEonZTlCbwWqn6Bih o3vjEEugGPQz9YzGhQ1l8B6T2DDTuRQ= X-Received: by 2002:a5d:448d:: with SMTP id j13-v6mr15080896wrq.236.1536586289844; Mon, 10 Sep 2018 06:31:29 -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 p11-v6sm17695045wrd.74.2018.09.10.06.31.28 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Sep 2018 06:31:29 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 10 Sep 2018 14:31:20 +0100 Message-Id: <20180910133123.22372-1-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 Subject: [OE-core] [PATCH 1/4] python3: fix ftplib with TLS 1.3 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 With OpenSSL 1.1.x TLS 1.3 can be used, so backport a patch from Python 3.6 to fix the ftplib unit test. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3/ftplib.patch | 57 +++++++++++++++++++++++ meta/recipes-devtools/python/python3_3.5.5.bb | 1 + 2 files changed, 58 insertions(+) create mode 100644 meta/recipes-devtools/python/python3/ftplib.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-devtools/python/python3/ftplib.patch b/meta/recipes-devtools/python/python3/ftplib.patch new file mode 100644 index 00000000000..8bb3cd02196 --- /dev/null +++ b/meta/recipes-devtools/python/python3/ftplib.patch @@ -0,0 +1,57 @@ +From cabe916dc694997d4892b58986e73a713d5a2f8d Mon Sep 17 00:00:00 2001 +From: "Miss Islington (bot)" + <31488909+miss-islington@users.noreply.github.com> +Date: Thu, 16 Aug 2018 15:38:03 -0400 +Subject: [PATCH] [3.6] bpo-34391: Fix ftplib test for TLS 1.3 (GH-8787) + (#8790) + +Read from data socket to avoid "[SSL] shutdown while in init" exception +during shutdown of the dummy server. + +Signed-off-by: Christian Heimes + + + +https://bugs.python.org/issue34391 + +(cherry picked from commit 1590c393360df059160145e7475754427bfc6680) + + +Co-authored-by: Christian Heimes +--- + Lib/test/test_ftplib.py | 5 +++++ + Misc/NEWS.d/next/Tests/2018-08-16-18-48-47.bpo-34391.ouNfxC.rst | 1 + + 2 files changed, 6 insertions(+) + create mode 100644 Misc/NEWS.d/next/Tests/2018-08-16-18-48-47.bpo-34391.ouNfxC.rst + +diff --git a/Lib/test/test_ftplib.py b/Lib/test/test_ftplib.py +index 44dd73aeca..4ff2f71afb 100644 +--- a/Lib/test/test_ftplib.py ++++ b/Lib/test/test_ftplib.py +@@ -876,18 +876,23 @@ class TestTLS_FTPClass(TestCase): + # clear text + with self.client.transfercmd('list') as sock: + self.assertNotIsInstance(sock, ssl.SSLSocket) ++ self.assertEqual(sock.recv(1024), LIST_DATA.encode('ascii')) + self.assertEqual(self.client.voidresp(), "226 transfer complete") + + # secured, after PROT P + self.client.prot_p() + with self.client.transfercmd('list') as sock: + self.assertIsInstance(sock, ssl.SSLSocket) ++ # consume from SSL socket to finalize handshake and avoid ++ # "SSLError [SSL] shutdown while in init" ++ self.assertEqual(sock.recv(1024), LIST_DATA.encode('ascii')) + self.assertEqual(self.client.voidresp(), "226 transfer complete") + + # PROT C is issued, the connection must be in cleartext again + self.client.prot_c() + with self.client.transfercmd('list') as sock: + self.assertNotIsInstance(sock, ssl.SSLSocket) ++ self.assertEqual(sock.recv(1024), LIST_DATA.encode('ascii')) + self.assertEqual(self.client.voidresp(), "226 transfer complete") + + def test_login(self): +-- +2.11.0 + diff --git a/meta/recipes-devtools/python/python3_3.5.5.bb b/meta/recipes-devtools/python/python3_3.5.5.bb index 40896dbc082..93878e4e45c 100644 --- a/meta/recipes-devtools/python/python3_3.5.5.bb +++ b/meta/recipes-devtools/python/python3_3.5.5.bb @@ -42,6 +42,7 @@ SRC_URI += "\ file://Use-correct-CFLAGS-for-extensions-when-cross-compili.patch \ file://0002-Makefile-add-target-to-split-profile-generation.patch \ file://float-endian.patch \ + file://ftplib.patch \ " SRC_URI[md5sum] = "f3763edf9824d5d3a15f5f646083b6e0" SRC_URI[sha256sum] = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009" From patchwork Mon Sep 10 13:31:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 146299 Delivered-To: patch@linaro.org Received: by 2002:a50:c01b:0:0:0:0:0 with SMTP id r27-v6csp2699012edb; Mon, 10 Sep 2018 06:31:37 -0700 (PDT) X-Google-Smtp-Source: ANB0VdZP0N+4vzr9vgS6SnTB7ZKcBBvzuG6sjWc3X/Z/D4UHPFt0RikdxxKqBfWEqntP6Qyy9TGg X-Received: by 2002:a63:986:: with SMTP id 128-v6mr23322610pgj.153.1536586297042; Mon, 10 Sep 2018 06:31:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536586297; cv=none; d=google.com; s=arc-20160816; b=bi6TGckKBq1CaSLBT4ginCeLuPlIAE2SzStQx3ArD5cZTAiE8j6H4WpL0mKVT2FI/y xsPS0bzyLzMHMS92835Ae37BiZtqCQIwB4ie4YFdKG9r+GJWiVZLLnxp+F03+ABq7WEV Yossm2sZ/v2urZU3a0j2n9huyyDXLoN8GUMqUkxvmEDWbqzPY0JGUF/+a2O3fI3Pzdjg PdZPT48hjI+z4KHwX74pq0vX4L6Pz5joBNEbvEp4Mnh7jC3Og1M4eZgIWSTIogLaBAjl gcAWz2vGJ2hKaSJ6kdhqEao8ZwJURz074a2J+exnqe65YUJaIdaBfCoGaRymd8Xju/kA ip4g== 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=QHPPNYBxWgnaVqjw1nrc3HKwZ2x9f01yoSKheWoBtO4=; b=FMrT5DVq8uk/22zhyqSd3QB0oklKeFkivdtTXdW76eWCTLArvQPB3CVWouGGDM1Scj kJOp3HXiPVBfhZ2M9NNPz7Xz+jTE1iZRmt4Je6waPfZUJHi7iv0xOwdbEkZZpHNg8oyw muMC4XctDgPI1ZZq/Q9QxXufv6leCPl0l+lOg5xijErWFW/sEeCXAXcA0Wwxj0Cumo0+ Gf0CPwot4uNmZyxWS6Xh/EvOgqsvg5lu2WwgGeCnptYTzm9KT6vgdlEsCEw6/P9FDOOm A95dIwfIZdreu32A2V9xnLSnFbo56IAvlU/MzgJFXKXPd0jOnp5TWk+q4zVUZVDklgUy Rliw== 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=tZ432vAV; 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 i5-v6si16732415pgg.84.2018.09.10.06.31.36; Mon, 10 Sep 2018 06:31:37 -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=tZ432vAV; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id BE0A9797FE; Mon, 10 Sep 2018 13:31:32 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by mail.openembedded.org (Postfix) with ESMTP id 5EC497969A for ; Mon, 10 Sep 2018 13:31:31 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id y139-v6so21440316wmc.2 for ; Mon, 10 Sep 2018 06:31:32 -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=0rkRgn9WGkrrjhluXjelqkhB7v6KAiP7lwDMSrEROzM=; b=tZ432vAVBgJv09o96/NMuLMP/hl+e9H5Md09K23h8Mj8uq95SB5cqgqNbUKkv5IdZa N79KT8NbAuQEHJvnFPxznQHhjenHw3Q34bYAlzO/kr+y0fAeFNmOwJAPMtV4I0WJmBYo ACXD3g+qjim0gAf+o9TpG1P2g4sLahvR+zxaRFpgb3Zn+2gT3o1DEGG1k7pNSyJcdMZA 0WQVkI3d69bJxnhwihJGSIfxtSLYYmVcjRfN5SV+qfaMVU1prM3tW1yEjnZCPCs5ldd2 depmWYIo1sFggWquf/yxvm0OPb3o9L5Hv+5j1DSYbi86Or36nz2kfqm8vdshI5yYM7Sw Uaiw== 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=0rkRgn9WGkrrjhluXjelqkhB7v6KAiP7lwDMSrEROzM=; b=Le4de8/yWVjAje0hyGDjvL1+SvZa4SvN4CgHw3Tiusj6WctIoiWLjOZeYRpnak9VrZ 98KSHwQGnntJ0XFm2jkN6wku8n5cEJIRTTmanj7wjPYQWZH9ozsG80XpQ9hMlz7iGAvw 7flwlBe+rXE3Qz/rRgSGN+K9/3xHEb+dglKMtF6Fa0ld6ETtrSgbng/p7H5NBPhaGNvu LZCWWmvLUZPeejOY9HA5rwRpHihcpu00LKbNHdcNw7C7srykhabBPU/UkrYeikouD4W/ RwTI4VsXtnX6CEHp5nVkGqqgIBGotskJpinXhQGHt16HPvmO0akNXodllt7DwOq1fUTu i0Ew== X-Gm-Message-State: APzg51Dy949WDnsOV6V+1EFp0X2mdq5rzXt0Y3jgU/9//l68xSTLpgBN exhSR1gRlb0y14aHzEgX3QrUq+55v0A= X-Received: by 2002:a1c:3411:: with SMTP id b17-v6mr739565wma.85.1536586291151; Mon, 10 Sep 2018 06:31:31 -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 p11-v6sm17695045wrd.74.2018.09.10.06.31.29 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Sep 2018 06:31:30 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 10 Sep 2018 14:31:21 +0100 Message-Id: <20180910133123.22372-2-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180910133123.22372-1-ross.burton@intel.com> References: <20180910133123.22372-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 2/4] python3: remove redundant patch 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 None of the Python invocations that this changes are actually called, and there's no need to provide a HOSTPGEN variable when the recipe can just override PGEN directly. Signed-off-by: Ross Burton --- .../python/python3-native_3.5.5.bb | 1 - .../python3/0001-cross-compile-support.patch | 96 ---------------------- meta/recipes-devtools/python/python3_3.5.5.bb | 3 +- 3 files changed, 1 insertion(+), 99 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3/0001-cross-compile-support.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-devtools/python/python3-native_3.5.5.bb b/meta/recipes-devtools/python/python3-native_3.5.5.bb index 3098027d803..7b940a16d28 100644 --- a/meta/recipes-devtools/python/python3-native_3.5.5.bb +++ b/meta/recipes-devtools/python/python3-native_3.5.5.bb @@ -7,7 +7,6 @@ DISTRO_SRC_URI_linuxstdbase = "" SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://12-distutils-prefix-is-inside-staging-area.patch \ file://python-config.patch \ -file://0001-cross-compile-support.patch \ file://030-fixup-include-dirs.patch \ file://070-dont-clean-ipkg-install.patch \ file://080-distutils-dont_adjust_files.patch \ diff --git a/meta/recipes-devtools/python/python3/0001-cross-compile-support.patch b/meta/recipes-devtools/python/python3/0001-cross-compile-support.patch deleted file mode 100644 index 7cd7e3b4906..00000000000 --- a/meta/recipes-devtools/python/python3/0001-cross-compile-support.patch +++ /dev/null @@ -1,96 +0,0 @@ -From ecde3ea170999a9ef734e8af4d7c25be5ba81697 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 31 Mar 2017 15:42:46 +0300 -Subject: [PATCH] cross-compile support - -We cross compile python. This patch uses tools from host/native -python instead of in-tree tools - --Khem - -Rebased on 3.5.4 - -Upstream-Status: Inappropriate[Configuration Specific] -Signed-off-by: Alexander Kanavin -Signed-off-by: Derek Straka ---- - Makefile.pre.in | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/Makefile.pre.in b/Makefile.pre.in -index 144c1f8629..f252ac2417 100644 ---- a/Makefile.pre.in -+++ b/Makefile.pre.in -@@ -223,6 +223,7 @@ LIBOBJS= @LIBOBJS@ - - PYTHON= python$(EXE) - BUILDPYTHON= python$(BUILDEXE) -+HOSTPYTHON= $(BUILDPYTHON) - - PYTHON_FOR_REGEN=@PYTHON_FOR_REGEN@ - PYTHON_FOR_BUILD=@PYTHON_FOR_BUILD@ -@@ -277,6 +278,7 @@ LIBFFI_INCLUDEDIR= @LIBFFI_INCLUDEDIR@ - ########################################################################## - # Parser - PGEN= Parser/pgen$(EXE) -+HOSTPGEN= $(PGEN)$(EXE) - - PSRCS= \ - Parser/acceler.c \ -@@ -478,7 +480,7 @@ build_all_generate_profile: - - run_profile_task: - : # FIXME: can't run for a cross build -- $(LLVM_PROF_FILE) $(RUNSHARED) ./$(BUILDPYTHON) $(PROFILE_TASK) || true -+ $(LLVM_PROF_FILE) $(RUNSHARED) $(HOSTPYTHON) $(PROFILE_TASK) || true - - build_all_merge_profile: - $(LLVM_PROF_MERGER) -@@ -772,7 +774,7 @@ regen-grammar: $(PGEN) - # Regenerate Include/graminit.h and Python/graminit.c - # from Grammar/Grammar using pgen - @$(MKDIR_P) Include -- $(PGEN) $(srcdir)/Grammar/Grammar \ -+ $(HOSTPGEN) $(srcdir)/Grammar/Grammar \ - $(srcdir)/Include/graminit.h \ - $(srcdir)/Python/graminit.c - -@@ -978,7 +980,7 @@ $(LIBRARY_OBJS) $(MODOBJS) Programs/python.o: $(PYTHON_HEADERS) - ###################################################################### - - TESTOPTS= $(EXTRATESTOPTS) --TESTPYTHON= $(RUNSHARED) ./$(BUILDPYTHON) $(TESTPYTHONOPTS) -+TESTPYTHON= $(RUNSHARED) $(HOSTPYTHON) $(TESTPYTHONOPTS) - TESTRUNNER= $(TESTPYTHON) $(srcdir)/Tools/scripts/run_tests.py - TESTTIMEOUT= 3600 - -@@ -1470,7 +1472,7 @@ frameworkinstallstructure: $(LDLIBRARY) - fi; \ - done - $(LN) -fsn include/python$(LDVERSION) $(DESTDIR)$(prefix)/Headers -- sed 's/%VERSION%/'"`$(RUNSHARED) ./$(BUILDPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist -+ sed 's/%VERSION%/'"`$(RUNSHARED) $(HOSTPYTHON) -c 'import platform; print(platform.python_version())'`"'/g' < $(RESSRCDIR)/Info.plist > $(DESTDIR)$(prefix)/Resources/Info.plist - $(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current - $(LN) -fsn Versions/Current/$(PYTHONFRAMEWORK) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/$(PYTHONFRAMEWORK) - $(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers -@@ -1543,7 +1545,7 @@ Python/dtoa.o: Python/dtoa.c - - # Run reindent on the library - reindent: -- ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib -+ $(HOSTPYTHON) $(srcdir)/Tools/scripts/reindent.py -r $(srcdir)/Lib - - # Rerun configure with the same options as it was run last time, - # provided the config.status script exists -@@ -1678,7 +1680,7 @@ funny: - - # Perform some verification checks on any modified files. - patchcheck: @DEF_MAKE_RULE@ -- $(RUNSHARED) ./$(BUILDPYTHON) $(srcdir)/Tools/scripts/patchcheck.py -+ $(RUNSHARED) $(HOSTPYTHON) $(srcdir)/Tools/scripts/patchcheck.py - - # Dependencies - --- -2.11.0 - diff --git a/meta/recipes-devtools/python/python3_3.5.5.bb b/meta/recipes-devtools/python/python3_3.5.5.bb index 93878e4e45c..6598b486afe 100644 --- a/meta/recipes-devtools/python/python3_3.5.5.bb +++ b/meta/recipes-devtools/python/python3_3.5.5.bb @@ -11,7 +11,6 @@ DISTRO_SRC_URI ?= "file://sitecustomize.py" DISTRO_SRC_URI_linuxstdbase = "" SRC_URI = "http://www.python.org/ftp/python/${PV}/Python-${PV}.tar.xz \ file://python-config.patch \ -file://0001-cross-compile-support.patch \ file://030-fixup-include-dirs.patch \ file://070-dont-clean-ipkg-install.patch \ file://080-distutils-dont_adjust_files.patch \ @@ -101,7 +100,7 @@ do_configure_append() { } run_make() { - oe_runmake HOSTPGEN=${STAGING_BINDIR_NATIVE}/python3-native/pgen \ + oe_runmake PGEN=${STAGING_BINDIR_NATIVE}/python3-native/pgen \ HOSTPYTHON=${STAGING_BINDIR_NATIVE}/python3-native/python3 \ STAGING_LIBDIR=${STAGING_LIBDIR} \ STAGING_INCDIR=${STAGING_INCDIR} \ From patchwork Mon Sep 10 13:31:22 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 146300 Delivered-To: patch@linaro.org Received: by 2002:a50:c01b:0:0:0:0:0 with SMTP id r27-v6csp2699280edb; Mon, 10 Sep 2018 06:31:51 -0700 (PDT) X-Google-Smtp-Source: ANB0Vdad9gngJS2p7D/Lu3lijLx43/Hx8GxEodOMXu2JW49stc7YtASfTaB4CWgHPWgTucC5Kfbw X-Received: by 2002:a62:9ed1:: with SMTP id f78-v6mr23889708pfk.206.1536586311142; Mon, 10 Sep 2018 06:31:51 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536586311; cv=none; d=google.com; s=arc-20160816; b=rEAIa1QcZKraxK7/lpYmweMwGfjitViLEVQWJrXrplge0C+Rns/TRE1z2m9l/YyBuq 4fVxHPTangovf3kAjzbDbgYHQyHceP2F5xQvoakPeuuCu5F+9XpyMa3j35S8lzqzQmjx p2moAoEokEsITCyYONoKklX+GcnI8uVeUQKhrgTh9ioXcIawfuFkJZTwZOKmN2ry6Fx4 YflQnjxQe2ykHt3EFMGe6wWLyZMey/K4f7LcmEX7vS5Ln8u7wG73Bw68Kyxojd3KPhy8 VZE4EQFyzu9j9RRS2aAKIEJJD7Ozu1c7wmCEPoO2vCM/0QUjeTep38o36GefN+9vyEAl i1lQ== 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=tmUuOgG+2nRctceFzt/3aNf2qppkSHGfYiPGDJCt5aE=; b=zCQb4G7+IPx1e9aSb5aZSJUS3WKY4vu4PltYT9np6xGEcIUa0YeLmC7mDrteUuoS6E N9D0GBGRsH1soXprjdujfi0vkty2iT1Bv0E1rT5o5akszkTobbsjzqAhK/hVmOCP3gC9 BnivL7VNi1IZCGPP4sPdGWKBFVGVgFF5OzPkoPzAYyCk2SpQqAspOfkHAXLNTgTDZw8M G+A6yO4A705jr5Haixaf70X5FeIGg+ll+hSU0C9V5cZ3hDAP1y6cZWf/TB0PU8cmNU/+ F7HvLtLDgeYOHKjydr/lo7PSqamIV0fAPLxe4LmFJTYpx/HgzQTSoD4PpW04+ALYF1c4 d1jg== 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=ogxSwEQh; 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 j8-v6si15884922pgp.548.2018.09.10.06.31.50; Mon, 10 Sep 2018 06:31:51 -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=ogxSwEQh; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id CC8E4797E8; Mon, 10 Sep 2018 13:31:47 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by mail.openembedded.org (Postfix) with ESMTP id B7445797DC for ; Mon, 10 Sep 2018 13:31:32 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id v16-v6so21930802wro.11 for ; Mon, 10 Sep 2018 06:31:34 -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=ycAJ+fTCiVn2OIiupbPgUbZSjtoUyGOZlFu9cpH0SFY=; b=ogxSwEQhv+O2Sr/xjcdtm9UFYk/PoXe/K/I2sdeovRVX6U896y1okDjCzE+zHO5FC8 hS6iMUt9/TJeA0fX18bZgUwLntW/Yx1h5PA5/J5j2H49h+73hH/DUt9rMbpvhXFzncU1 Y02/lECcoGuWzDcYkA0DD3CFyPpIARtOj6LBrgw8tfdQj26PtGElzuaGRgUQR9auqBm8 3GTGrO8MtXw4b5LjqGGZC/O/BAKntEiqGLyKIt+cYw2G2a9tsJy9olFE9FcJYbwgc/Hb hNGBj//aNVfjhHFox7M2XnJ/2OPF9bnoepf3BgCDWX8OdHxIF6Yjw1OJJsTaUT5feDW8 HBwg== 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=ycAJ+fTCiVn2OIiupbPgUbZSjtoUyGOZlFu9cpH0SFY=; b=CQLO1d4LcO/EpQCQU3j78bJNDvtH7OhQv38Nrn2lMNdiL9jxdyDSVdY0flTgKHmP3c XWURTWTWfUc9/TLtKzgkYvpZB7FbXov9bcNNf8MTDwCszDoPsnLV2KAvzVLeWq32NMw1 B+rhTnPp0UuGh6WT3Ma32i/chp7tUuFc2btN6XXZn0iZyTfukei3L7JimSmvJB0+7Z5/ VwZJfIkXM8YobYwE8jmrK0pSn/D9wWh8h9kYPDQofddRvleaVHP+27wTR+ekxIMLeJzO snwEEYPe9gyeemfBb8XKI33uJhxwBuXzNlLShLltDdpstv1t0k1S/LZeGANnA+Wjb1ua U8jQ== X-Gm-Message-State: APzg51AWR8hUFDYhBB2KW6VMz8PBChFOrM1j8CiqUAz6EtWuZmWryPU6 82OOG9R0R6FZBXH56lCm5/K4gl8amqg= X-Received: by 2002:a5d:488c:: with SMTP id g12-v6mr15385600wrq.0.1536586292821; Mon, 10 Sep 2018 06:31:32 -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 p11-v6sm17695045wrd.74.2018.09.10.06.31.31 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Sep 2018 06:31:32 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 10 Sep 2018 14:31:22 +0100 Message-Id: <20180910133123.22372-3-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180910133123.22372-1-ross.burton@intel.com> References: <20180910133123.22372-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 3/4] python3: remove patch that inadvertently disables xattrs 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 This patch dates back to the addition of the Python 3 recipe to oe-core, and as listxattr is never added to supports_follow_symlinks the extended attribute support will never be enabled. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3-native_3.5.5.bb | 1 - .../python/python3/shutil-follow-symlink-fix.patch | 17 ----------------- meta/recipes-devtools/python/python3_3.5.5.bb | 1 - 3 files changed, 19 deletions(-) delete mode 100644 meta/recipes-devtools/python/python3/shutil-follow-symlink-fix.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-devtools/python/python3-native_3.5.5.bb b/meta/recipes-devtools/python/python3-native_3.5.5.bb index 7b940a16d28..b231542f46f 100644 --- a/meta/recipes-devtools/python/python3-native_3.5.5.bb +++ b/meta/recipes-devtools/python/python3-native_3.5.5.bb @@ -15,7 +15,6 @@ file://150-fix-setupterm.patch \ file://python-3.3-multilib.patch \ file://03-fix-tkinter-detection.patch \ file://avoid_warning_about_tkinter.patch \ -file://shutil-follow-symlink-fix.patch \ file://0001-h2py-Fix-issue-13032-where-it-fails-with-UnicodeDeco.patch \ file://sysroot-include-headers.patch \ file://unixccompiler.patch \ diff --git a/meta/recipes-devtools/python/python3/shutil-follow-symlink-fix.patch b/meta/recipes-devtools/python/python3/shutil-follow-symlink-fix.patch deleted file mode 100644 index 802b1c72038..00000000000 --- a/meta/recipes-devtools/python/python3/shutil-follow-symlink-fix.patch +++ /dev/null @@ -1,17 +0,0 @@ -shutils should consider symlinks - --Khem - -Upstream-Status: Pending - ---- a/Lib/shutil.py 2013-01-29 12:31:06.926555779 -0800 -+++ b/Lib/shutil.py 2013-01-29 16:31:39.097554182 -0800 -@@ -132,7 +132,7 @@ def copymode(src, dst, *, follow_symlink - st = stat_func(src) - chmod_func(dst, stat.S_IMODE(st.st_mode)) - --if hasattr(os, 'listxattr'): -+if hasattr(os, 'listxattr') and os.listxattr in os.supports_follow_symlinks: - def _copyxattr(src, dst, *, follow_symlinks=True): - """Copy extended filesystem attributes from `src` to `dst`. - diff --git a/meta/recipes-devtools/python/python3_3.5.5.bb b/meta/recipes-devtools/python/python3_3.5.5.bb index 6598b486afe..02decf470c8 100644 --- a/meta/recipes-devtools/python/python3_3.5.5.bb +++ b/meta/recipes-devtools/python/python3_3.5.5.bb @@ -28,7 +28,6 @@ SRC_URI += "\ file://cgi_py.patch \ file://host_include_contamination.patch \ file://python-3.3-multilib.patch \ - file://shutil-follow-symlink-fix.patch \ file://sysroot-include-headers.patch \ file://unixccompiler.patch \ file://avoid-ncursesw-include-path.patch \ From patchwork Mon Sep 10 13:31:23 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 146301 Delivered-To: patch@linaro.org Received: by 2002:a50:c01b:0:0:0:0:0 with SMTP id r27-v6csp2699379edb; Mon, 10 Sep 2018 06:31:56 -0700 (PDT) X-Google-Smtp-Source: ANB0VdbVEoYGOazafkii5ElLXBSZNlawLAFp754H80H/yfGy/KIPWSj7Iqsc7tnXVJw96v8SuPmP X-Received: by 2002:a63:7c50:: with SMTP id l16-v6mr22640843pgn.311.1536586316214; Mon, 10 Sep 2018 06:31:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536586316; cv=none; d=google.com; s=arc-20160816; b=p2HcHIDc8mFlwTblcIwFt4BVp6ASm0TABxHa2qzBD9z37GvOtiH971CVZkxW1LdNvL 6Z3imKoI45FbfV8rTbJbxmwUqbNJ+8vPyOfjoKSYoLXhrSGOHT1QKCxcqTHAn71zhtch kC9qNDa96W9zxWCkRS2Gl23NtYZrzj4FzZG3slTkjRJxsGlpHWlnpSGu6eOASzILvDCi t1FJJdtRfOxfS4d8scFKiKwVewgYL8ZwvGMHdlMk7awAC+j+hGVQrXTm8tVwVjThE9cN TkX6pdoKrLbwD9OTVBECiXZIGkLWDfexAudSWAwTBVc9nx4JdSsF8/4O6zkhaS+LAV1H Q0bQ== 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=Lccoos3yWfAPDXzqPzCLqCpoOZhX/ZyUhDiCpOWoDCg=; b=E+JaKEwyBP+eH/CNmt0podJ/rwP6axiO7XJ/8k34rSJAUaQIyFs9D6Kj5P0lWxfq6I +rbuPkPpOGXTgz+rjm422fFtvSlpMsvrOcki5KN+cAis/fqY6IDWEIIkyV98nSYwBMQZ nySMyt6heN9No/SGutKI1Nw0sd5my3uKgkuhRszwQUYxwEERnsCa16hiSbN+vpkFcNIL Mhh8RjY3LPvfJatjWSZbaV6cEjcx1KnjNNDmvvEk4K4VRXrC0OmZTmSf6w76K4psPwos w4Gh1Nh+f3IrY6rpKE69KD/siCcj5fn5IWExso24tfFS7METj6u+DoV72dCpYkwrhGzM IRgA== 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=JjKXlvDB; 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 bd3-v6si14198397plb.382.2018.09.10.06.31.55; Mon, 10 Sep 2018 06:31:56 -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=JjKXlvDB; 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 layers.openembedded.org (localhost [127.0.0.1]) by mail.openembedded.org (Postfix) with ESMTP id E418B79827; Mon, 10 Sep 2018 13:31:48 +0000 (UTC) X-Original-To: openembedded-core@lists.openembedded.org Delivered-To: openembedded-core@lists.openembedded.org Received: from mail-wm0-f67.google.com (mail-wm0-f67.google.com [74.125.82.67]) by mail.openembedded.org (Postfix) with ESMTP id EDD28797DC for ; Mon, 10 Sep 2018 13:31:33 +0000 (UTC) Received: by mail-wm0-f67.google.com with SMTP id n11-v6so21399209wmc.2 for ; Mon, 10 Sep 2018 06:31:35 -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=CeH2FbE7mCIx6LNF05r36Z9I68kV+s5dEVFmvTkijdE=; b=JjKXlvDB2oxEc+BjwG8na+DGtbKbbd8NwHWVOxp3VxplVONAdJbeoiH0X/RyRL8vdp fyhtXaxNMdeKLsl64aZy9GMttfH/NAtrc9QLEkukqnbtFTkUVg8vn2o9FH13wFiVdYi2 ACXLpBtvThLm0L8dLKJxncJtRp+gQtpIh2RcJ62o7RIuFaLmGH43sgUdc+Ae/M97wJOX lPu5kCyPl4si/vmKaH2NaUkFLs6GpulL3PcLhEF33HNrOM7Kf8RvgV3U6f8cPayVqzCM E0MLAEHtPZeNWuz9Ti+iIxK02OY+Uui8Q+GrwX4XGdKQXiu4U8nH4bJC45OKzSPs/+aN +uQA== 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=CeH2FbE7mCIx6LNF05r36Z9I68kV+s5dEVFmvTkijdE=; b=LnAqb7Tky0Opm1CBa+4s10WAK1DeBvkk8IfmzU/h5apG+jGSe9kUKANgf7TQbokvFQ 5b+dq/zTNqd3Expj4/GmippzkjTbRYrzXUeJj1wXnnXa2AunR9voUWt/ZlUMWMVeGstf macQ3nz5/Ujd5XWkS00b2bwQTtZdqXRhEWE0C4y6NfNHLnzM12VDq3Ht9HCWn8TjSH5T Ql0Rtnrww8y0Zsbgb1f5x00sELW5l3P4KyKlzcs3hW19H493pWDNz6jfBiHSqN6bOR5l rizdqjlcEVlw9BIT+aS4NfDZITQZYzlKZN8CB9uvePqXeKuuqABMVjNCV8cu8F2LKzY7 kpZw== X-Gm-Message-State: APzg51BK3IBi6OCkFouJEhmgWxpiw5Rv+TxBWIDqLdpLt+imRiw/7dcc /fSNDZGrPDJPM/9REE0mtqpCETCMQd4= X-Received: by 2002:a1c:a8cf:: with SMTP id r198-v6mr716358wme.133.1536586294227; Mon, 10 Sep 2018 06:31:34 -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 p11-v6sm17695045wrd.74.2018.09.10.06.31.32 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 10 Sep 2018 06:31:33 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Date: Mon, 10 Sep 2018 14:31:23 +0100 Message-Id: <20180910133123.22372-4-ross.burton@intel.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180910133123.22372-1-ross.burton@intel.com> References: <20180910133123.22372-1-ross.burton@intel.com> Subject: [OE-core] [PATCH 4/4] python3: fix multiprocessing 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 glibc 2.28 slightly changed the behaviour of sigaddset() which broke multiprocessing. Backport a patch from Python 3.6 to solve this. Signed-off-by: Ross Burton --- meta/recipes-devtools/python/python3/signal.patch | 56 +++++++++++++++++++++++ meta/recipes-devtools/python/python3_3.5.5.bb | 1 + 2 files changed, 57 insertions(+) create mode 100644 meta/recipes-devtools/python/python3/signal.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-devtools/python/python3/signal.patch b/meta/recipes-devtools/python/python3/signal.patch new file mode 100644 index 00000000000..534a097771c --- /dev/null +++ b/meta/recipes-devtools/python/python3/signal.patch @@ -0,0 +1,56 @@ +Upstream-Status: Backport +Signed-off-by: Ross Burton + +From 4315389df3c4e8c1f94a18ab11a4b234762132b1 Mon Sep 17 00:00:00 2001 +From: Antoine Pitrou +Date: Mon, 23 Apr 2018 22:22:49 +0200 +Subject: [PATCH] [3.6] bpo-33329: Fix multiprocessing regression on newer + glibcs (GH-6575) (GH-6582) + +Starting with glibc 2.27.9000-xxx, sigaddset() can return EINVAL for some +reserved signal numbers between 1 and NSIG. The `range(1, NSIG)` idiom +is commonly used to select all signals for blocking with `pthread_sigmask`. +So we ignore the sigaddset() return value until we expose sigfillset() +to provide a better idiom. +(cherry picked from commit 25038ecfb665bef641abf8cb61afff7505b0e008) +--- + .../next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst | 1 + + Modules/signalmodule.c | 14 ++++++++------ + 2 files changed, 9 insertions(+), 6 deletions(-) + create mode 100644 Misc/NEWS.d/next/Library/2018-04-23-13-21-39.bpo-33329.lQ-Eod.rst + +diff --git a/Modules/signalmodule.c b/Modules/signalmodule.c +index e0d06b434d..138e74e8a9 100644 +--- a/Modules/signalmodule.c ++++ b/Modules/signalmodule.c +@@ -744,7 +744,6 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask) + int result = -1; + PyObject *iterator, *item; + long signum; +- int err; + + sigemptyset(mask); + +@@ -766,11 +765,14 @@ iterable_to_sigset(PyObject *iterable, sigset_t *mask) + Py_DECREF(item); + if (signum == -1 && PyErr_Occurred()) + goto error; +- if (0 < signum && signum < NSIG) +- err = sigaddset(mask, (int)signum); +- else +- err = 1; +- if (err) { ++ if (0 < signum && signum < NSIG) { ++ /* bpo-33329: ignore sigaddset() return value as it can fail ++ * for some reserved signals, but we want the `range(1, NSIG)` ++ * idiom to allow selecting all valid signals. ++ */ ++ (void) sigaddset(mask, (int)signum); ++ } ++ else { + PyErr_Format(PyExc_ValueError, + "signal number %ld out of range", signum); + goto error; +-- +2.11.0 + diff --git a/meta/recipes-devtools/python/python3_3.5.5.bb b/meta/recipes-devtools/python/python3_3.5.5.bb index 02decf470c8..15ec7d7fda6 100644 --- a/meta/recipes-devtools/python/python3_3.5.5.bb +++ b/meta/recipes-devtools/python/python3_3.5.5.bb @@ -41,6 +41,7 @@ SRC_URI += "\ file://0002-Makefile-add-target-to-split-profile-generation.patch \ file://float-endian.patch \ file://ftplib.patch \ + file://signal.patch \ " SRC_URI[md5sum] = "f3763edf9824d5d3a15f5f646083b6e0" SRC_URI[sha256sum] = "063d2c3b0402d6191b90731e0f735c64830e7522348aeb7ed382a83165d45009"