diff options
| author | Mike Banon <mikebdp2@gmail.com> | 2023-07-29 09:29:02 +0300 |
|---|---|---|
| committer | Matt DeVillier <matt.devillier@amd.corp-partner.google.com> | 2023-08-08 16:02:31 +0000 |
| commit | 9faf74ca96e7796a091a514d6fbad8a664514f72 (patch) | |
| tree | 105fda0b914ed3c765d05a9906f8bfd5d0ea3c03 /payloads | |
| parent | 6230d26ad108da328ae462762beb27284f061ea7 (diff) | |
tint: update the tint build system to fix the download/patch errors
Restore the tint build system compatibility with the current version
of buildgcc script while preserving the backwards compatibility.
Change-Id: I45d3454b4527ee81c3927a5b3da2e9067c530fb0
Signed-off-by: Mike Banon <mikebdp2@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/76819
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'payloads')
| -rw-r--r-- | payloads/external/tint/Makefile | 5 | ||||
| -rwxr-xr-x | payloads/external/tint/generate_core.sh | 1 | ||||
| -rwxr-xr-x | payloads/external/tint/tintify_core.sh | 6 |
3 files changed, 7 insertions, 5 deletions
diff --git a/payloads/external/tint/Makefile b/payloads/external/tint/Makefile index 5bd9df5a4f..2b653f5a39 100644 --- a/payloads/external/tint/Makefile +++ b/payloads/external/tint/Makefile @@ -7,8 +7,7 @@ # TINT_VERSION=0.05 -TINT_EXT_VERSION=0.05 -TINT_ARCHIVE_LINK="https://mirror.fsf.org/trisquel/pool/main/t/tint/tint_${TINT_EXT_VERSION}.tar.xz" +TINT_BASE_URL="https://mirror.fsf.org/trisquel/pool/main/t/tint" TINT_ARCHIVE="tint_${TINT_VERSION}.tar.xz" TINT_DIR="tint-${TINT_VERSION}" TINT_SHA1SUM="859008216930a4584e622d0df41fd75c44d2b47f" @@ -50,7 +49,7 @@ tint: "./generate_core.sh" ${buildgcc} ${corescript} "prepare_before_patch" ; \ chmod +x "./tintify_core.sh" ; \ "./tintify_core.sh" ${corescript} ${tintified} \ - ${TINT_ARCHIVE_LINK} ${TINT_ARCHIVE} ${TINT_DIR} ${TINT_SHA1SUM} ; \ + ${TINT_BASE_URL} ${TINT_ARCHIVE} ${TINT_DIR} ${TINT_SHA1SUM} ; \ fi ; \ chmod +x ${tintified} ${tintified} diff --git a/payloads/external/tint/generate_core.sh b/payloads/external/tint/generate_core.sh index bb0de2d169..834906b5fc 100755 --- a/payloads/external/tint/generate_core.sh +++ b/payloads/external/tint/generate_core.sh @@ -97,6 +97,7 @@ sed -i -e "s/util\/crossgcc\///g" "$corescript" if [ ! -z "${prepare_before_patch}" ] ; then sed -i -e "/\$TAR \$FLAGS \"\$(basename \"\$archive\")\"/a prepare_\${package} || exit \"\$?\"" "$corescript" + sed -i -e "/\$TAR \$FLAGS \"\$archive\"/a prepare_\${package} || exit \"\$?\"" "$corescript" fi # diff --git a/payloads/external/tint/tintify_core.sh b/payloads/external/tint/tintify_core.sh index c2eb7e6b78..0cd659912a 100755 --- a/payloads/external/tint/tintify_core.sh +++ b/payloads/external/tint/tintify_core.sh @@ -9,7 +9,7 @@ # # USAGE: # ./tintify_core.sh <corescript> <tintified> \ -# <TINT_ARCHIVE_LINK> <TINT_ARCHIVE> <TINT_DIR> <TINT_SHA1SUM> +# <TINT_BASE_URL> <TINT_ARCHIVE> <TINT_DIR> <TINT_SHA1SUM> # where # corescript - path to input core script # tintified - path to output tint script @@ -28,10 +28,12 @@ tintified="$2" # echo "#!/bin/sh" > "$tintified" -echo "TINT_ARCHIVE_LINK=${3}" >> "$tintified" +echo "TINT_BASE_URL=${3}" >> "$tintified" echo "TINT_ARCHIVE=${4}" >> "$tintified" +echo "TINT_ARCHIVE_LINK=${3}/${4}" >> "$tintified" echo "TINT_DIR=${5}" >> "$tintified" echo "TINT_SHA1SUM=${6}" >> "$tintified" +echo "USE_COREBOOT_MIRROR=0" >> "$tintified" # # Add the replace_plus_with_minus() function - needed to fix the version number |