From f040cc93f99efbd7ad548776effa77c1c7802351 Mon Sep 17 00:00:00 2001 From: Tim Crawford Date: Thu, 12 Oct 2023 09:10:56 -0600 Subject: [PATCH] scripts: Version EC separately from SBIOS Stop setting the EC version to the SBIOS version so that the EC will use its real version. Signed-off-by: Tim Crawford --- scripts/_build/ec.sh | 2 +- scripts/build.sh | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/_build/ec.sh b/scripts/_build/ec.sh index 51d84b2f..e1dcd9fd 100755 --- a/scripts/_build/ec.sh +++ b/scripts/_build/ec.sh @@ -16,5 +16,5 @@ while read line; do done < "$1" make -C ec clean -make -C ec VERSION="${VERSION}" "${EC_ARGS[@]}" BUILD=build -j "$(nproc)" +make -C ec "${EC_ARGS[@]}" BUILD=build -j "$(nproc)" cp "ec/build/ec.rom" "$2" diff --git a/scripts/build.sh b/scripts/build.sh index a63de80e..4bb197fd 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -86,8 +86,7 @@ KERNELVERSION="${VERSION}" \ # Rebuild EC firmware for System76 EC models if [ ! -e "${MODEL_DIR}/ec.rom" -a -e "${MODEL_DIR}/ec.config" ] then - env VERSION="${VERSION}" \ - ./scripts/_build/ec.sh \ + ./scripts/_build/ec.sh \ "${MODEL_DIR}/ec.config" \ "${BUILD}/ec.rom" fi