From patchwork Fri Feb 26 16:09:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conrad Ratschan X-Patchwork-Id: 1444984 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=rockwellcollins.com header.i=@rockwellcollins.com header.a=rsa-sha256 header.s=hrcrc2020 header.b=PWMTVSE0; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DnF4K5JVZz9rx6 for ; Sat, 27 Feb 2021 03:10:25 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 4E445433C5; Fri, 26 Feb 2021 16:10:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hWFdIiQJaUQN; Fri, 26 Feb 2021 16:10:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 98E7B433BE; Fri, 26 Feb 2021 16:10:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 1525D1BF292 for ; Fri, 26 Feb 2021 16:10:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 115B16F967 for ; Fri, 26 Feb 2021 16:10:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=rockwellcollins.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GP99TsyEH_rS for ; Fri, 26 Feb 2021 16:10:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from ch3vs02.rockwellcollins.com (ch3vs02.rockwellcollins.com [205.175.226.29]) by smtp3.osuosl.org (Postfix) with ESMTPS id E11076F94E for ; Fri, 26 Feb 2021 16:10:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rockwellcollins.com; s=hrcrc2020; h=from:to:cc:subject:date:message-id; bh=Y9SxNQCcoB5uENF9vBHr+xY6xrDM8mHEbZXJq+Overo=; b=PWMTVSE0IN2DW5oMJ2pM0m6z0p4YKPKoWba/EyMU7jiqFR1X3nrh5eec TexJZDgSkensqxes0HkKA1hSey64RqQVisN+1UyrllaNqLVya1JqSh1QE gbt2Fdfnvsy33EqbSjmkTUyHdgxeVquCG/2MV2nGXq5Q3A/OFVFhNaCp1 gTpmG8NvDiFVWo+4VAYPPej2AVAsC1x1YSaOimDJoi+Y0/wcYBZSQHphO Gy/YVf7g6U3srvJZO7buDGbCpAzud3nHT3Xq+YKOiyiaga4HGTSq0ZIDV zTUUbVnI2msmxBeb4zLgCBfbx3YnayLtR0HfPEUW8H41iTzj7OM1u3w4L A==; IronPort-SDR: Z+KmXC1YFQPFtRgghgzotG5hjMkTihJiLZ040CjeQzv0ghytjEMtfq+EXZxLjxbdxH8PC7g8ZU ma432SVrGqtjHTTNWpOFX4ZN2FGg5LMj0KRNC429oeprvblC0jYQSh0wJTd54tjUZN1cnKSyKH AHuxKGFxUQQMUD97SACwE4DJOdtBm4X8QGL97wW22vBFbW7KKgP79tN4vX+K7jzDKhqFHo4c/B XlyqzWFZO0IJJEpBrXvxFL8jLWmc/knUg7vCwYRR7KLJhB5fUuSbtTjXJuChHnMUCw/erdxyvq YF4= Received: from ofwch3n02.rockwellcollins.com (HELO ciulimr02.rockwellcollins.com) ([205.175.226.14]) by ch3vs02.rockwellcollins.com with ESMTP; 26 Feb 2021 10:10:18 -0600 X-Received: from eggs.rockwellcollins.com (eggs.rockwellcollins.lab [10.148.117.42]) by ciulimr02.rockwellcollins.com (Postfix) with ESMTP id 7AAD02007E; Fri, 26 Feb 2021 10:10:17 -0600 (CST) From: Conrad Ratschan To: buildroot@buildroot.org Date: Fri, 26 Feb 2021 10:09:34 -0600 Message-Id: <20210226160937.16082-1-conrad.ratschan@rockwellcollins.com> X-Mailer: git-send-email 2.17.1 Subject: [Buildroot] [PATCH 1/4] package/python-magic: Add new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Conrad Ratschan , Thomas Petazzoni , Asaf Kahlon MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add new package for python-magic. This is needed as a runtime dependency for Diffoscope. Signed-off-by: Conrad Ratschan --- package/Config.in.host | 1 + package/python-magic/Config.in.host | 8 ++++++++ package/python-magic/python-magic.hash | 2 ++ package/python-magic/python-magic.mk | 14 ++++++++++++++ 4 files changed, 25 insertions(+) create mode 100644 package/python-magic/Config.in.host create mode 100644 package/python-magic/python-magic.hash create mode 100644 package/python-magic/python-magic.mk diff --git a/package/Config.in.host b/package/Config.in.host index ba6a68c728..1b3812decf 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -66,6 +66,7 @@ menu "Host utilities" source "package/python/Config.in.host" source "package/python-cython/Config.in.host" source "package/python-lxml/Config.in.host" + source "package/python-magic/Config.in.host" source "package/python-six/Config.in.host" source "package/python-xlrd/Config.in.host" source "package/python3/Config.in.host" diff --git a/package/python-magic/Config.in.host b/package/python-magic/Config.in.host new file mode 100644 index 0000000000..021c6b11ed --- /dev/null +++ b/package/python-magic/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_PYTHON_MAGIC + bool "host-python-magic" + depends on BR2_PACKAGE_HOST_PYTHON3 + help + A Python interface to the libmagic file type identification + library. + + https://github.com/ahupp/python-magic diff --git a/package/python-magic/python-magic.hash b/package/python-magic/python-magic.hash new file mode 100644 index 0000000000..e6d722ec50 --- /dev/null +++ b/package/python-magic/python-magic.hash @@ -0,0 +1,2 @@ +# sha256 from https://pypi.org/pypi/python-magic/json +sha256 ca884349f2c92ce830e3f498c5b7c7051fe2942c3ee4332f65213b8ebff15a62 python-magic-0.4.22.tar.gz diff --git a/package/python-magic/python-magic.mk b/package/python-magic/python-magic.mk new file mode 100644 index 0000000000..fb9e61d2e9 --- /dev/null +++ b/package/python-magic/python-magic.mk @@ -0,0 +1,14 @@ +################################################################################ +# +# python-magic +# +################################################################################ + +PYTHON_MAGIC_VERSION = 0.4.22 +PYTHON_MAGIC_SITE = https://files.pythonhosted.org/packages/26/60/6d45e0e7043f5a7bf15238ca451256a78d3c5fe02cd372f0ed6d888a16d5 +PYTHON_MAGIC_SETUP_TYPE = setuptools +PYTHON_MAGIC_LICENSE = MIT +HOST_PYTHON_MAGIC_DL_SUBDIR = python-magic +HOST_PYTHON_MAGIC_NEEDS_HOST_PYTHON = python3 + +$(eval $(host-python-package)) From patchwork Fri Feb 26 16:09:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conrad Ratschan X-Patchwork-Id: 1444986 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=rockwellcollins.com header.i=@rockwellcollins.com header.a=rsa-sha256 header.s=hrcrc2020 header.b=d6tIsEJ3; dkim-atps=neutral Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DnF4r3pqJz9sBy for ; Sat, 27 Feb 2021 03:10:51 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E5C9B4EF53; Fri, 26 Feb 2021 16:10:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tEx-IL4hqL9C; Fri, 26 Feb 2021 16:10:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id C8FE34EF5A; Fri, 26 Feb 2021 16:10:46 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 3E66E1BF292 for ; Fri, 26 Feb 2021 16:10:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 3C36A840D5 for ; Fri, 26 Feb 2021 16:10:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=rockwellcollins.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rmartaE-Tt3K for ; Fri, 26 Feb 2021 16:10:24 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from ch3vs03.rockwellcollins.com (ch3vs03.rockwellcollins.com [205.175.226.47]) by smtp1.osuosl.org (Postfix) with ESMTPS id 43D5D83F88 for ; Fri, 26 Feb 2021 16:10:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rockwellcollins.com; s=hrcrc2020; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=vJiXPvWPpfh2wmZ+9qE5xqjVldA+gJdhpclv1qnsvlw=; b=d6tIsEJ3eIa5w07N2+IVqQY7MP4gVjk9pd/FmFp7SgrTv68YPqJErWED nnuG6WMABB4JBU7ydC5NcT5rgrv2GwWpxUyzj/eA9uWhx3EBLgNAxlNIT upDBFNIblJEmtIr2MqQ6aAFJ2Hr2M7de2usIoPJZRXvTWV9/A6UdHFrWe 0Dro34LijgCHsDOPy1sZ5Sfa7Jo9mpEKoic9pvVK8hodTr0Znr+m7jrqq UGoBqcUqW7zhGP57aKggf+88uvvf2Rm9jTc4xk7BEgOYU1qvkAUzHs2HH KmephLFYGGmcQ0OJgiK4PngtexvhcG3iZUP4r4jhWR4tzAPSFfKdTyKSc g==; IronPort-SDR: B5KbPEe4lQrM9WdSInbKIlqlR3XQHZPcISaK5oeDaaZioJiZeAftAcU+b9HcHZxVkOaFbQp7IC eMTNZl9btzZuXDFeUJRz3CQVxK2jMKK5TccRw8KIdDSnZFPWyINVoJ8nPRru4xH18NUxXVeYEL 37vMsSUx4F+LrOdryrnD6X13u8ENBhVkcFXy7VuC846EBC8MWyB3QaZxK6iMparRURYKCV2p9+ dWVEP3HMqe+MH5OUvUL7N4wsabZ/pcd1BoMBgfWsrP4GQAtvS1JijCDqoEClmRuu02yS1t+p2X fsw= Received: from ofwch3n02.rockwellcollins.com (HELO ciulimr02.rockwellcollins.com) ([205.175.226.14]) by ch3vs03.rockwellcollins.com with ESMTP; 26 Feb 2021 10:10:18 -0600 X-Received: from eggs.rockwellcollins.com (eggs.rockwellcollins.lab [10.148.117.42]) by ciulimr02.rockwellcollins.com (Postfix) with ESMTP id 8F2072008A; Fri, 26 Feb 2021 10:10:17 -0600 (CST) From: Conrad Ratschan To: buildroot@buildroot.org Date: Fri, 26 Feb 2021 10:09:35 -0600 Message-Id: <20210226160937.16082-2-conrad.ratschan@rockwellcollins.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210226160937.16082-1-conrad.ratschan@rockwellcollins.com> References: <20210226160937.16082-1-conrad.ratschan@rockwellcollins.com> Subject: [Buildroot] [PATCH 2/4] package/python-libarchive-c: Add as new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Conrad Ratschan , Thomas Petazzoni , Asaf Kahlon MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add new host python package for python-libarchive-c. This is needed as a runtime dependency for Diffoscope. Signed-off-by: Conrad Ratschan --- package/Config.in.host | 1 + package/python-libarchive-c/Config.in.host | 8 ++++++++ .../python-libarchive-c/python-libarchive-c.hash | 2 ++ .../python-libarchive-c/python-libarchive-c.mk | 15 +++++++++++++++ 4 files changed, 26 insertions(+) create mode 100644 package/python-libarchive-c/Config.in.host create mode 100644 package/python-libarchive-c/python-libarchive-c.hash create mode 100644 package/python-libarchive-c/python-libarchive-c.mk diff --git a/package/Config.in.host b/package/Config.in.host index 1b3812decf..4edfb9cfa4 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -65,6 +65,7 @@ menu "Host utilities" source "package/pwgen/Config.in.host" source "package/python/Config.in.host" source "package/python-cython/Config.in.host" + source "package/python-libarchive-c/Config.in.host" source "package/python-lxml/Config.in.host" source "package/python-magic/Config.in.host" source "package/python-six/Config.in.host" diff --git a/package/python-libarchive-c/Config.in.host b/package/python-libarchive-c/Config.in.host new file mode 100644 index 0000000000..cd0c09af9d --- /dev/null +++ b/package/python-libarchive-c/Config.in.host @@ -0,0 +1,8 @@ +config BR2_PACKAGE_HOST_PYTHON_LIBARCHIVE_C + bool "host-python-libarchive-c" + depends on BR2_PACKAGE_HOST_PYTHON3 + select BR2_PACKAGE_HOST_LIBARCHIVE + help + A Python interface to libarchive + + https://github.com/Changaco/python-libarchive-c diff --git a/package/python-libarchive-c/python-libarchive-c.hash b/package/python-libarchive-c/python-libarchive-c.hash new file mode 100644 index 0000000000..adde6a8462 --- /dev/null +++ b/package/python-libarchive-c/python-libarchive-c.hash @@ -0,0 +1,2 @@ +# sha256 from https://pypi.org/pypi/diffoscope/json +sha256 9919344cec203f5db6596a29b5bc26b07ba9662925a05e24980b84709232ef60 libarchive-c-2.9.tar.gz diff --git a/package/python-libarchive-c/python-libarchive-c.mk b/package/python-libarchive-c/python-libarchive-c.mk new file mode 100644 index 0000000000..b67e0a6796 --- /dev/null +++ b/package/python-libarchive-c/python-libarchive-c.mk @@ -0,0 +1,15 @@ +################################################################################ +# +# python-libarchive +# +################################################################################ + +PYTHON_LIBARCHIVE_C_VERSION = 2.9 +PYTHON_LIBARCHIVE_C_SOURCE = libarchive-c-$(PYTHON_LIBARCHIVE_C_VERSION).tar.gz +PYTHON_LIBARCHIVE_C_SITE = https://files.pythonhosted.org/packages/63/fe/9e6c78db381934e28c7ec3d30d4f209fe24442d17f1bd8c56d13ae185cf6 +PYTHON_LIBARCHIVE_C_SETUP_TYPE = setuptools +PYTHON_LIBARCHIVE_C_LICENSE = CC0-1.0 +HOST_PYTHON_LIBARCHIVE_C_DL_SUBDIR = python-libarchive-c +HOST_PYTHON_LIBARCHIVE_C_NEEDS_HOST_PYTHON = python3 + +$(eval $(host-python-package)) From patchwork Fri Feb 26 16:09:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conrad Ratschan X-Patchwork-Id: 1444985 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=rockwellcollins.com header.i=@rockwellcollins.com header.a=rsa-sha256 header.s=hrcrc2020 header.b=Xjo8FHFK; dkim-atps=neutral Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DnF4Y44xRz9rx6 for ; Sat, 27 Feb 2021 03:10:37 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id EC734433DA; Fri, 26 Feb 2021 16:10:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id MuhVBua4GXtv; Fri, 26 Feb 2021 16:10:35 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 1F05C433C7; Fri, 26 Feb 2021 16:10:34 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 1CDC71BF292 for ; Fri, 26 Feb 2021 16:10:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 0CA6B6F94E for ; Fri, 26 Feb 2021 16:10:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp3.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=rockwellcollins.com Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DA7Or-BWzRob for ; Fri, 26 Feb 2021 16:10:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from ch3vs05.rockwellcollins.com (ch3vs05.rockwellcollins.com [205.175.226.130]) by smtp3.osuosl.org (Postfix) with ESMTPS id E01AF60672 for ; Fri, 26 Feb 2021 16:10:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rockwellcollins.com; s=hrcrc2020; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=PaDcTBlwpWqqBmsw+67RLahR6S/k87RJ8e4QbdbWp1M=; b=Xjo8FHFKRaMQ7lOeVCTC6gU+i9MM4cjwKyQkHkfkNn0a5O+EjXYtCLJU 2MOnIv2qr51pegOI9RgBTtP7K0XSymZpqs2K+VspjfPxII5aUAXc7WEZq luWY2XvzacFG8A4CEpF7Mex9lnk39cTM6kF68KyZglIoaQMyBVrfGJ/qW iMhYr9fxW7VgLTL17Rhg16qrs2OuokLFfG8b33VpUYIxqKd0x+cbQsD5J qUazIDEpc7vBKDqN1aCWjAzXIhmKgApCKDLOcw+X1FnrjHjthoK5Dt9kW TI5A7TRFoPq4aPtm6xTg7Pek5FDgk5wKvSiWLOQNazBydG/Hc23oYrarY A==; IronPort-SDR: eWhD93RW6qkkHBGBuUUb6GCQ4uX78zBUz4nhVq2VfOHRzV2E6bgGnHrxTaKsFPvFC39HwoWoNb w95tGihQN5m9ivadIS/uPVzSu+zqFSsNFSNpLztQ7W2hNzovhjODx9rEWCXEwVm6MD/XBTxyKg CCzeZDBqcKbwOITY5w6tCG1qXlirXEcfN02ZOVGEIKKFJBUP+taNwFILmaR9vVPgiVoS2JAT2r ac5t0slDzj+V14s8aAzOfCZH+p9uH5rSH4YRPoK9VTjwkFkn/cGBZ8Tz7nD3su2dv04hNJbIhv apk= Received: from ofwch3n02.rockwellcollins.com (HELO ciulimr02.rockwellcollins.com) ([205.175.226.14]) by ch3vs05.rockwellcollins.com with ESMTP; 26 Feb 2021 10:10:17 -0600 X-Received: from eggs.rockwellcollins.com (eggs.rockwellcollins.lab [10.148.117.42]) by ciulimr02.rockwellcollins.com (Postfix) with ESMTP id A353A20092; Fri, 26 Feb 2021 10:10:17 -0600 (CST) From: Conrad Ratschan To: buildroot@buildroot.org Date: Fri, 26 Feb 2021 10:09:36 -0600 Message-Id: <20210226160937.16082-3-conrad.ratschan@rockwellcollins.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210226160937.16082-1-conrad.ratschan@rockwellcollins.com> References: <20210226160937.16082-1-conrad.ratschan@rockwellcollins.com> Subject: [Buildroot] [PATCH 3/4] package/python3: Allow host-python ncurses X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Conrad Ratschan , Thomas Petazzoni , Asaf Kahlon MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" The Diffoscope tool has a runtime dependency on the curses module in Python. Buildroot disables curses support for host-python3. This patch allows for ncurses to be a configurable option for the host-python3 package like it is for the target python3 package. An additional patch is added to fix the ncurses include path as it previously was not correct when not cross compiling. Signed-off-by: Conrad Ratschan --- ...-ncurses-include-when-not-cross-comp.patch | 35 +++++++++++++++++++ package/python3/Config.in.host | 5 +++ package/python3/python3.mk | 8 ++++- 3 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 package/python3/0035-configure.ac-Fix-ncurses-include-when-not-cross-comp.patch diff --git a/package/python3/0035-configure.ac-Fix-ncurses-include-when-not-cross-comp.patch b/package/python3/0035-configure.ac-Fix-ncurses-include-when-not-cross-comp.patch new file mode 100644 index 0000000000..15834772d0 --- /dev/null +++ b/package/python3/0035-configure.ac-Fix-ncurses-include-when-not-cross-comp.patch @@ -0,0 +1,35 @@ +From 9f10c2f660ab24d622b66a58d14dd7522b120d6d Mon Sep 17 00:00:00 2001 +From: Conrad Ratschan +Date: Tue, 2 Feb 2021 09:45:57 -0600 +Subject: [PATCH] configure.ac: Fix ncurses include when not cross compiling + +When not cross compiling, the ncurses include path used by configure.ac +is hardcoded to a path on the user's development machine. Change this +path to use ${prefix} so that it can use a host folder path specified +by Buildroot. + +Signed-off-by: Conrad Ratschan +--- + configure.ac | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 07bceda..0398da5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -5271,7 +5271,11 @@ fi + # first curses header check + ac_save_cppflags="$CPPFLAGS" + if test "$cross_compiling" = no; then +- CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" ++ if test "x${prefix}" = "xNONE" ; then ++ CPPFLAGS="$CPPFLAGS -I/usr/include/ncursesw" ++ else ++ CPPFLAGS="$CPPFLAGS -I${prefix}/include/ncursesw -I${prefix}/include/ncurses" ++ fi + fi + + AC_CHECK_HEADERS(curses.h ncurses.h) +-- +2.17.1 + diff --git a/package/python3/Config.in.host b/package/python3/Config.in.host index 70b5dacdde..dc463e51b6 100644 --- a/package/python3/Config.in.host +++ b/package/python3/Config.in.host @@ -13,4 +13,9 @@ config BR2_PACKAGE_HOST_PYTHON3_SSL help _ssl module for host Python3. +config BR2_PACKAGE_HOST_PYTHON3_CURSES + bool "curses" + help + curses module for Python3. + endif diff --git a/package/python3/python3.mk b/package/python3/python3.mk index 63d6c3f535..9187fb8220 100644 --- a/package/python3/python3.mk +++ b/package/python3/python3.mk @@ -20,7 +20,6 @@ HOST_PYTHON3_CONF_OPTS += \ --disable-sqlite3 \ --disable-tk \ --with-expat=system \ - --disable-curses \ --disable-codecs-cjk \ --disable-nis \ --enable-unicodedata \ @@ -47,6 +46,13 @@ else HOST_PYTHON3_CONF_OPTS += --disable-openssl endif +ifeq ($(BR2_PACKAGE_HOST_PYTHON3_CURSES),y) +HOST_PYTHON3_DEPENDENCIES += host-ncurses +HOST_PYTHON3_CONF_OPTS += --enable-curses +else +HOST_PYTHON3_CONF_OPTS += --disable-curses +endif + PYTHON3_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_PYTHON3_2TO3),y) From patchwork Fri Feb 26 16:09:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Conrad Ratschan X-Patchwork-Id: 1444987 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=rockwellcollins.com header.i=@rockwellcollins.com header.a=rsa-sha256 header.s=hrcrc2020 header.b=K/1fdrHa; dkim-atps=neutral Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4DnF536hQgz9rx6 for ; Sat, 27 Feb 2021 03:11:03 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 891BC6F983; Fri, 26 Feb 2021 16:11:01 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id TnHd2xUKaLaG; Fri, 26 Feb 2021 16:11:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id D3B2F6F97B; Fri, 26 Feb 2021 16:10:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id B3D551BF292 for ; Fri, 26 Feb 2021 16:10:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id A20EE83F88 for ; Fri, 26 Feb 2021 16:10:25 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Authentication-Results: smtp1.osuosl.org (amavisd-new); dkim=pass (2048-bit key) header.d=rockwellcollins.com Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id F4pIgEHw5M_b for ; Fri, 26 Feb 2021 16:10:24 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from ch3vs03.rockwellcollins.com (ch3vs03.rockwellcollins.com [205.175.226.47]) by smtp1.osuosl.org (Postfix) with ESMTPS id 91FDF840BE for ; Fri, 26 Feb 2021 16:10:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=rockwellcollins.com; s=hrcrc2020; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=PDKTg12G5nfJ7R2mN/YfbaVbUQhWrj1RD9xu8rpabR8=; b=K/1fdrHavh1y/MOaLAOhZ7j6NB+/EiUrDA1FrbamHMRYgqU4qQVB8jrP Wfwl3qPdffObGTQGQ/ZvxolO+EChB40P+5vYJrKLgTeuAu/Kbzmj7vhkT ZS1BWXKJM8Q65UM7hDf5LVChRfSuYx46UEWbyTJccF7quE93Kwy3JSDgt i55k8mrorGbeNbmO4n/fJ1j92hFojApGVp2eD82yMeISkds2EodiaRnno eDk3zo3EacutI4p/6bjeHBJ2sKSY1bD0BoTpyJ9bBW+Jky7Sa+tWfbsL7 ud5fFAprSGfyrEyGtfii+bybijHEuWI9+mXcJsktV5X/bDRIuJEApgp+E A==; IronPort-SDR: 3Y7VXASDijkiQVFH/vrkNsCM30OP6rUibk3/Y/BRXDgzzahW3KnHu6TCk9HHOZwwh3gABRTp8H a7dEKx1ANLYhlDE33G/VOD8RAqJasL5jJPfMJFINGM5YQqzCbrWEP17n2xZFuwE3ME6MMKTu20 0BvHs3WTkGUXL0gdDJM21CiRnflfBgwxiFF49hc+kj2TW/gvAPX8zjfPWXfWJmdPlexrajIGc8 10Gk2moUamnIvXLbi1tFf+H1rB70mO3J9wlhpxBNvQ/bRVMNjkkd6UeCCU8VyL3rwtJmnpUcQp aaM= Received: from ofwch3n02.rockwellcollins.com (HELO ciulimr02.rockwellcollins.com) ([205.175.226.14]) by ch3vs03.rockwellcollins.com with ESMTP; 26 Feb 2021 10:10:18 -0600 X-Received: from eggs.rockwellcollins.com (eggs.rockwellcollins.lab [10.148.117.42]) by ciulimr02.rockwellcollins.com (Postfix) with ESMTP id B75C320093; Fri, 26 Feb 2021 10:10:17 -0600 (CST) From: Conrad Ratschan To: buildroot@buildroot.org Date: Fri, 26 Feb 2021 10:09:37 -0600 Message-Id: <20210226160937.16082-4-conrad.ratschan@rockwellcollins.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210226160937.16082-1-conrad.ratschan@rockwellcollins.com> References: <20210226160937.16082-1-conrad.ratschan@rockwellcollins.com> Subject: [Buildroot] [PATCH 4/4] package/python-diffoscope: Add as new package X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Conrad Ratschan , Thomas Petazzoni , Asaf Kahlon MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Add a new host python package for python-diffoscope. Signed-off-by: Conrad Ratschan --- package/Config.in.host | 1 + package/python-diffoscope/Config.in.host | 10 ++++++++++ package/python-diffoscope/python-diffoscope.hash | 2 ++ package/python-diffoscope/python-diffoscope.mk | 16 ++++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 package/python-diffoscope/Config.in.host create mode 100644 package/python-diffoscope/python-diffoscope.hash create mode 100644 package/python-diffoscope/python-diffoscope.mk diff --git a/package/Config.in.host b/package/Config.in.host index 4edfb9cfa4..5a9e606a4b 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -65,6 +65,7 @@ menu "Host utilities" source "package/pwgen/Config.in.host" source "package/python/Config.in.host" source "package/python-cython/Config.in.host" + source "package/python-diffoscope/Config.in.host" source "package/python-libarchive-c/Config.in.host" source "package/python-lxml/Config.in.host" source "package/python-magic/Config.in.host" diff --git a/package/python-diffoscope/Config.in.host b/package/python-diffoscope/Config.in.host new file mode 100644 index 0000000000..520607e8a6 --- /dev/null +++ b/package/python-diffoscope/Config.in.host @@ -0,0 +1,10 @@ +config BR2_PACKAGE_HOST_PYTHON_DIFFOSCOPE + bool "host-python-diffoscope" + depends on BR2_PACKAGE_HOST_PYTHON3 + select BR2_PACKAGE_HOST_PYTHON_MAGIC + select BR2_PACKAGE_HOST_PYTHON_LIBARCHIVE_C + select BR2_PACKAGE_HOST_PYTHON3_CURSES + help + Tool to recursively diff varying file types. + + https://diffoscope.org/ diff --git a/package/python-diffoscope/python-diffoscope.hash b/package/python-diffoscope/python-diffoscope.hash new file mode 100644 index 0000000000..ea6d73aa60 --- /dev/null +++ b/package/python-diffoscope/python-diffoscope.hash @@ -0,0 +1,2 @@ +# sha256 from https://pypi.org/pypi/diffoscope/json +sha256 d95cef5b3eef49fa1c811c1ac103f7f7cca4a0ebabc674e4283b51f28309d242 diffoscope-167.tar.gz diff --git a/package/python-diffoscope/python-diffoscope.mk b/package/python-diffoscope/python-diffoscope.mk new file mode 100644 index 0000000000..ad5a7c6255 --- /dev/null +++ b/package/python-diffoscope/python-diffoscope.mk @@ -0,0 +1,16 @@ +################################################################################ +# +# python-diffoscope +# +################################################################################ + +PYTHON_DIFFOSCOPE_VERSION = 167 +PYTHON_DIFFOSCOPE_SOURCE = diffoscope-$(PYTHON_DIFFOSCOPE_VERSION).tar.gz +PYTHON_DIFFOSCOPE_SITE = https://files.pythonhosted.org/packages/69/d8/3cd7efd904d4db9039f3111938598f6093d14087f40f4359ef1514e7d5eb +PYTHON_DIFFOSCOPE_SETUP_TYPE = setuptools +PYTHON_DIFFOSCOPE_LICENSE = GPL-3.0+ +HOST_PYTHON_DIFFOSCOPE_DL_SUBDIR = python-diffoscope +HOST_PYTHON_DIFFOSCOPE_NEEDS_HOST_PYTHON = python3 +HOST_PYTHON_DIFFOSCOPE_DEPENDENCIES = host-python-libarchive-c host-python-magic + +$(eval $(host-python-package))