From 189b70ddcb2c7b69a93b3b74b801ba588ccb60ef Mon Sep 17 00:00:00 2001 From: Leah Rowe Date: Wed, 15 May 2024 01:23:22 +0100 Subject: build/roms: create full release tarball name set relname from option.sh under check_project() now the release logic simply has to move a directory Signed-off-by: Leah Rowe --- include/option.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/option.sh b/include/option.sh index f5b07b49..7303287d 100755 --- a/include/option.sh +++ b/include/option.sh @@ -41,7 +41,8 @@ eval "$(setvars "" CONFIG_BOARD_DELL_E6400 CONFIG_HAVE_MRC CONFIG_HAVE_ME_BIN \ CONFIG_VGA_BIOS_FILE CONFIG_VGA_BIOS_ID CONFIG_GBE_BIN_PATH tmpdir _nogit \ CONFIG_INCLUDE_SMSC_SCH5545_EC_FW CONFIG_SMSC_SCH5545_EC_FW_FILE version \ CONFIG_IFD_BIN_PATH CONFIG_MRC_FILE _dest board boarddir lbmk_release \ - CONFIG_HAVE_REFCODE_BLOB CONFIG_REFCODE_BLOB_FILE threads projectname)" + CONFIG_HAVE_REFCODE_BLOB CONFIG_REFCODE_BLOB_FILE threads projectname \ + relname)" # if "y": a coreboot target won't be built if target.cfg says release="n" # (this is used to exclude certain build targets from releases) @@ -169,6 +170,8 @@ check_project() eval "[ -n \"\$$p\" ] || $err \"$p unset\"" eval "x_ printf \"%s\\n\" \"\$$p\" > $p" done + + relname="${projectname}-${version}" export LOCALVERSION="-${projectname}-${version%%-*}" } @@ -178,7 +181,7 @@ mktar_release() printf "%s\n" "${versiondate}" > "${1}/versiondate" || return 1 printf "%s\n" "${projectname}" > "${1}/projectname" || return 1 - mktarball "$1" "${1}.tar.xz" + mktarball "$1" "${1%/*}/${relname}_${1##*/}.tar.xz" x_ rm -Rf "$1" } -- cgit v1.2.1