From mboxrd@z Thu Jan 1 00:00:00 1970 Delivery-date: Thu, 01 Sep 2022 11:00:57 +0200 Received: from metis.ext.pengutronix.de ([2001:67c:670:201:290:27ff:fe1d:cc33]) by lore.white.stw.pengutronix.de with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1oTg4F-003L6D-7X for lore@lore.pengutronix.de; Thu, 01 Sep 2022 11:00:57 +0200 Received: from localhost ([127.0.0.1] helo=metis.ext.pengutronix.de) by metis.ext.pengutronix.de with esmtp (Exim 4.92) (envelope-from ) id 1oTg4F-0005Hn-Rt; Thu, 01 Sep 2022 11:00:55 +0200 Received: from drehscheibe.grey.stw.pengutronix.de ([2a0a:edc0:0:c01:1d::a2]) by metis.ext.pengutronix.de with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1oTg36-0004us-9I for ptxdist@pengutronix.de; Thu, 01 Sep 2022 10:59:44 +0200 Received: from [2a0a:edc0:0:1101:1d::28] (helo=dude02.red.stw.pengutronix.de) by drehscheibe.grey.stw.pengutronix.de with esmtp (Exim 4.94.2) (envelope-from ) id 1oTg33-003GY2-NV for ptxdist@pengutronix.de; Thu, 01 Sep 2022 10:59:43 +0200 Received: from mfe by dude02.red.stw.pengutronix.de with local (Exim 4.94.2) (envelope-from ) id 1oTg34-00Axqq-Kj for ptxdist@pengutronix.de; Thu, 01 Sep 2022 10:59:42 +0200 From: Marco Felsch To: ptxdist@pengutronix.de Date: Thu, 1 Sep 2022 10:59:41 +0200 Message-Id: <20220901085941.2597793-3-m.felsch@pengutronix.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220901085941.2597793-1-m.felsch@pengutronix.de> References: <20220901085941.2597793-1-m.felsch@pengutronix.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [ptxdist] [PATCH 3/3] host-system-python3: order options alphabetical X-BeenThere: ptxdist@pengutronix.de X-Mailman-Version: 2.1.29 Precedence: list List-Id: PTXdist Development Mailing List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: ptxdist@pengutronix.de Sender: "ptxdist" X-SA-Exim-Connect-IP: 127.0.0.1 X-SA-Exim-Mail-From: ptxdist-bounces@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false No functional changes. Signed-off-by: Marco Felsch --- rules/host-system-python3.in | 6 +++--- rules/host-system-python3.make | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rules/host-system-python3.in b/rules/host-system-python3.in index 21d02e9e7..25201e93f 100644 --- a/rules/host-system-python3.in +++ b/rules/host-system-python3.in @@ -5,6 +5,9 @@ config HOST_SYSTEM_PYTHON3 if HOST_SYSTEM_PYTHON3 +config HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY + bool + config HOST_SYSTEM_PYTHON3_DEV bool @@ -32,7 +35,4 @@ config HOST_SYSTEM_PYTHON3_PYELFTOOLS config HOST_SYSTEM_PYTHON3_PYYAML bool -config HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY - bool - endif diff --git a/rules/host-system-python3.make b/rules/host-system-python3.make index 217f1f56d..b03efd8bb 100644 --- a/rules/host-system-python3.make +++ b/rules/host-system-python3.make @@ -24,6 +24,12 @@ $(STATEDIR)/host-system-python3.prepare: @$(SYSTEMPYTHON3) -V >/dev/null 2>&1 || \ ptxd_bailout "'python3' not found! Please install."; @echo +ifdef PTXCONF_HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY + @echo "Checking for Python Cryptography ..." + @$(SYSTEMPYTHON3) -c 'import cryptography' 2>/dev/null || \ + ptxd_bailout "Python cryptography module not found! \ + Please install python3-cryptography (debian)"; +endif ifdef PTXCONF_HOST_SYSTEM_PYTHON3_DEV @echo "Checking for Python development files ..." @$(SYSTEMPYTHON3)-config --includes &>/dev/null || \ @@ -77,12 +83,6 @@ ifdef PTXCONF_HOST_SYSTEM_PYTHON3_PYYAML @$(SYSTEMPYTHON3) -c 'import yaml' 2>/dev/null || \ ptxd_bailout "Python pyyaml module not found! \ Please install python3-yaml (debian)"; -endif -ifdef PTXCONF_HOST_SYSTEM_PYTHON3_CRYPTOGRAPHY - @echo "Checking for Python Cryptography ..." - @$(SYSTEMPYTHON3) -c 'import cryptography' 2>/dev/null || \ - ptxd_bailout "Python cryptography module not found! \ - Please install python3-cryptography (debian)"; endif @$(call touch) -- 2.30.2