arne/openwrt
1
0
Fork 0
forked from mirror/openwrt
Code Pull requests Activity

tools/npkpy: do not use venv

Browse source 
Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
This commit is contained in:
Etienne Champetier 2024-12-18 21:43:06 -05:00 • committed by Arne Zachlod
parent ccd3670ec4
commit 5b5439ad23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/image-commands.mk
View file

@ -531,7 +531,7 @@ define Build/gl-qsdk-factory
endef endef
define Build/kernel-pack-npk define Build/kernel-pack-npk
sh -c '. $(STAGING_DIR_HOST)/share/npkpy-venv/bin/activate; python $(STAGING_DIR_HOST)/share/npkpy-venv/bin/pack_npk_kernel.py --kernel $@ --output $@.npk' PYTHONPATH="$(STAGING_DIR_HOST)/share/npkpy" python $(STAGING_DIR_HOST)/share/npkpy/pack_npk_kernel.py --kernel $@ --output $@.npk
mv $@.npk $@ mv $@.npk $@
endef endef

8
tools/npkpy/Makefile
View file

@ -18,16 +18,16 @@ PKG_MIRROR_HASH:=4c0596218e8c1f78b38c0583c18a574da18ff4c000ecdd5fbf50c62a62a1fb0
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
define Host/Compile define Host/Compile
python -m venv $(STAGING_DIR_HOST)/share/npkpy-venv
sh -c '. $(STAGING_DIR_HOST)/share/npkpy-venv/bin/activate; pip install --editable $(HOST_BUILD_DIR)'
endef endef
define Host/Install define Host/Install
$(CP) $(HOST_BUILD_DIR)/tools/demo_pack_kernel/poc_pack_kernel.py $(STAGING_DIR_HOST)/share/npkpy-venv/bin/pack_npk_kernel.py mkdir -p $(STAGING_DIR_HOST)/share/npkpy
$(CP) $(HOST_BUILD_DIR)/npkpy $(STAGING_DIR_HOST)/share/npkpy/
$(CP) $(HOST_BUILD_DIR)/tools/demo_pack_kernel/poc_pack_kernel.py $(STAGING_DIR_HOST)/share/npkpy/pack_npk_kernel.py
endef endef
define Host/Clean define Host/Clean
rm -rf $(STAGING_DIR_HOST)/share/npkpy-venv rm -rf $(STAGING_DIR_HOST)/share/npkpy
endef endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))