From 4c08130f0966cbf745446ca44377fec4f1b87ea3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Filip=20Lewi=C5=84ski?= Date: Mon, 9 Dec 2024 18:18:08 +0100 Subject: [PATCH] build.sh: correct FW_VERSION parsing for OptiPlex SeaBIOS/UEFI MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Filip LewiƄski --- build.sh | 11 ++++++----- configs/config.dell_optiplex_9010_sff | 2 +- configs/config.dell_optiplex_9010_sff_txt | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/build.sh b/build.sh index e05c58cf52a..e818ac93efa 100755 --- a/build.sh +++ b/build.sh @@ -33,15 +33,16 @@ SDKVER="2024-02-18_732134932b" function build_optiplex_9010 { - local CONFIG=$1 - local FW_VERSION=$2 + DEFCONFIG=$1 + FW_VERSION=$(cat ${DEFCONFIG} | grep CONFIG_LOCALVERSION | cut -d '=' -f 2 | tr -d '"') + [[ ${DEFCONFIG} != *"uefi"* ]] && FW_VERSION="${FW_VERSION}_seabios" docker run --rm -t -u $UID -v $PWD:/home/coreboot/coreboot \ -v $HOME/.ssh:/home/coreboot/.ssh \ -w /home/coreboot/coreboot coreboot/coreboot-sdk:$SDKVER \ /bin/bash -c "make distclean" - cp "${CONFIG}" .config + cp "${DEFCONFIG}" .config git submodule update --init --checkout @@ -326,11 +327,11 @@ case "$CMD" in ;; "optiplex_9010_uefi") BOARD="optiplex_9010" - build_optiplex_9010 "configs/config.dell_optiplex_9010_sff_uefi_txt" "v0.1.1_uefi" + build_optiplex_9010 "configs/config.dell_optiplex_9010_sff_uefi_txt" ;; "optiplex_9010_seabios") BOARD="optiplex_9010" - build_optiplex_9010 "configs/config.dell_optiplex_9010_sff_txt" "v0.1.0-rc1_seabios" + build_optiplex_9010 "configs/config.dell_optiplex_9010_sff_txt" ;; "qemu" | "QEMU" | "q35" | "Q35" ) build_qemu diff --git a/configs/config.dell_optiplex_9010_sff b/configs/config.dell_optiplex_9010_sff index 33feb6acd9a..da23c1a857a 100644 --- a/configs/config.dell_optiplex_9010_sff +++ b/configs/config.dell_optiplex_9010_sff @@ -1,4 +1,4 @@ -CONFIG_LOCALVERSION="v0.1.0" +CONFIG_LOCALVERSION="v0.1.0-rc1" CONFIG_USE_OPTION_TABLE=y CONFIG_VENDOR_DELL=y CONFIG_ONBOARD_VGA_IS_PRIMARY=y diff --git a/configs/config.dell_optiplex_9010_sff_txt b/configs/config.dell_optiplex_9010_sff_txt index 6133358a3a9..744789a65f3 100644 --- a/configs/config.dell_optiplex_9010_sff_txt +++ b/configs/config.dell_optiplex_9010_sff_txt @@ -1,4 +1,4 @@ -CONFIG_LOCALVERSION="v0.1.0" +CONFIG_LOCALVERSION="v0.1.0-rc1" CONFIG_USE_OPTION_TABLE=y CONFIG_VENDOR_DELL=y CONFIG_ONBOARD_VGA_IS_PRIMARY=y