From 5b5439ad23adf1e4ea0c0c200315ee0c0e7152c3 Mon Sep 17 00:00:00 2001 From: Etienne Champetier Date: Wed, 18 Dec 2024 21:43:06 -0500 Subject: [PATCH] tools/npkpy: do not use venv Signed-off-by: Etienne Champetier --- include/image-commands.mk | 2 +- tools/npkpy/Makefile | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/image-commands.mk b/include/image-commands.mk index 52f202f37f..22fa4a2790 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -531,7 +531,7 @@ define Build/gl-qsdk-factory endef 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 $@ endef diff --git a/tools/npkpy/Makefile b/tools/npkpy/Makefile index c3bd792101..838d9f6011 100644 --- a/tools/npkpy/Makefile +++ b/tools/npkpy/Makefile @@ -18,16 +18,16 @@ PKG_MIRROR_HASH:=4c0596218e8c1f78b38c0583c18a574da18ff4c000ecdd5fbf50c62a62a1fb0 include $(INCLUDE_DIR)/host-build.mk 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 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 define Host/Clean - rm -rf $(STAGING_DIR_HOST)/share/npkpy-venv + rm -rf $(STAGING_DIR_HOST)/share/npkpy endef $(eval $(call HostBuild))