From patchwork Tue Feb 12 14:13:57 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: kpa_info@yahoo.fr X-Patchwork-Id: 219862 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 19BFE2C0326 for ; Wed, 13 Feb 2013 01:15:31 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 6F07E101BD1; Tue, 12 Feb 2013 14:15:17 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FmJBYvT7t5Pt; Tue, 12 Feb 2013 14:15:09 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id AB664101AF6; Tue, 12 Feb 2013 14:14:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 1A3A58F753 for ; Tue, 12 Feb 2013 14:14:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B1D798065F for ; Tue, 12 Feb 2013 14:14:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LAyxkizvFvmW for ; Tue, 12 Feb 2013 14:14:18 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from nm7-vm0.bullet.mail.ird.yahoo.com (nm7-vm0.bullet.mail.ird.yahoo.com [77.238.189.222]) by whitealder.osuosl.org (Postfix) with SMTP id 53F7481486 for ; Tue, 12 Feb 2013 14:14:16 +0000 (UTC) Received: from [77.238.189.54] by nm7.bullet.mail.ird.yahoo.com with NNFMP; 12 Feb 2013 14:14:14 -0000 Received: from [46.228.39.119] by tm7.bullet.mail.ird.yahoo.com with NNFMP; 12 Feb 2013 14:14:14 -0000 Received: from [127.0.0.1] by smtp156.mail.ir2.yahoo.com with NNFMP; 12 Feb 2013 14:14:14 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=yahoo.fr; s=s1024; t=1360678454; bh=eV+afxEppMNKuuZIsFr4iZ0DjMTYsZh21+H4YAXqhAs=; h=X-Yahoo-Newman-Id:X-Yahoo-Newman-Property:X-YMail-OSG:X-Yahoo-SMTP:Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References; b=IK9jmWMvAkWaDAfb3O+WDOf+6/zFOaRWdQEyHRtbIw9JN9WTx0h0hyC92qKM6Ll0mfMCQJ2WH3/eVUzhbtF9Ozp5xHfbAF3L7mGpav1y1FQKOX4D6qzgr0y4Y8sqpOESgsrpgGIAxOsuv2iflejt8Z0O5l2fdgBzeyFkDrMjOz0= X-Yahoo-Newman-Id: 495436.84126.bm@smtp156.mail.ir2.yahoo.com X-Yahoo-Newman-Property: ymail-3 X-YMail-OSG: SYKcPZAVM1nJFTZ5o93JfjVGSxP_59mNj4HiakMIt4WgTfH GSpofQyvT7mwqt1n90cvsVBroTO5nFJbkc2YiM0BYc6iHpGDPnEBe7JZgNx0 J5_U36OcWv.41A0Ww2x68Yq6KlfOD9H0b0zGLjJ0DLqrxyUYDc50q_RSmCZk cDh8OS8Wge6d5MQI0_PFF8G8_wUrf0oxkduqzuMP2CEEpGpOItrrQuGUPR59 UyV9a_inFBNSwLcLnRjnc.cLMHPpuqB7vPk63YlppYyRiO3nVOqcbOW7fd2L QtS6_z4kC9QqDW.S16gzMgjzsMLgqXRkzNZibDm3267keMTItnDB64FGCloz JeUR_Le9P65uxul3DjkU20_af4CZNpD15Ii3FAjoJFBz6I7mm6.WACq6U_kB _90j5CoX_L9Wne8IBAQSCNULoIgWhrhuedwGIHYTTaqF.TrJT6_P3kYfVbkd qksaq5wchWZivc70gfAmV0eijTYtAeQ1o0m0AjbckpO3v5xpEfs_S8JHdaU8 yCEqwJqjyFRk8HAUS2krYO3vT X-Yahoo-SMTP: gXxkLaeswBDA9gtBSIbQ8XWSflp0 Received: from kpa-move.lan.sensometrix.ch (kpa_info@109.164.253.69 with login) by smtp156.mail.ir2.yahoo.com with SMTP; 12 Feb 2013 14:14:14 +0000 UTC From: Patrick Gerber To: buildroot@busybox.net Date: Tue, 12 Feb 2013 15:13:57 +0100 Message-Id: <1360678441-3199-2-git-send-email-kpa_info@yahoo.fr> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1360678441-3199-1-git-send-email-kpa_info@yahoo.fr> References: <1360678441-3199-1-git-send-email-kpa_info@yahoo.fr> Subject: [Buildroot] [PATCH 1/5] Python menu reorganization X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net In order to have a better support for python external package make the python menu clearer. Python2 and Python3 are now mutually exclusive Signed-off-by: Patrick Gerber --- package/Config.in | 19 +------------ package/python-generic/Config.in | 56 ++++++++++++++++++++++++++++++++++++++ package/python/Config.in | 14 ---------- package/python3/Config.in | 14 ---------- 4 files changed, 57 insertions(+), 46 deletions(-) create mode 100644 package/python-generic/Config.in diff --git a/package/Config.in b/package/Config.in index 2fad94d..b7da22f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -315,24 +315,7 @@ endmenu endif source "package/microperl/Config.in" source "package/php/Config.in" -source "package/python/Config.in" -source "package/python3/Config.in" -if BR2_PACKAGE_PYTHON -menu "external python modules" -source "package/python-bottle/Config.in" -source "package/python-dpkt/Config.in" -source "package/python-id3/Config.in" -source "package/python-mad/Config.in" -source "package/python-meld3/Config.in" -source "package/python-netifaces/Config.in" -source "package/python-nfc/Config.in" -source "package/python-protobuf/Config.in" -source "package/python-pygame/Config.in" -source "package/python-pyparsing/Config.in" -source "package/python-serial/Config.in" -source "package/python-setuptools/Config.in" -endmenu -endif +source "package/python-generic/Config.in" source "package/ruby/Config.in" source "package/tcl/Config.in" if BR2_PACKAGE_TCL diff --git a/package/python-generic/Config.in b/package/python-generic/Config.in new file mode 100644 index 0000000..4acd79b --- /dev/null +++ b/package/python-generic/Config.in @@ -0,0 +1,56 @@ +config BR2_PACKAGE_PYTHON_GENERIC + bool "Python" + depends on BR2_USE_WCHAR + # uses fork() + depends on BR2_USE_MMU + help + The python language interpreter. + + http://www.python.org/ + +comment "python3 requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR + +choice + depends on BR2_PACKAGE_PYTHON_GENERIC + prompt "Python interpreter" + help + Select which version of Python you would like to use. + +config BR2_PACKAGE_PYTHON + bool "python2" + select BR2_PACKAGE_LIBFFI + help + Use Python 2.x + + +config BR2_PACKAGE_PYTHON3 + bool "python3" + # uses fork() + depends on BR2_USE_MMU + select BR2_PACKAGE_LIBFFI + help + Use Python 3.x + +endchoice + +source "package/python/Config.in" +source "package/python3/Config.in" + +if (BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3) +menu "external python modules" +source "package/python-bottle/Config.in" +source "package/python-dpkt/Config.in" +source "package/python-id3/Config.in" +source "package/python-mad/Config.in" +source "package/python-meld3/Config.in" +source "package/python-netifaces/Config.in" +source "package/python-nfc/Config.in" +source "package/python-protobuf/Config.in" +source "package/python-pygame/Config.in" +source "package/python-pyparsing/Config.in" +source "package/python-serial/Config.in" +source "package/python-setuptools/Config.in" +endmenu +endif + diff --git a/package/python/Config.in b/package/python/Config.in index 4089cce..b4fd6c2 100644 --- a/package/python/Config.in +++ b/package/python/Config.in @@ -1,17 +1,3 @@ -config BR2_PACKAGE_PYTHON - bool "python" - depends on BR2_USE_WCHAR - # uses fork() - depends on BR2_USE_MMU - select BR2_PACKAGE_LIBFFI - help - The python language interpreter. - - http://www.python.org/ - -comment "python requires a toolchain with WCHAR support" - depends on !BR2_USE_WCHAR - if BR2_PACKAGE_PYTHON choice diff --git a/package/python3/Config.in b/package/python3/Config.in index 5959d31..279f31b 100644 --- a/package/python3/Config.in +++ b/package/python3/Config.in @@ -1,17 +1,3 @@ -config BR2_PACKAGE_PYTHON3 - bool "python3" - depends on BR2_USE_WCHAR - # uses fork() - depends on BR2_USE_MMU - select BR2_PACKAGE_LIBFFI - help - The python language interpreter. - - http://www.python.org/ - -comment "python3 requires a toolchain with WCHAR support" - depends on !BR2_USE_WCHAR - if BR2_PACKAGE_PYTHON3 choice