summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-05-15 01:23:22 +0100
committerLeah Rowe <leah@libreboot.org>2024-05-15 01:27:45 +0100
commit189b70ddcb2c7b69a93b3b74b801ba588ccb60ef (patch)
tree65caee45e6e1374070223ddbe475397876e7a9a5
parent36d45474c0ddde8da030f8a482829c9379b8097a (diff)
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 <leah@libreboot.org>
-rwxr-xr-xbuild13
-rwxr-xr-xinclude/option.sh7
-rwxr-xr-xscript/roms3
3 files changed, 9 insertions, 14 deletions
diff --git a/build b/build
index 01166982..aa6d99dc 100755
--- a/build
+++ b/build
@@ -16,8 +16,7 @@ fi
. "include/vendor.sh"
. "include/mrc.sh"
-eval "$(setvars "" script_path aur_notice vdir relname src_dirname srcdir \
- _xm target romdir mode)"
+eval "$(setvars "" script_path aur_notice vdir src_dirname srcdir _xm mode)"
err="fail"
linkpath="${0}"
@@ -140,7 +139,6 @@ mkrelease()
check_project
vdir="${vdir}/${version}"
- relname="${projectname}-${version}"
[ "${mode}" = "u-boot" ] && relname="u-boot-for-${relname}"
src_dirname="${relname}_src"
srcdir="${vdir}/${src_dirname}"
@@ -216,14 +214,7 @@ mkrom_images()
./build roms all || $err "${_xm}: roms-all"
./build roms serprog rp2040 || $err "${_xm}: rp2040"
./build roms serprog stm32 || $err "${_xm}: stm32"
-
- for rombuild in bin/*.tar.xz; do
- [ -f "${rombuild}" ] || continue
- tarball="release/$version/roms/${relname}_${rombuild##*/}"
- mv "$rombuild" "$tarball" || $err "Cannot create $tarball"
- done
-
- mv "release/${version}/roms/" ../roms || $err "${_xm}: copy roms/"
+ x_ mv bin ../roms
}
mkversion()
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"
}
diff --git a/script/roms b/script/roms
index 2908dc3a..2d07fa44 100755
--- a/script/roms
+++ b/script/roms
@@ -160,7 +160,8 @@ handle_coreboot_target()
[ -d "bin/${board}" ] || return 0
[ "$lbmk_release" = "y" ] || targets="* bin/${board}\n${targets}"
- [ "$lbmk_release" = "y" ] && targets="* bin/$board.tar.xz\n$targets"
+ [ "$lbmk_release" = "y" ] && \
+ targets="* bin/${relname}_$board.tar.xz\n$targets"
[ "$lbmk_release" = "y" ] && mktar_release "bin/$board"; return 0
}