summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLeah Rowe <leah@libreboot.org>2024-09-30 09:35:46 +0100
committerLeah Rowe <leah@libreboot.org>2024-09-30 09:35:46 +0100
commit02e76d09c1c91ca09c3487259b769ebd85c1915d (patch)
tree101eb616047df16bec30208287237390f484ff6a
parenta42fe72c93e3a20db55fe571d8d8b0e586102e28 (diff)
add swig to fedora dependencies
needed when compiling u-boot Signed-off-by: Leah Rowe <leah@libreboot.org>
-rwxr-xr-xconfig/dependencies/fedora382
-rwxr-xr-xconfig/dependencies/fedora402
-rw-r--r--include/git.sh13
3 files changed, 10 insertions, 7 deletions
diff --git a/config/dependencies/fedora38 b/config/dependencies/fedora38
index 5575a5f0..8f672205 100755
--- a/config/dependencies/fedora38
+++ b/config/dependencies/fedora38
@@ -8,5 +8,5 @@ innoextract intltool libftdi-devel libselinux-devel libusb1 libusb1-devel \
nasm ncurses-devel openssl-devel p7zip p7zip-plugins pandoc parted \
pciutils-devel perl perl-libwww-perl python-unversioned-command python3 \
python3-setuptools rsync sharutils subversion texinfo unar unifont \
-unifont-fonts unifont-ttf-fonts unzip wget xz zlib-devel ccache \
+unifont-fonts unifont-ttf-fonts unzip wget xz zlib-devel ccache swig \
"
diff --git a/config/dependencies/fedora40 b/config/dependencies/fedora40
index f39de483..f73595b8 100755
--- a/config/dependencies/fedora40
+++ b/config/dependencies/fedora40
@@ -9,5 +9,5 @@ libselinux-devel libusb1 libusb1-devel nasm ncurses-devel openssl-devel \
p7zip p7zip-plugins pandoc parted pciutils-devel perl perl-libwww-perl \
python-unversioned-command python3 python3-setuptools rsync sharutils \
subversion systemd-devel texinfo unar unifont unifont-fonts \
-unifont-ttf-fonts unzip wget xz zlib-devel ccache
+unifont-ttf-fonts unzip wget xz zlib-devel ccache swig \
"
diff --git a/include/git.sh b/include/git.sh
index 8c86b4c2..0c2f7acc 100644
--- a/include/git.sh
+++ b/include/git.sh
@@ -91,21 +91,24 @@ fetch_submodule()
"$mdir/${1##*/}/patches"
}
+livepull="n"
tmpclone()
{
[ "$repofail" = "y" ] && \
- printf "Cached clone failed; trying online.\n" 1>&2; repofail="n"
+ printf "Cached clone failed; trying online.\n" 1>&2 && livepull="y"
+
+ repofail="n"
[ $# -lt 6 ] || rm -Rf "$3" || $err "git retry: !rm $3 ($1)"
repodir="$XBMK_CACHE/repo/${1##*/}" && [ $# -gt 5 ] && repodir="$3"
mkdir -p "$XBMK_CACHE/repo" || $err "!rmdir $XBMK_CACHE/repo"
- if [ -d "$repodir" ] && [ $# -lt 6 ]; then
- git -C "$repodir" pull || sleep 3 || git -C "$repodir" pull \
- || sleep 3 || git -C "$repodir" pull || :
- else
+ if [ "$livepull" = "y" ]; then
git clone $1 "$repodir" || git clone $2 "$repodir" || \
$err "!clone $1 $2 $repodir $4 $5"
+ elif [ -d "$repodir" ] && [ $# -lt 6 ]; then
+ git -C "$repodir" pull || sleep 3 || git -C "$repodir" pull \
+ || sleep 3 || git -C "$repodir" pull || :
fi
(
[ $# -gt 5 ] || git clone "$repodir" "$3" || $err "!clone $repodir $3"