[openwrt/openwrt] prereq-build: fix python distutils detection

LEDE Commits lede-commits at lists.infradead.org
Sun Sep 11 07:13:21 PDT 2022


ansuel pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/be6f0125514db8967a7181420db8ef20990bd93c

commit be6f0125514db8967a7181420db8ef20990bd93c
Author: Rosen Penev <rosenp at gmail.com>
AuthorDate: Fri Sep 9 12:28:08 2022 -0700

    prereq-build: fix python distutils detection
    
    Debian and by extension Ubuntu packages distutils in a suboptimal way
    where import distutils works but none of the methods do.
    
    This alternative check verifies that distutils is actually usable.
    
    Signed-off-by: Rosen Penev <rosenp at gmail.com>
---
 include/prereq-build.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/prereq-build.mk b/include/prereq-build.mk
index 0a023c2c6f..67993cf7e3 100644
--- a/include/prereq-build.mk
+++ b/include/prereq-build.mk
@@ -188,7 +188,7 @@ $(eval $(call SetupHostCommand,python3,Please install Python >= 3.6, \
 
 $(eval $(call TestHostCommand,python3-distutils, \
 	Please install the Python3 distutils module, \
-	$(STAGING_DIR_HOST)/bin/python3 -c 'import distutils'))
+	$(STAGING_DIR_HOST)/bin/python3 -c 'from distutils import util'))
 
 $(eval $(call SetupHostCommand,file,Please install the 'file' package, \
 	file --version 2>&1 | grep file))




More information about the lede-commits mailing list