2023-10-26 19:11:40 +00:00
|
|
|
# SPDX-License-Identifier: GPL-3.0-or-later
|
2024-05-26 00:54:36 +00:00
|
|
|
# Copyright (c) 2020-2021,2023-2024 Leah Rowe <leah@libreboot.org>
|
|
|
|
# Copyright (c) 2022 Caleb La Grange <thonkpeasant@protonmail.com>
|
2023-10-26 19:11:40 +00:00
|
|
|
|
2024-07-17 13:55:49 +00:00
|
|
|
eval `setvars "" loc url bkup_url subfile subhash subrepo subrepo_bkup \
|
2024-07-18 22:09:59 +00:00
|
|
|
depend subfile_bkup repofail`
|
2023-10-26 19:11:40 +00:00
|
|
|
|
2024-06-29 18:59:16 +00:00
|
|
|
fetch_targets()
|
2023-10-26 19:11:40 +00:00
|
|
|
{
|
2024-01-21 12:59:02 +00:00
|
|
|
[ -n "$tree_depend" ] && [ "$tree_depend" != "$tree" ] && \
|
2024-07-26 14:24:00 +00:00
|
|
|
x_ ./mk -f "$project" "$tree_depend"
|
2024-06-30 14:49:35 +00:00
|
|
|
e "src/$project/$tree" d && return 0
|
2023-10-26 19:11:40 +00:00
|
|
|
|
trees: unified multi-tree configuration handling
the same function that loads configurations for single-tree
projects has been merged with the function for multi-tree
configs in git.sh, and that functionality has been removed
from git.sh; now it is all unified in the trees script.
as the saying goes: write one program to do one thing well.
the purpose of git.sh is to download source code, but not
to handle configuration files; the latter is meant to be
handled by the trees script, which then calls into git.sh
before running the build logic for that given project.
additionally: the "seen" files are no longer handled, at all.
the logic there was added ages ago, because at the time, i was
considering whether to separate configuration into a new
repository, so that users could more easily make their own
configuration, so it was a guard against misconfiguration.
however, that decision was canceled and we're always very
careful not to introduce a loop; if a loop does occur, the
worst that can possibly happen is you waste some CPU cycles.
Instead, print (on standard output) what config file is being
used, so the operator can see when an infinite loop occurs.
ALSO:
remove _setcfgarg in load_project_config()
it was used to skip when a target.cfg file didn't exist,
specifically on single-tree projects, but this is now
handled using -f instead, on the while loop inside that
function, so _setcfgarg is now a redundant variable.
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-29 22:13:55 +00:00
|
|
|
printf "Creating %s tree %s\n" "$project" "$tree"
|
2024-07-10 21:14:39 +00:00
|
|
|
git_prep "$loc" "$loc" "$PWD/$configdir/$tree/patches" \
|
2024-07-17 12:20:51 +00:00
|
|
|
"src/$project/$tree" u; nuke "$project/$tree" "$project/$tree"
|
2023-10-26 19:11:40 +00:00
|
|
|
}
|
|
|
|
|
2024-06-29 18:58:03 +00:00
|
|
|
fetch_project()
|
2023-10-26 19:11:40 +00:00
|
|
|
{
|
2024-06-22 03:06:07 +00:00
|
|
|
eval `setvars "" xtree tree_depend`
|
2024-06-22 01:35:25 +00:00
|
|
|
eval `setcfg "config/git/$project/pkg.cfg"`
|
2024-01-26 11:15:23 +00:00
|
|
|
|
2024-06-22 01:35:25 +00:00
|
|
|
chkvars url
|
2023-10-26 19:11:40 +00:00
|
|
|
|
2024-07-26 14:24:00 +00:00
|
|
|
[ -n "$xtree" ] && x_ ./mk -f coreboot "$xtree"
|
2024-05-26 00:54:36 +00:00
|
|
|
[ -z "$depend" ] || for d in $depend ; do
|
2024-06-20 00:15:06 +00:00
|
|
|
printf "'%s' needs '%s'; grabbing '%s'\n" "$project" "$d" "$d"
|
2024-07-26 14:24:00 +00:00
|
|
|
x_ ./mk -f $d
|
2023-10-26 19:11:40 +00:00
|
|
|
done
|
git.sh: download "depend" projects *before*
don't do it after, because that means the main project
is saved under src/ before we know whether the subrepo
was downloaded.
the "depend" variable (in config/git/) is no longer used
for projects that go in subdirectories of a parent; now,
we use config/submodules/ for this type of dependency.
download the "depend" projects (as per config/git/) first.
this way, if they fail, the main one will fail, but if
they succeed and main fails, you can just run the main
download again and it won't fail.
this fixes a bug where, depending on how you download a
set of projects and depending on the order which you do so,
a given project can become un-downloadable on current design,
because git will complain that a directory already exists.
this fix is done not only in code (by this commit), but
by prior configuration changes.
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-07 13:16:58 +00:00
|
|
|
clone_project
|
2023-10-26 19:11:40 +00:00
|
|
|
|
rebase cbmk 9429287 per lbmk c4d90087..f5b04fa5
cbmk 9429287 is the present canoeboot revision, on this day,
two commits after canoeboot 20231107
the cbmk revision was based on lbmk c4d90087, but lbmk
has developed a lot since, right up to f5b04fa5. lbmk
c4d90087 was four commits after libreboot 20231106
this patch brings cbmk up to date, versus lbmk f5b04fa5,
which is 135 commits after libreboot 20231106 (not 4)
therefore, the next canoeboot release shall import lbmk
changes made *after* lbmk revision f5b04fa5. good day!
In English (the above is for my reference, next time
I make a new canoeboot release):
This imports all of the numerous improvements from
Libreboot, sans the non-FSDG-compliant changes. You
can find a full list of such changes in the audit4 page:
https://libreboot.org/news/audit4.html
A full canoeboot-ised changelog will be available in
the next canoeboot release, with these and subsequent
changes. Most notable here is the update to the new
GRUB 2.12 release (instead of 2.12-rc1), and the
improvements Riku made to pico-serprog. And the build
system improvements from lbmk, such as improved, more
generic cmake and autoconf handling.
Canoeboot-specific changes: I also tweaked the deblob
logic, to make it less error-prone. The new design
changes imported into cbmk (based on latest lbmk) somewhat
broke the deblob logic; it was constantly reminding the
user that blobs.list was missing for coreboot,
at config/coreboot/blobs.list - coreboot is a multi-tree
project in both cbmk and lbmk, and the deblob logic was
tuned for single/multi, but was treating coreboot as both.
for simplicity, i removed the check for whether blobs.list
is present. this means that the operator must ensure that
these files are present, in any given revision, where they
are required on a given set of projects (and the files are
all present, in this update to cbmk)
Also of note: the grub.cfg improvements are included in this
cbmk update. The improved grub.cfg can find grub/syslinux
configs by default, not just grub anymore, also finds extlinux,
and will also find them on EFI System Partition - in addition,
UEFI-based install media is also more robust; although cbmk
doesn't provide UEFI configurations on x86, our GRUB palyoad
does still need to work with distro install media, and many
of them now use UEFI-based GRUB configurations in their
installation media, which just happen to work with our GRUB
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-01-02 11:37:25 +00:00
|
|
|
for x in config/git/*; do
|
2024-06-22 01:35:25 +00:00
|
|
|
[ -d "$x" ] && nuke "${x##*/}" "src/${x##*/}" 2>/dev/null
|
|
|
|
done; return 0
|
2023-10-26 19:11:40 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
clone_project()
|
|
|
|
{
|
2024-07-18 23:31:57 +00:00
|
|
|
loc="$XBMK_CACHE/repo/$project" && singletree "$project" && \
|
2024-07-17 17:39:42 +00:00
|
|
|
loc="src/$project"
|
2024-06-07 13:21:31 +00:00
|
|
|
printf "Downloading project '%s' to '%s'\n" "$project" "$loc"
|
2023-10-26 19:11:40 +00:00
|
|
|
|
2024-07-26 14:24:00 +00:00
|
|
|
e "$loc" d missing && remkdir "${tmpgit%/*}" && git_prep \
|
|
|
|
"$url" "$bkup_url" "$PWD/config/$project/patches" "$loc"; :
|
2023-10-26 19:11:40 +00:00
|
|
|
}
|
|
|
|
|
rebase cbmk 9429287 per lbmk c4d90087..f5b04fa5
cbmk 9429287 is the present canoeboot revision, on this day,
two commits after canoeboot 20231107
the cbmk revision was based on lbmk c4d90087, but lbmk
has developed a lot since, right up to f5b04fa5. lbmk
c4d90087 was four commits after libreboot 20231106
this patch brings cbmk up to date, versus lbmk f5b04fa5,
which is 135 commits after libreboot 20231106 (not 4)
therefore, the next canoeboot release shall import lbmk
changes made *after* lbmk revision f5b04fa5. good day!
In English (the above is for my reference, next time
I make a new canoeboot release):
This imports all of the numerous improvements from
Libreboot, sans the non-FSDG-compliant changes. You
can find a full list of such changes in the audit4 page:
https://libreboot.org/news/audit4.html
A full canoeboot-ised changelog will be available in
the next canoeboot release, with these and subsequent
changes. Most notable here is the update to the new
GRUB 2.12 release (instead of 2.12-rc1), and the
improvements Riku made to pico-serprog. And the build
system improvements from lbmk, such as improved, more
generic cmake and autoconf handling.
Canoeboot-specific changes: I also tweaked the deblob
logic, to make it less error-prone. The new design
changes imported into cbmk (based on latest lbmk) somewhat
broke the deblob logic; it was constantly reminding the
user that blobs.list was missing for coreboot,
at config/coreboot/blobs.list - coreboot is a multi-tree
project in both cbmk and lbmk, and the deblob logic was
tuned for single/multi, but was treating coreboot as both.
for simplicity, i removed the check for whether blobs.list
is present. this means that the operator must ensure that
these files are present, in any given revision, where they
are required on a given set of projects (and the files are
all present, in this update to cbmk)
Also of note: the grub.cfg improvements are included in this
cbmk update. The improved grub.cfg can find grub/syslinux
configs by default, not just grub anymore, also finds extlinux,
and will also find them on EFI System Partition - in addition,
UEFI-based install media is also more robust; although cbmk
doesn't provide UEFI configurations on x86, our GRUB palyoad
does still need to work with distro install media, and many
of them now use UEFI-based GRUB configurations in their
installation media, which just happen to work with our GRUB
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-01-02 11:37:25 +00:00
|
|
|
git_prep()
|
2023-10-26 19:11:40 +00:00
|
|
|
{
|
2024-07-26 14:24:00 +00:00
|
|
|
_patchdir="$3"; _loc="$4" # $1 and $2 are gitrepo and gitrepo_backup
|
rebase cbmk 9429287 per lbmk c4d90087..f5b04fa5
cbmk 9429287 is the present canoeboot revision, on this day,
two commits after canoeboot 20231107
the cbmk revision was based on lbmk c4d90087, but lbmk
has developed a lot since, right up to f5b04fa5. lbmk
c4d90087 was four commits after libreboot 20231106
this patch brings cbmk up to date, versus lbmk f5b04fa5,
which is 135 commits after libreboot 20231106 (not 4)
therefore, the next canoeboot release shall import lbmk
changes made *after* lbmk revision f5b04fa5. good day!
In English (the above is for my reference, next time
I make a new canoeboot release):
This imports all of the numerous improvements from
Libreboot, sans the non-FSDG-compliant changes. You
can find a full list of such changes in the audit4 page:
https://libreboot.org/news/audit4.html
A full canoeboot-ised changelog will be available in
the next canoeboot release, with these and subsequent
changes. Most notable here is the update to the new
GRUB 2.12 release (instead of 2.12-rc1), and the
improvements Riku made to pico-serprog. And the build
system improvements from lbmk, such as improved, more
generic cmake and autoconf handling.
Canoeboot-specific changes: I also tweaked the deblob
logic, to make it less error-prone. The new design
changes imported into cbmk (based on latest lbmk) somewhat
broke the deblob logic; it was constantly reminding the
user that blobs.list was missing for coreboot,
at config/coreboot/blobs.list - coreboot is a multi-tree
project in both cbmk and lbmk, and the deblob logic was
tuned for single/multi, but was treating coreboot as both.
for simplicity, i removed the check for whether blobs.list
is present. this means that the operator must ensure that
these files are present, in any given revision, where they
are required on a given set of projects (and the files are
all present, in this update to cbmk)
Also of note: the grub.cfg improvements are included in this
cbmk update. The improved grub.cfg can find grub/syslinux
configs by default, not just grub anymore, also finds extlinux,
and will also find them on EFI System Partition - in addition,
UEFI-based install media is also more robust; although cbmk
doesn't provide UEFI configurations on x86, our GRUB palyoad
does still need to work with distro install media, and many
of them now use UEFI-based GRUB configurations in their
installation media, which just happen to work with our GRUB
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-01-02 11:37:25 +00:00
|
|
|
|
2024-07-26 14:24:00 +00:00
|
|
|
chkvars rev; tmpclone "$1" "$2" "$tmpgit" "$rev" "$_patchdir"
|
2024-06-07 15:15:26 +00:00
|
|
|
if singletree "$project" || [ $# -gt 4 ]; then
|
2024-07-26 14:24:00 +00:00
|
|
|
prep_submodules "$_loc"; fi
|
2024-05-22 16:59:42 +00:00
|
|
|
|
2024-05-22 17:50:42 +00:00
|
|
|
[ "$project" = "coreboot" ] && [ -n "$xtree" ] && [ $# -gt 2 ] && \
|
|
|
|
[ "$xtree" != "$tree" ] && link_crossgcc "$_loc"
|
2024-07-18 23:31:57 +00:00
|
|
|
[ "$XBMK_RELEASE" = "y" ] && \
|
2024-07-26 14:24:00 +00:00
|
|
|
[ "$_loc" != "$XBMK_CACHE/repo/$project" ] && rmgit "$tmpgit"
|
2024-05-19 22:04:37 +00:00
|
|
|
|
2024-05-22 22:11:12 +00:00
|
|
|
move_repo "$_loc"
|
2023-10-26 19:11:40 +00:00
|
|
|
}
|
|
|
|
|
2024-05-22 16:59:42 +00:00
|
|
|
prep_submodules()
|
|
|
|
{
|
2024-06-07 15:21:43 +00:00
|
|
|
[ -f "$mdir/module.list" ] && while read -r msrcdir; do
|
git.sh: allow finer control of git submodules
in each submodule configuration directory, a module.cfg
file can now be provided. in it, the user can specify
two repository links (main and backup) and a revision, like
so:
subrepo="repo link goes here"
subrepo_bkup="backup repo link goes here"
subrev="git revision id goes here"
additionally:
in the *main* project directory for the submodules,
a module.list file can be provided. example entries:
3rdparty/vboot
3rdparty/libgfxinit
if the module.list file is provided, only those submodules
will be downloaded. this can be combined with the module.cfg
files, if you wish, but it's optional. you can mix and match.
example locations:
multi-tree project:
config/submodule/coreboot/default/module.list
config/submodule/coreboot/default/vboot/module.cfg
single-tree project:
config/submodule/flashprog/module.list
config/submodule/flashprog/foo/module.cfg
*no* configuration files have been provided, in this commit,
which means that the current behaviour is maintained.
follow-up commits will absolutely configure the submodules.
this is being done to reduce the number of modules downloaded,
because we don't use most of the coreboot submodules that are
downloaded, thus wasting bandwidth and the releases are also
much bigger than necessary.
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-05-24 16:50:42 +00:00
|
|
|
fetch_submodule "$msrcdir"
|
2024-06-07 15:21:43 +00:00
|
|
|
done < "$mdir/module.list"; return 0
|
git.sh: allow finer control of git submodules
in each submodule configuration directory, a module.cfg
file can now be provided. in it, the user can specify
two repository links (main and backup) and a revision, like
so:
subrepo="repo link goes here"
subrepo_bkup="backup repo link goes here"
subrev="git revision id goes here"
additionally:
in the *main* project directory for the submodules,
a module.list file can be provided. example entries:
3rdparty/vboot
3rdparty/libgfxinit
if the module.list file is provided, only those submodules
will be downloaded. this can be combined with the module.cfg
files, if you wish, but it's optional. you can mix and match.
example locations:
multi-tree project:
config/submodule/coreboot/default/module.list
config/submodule/coreboot/default/vboot/module.cfg
single-tree project:
config/submodule/flashprog/module.list
config/submodule/flashprog/foo/module.cfg
*no* configuration files have been provided, in this commit,
which means that the current behaviour is maintained.
follow-up commits will absolutely configure the submodules.
this is being done to reduce the number of modules downloaded,
because we don't use most of the coreboot submodules that are
downloaded, thus wasting bandwidth and the releases are also
much bigger than necessary.
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-05-24 16:50:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
fetch_submodule()
|
|
|
|
{
|
|
|
|
mcfgdir="$mdir/${1##*/}"
|
2024-06-22 03:06:07 +00:00
|
|
|
eval `setvars "" subhash subrepo subrepo_bkup subfile subfile_bkup st`
|
git.sh: allow finer control of git submodules
in each submodule configuration directory, a module.cfg
file can now be provided. in it, the user can specify
two repository links (main and backup) and a revision, like
so:
subrepo="repo link goes here"
subrepo_bkup="backup repo link goes here"
subrev="git revision id goes here"
additionally:
in the *main* project directory for the submodules,
a module.list file can be provided. example entries:
3rdparty/vboot
3rdparty/libgfxinit
if the module.list file is provided, only those submodules
will be downloaded. this can be combined with the module.cfg
files, if you wish, but it's optional. you can mix and match.
example locations:
multi-tree project:
config/submodule/coreboot/default/module.list
config/submodule/coreboot/default/vboot/module.cfg
single-tree project:
config/submodule/flashprog/module.list
config/submodule/flashprog/foo/module.cfg
*no* configuration files have been provided, in this commit,
which means that the current behaviour is maintained.
follow-up commits will absolutely configure the submodules.
this is being done to reduce the number of modules downloaded,
because we don't use most of the coreboot submodules that are
downloaded, thus wasting bandwidth and the releases are also
much bigger than necessary.
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-05-24 16:50:42 +00:00
|
|
|
[ ! -f "$mcfgdir/module.cfg" ] || . "$mcfgdir/module.cfg" || \
|
|
|
|
$err "! . $mcfgdir/module.cfg"
|
|
|
|
|
2024-06-19 23:57:10 +00:00
|
|
|
for xt in repo file; do
|
2024-06-20 00:42:10 +00:00
|
|
|
_seval="if [ -n \"\$sub$xt\" ] || [ -n \"\$sub${xt}_bkup\" ]"
|
|
|
|
eval "$_seval; then st=\"\$st \$xt\"; fi"
|
git.sh: support downloading *files* as submodules
when we download coreboot, we currently don't have a way to
download crossgcc tarballs, so we rely on coreboot to do it,
which means running the coreboot build system to do it; which
means we don't get them in release archives, unless we add
very hacky logic (which did exist and was removed).
the problem with coreboot's build system is that it does not
define backup links for each given tarball, instead relying
on gnu.org exclusively, which seems OK at first because the
gnu.org links actually return an HTTP 302 response leading
to a random mirror, HOWEVER:
the gnu.org 302 redirect often fails, and the download fails,
causing an error. a mitigation for this has been to patch the
coreboot build system to download directly from a single mirror
that is reliable (in our case mirrorservice.org).
while this mitigation mostly works, it's not redundant; the
kent mirror is occasionally down too, and again we still have
the problem of not being able to cleanly provide crossgcc
tarballs inside release archives.
do it in config/submodules, like so:
module.list shall say the relative path of a given file,
once downloaded, relative to the given source tree.
module.cfg shall be re-used, in the same way as for git
submodules, but:
subfile="url"
subfile_bkup="backup url"
do this, instead of:
subrepo="url"
subrepo_bkup="backup url"
example entries in module.list:
util/crossgcc/tarballs/binutils-2.41.tar.xz
util/crossgcc/tarballs/gcc-13.2.0.tar.xz
util/crossgcc/tarballs/gmp-6.3.0.tar.xz
util/crossgcc/tarballs/mpc-1.3.1.tar.gz
util/crossgcc/tarballs/mpfr-4.2.1.tar.xz
util/crossgcc/tarballs/nasm-2.16.01.tar.bz2
util/crossgcc/tarballs/R06_28_23.tar.gz
the "subrev" variable (in module.cfg) has been renamed
to "subhash", so that this makes sense, and that name is
common to both subfile/subrepo.
the download logic from the vendor scripts has been re-used
for this purpose, and it verifies files using sha512sum.
therefore:
when specifying subrepo(git submodule), subhash will still
be a sha1 checksum, but:
when specifying subfile(file, e.g. tarball), subhash will
be a sha512 checksum
the logic for both (subrepo and subfile) is unified, and
has this rule:
subrepo* and subfile* must never *both* be declared.
the actual configuration of coreboot crossgcc tarballs
will be done in a follow-up commit. this commit simply
modifies the code to accomodate this.
over time, this feature could be used for many other files
within source trees, and could perhaps be expanded to allow
extracting source tarballs in leiu of git repositories, but
the latter is not yet required and thus not implemented.
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-08 02:01:05 +00:00
|
|
|
done
|
2024-06-19 23:57:10 +00:00
|
|
|
st="${st# }" && [ "$st" = "repo file" ] && $err "$mdir: repo+file"
|
git.sh: support downloading *files* as submodules
when we download coreboot, we currently don't have a way to
download crossgcc tarballs, so we rely on coreboot to do it,
which means running the coreboot build system to do it; which
means we don't get them in release archives, unless we add
very hacky logic (which did exist and was removed).
the problem with coreboot's build system is that it does not
define backup links for each given tarball, instead relying
on gnu.org exclusively, which seems OK at first because the
gnu.org links actually return an HTTP 302 response leading
to a random mirror, HOWEVER:
the gnu.org 302 redirect often fails, and the download fails,
causing an error. a mitigation for this has been to patch the
coreboot build system to download directly from a single mirror
that is reliable (in our case mirrorservice.org).
while this mitigation mostly works, it's not redundant; the
kent mirror is occasionally down too, and again we still have
the problem of not being able to cleanly provide crossgcc
tarballs inside release archives.
do it in config/submodules, like so:
module.list shall say the relative path of a given file,
once downloaded, relative to the given source tree.
module.cfg shall be re-used, in the same way as for git
submodules, but:
subfile="url"
subfile_bkup="backup url"
do this, instead of:
subrepo="url"
subrepo_bkup="backup url"
example entries in module.list:
util/crossgcc/tarballs/binutils-2.41.tar.xz
util/crossgcc/tarballs/gcc-13.2.0.tar.xz
util/crossgcc/tarballs/gmp-6.3.0.tar.xz
util/crossgcc/tarballs/mpc-1.3.1.tar.gz
util/crossgcc/tarballs/mpfr-4.2.1.tar.xz
util/crossgcc/tarballs/nasm-2.16.01.tar.bz2
util/crossgcc/tarballs/R06_28_23.tar.gz
the "subrev" variable (in module.cfg) has been renamed
to "subhash", so that this makes sense, and that name is
common to both subfile/subrepo.
the download logic from the vendor scripts has been re-used
for this purpose, and it verifies files using sha512sum.
therefore:
when specifying subrepo(git submodule), subhash will still
be a sha1 checksum, but:
when specifying subfile(file, e.g. tarball), subhash will
be a sha512 checksum
the logic for both (subrepo and subfile) is unified, and
has this rule:
subrepo* and subfile* must never *both* be declared.
the actual configuration of coreboot crossgcc tarballs
will be done in a follow-up commit. this commit simply
modifies the code to accomodate this.
over time, this feature could be used for many other files
within source trees, and could perhaps be expanded to allow
extracting source tarballs in leiu of git repositories, but
the latter is not yet required and thus not implemented.
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-06-08 02:01:05 +00:00
|
|
|
|
|
|
|
[ -z "$st" ] && return 0 # subrepo/subfile not defined
|
2024-06-14 12:36:31 +00:00
|
|
|
chkvars "sub${st}" "sub${st}_bkup" "subhash"
|
git.sh: allow finer control of git submodules
in each submodule configuration directory, a module.cfg
file can now be provided. in it, the user can specify
two repository links (main and backup) and a revision, like
so:
subrepo="repo link goes here"
subrepo_bkup="backup repo link goes here"
subrev="git revision id goes here"
additionally:
in the *main* project directory for the submodules,
a module.list file can be provided. example entries:
3rdparty/vboot
3rdparty/libgfxinit
if the module.list file is provided, only those submodules
will be downloaded. this can be combined with the module.cfg
files, if you wish, but it's optional. you can mix and match.
example locations:
multi-tree project:
config/submodule/coreboot/default/module.list
config/submodule/coreboot/default/vboot/module.cfg
single-tree project:
config/submodule/flashprog/module.list
config/submodule/flashprog/foo/module.cfg
*no* configuration files have been provided, in this commit,
which means that the current behaviour is maintained.
follow-up commits will absolutely configure the submodules.
this is being done to reduce the number of modules downloaded,
because we don't use most of the coreboot submodules that are
downloaded, thus wasting bandwidth and the releases are also
much bigger than necessary.
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-05-24 16:50:42 +00:00
|
|
|
|
2024-06-19 23:57:10 +00:00
|
|
|
[ "$st" = "file" ] && download "$subfile" "$subfile_bkup" \
|
2024-06-19 23:51:04 +00:00
|
|
|
"$tmpgit/$1" "$subhash" && return 0
|
|
|
|
rm -Rf "$tmpgit/$1" || $err "!rm '$mdir' '$1'"
|
|
|
|
tmpclone "$subrepo" "$subrepo_bkup" "$tmpgit/$1" "$subhash" \
|
|
|
|
"$mdir/${1##*/}/patches"
|
2024-06-07 15:15:26 +00:00
|
|
|
}
|
git.sh: allow finer control of git submodules
in each submodule configuration directory, a module.cfg
file can now be provided. in it, the user can specify
two repository links (main and backup) and a revision, like
so:
subrepo="repo link goes here"
subrepo_bkup="backup repo link goes here"
subrev="git revision id goes here"
additionally:
in the *main* project directory for the submodules,
a module.list file can be provided. example entries:
3rdparty/vboot
3rdparty/libgfxinit
if the module.list file is provided, only those submodules
will be downloaded. this can be combined with the module.cfg
files, if you wish, but it's optional. you can mix and match.
example locations:
multi-tree project:
config/submodule/coreboot/default/module.list
config/submodule/coreboot/default/vboot/module.cfg
single-tree project:
config/submodule/flashprog/module.list
config/submodule/flashprog/foo/module.cfg
*no* configuration files have been provided, in this commit,
which means that the current behaviour is maintained.
follow-up commits will absolutely configure the submodules.
this is being done to reduce the number of modules downloaded,
because we don't use most of the coreboot submodules that are
downloaded, thus wasting bandwidth and the releases are also
much bigger than necessary.
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-05-24 16:50:42 +00:00
|
|
|
|
2024-06-07 15:15:26 +00:00
|
|
|
tmpclone()
|
|
|
|
{
|
2024-07-18 22:23:02 +00:00
|
|
|
[ "$repofail" = "y" ] && \
|
2024-07-26 14:24:00 +00:00
|
|
|
printf "Cached clone failed; trying online.\n" 1>&2; repofail="n"
|
2024-07-18 22:09:59 +00:00
|
|
|
|
2024-07-17 16:28:27 +00:00
|
|
|
[ $# -lt 6 ] || rm -Rf "$3" || $err "git retry: !rm $3 ($1)"
|
2024-07-18 23:31:57 +00:00
|
|
|
repodir="$XBMK_CACHE/repo/${1##*/}" && [ $# -gt 5 ] && repodir="$3"
|
|
|
|
mkdir -p "$XBMK_CACHE/repo" || $err "!rmdir $XBMK_CACHE/repo"
|
2024-07-26 14:24:00 +00:00
|
|
|
|
git.sh: try direct clone if cached git fails
normally, a project is cached at repo/PROJECT/, and
cloned from there to the final destination.
errors lead to a calling of $err, but this will result
in a return if done from inside a subshell, of non-zero
value, so use this to re-try with a 6th argument when
calling tmpclone().
in most cases, this fallback will never kick in, but
it will kick in resetting or patching the cached clone
fails; specifically, we are interested in the reset part.
a given project name may change repositories in lbmk at
a given time. if this happens, and the old one is cached,
the overall result of this patch is that lbmk will fall
back to the old behaviour, where git urls are tried
directly, without caching.
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-07-17 16:01:15 +00:00
|
|
|
if [ -d "$repodir" ] && [ $# -lt 6 ]; then
|
2024-07-17 15:55:05 +00:00
|
|
|
git -C "$repodir" pull || sleep 3 || git -C "$repodir" pull \
|
2024-07-18 22:11:45 +00:00
|
|
|
|| sleep 3 || git -C "$repodir" pull || :
|
2024-07-17 12:01:12 +00:00
|
|
|
else
|
|
|
|
git clone $1 "$repodir" || git clone $2 "$repodir" || \
|
|
|
|
$err "!clone $1 $2 $repodir $4 $5"
|
|
|
|
fi
|
git.sh: try direct clone if cached git fails
normally, a project is cached at repo/PROJECT/, and
cloned from there to the final destination.
errors lead to a calling of $err, but this will result
in a return if done from inside a subshell, of non-zero
value, so use this to re-try with a 6th argument when
calling tmpclone().
in most cases, this fallback will never kick in, but
it will kick in resetting or patching the cached clone
fails; specifically, we are interested in the reset part.
a given project name may change repositories in lbmk at
a given time. if this happens, and the old one is cached,
the overall result of this patch is that lbmk will fall
back to the old behaviour, where git urls are tried
directly, without caching.
Signed-off-by: Leah Rowe <leah@libreboot.org>
2024-07-17 16:01:15 +00:00
|
|
|
(
|
|
|
|
[ $# -gt 5 ] || git clone "$repodir" "$3" || $err "!clone $repodir $3"
|
2024-06-07 15:15:26 +00:00
|
|
|
git -C "$3" reset --hard "$4" || $err "!reset $1 $2 $3 $4 $5"
|
|
|
|
git_am_patches "$3" "$5"
|
2024-07-18 22:09:59 +00:00
|
|
|
) || repofail="y"
|
|
|
|
|
|
|
|
[ "$repofail" = "y" ] && [ $# -lt 6 ] && tmpclone $@ retry
|
|
|
|
[ "$repofail" = "y" ] && $err "!clone $1 $2 $3 $4 $5"; :
|
2024-05-19 23:10:27 +00:00
|
|
|
}
|
|
|
|
|
2023-10-26 19:11:40 +00:00
|
|
|
git_am_patches()
|
|
|
|
{
|
2024-06-30 17:23:15 +00:00
|
|
|
for p in "$2/"*; do
|
|
|
|
[ -L "$p" ] && continue; [ -e "$p" ] || continue
|
|
|
|
[ -d "$p" ] && git_am_patches "$1" "$p" && continue
|
|
|
|
[ ! -f "$p" ] || git -C "$1" am "$p" || $err "$1 $2: !am $p"
|
2024-06-30 17:14:58 +00:00
|
|
|
done; return 0
|
2023-10-26 19:11:40 +00:00
|
|
|
}
|
2024-05-22 22:08:13 +00:00
|
|
|
|
|
|
|
link_crossgcc()
|
|
|
|
{
|
|
|
|
(
|
2024-06-09 09:48:28 +00:00
|
|
|
x_ cd "$tmpgit/util" && x_ rm -Rf crossgcc
|
2024-05-22 22:08:13 +00:00
|
|
|
ln -s "../../$xtree/util/crossgcc" crossgcc || $err "$1: !xgcc link"
|
|
|
|
) || $err "$1: !xgcc link"
|
|
|
|
}
|
2024-05-22 22:11:12 +00:00
|
|
|
|
|
|
|
move_repo()
|
|
|
|
{
|
|
|
|
[ "$1" = "${1%/*}" ] || x_ mkdir -p "${1%/*}"
|
|
|
|
mv "$tmpgit" "$1" || $err "git_prep: !mv $tmpgit $1"
|
|
|
|
}
|
2024-05-26 08:37:28 +00:00
|
|
|
|
|
|
|
# can delete from multi- and single-tree projects.
|
|
|
|
# called from script/trees when downloading sources.
|
|
|
|
nuke()
|
|
|
|
{
|
2024-06-09 09:49:58 +00:00
|
|
|
e "config/${1%/}/nuke.list" f missing || while read -r nukefile; do
|
2024-06-09 10:43:47 +00:00
|
|
|
rmf="src/${2%/}/$nukefile" && [ -L "$rmf" ] && continue
|
2024-06-09 09:42:10 +00:00
|
|
|
e "$rmf" e missing || rm -Rf "$rmf" || $err "!rm $rmf, ${2%/}"
|
|
|
|
done < "config/${1%/}/nuke.list"; return 0
|
2024-05-26 08:37:28 +00:00
|
|
|
}
|