From 2fbbe57c721af2ada7c403703572cf1aca1d59ae Mon Sep 17 00:00:00 2001 From: =?utf8?q?Petr=20=C5=A0tetiar?= Date: Wed, 31 Jul 2019 18:11:01 +0200 Subject: [PATCH] wireless-regdb: fix build when python2 from package feeds exists MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit wireless-regdb fails to build if there is python2 installed from package feeds, as staging_dir/hostpkg/bin/python is python2 and staging_dir/hostpkg/bin takes precedence over staging_dir/host/bin (proper place with python -> python3 symlink) which leads to the build failure of wireless-regdb, so this patch makes it explicit which python should be used. Reported-by: Hauke Mehrtens Tested-by: Kevin Darbyshire-Bryant Tested-by: Russell Senior Tested-by: Lucian Cristian Signed-off-by: Petr Å tetiar (cherry picked from commit b6bae4a2c9f11f7e55319c2b4c709396ce649688) --- package/firmware/wireless-regdb/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package/firmware/wireless-regdb/Makefile b/package/firmware/wireless-regdb/Makefile index 88a8d0bd9c..26f470af44 100644 --- a/package/firmware/wireless-regdb/Makefile +++ b/package/firmware/wireless-regdb/Makefile @@ -20,7 +20,7 @@ define Package/wireless-regdb endef define Build/Compile - $(PYTHON) $(PKG_BUILD_DIR)/db2fw.py $(PKG_BUILD_DIR)/regulatory.db $(PKG_BUILD_DIR)/db.txt + $(STAGING_DIR_HOST)/bin/$(PYTHON) $(PKG_BUILD_DIR)/db2fw.py $(PKG_BUILD_DIR)/regulatory.db $(PKG_BUILD_DIR)/db.txt endef define Package/wireless-regdb/install -- 2.25.1