GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Mike Banon 2023-07-29 09:29:02 +03:00 committed by Matt DeVillier
parent 6230d26ad1
commit 9faf74ca96
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
payloads/external/tint/Makefile vendored
View File

@ -7,8 +7,7 @@
# #
TINT_VERSION=0.05 TINT_VERSION=0.05
TINT_EXT_VERSION=0.05 TINT_BASE_URL="https://mirror.fsf.org/trisquel/pool/main/t/tint"
TINT_ARCHIVE_LINK="https://mirror.fsf.org/trisquel/pool/main/t/tint/tint_${TINT_EXT_VERSION}.tar.xz"
TINT_ARCHIVE="tint_${TINT_VERSION}.tar.xz" TINT_ARCHIVE="tint_${TINT_VERSION}.tar.xz"
TINT_DIR="tint-${TINT_VERSION}" TINT_DIR="tint-${TINT_VERSION}"
TINT_SHA1SUM="859008216930a4584e622d0df41fd75c44d2b47f" TINT_SHA1SUM="859008216930a4584e622d0df41fd75c44d2b47f"
@ -50,7 +49,7 @@ tint:
"./generate_core.sh" ${buildgcc} ${corescript} "prepare_before_patch" ; \ "./generate_core.sh" ${buildgcc} ${corescript} "prepare_before_patch" ; \
chmod +x "./tintify_core.sh" ; \ chmod +x "./tintify_core.sh" ; \
"./tintify_core.sh" ${corescript} ${tintified} \ "./tintify_core.sh" ${corescript} ${tintified} \
${TINT_ARCHIVE_LINK} ${TINT_ARCHIVE} ${TINT_DIR} ${TINT_SHA1SUM} ; \ ${TINT_BASE_URL} ${TINT_ARCHIVE} ${TINT_DIR} ${TINT_SHA1SUM} ; \
fi ; \ fi ; \
chmod +x ${tintified} chmod +x ${tintified}
${tintified} ${tintified}

1
payloads/external/tint/generate_core.sh vendored
View File

@ -97,6 +97,7 @@ sed -i -e "s/util\/crossgcc\///g" "$corescript"
if [ ! -z "${prepare_before_patch}" ] ; then if [ ! -z "${prepare_before_patch}" ] ; then
sed -i -e "/\$TAR \$FLAGS \"\$(basename \"\$archive\")\"/a prepare_\${package} || exit \"\$?\"" "$corescript" sed -i -e "/\$TAR \$FLAGS \"\$(basename \"\$archive\")\"/a prepare_\${package} || exit \"\$?\"" "$corescript"
sed -i -e "/\$TAR \$FLAGS \"\$archive\"/a prepare_\${package} || exit \"\$?\"" "$corescript"
fi fi
# #

6
payloads/external/tint/tintify_core.sh vendored
View File

@ -9,7 +9,7 @@
# #
# USAGE: # USAGE:
# ./tintify_core.sh <corescript> <tintified> \ # ./tintify_core.sh <corescript> <tintified> \
# <TINT_ARCHIVE_LINK> <TINT_ARCHIVE> <TINT_DIR> <TINT_SHA1SUM> # <TINT_BASE_URL> <TINT_ARCHIVE> <TINT_DIR> <TINT_SHA1SUM>
# where # where
# corescript - path to input core script # corescript - path to input core script
# tintified - path to output tint script # tintified - path to output tint script
@ -28,10 +28,12 @@ tintified="$2"
# #
echo "#!/bin/sh" > "$tintified" echo "#!/bin/sh" > "$tintified"
echo "TINT_ARCHIVE_LINK=${3}" >> "$tintified" echo "TINT_BASE_URL=${3}" >> "$tintified"
echo "TINT_ARCHIVE=${4}" >> "$tintified" echo "TINT_ARCHIVE=${4}" >> "$tintified"
echo "TINT_ARCHIVE_LINK=${3}/${4}" >> "$tintified"
echo "TINT_DIR=${5}" >> "$tintified" echo "TINT_DIR=${5}" >> "$tintified"
echo "TINT_SHA1SUM=${6}" >> "$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 # Add the replace_plus_with_minus() function - needed to fix the version number