Compare commits

...

2 Commits

Author SHA1 Message Date
Leah Rowe f9590760e8 support making u-boot-only tarballs in releases
./update release -m u-boot

if someone just wants to make u-boot, they can
use this and it tars up all the trees.

Signed-off-by: Leah Rowe <info@minifree.org>
2024-02-07 00:21:47 +00:00
Leah Rowe e13b8fe59c git.sh: also reset xtree/tree_depend here
it's still necessary here, to prevent the same bug
identified in the previous patch.

Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-01-26 11:19:15 +00:00
2 changed files with 19 additions and 3 deletions

View File

@ -30,6 +30,7 @@ fetch_from_upstream()
fetch_config()
{
rm -f "${cfgsdir}/"*/seen || err "fetch_config ${cfgsdir}: !rm seen"
eval "$(setvars "" xtree tree_depend)"
while true; do
eval "$(setvars "" rev tree)"
_xm="fetch_config ${project}/${_target}"
@ -63,6 +64,8 @@ prepare_new_tree()
fetch_project_repo()
{
eval "$(setvars "" xtree tree_depend)"
scan_config "${project}" "config/git" "err"
[ -z "${loc+x}" ] && err "fetch_project_repo $project: loc not set"
[ -z "${url+x}" ] && err "fetch_project_repo $project: url not set"

View File

@ -25,6 +25,7 @@ main()
vdir="${vdir}/${version}"
relname="${projectname}-${version}"
[ "${mode}" = "u-boot" ] && relname="u-boot-for-${relname}"
src_dirname="${relname}_src"
srcdir="${vdir}/${src_dirname}"
@ -49,7 +50,7 @@ build_release()
(
cd "${srcdir}" || err "${_xm}: !cd \"${srcdir}\""
fetch_trees
x_ mv src/docs docs
[ "${mode}" = "u-boot" ] || x_ mv src/docs docs
) || err "can't create release files"
git log --graph --pretty=format:'%Cred%h%Creset %s %Creset' \
@ -57,10 +58,19 @@ build_release()
err "build_release $srcdir: couldn't generate changelog"
(
cd "${srcdir%/*}" || err "${_xm}: mktarball \"${srcdir}\""
mktarball "${srcdir##*/}" "${srcdir##*/}.tar.xz" || err "$_xm: mksrc"
if [ "${mode}" = "u-boot" ]; then
cd "${srcdir}/src/" || err "${_xm}: mktarball \"${srcdir}\""
mktarball u-boot "../../${srcdir##*/}.tar.xz" || \
err "$_xm: mksrc"
# make a src archive containing only u-boot
else
cd "${srcdir%/*}" || err "${_xm}: mktarball \"${srcdir}\""
mktarball "${srcdir##*/}" "${srcdir##*/}.tar.xz" || \
err "$_xm: mksrc"
fi
) || err "can't create src tarball"
[ "${mode}" = "src" ] && return 0
[ "${mode}" = "u-boot" ] && return 0
(
cd "${srcdir}" || err "${_xm}: 2 !cd \"${srcdir}\""
@ -73,9 +83,12 @@ build_release()
fetch_trees()
{
for x in config/git/*; do
[ "${mode}" = "u-boot" ] && break
[ ! -f "${x}" ] || ./update trees -f "${x#config/git/}" || \
err "${_xm}: fetch ${x#config/git/}"
done
[ "${mode}" = "u-boot" ] && x_ ./update trees -f u-boot
for x in config/*/build.list; do
[ -f "${x}" ] || continue
xp="${x#*/}"; xp="${xp%/*}"