From: Petr Štetiar <ynezz@true.cz> Date: Wed, 31 Jul 2019 16:11:01 +0000 (+0200) Subject: wireless-regdb: fix build when python2 from package feeds exists X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=b6bae4a2c9f11f7e55319c2b4c709396ce649688;p=openwrt%2Fstaging%2Fblogic.git wireless-regdb: fix build when python2 from package feeds exists 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 <hauke@hauke-m.de> Tested-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk> Tested-by: Russell Senior <russell@personaltelco.net> Tested-by: Lucian Cristian <lucian.cristian@gmail.com> Signed-off-by: Petr Štetiar <ynezz@true.cz> --- diff --git a/package/firmware/wireless-regdb/Makefile b/package/firmware/wireless-regdb/Makefile index 88a8d0bd9c3b..26f470af44c4 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