From patchwork Fri Sep 20 14:59:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Carrier X-Patchwork-Id: 1165263 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=orolia.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=orolia.com header.i=@orolia.com header.b="EdLDs6ZI"; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46ZcMM0SDMz9s00 for ; Sat, 21 Sep 2019 00:59:58 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E273D20534; Fri, 20 Sep 2019 14:59:56 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id tlhx9BRXVTzO; Fri, 20 Sep 2019 14:59:54 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 2D82020554; Fri, 20 Sep 2019 14:59:54 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id A05151BF20B for ; Fri, 20 Sep 2019 14:59:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 9D44E87E5C for ; Fri, 20 Sep 2019 14:59:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id isOSAQp-n04s for ; Fri, 20 Sep 2019 14:59:51 +0000 (UTC) X-Greylist: delayed 02:16:03 by SQLgrey-1.7.6 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150082.outbound.protection.outlook.com [40.107.15.82]) by hemlock.osuosl.org (Postfix) with ESMTPS id 999E987E19 for ; Fri, 20 Sep 2019 14:59:51 +0000 (UTC) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=k5Ray4+G4bs5XPANQNf054DZNd5KIouGH6eYDYCgqty2fSvZxucgbKezFlrwkII9dwJN/QiCmd2vTWmQXOiiAVSkxkq7gEVUp5l4oAVSUG5JwHAvNzsYfPraF+uqZhz0RywlSxKxhEss+1LEXhxy31+VmaLKT/CLbFUqQiHzZpSvaQRbHj7NWEdDEMML3DGzXyE5oc51IgUqm6Zt+7zf6wrKxs4wiNh5I3kl+7+vqX81hXQYmowTseIaCZVlv1uMe7hZeskYdiVxiG2nU+1TdxEiOFjLl6lXOCV5QVxfKI+5T9krMhzLtmHWrFIFh2eHc2sl7sSBwBdGuUFkZaRuhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jnQC7Hh7YeiNhfwKnteoLNBG52AWTMidU6fP+U68RSw=; b=j8Jd0bE/7BSOtB/OqHBuGGzL84Mx2X7MvWQ21/1lzCMPvor1T43sWaBL8cw+v0vPXAoIo2KlhZh/gwwaXqDR2cxAlr7rJB9EAcrSD40CWHk5pGQVmCmWJkG8/eCC7PRBLtQG+GIVuMKrdTiuHQPwIaQxNTsD1G5SNRb8hdB3oZUMee92TqBJAFK3WgF8njd9wqpukIbAVg0cPIuEwUfT0nPDJkBCPhXVE6+z/DvGCFbaWZ5CpoMCSKBy832wQoITP3yhJPb7K3LCZS5ZTGeM2uQoKjoBiNHeBGLWAHsVqKuvEpTLaogqE9mxSsJ7vXOOKg/xuJLzsOilQrRJU76j3w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=orolia.com; dmarc=pass action=none header.from=orolia.com; dkim=pass header.d=orolia.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=orolia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=jnQC7Hh7YeiNhfwKnteoLNBG52AWTMidU6fP+U68RSw=; b=EdLDs6ZIR5IDiC+AXb7fHl4Ecv4baVxpKs+tGZqCcN/KEVrvuptvZ9sGQCqLbqqxNKjOdSccBXAHaNn8z8lVzXm2nDlDk0yI7usZPO2p8R8ES3DnrmLVyn5hgjAIIJ0HZk0StV+QpR/hOuSCPwaapzZ1jsWzuE8hGstbTXDqcwM= Received: from AM6PR06MB4341.eurprd06.prod.outlook.com (20.176.243.160) by AM6PR06MB6134.eurprd06.prod.outlook.com (20.179.244.31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2263.17; Fri, 20 Sep 2019 14:59:49 +0000 Received: from AM6PR06MB4341.eurprd06.prod.outlook.com ([fe80::dfb:5522:e617:fdaf]) by AM6PR06MB4341.eurprd06.prod.outlook.com ([fe80::dfb:5522:e617:fdaf%5]) with mapi id 15.20.2284.023; Fri, 20 Sep 2019 14:59:49 +0000 From: Nicolas Carrier To: "buildroot@buildroot.org" Thread-Topic: [PATCH 2/2] package/python: allow to enable ssl support for host package too Thread-Index: AQHVb8QM/QN1UgyU5Eme4Xb0A3wpnA== Date: Fri, 20 Sep 2019 14:59:49 +0000 Message-ID: <20190920145920.21999-2-nicolas.carrier@orolia.com> References: <20190920145920.21999-1-nicolas.carrier@orolia.com> In-Reply-To: <20190920145920.21999-1-nicolas.carrier@orolia.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-clientproxiedby: LO2P265CA0449.GBRP265.PROD.OUTLOOK.COM (2603:10a6:600:e::29) To AM6PR06MB4341.eurprd06.prod.outlook.com (2603:10a6:20b:26::32) authentication-results: spf=none (sender IP is ) smtp.mailfrom=nicolas.carrier@orolia.com; x-ms-exchange-messagesentrepresentingtype: 1 x-mailer: git-send-email 2.20.1 x-originating-ip: [193.57.120.248] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 0e0953c5-46c2-446b-b61f-08d73ddb2ed5 x-microsoft-antispam: BCL:0; PCL:0; RULEID:(2390118)(7020095)(4652040)(8989299)(4534185)(4627221)(201703031133081)(201702281549075)(8990200)(5600167)(711020)(4605104)(1401327)(2017052603328)(7193020); SRVR:AM6PR06MB6134; x-ms-traffictypediagnostic: AM6PR06MB6134:|AM6PR06MB6134: x-ms-exchange-purlcount: 1 x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:8273; x-forefront-prvs: 0166B75B74 x-forefront-antispam-report: SFV:NSPM; SFS:(10009020)(4636009)(376002)(366004)(346002)(39850400004)(396003)(136003)(189003)(199004)(446003)(5660300002)(5640700003)(66066001)(71200400001)(2616005)(11346002)(71190400001)(107886003)(7736002)(6306002)(50226002)(25786009)(66476007)(305945005)(4326008)(36756003)(66556008)(8936002)(6116002)(966005)(3846002)(99286004)(2501003)(6512007)(478600001)(66946007)(64756008)(66446008)(6506007)(386003)(2351001)(44832011)(14454004)(486006)(14444005)(102836004)(52116002)(256004)(476003)(76176011)(86362001)(1730700003)(186003)(316002)(6486002)(6436002)(81166006)(81156014)(6916009)(1076003)(2906002)(54906003)(8676002)(26005); DIR:OUT; SFP:1101; SCL:1; SRVR:AM6PR06MB6134; H:AM6PR06MB4341.eurprd06.prod.outlook.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; MX:1; A:1; received-spf: None (protection.outlook.com: orolia.com does not designate permitted sender hosts) x-ms-exchange-senderadcheck: 1 x-microsoft-antispam-message-info: o4/+hUoNIMRmAXHUZAYFvS1KGpUtiBi5Fc6HmXAs1Db300XX7vyyJlVcNguMKpheHoPCP/TnSnFIb2hyuMeGUE2mFa0ttWrz56AKMyH9jZVv26HQmryoaxkMOBgdx7LzgzU4ci38B+yMnrg4KPEMCsjmKe6awB83Y7yKfFsIA4YHzGPa9IS6hodA8BT7KHFi9KucJf6Of/+zMG0rO16itlJv8CYWBXbQ3dtptdEGoB8qD+T8y6C4Sk/dAjEuf9HO/1hYnx69qOZaSCx2nlUFPoYFuWihEpK9O+txvnwR4mJ3O8ADJN1hkWKgNUIvOf4DH815YXn4qNVBfnntvDHQ5z4POi+eeaX0GKDy6IlSvidrNbc/oL614bHXw0YoSXgbdNrsMS1gjv/UbBPcIAw252BI0gECpi5OqzEVqn5bF8o= MIME-Version: 1.0 X-OriginatorOrg: orolia.com X-MS-Exchange-CrossTenant-Network-Message-Id: 0e0953c5-46c2-446b-b61f-08d73ddb2ed5 X-MS-Exchange-CrossTenant-originalarrivaltime: 20 Sep 2019 14:59:49.0953 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: a263030c-9c1b-421f-9471-1dec0b29c664 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: xSwJezO9kBVnvFW8+xCV/aKLnz/UoURSJc/zvMQZ1AHL+s+08+NTIW3NTaFWNW1V9//9kH6NmC63c1E2iOtpjJkS6RMQMrvEMuspwx9ksgI= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR06MB6134 Subject: [Buildroot] [PATCH 2/2] package/python: allow to enable ssl support for host package too 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: Thomas Petazzoni , Nicolas Carrier , Asaf Kahlon , Adam Duskett Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Some python scripts may be ran in the custom scripts a user can define in the config. If any of those require ssl, they will fail with no possible fix. This patch allows to enable ssl support for host python2 in the config, defaulting to it being disable to conform to the previous behaviour. Signed-off-by: Nicolas Carrier --- package/Config.in.host | 1 + package/python/Config.in.host | 17 +++++++++++++++++ package/python/python.mk | 7 ++++++- 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 package/python/Config.in.host diff --git a/package/Config.in.host b/package/Config.in.host index 5767837a9a..100a3ecd1c 100644 --- a/package/Config.in.host +++ b/package/Config.in.host @@ -51,6 +51,7 @@ menu "Host utilities" source "package/pkgconf/Config.in.host" source "package/pru-software-support/Config.in.host" source "package/pwgen/Config.in.host" + source "package/python/Config.in.host" source "package/python-cython/Config.in.host" source "package/python-lxml/Config.in.host" source "package/python-six/Config.in.host" diff --git a/package/python/Config.in.host b/package/python/Config.in.host new file mode 100644 index 0000000000..01d1a14620 --- /dev/null +++ b/package/python/Config.in.host @@ -0,0 +1,17 @@ +config BR2_PACKAGE_HOST_PYTHON + bool "host python" + help + The python language interpreter. Host package. + + http://www.python.org/ + +if BR2_PACKAGE_HOST_PYTHON + +config BR2_PACKAGE_HOST_PYTHON_SSL + bool "ssl" + select BR2_PACKAGE_HOST_OPENSSL + help + _ssl module for host Python. + +endif + diff --git a/package/python/python.mk b/package/python/python.mk index d1e70a015a..e6c2cb0b22 100644 --- a/package/python/python.mk +++ b/package/python/python.mk @@ -32,7 +32,6 @@ HOST_PYTHON_CONF_OPTS += \ --disable-bsddb \ --disable-test-modules \ --disable-bz2 \ - --disable-ssl \ --disable-ossaudiodev \ --disable-pyo-build @@ -58,6 +57,12 @@ PYTHON_DEPENDENCIES = host-python libffi $(TARGET_NLS_DEPENDENCIES) HOST_PYTHON_DEPENDENCIES = host-expat host-zlib +ifeq ($(BR2_PACKAGE_HOST_PYTHON_SSL),y) +HOST_PYTHON_DEPENDENCIES += host-openssl +else +HOST_PYTHON_CONF_OPTS += --disable-ssl +endif + PYTHON_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_PYTHON_READLINE),y)