From b62fe5a78b11711c8a4f67e292615657defbd51a Mon Sep 17 00:00:00 2001 From: Nathaniel van Diepen Date: Thu, 4 Jan 2024 00:45:23 -0700 Subject: [PATCH] Simplify --- Makefile | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/Makefile b/Makefile index 69f78de..450b560 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,6 @@ CODEXCTL := https://github.com/Jayy001/codexctl/releases/download/1703028363/ubu CODEXCTL_HASH := 5c3aa5f264f4ae95de6e259eb8d5da8f0d9c2d7eb3710adb0cf53bcb72dcb79a FW_VERSION := 2.15.1.1189 FW_DATA := wVbHkgKisg- -ARCH := $(shell uname -m) PROTO_SOURCE := $(shell find protobuf -type f -name '*.proto') PROTO_OBJ := $(addprefix $(PACKAGE)/proto/,$(PROTO_SOURCE:%.proto=%_pb2.py)) @@ -85,14 +84,8 @@ dist/${PACKAGE}-${VERSION}-${ABI}-${ABI}-${PLATFORM}.whl: dist $(OBJ) dist/rmufuse: dist .venv/bin/activate $(OBJ) -ifeq ($(ARCH), armv7l) - . .venv/bin/activate; \ - python -m pip install --extra-index-url=https://wheels.eeems.codes/ wheel nuitka -else - . .venv/bin/activate; \ - python -m pip install wheel nuitka -endif . .venv/bin/activate; \ + python -m pip install --extra-index-url=https://wheels.eeems.codes/ wheel nuitka; \ NUITKA_CACHE_DIR="$(realpath .)/.nuitka" \ nuitka3 \ --enable-plugin=pylint-warnings \ @@ -110,13 +103,9 @@ endif .venv/bin/activate: requirements.txt @echo "Setting up development virtual env in .venv" python -m venv .venv -ifeq ($(ARCH), armv7l) . .venv/bin/activate; \ python -m pip install --extra-index-url=https://wheels.eeems.codes/ -r requirements.txt -else - . .venv/bin/activate; \ - python -m pip install $$extra_flags -r requirements.txt -endif + .venv/codexctl.zip: .venv/bin/activate curl -L "${CODEXCTL}" -o .venv/codexctl.zip