[OpenWrt-Devel] [PATCH] wireless-regdb: fix build when python2 from package feeds exists

Hauke Mehrtens hauke at hauke-m.de
Fri Aug 2 10:33:08 EDT 2019


On 7/31/19 10:31 PM, Petr Štetiar wrote:
> 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 at hauke-m.de>
> Tested-by: Kevin Darbyshire-Bryant <ldir at darbyshire-bryant.me.uk>
> Signed-off-by: Petr Štetiar <ynezz at true.cz>

Tested-by: Hauke Mehrtens <hauke at hauke-m.de>

> ---
>  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 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
> 
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel at lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
> 


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: OpenPGP digital signature
URL: <http://lists.infradead.org/pipermail/openwrt-devel/attachments/20190802/ca057c50/attachment.sig>
-------------- next part --------------
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


More information about the openwrt-devel mailing list