coreboot-gerrit February 2018

coreboot-gerrit@coreboot.org

1 participants
1573 discussions

Change in coreboot[master]: tint: fix the "Paused - Press any key to continue" message for pause
by build bot (Jenkins) (Code Review) 23 Feb '18

23 Feb '18

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/23854 ) Change subject: tint: fix the "Paused - Press any key to continue" message for pause ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-gerrit/67838/ : SUCCESS https://qa.coreboot.org/job/coreboot-checkpatch/22332/ : SUCCESS -- To view, visit https://review.coreboot.org/23854 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: If4e33e884c00c17f19ab330167d9293c8396ff3e Gerrit-Change-Number: 23854 Gerrit-PatchSet: 1 Gerrit-Owner: Mike Banon <mikebdp2(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 23 Feb 2018 17:30:28 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in coreboot[master]: tint: introduce the new tint build system with checksum verification
by build bot (Jenkins) (Code Review) 23 Feb '18

23 Feb '18

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/23856 ) Change subject: tint: introduce the new tint build system with checksum verification ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-gerrit/67841/ : SUCCESS https://qa.coreboot.org/job/coreboot-checkpatch/22335/ : SUCCESS -- To view, visit https://review.coreboot.org/23856 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I1d24f222d1b92030b81bba3951e243a2a9f37290 Gerrit-Change-Number: 23856 Gerrit-PatchSet: 1 Gerrit-Owner: Mike Banon <mikebdp2(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 23 Feb 2018 17:30:02 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in coreboot[master]: tint: make it possible to reboot by pressing 'q' key two times
by build bot (Jenkins) (Code Review) 23 Feb '18

23 Feb '18

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/23853 ) Change subject: tint: make it possible to reboot by pressing 'q' key two times ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-gerrit/67839/ : SUCCESS https://qa.coreboot.org/job/coreboot-checkpatch/22333/ : SUCCESS -- To view, visit https://review.coreboot.org/23853 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Ia56d639fa8e563047fb3d2723695626a449ead40 Gerrit-Change-Number: 23853 Gerrit-PatchSet: 1 Gerrit-Owner: Mike Banon <mikebdp2(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 23 Feb 2018 17:26:13 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in coreboot[master]: tint: upgrade the outdated tint payload from 0.03b to 0.04+nmu1
by build bot (Jenkins) (Code Review) 23 Feb '18

23 Feb '18

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/23852 ) Change subject: tint: upgrade the outdated tint payload from 0.03b to 0.04+nmu1 ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-gerrit/67837/ : SUCCESS https://qa.coreboot.org/job/coreboot-checkpatch/22331/ : SUCCESS -- To view, visit https://review.coreboot.org/23852 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: I22e65d18a0b1551f7049c4afe7f95868f584cf9b Gerrit-Change-Number: 23852 Gerrit-PatchSet: 1 Gerrit-Owner: Mike Banon <mikebdp2(a)gmail.com> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 23 Feb 2018 17:22:23 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Change in coreboot[master]: tint: change the tint download link from HTTP Debian to HTTPS FSF
by Mike Banon (Code Review) 23 Feb '18

23 Feb '18

Mike Banon has uploaded this change for review. ( https://review.coreboot.org/23855 Change subject: tint: change the tint download link from HTTP Debian to HTTPS FSF ...................................................................... tint: change the tint download link from HTTP Debian to HTTPS FSF Last time there was a request to change a link from HTTP to HTTPS. I haven't found a similar HTTPS link at the Debian server and thought it is a good idea to take it from the Free Software Foundation server Change-Id: I55147ee2668de03ba6e9feb84936de24b2a001df Signed-off-by: Mike Banon <mikebdp2(a)gmail.com> --- M payloads/external/tint/Makefile 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/55/23855/1 diff --git a/payloads/external/tint/Makefile b/payloads/external/tint/Makefile index 5ab8974..253bfea 100644 --- a/payloads/external/tint/Makefile +++ b/payloads/external/tint/Makefile @@ -1,4 +1,4 @@ -project_url=http://http.debian.net/debian/pool/main/t/tint/tint_0.04+nmu1.tar.gz +project_url=https://mirror.fsf.org/trisquel/pool/main/t/tint/tint_0.04+nmu1.tar.gz archive_name=tint_0.04+nmu1.tar.gz unexport KCONFIG_AUTOHEADER -- To view, visit https://review.coreboot.org/23855 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I55147ee2668de03ba6e9feb84936de24b2a001df Gerrit-Change-Number: 23855 Gerrit-PatchSet: 1 Gerrit-Owner: Mike Banon <mikebdp2(a)gmail.com>

1 0

Change in coreboot[master]: tint: introduce the new tint build system with checksum verification
by Mike Banon (Code Review) 23 Feb '18

23 Feb '18

Mike Banon has uploaded this change for review. ( https://review.coreboot.org/23856 Change subject: tint: introduce the new tint build system with checksum verification ...................................................................... tint: introduce the new tint build system with checksum verification Three stages of the new tint build system: 1) generate_core.sh extracts the core part from buildgcc script, most importantly the checksum calculation/verification functions 2) tintify_core.sh adds the tint-specific footer/header to the core, such as the properties of current version including its checksum 3) tint.sh - generated and "tintified" core script - builds a tint Change-Id: I1d24f222d1b92030b81bba3951e243a2a9f37290 Signed-off-by: Mike Banon <mikebdp2(a)gmail.com> --- M payloads/external/tint/Makefile A payloads/external/tint/generate_core.sh R payloads/external/tint/tint-0.04+nmu1_libpayload.patch A payloads/external/tint/tintify_core.sh 4 files changed, 215 insertions(+), 21 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/56/23856/1 diff --git a/payloads/external/tint/Makefile b/payloads/external/tint/Makefile index 253bfea..0c0300a 100644 --- a/payloads/external/tint/Makefile +++ b/payloads/external/tint/Makefile @@ -1,5 +1,23 @@ -project_url=https://mirror.fsf.org/trisquel/pool/main/t/tint/tint_0.04+nmu1.tar.gz -archive_name=tint_0.04+nmu1.tar.gz +# +# TINT build system +# + +# +# Properties of the current TINT version +# + +TINT_VERSION=0.04+nmu1 +TINT_ARCHIVE="https://mirror.fsf.org/trisquel/pool/main/t/tint/tint_${TINT_VERSION}.tar.gz" +TINT_DIR="tint-${TINT_VERSION}" +TINT_CHECKSUM=7fcaa428c6d0de7096d1e4fbfd14848096ae5aad + +# +# Locations of the input/output scripts +# + +buildgcc="./../../../util/crossgcc/buildgcc" +corescript="./core.sh" +tintified="./tint.sh" unexport KCONFIG_AUTOHEADER unexport KCONFIG_AUTOCONFIG @@ -10,28 +28,33 @@ all: tint -tint: patch - echo " MAKE TINT " - $(MAKE) -C tint +################################################################################ +# +# Three stages of TINT build system: +# +# 1) generate_core.sh extracts the core part from buildgcc script, +# most importantly the checksum calculation/verification functions +# +# 2) tintify_core.sh adds the TINT-specific footer/header to the core, +# such as the properties of current version including its checksum +# +# 3) tint.sh - generated and "tintified" core script - builds a TINT +# +################################################################################ -patch: download - cd tint; \ - if [ -e debian ]; then \ - rm -rf debian typedefs.h Makefile; \ - touch Makefile; \ - patch -l -p1 < ../libpayload_tint.patch; \ - fi - -download: - test -d tint || { wget $(project_url); \ - tar -xvf $(archive_name); \ - rm $(archive_name); \ - mv tint-0.04+nmu1 tint; } +tint: + ./generate_core.sh ${buildgcc} ${corescript} prepare_before_patch + ./tintify_core.sh ${corescript} ${tintified} \ + ${TINT_VERSION} ${TINT_ARCHIVE} ${TINT_DIR} ${TINT_CHECKSUM} + ${tintified} + mv ./${TINT_DIR} ./tint clean: - test -d tint && $(MAKE) -C tint clean || exit 0 + test -d ./tint && $(MAKE) -C ./tint clean || exit 0 distclean: - rm -rf tint + rm -rf ./tint + rm -f ${corescript} + rm -f ${tintified} -.PHONY: download patch tint clean distclean +.PHONY: tint clean distclean diff --git a/payloads/external/tint/generate_core.sh b/payloads/external/tint/generate_core.sh new file mode 100755 index 0000000..f891178 --- /dev/null +++ b/payloads/external/tint/generate_core.sh @@ -0,0 +1,100 @@ +#!/bin/sh +# +# generate_core.sh extracts the core part from buildgcc script, +# most importantly the checksum calculation/verification functions +# +# Copyright (C) 2018 Mike Banon <mikebdp2(a)gmail.com> +# +############################################################################## +# +# USAGE: +# ./generate_core.sh <buildgcc> <corescript> prepare_before_patch +# where +# buildgcc - path to input buildgcc script +# corescript - path to output core part script +# prepare_before_patch - optional argument to insert prepare_${package} +# call into the unpack_and_patch function, e.g. +# for removing some files with rm command +# in order to reduce the size of patch file +# +############################################################################## + +buildgcc=$1 +corescript=$2 +prepare_before_patch=$3 + +# +# Imports the source file fragment between start and end into the +# destination file, optionally excluding the last line if not needed +# + +import_from_file() { + source=$1 + destination=$2 + start=$3 + end=$4 + last_line_disabled=$5 + if [ -z ${last_line_disabled} ]; then + sed -n "/^${start}/,/^${end}/{/^${start}/{p;n};{p}}" $source >> $destination + else + sed -n "/^${start}/,/^${end}/{/^${start}/{p;n};/^${end}/{q};{p}}" $source >> $destination + fi +} + +# +# Import the color defines together with UNAME/HALT_FOR_TOOLS variables +# + +import_from_file $buildgcc $corescript "red=" "HALT_FOR_TOOLS=0" || exit "$?" + +# +# Import the core functions +# + +FUNCTIONS="please_install searchtool download compute_hash error_hash_mismatch verify_hash unpack_and_patch" + +for F in $FUNCTIONS; do + import_from_file $buildgcc $corescript "$F()" "}" || exit "$?" +done + +# +# Import a fragment where we find tar/patch/make and other essential tools +# + +import_from_file $buildgcc $corescript "# Find all the required tools" "# Allow" last_line_disabled || exit "$?" + +# +# Import a fragment with conditional exit if some required tools were not found +# + +import_from_file $buildgcc $corescript "if \[ \"\$HALT_FOR_TOOLS" "fi" || exit "$?" + +# +# Avoid the unnecessary subdirectories holding a single file each +# + +sed -i -e "s/patches\///g" $corescript +sed -i -e "s/sum\///g" $corescript +sed -i -e "s/tarballs\///g" $corescript +sed -i -e "s/cd tarballs//g" $corescript +sed -i -e "s/cd \.\.//g" $corescript + +# +# Get the known checksum without using a dedicated single-line file +# + +sed -i -e "s/\tknown_hash=\"\$(get_known_hash.*/\tknown_hash=\"\$2\"/g" $corescript + +# +# Update the paths printed at the error messages +# + +sed -i -e "s/util\/crossgcc\///g" $corescript + +# +# Insert prepare_${package} function call between the unpack and patch operations +# + +if [ ! -z ${prepare_before_patch} ]; then + sed -i -e "/\$TAR \$FLAGS \$(basename \$archive)/a prepare_\${package} || exit \"\$?\"" $corescript +fi diff --git a/payloads/external/tint/libpayload_tint.patch b/payloads/external/tint/tint-0.04+nmu1_libpayload.patch similarity index 100% rename from payloads/external/tint/libpayload_tint.patch rename to payloads/external/tint/tint-0.04+nmu1_libpayload.patch diff --git a/payloads/external/tint/tintify_core.sh b/payloads/external/tint/tintify_core.sh new file mode 100755 index 0000000..a12020d --- /dev/null +++ b/payloads/external/tint/tintify_core.sh @@ -0,0 +1,71 @@ +#!/bin/sh +# +# tintify_core.sh adds the TINT-specific footer/header to the core, +# such as the properties of current TINT version including its checksum +# +# Copyright (C) 2018 Mike Banon <mikebdp2(a)gmail.com> +# +################################################################################ +# +# USAGE: +# ./tintify_core.sh <corescript> <tintified> \ +# <TINT_VERSION> <TINT_ARCHIVE> <TINT_DIR> <TINT_CHECKSUM> +# where +# corescript - path to input core script +# tintified - path to output tint script +# +################################################################################ + +corescript=$1 +tintified=$2 + +# +# TINT-specific header +# + +# +# Insert the properties of the current TINT version +# + +echo "#!/bin/sh" > $tintified +echo "TINT_VERSION=${3}" >> $tintified +echo "TINT_ARCHIVE=${4}" >> $tintified +echo "TINT_DIR=${5}" >> $tintified +echo "TINT_CHECKSUM=${6}" >> $tintified + +# +# Add the prepare_TINT() function, it will remove the unneeded debian directory +# as well as typedefs.h and old Makefile to significantly reduce the patch size +# + +echo "prepare_TINT() {" >> $tintified +echo "if [ ! -z ./\${TINT_DIR} ] && [ -e ./\${TINT_DIR}/debian ]; then" >> $tintified +echo "rm -rf ./\${TINT_DIR}/debian ./\${TINT_DIR}/typedefs.h ./\${TINT_DIR}/Makefile;" >> $tintified +echo "touch ./\${TINT_DIR}/Makefile;" >> $tintified +echo "fi" >> $tintified +echo "}" >> $tintified + +# +# Importing the core script +# + +cat ${corescript} >> ${tintified} + +# +# TINT-specific footer +# + +echo "printf \"Downloading and verifing TINT tarball ... \\n\"" >> ${tintified} +echo "download TINT || exit \"\$?\"" >> ${tintified} +echo "verify_hash TINT \${TINT_CHECKSUM} || exit \"\$?\"" >> ${tintified} +echo "printf \"Downloaded TINT tarball ... \${green}ok\${NC}\\n\"" >> ${tintified} + +echo "printf \"Unpacking and patching TINT... \\n\"" >> ${tintified} +echo "unpack_and_patch TINT || exit 1" >> ${tintified} +echo "printf \"Unpacked and patched TINT... \${green}ok\${NC}\\n\"" >> ${tintified} + +echo "printf \"Building TINT ... \\n\"" >> ${tintified} +echo "make -C ./\${TINT_DIR}" >> ${tintified} +echo "printf \"TINT built ... \${green}ok\${NC}\\n\"" >> ${tintified} + +chmod +x ${tintified} -- To view, visit https://review.coreboot.org/23856 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I1d24f222d1b92030b81bba3951e243a2a9f37290 Gerrit-Change-Number: 23856 Gerrit-PatchSet: 1 Gerrit-Owner: Mike Banon <mikebdp2(a)gmail.com>

1 0

Change in coreboot[master]: tint: fix the "Paused - Press any key to continue" message for pause
by Mike Banon (Code Review) 23 Feb '18

23 Feb '18

Mike Banon has uploaded this change for review. ( https://review.coreboot.org/23854 Change subject: tint: fix the "Paused - Press any key to continue" message for pause ...................................................................... tint: fix the "Paused - Press any key to continue" message for pause Earlier this message has not been shown even at the corner of screen. This fixes it by refreshing the screen, and moves it to the center Change-Id: If4e33e884c00c17f19ab330167d9293c8396ff3e Signed-off-by: Mike Banon <mikebdp2(a)gmail.com> --- M payloads/external/tint/libpayload_tint.patch 1 file changed, 19 insertions(+), 1 deletion(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/54/23854/1 diff --git a/payloads/external/tint/libpayload_tint.patch b/payloads/external/tint/libpayload_tint.patch index a21eabf..bb19718 100644 --- a/payloads/external/tint/libpayload_tint.patch +++ b/payloads/external/tint/libpayload_tint.patch @@ -376,7 +376,25 @@ rand_init (); /* must be called before engine_init () */ engine_init (&engine,score_function); /* must be called before using engine.curshape */ finished = shownext = FALSE; -@@ -673,11 +692,31 @@ int main (int argc,char *argv[]) +@@ -632,13 +651,15 @@ int main (int argc,char *argv[]) + /* pause */ + case 'p': + out_setcolor (COLOR_WHITE,COLOR_BLACK); +- out_gotoxy ((out_width () - 34) / 2,out_height () - 2); ++ out_gotoxy ((out_width () - 34) / 2,out_height () / 2); + out_printf ("Paused - Press any key to continue"); ++ refresh (); + while ((ch = in_getch ()) == ERR) ; /* Wait for a key to be pressed */ + in_flush (); /* Clear keyboard buffer */ +- out_gotoxy ((out_width () - 34) / 2,out_height () - 2); ++ out_gotoxy ((out_width () - 34) / 2,out_height () / 2); + out_printf (" "); ++ refresh (); + break; + /* unknown keypress */ + default: + out_beep (); +@@ -673,11 +694,31 @@ int main (int argc,char *argv[]) /* Restore console settings and exit */ io_close (); +#if 0 -- To view, visit https://review.coreboot.org/23854 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: If4e33e884c00c17f19ab330167d9293c8396ff3e Gerrit-Change-Number: 23854 Gerrit-PatchSet: 1 Gerrit-Owner: Mike Banon <mikebdp2(a)gmail.com>

1 0

Change in coreboot[master]: tint: make it possible to reboot by pressing 'q' key two times
by Mike Banon (Code Review) 23 Feb '18

23 Feb '18

Mike Banon has uploaded this change for review. ( https://review.coreboot.org/23853 Change subject: tint: make it possible to reboot by pressing 'q' key two times ...................................................................... tint: make it possible to reboot by pressing 'q' key two times Earlier it was impossible to exit without pressing the power button Change-Id: Ia56d639fa8e563047fb3d2723695626a449ead40 Signed-off-by: Mike Banon <mikebdp2(a)gmail.com> --- M payloads/external/tint/libpayload_tint.patch 1 file changed, 14 insertions(+), 3 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/53/23853/1 diff --git a/payloads/external/tint/libpayload_tint.patch b/payloads/external/tint/libpayload_tint.patch index b743b2f..a21eabf 100644 --- a/payloads/external/tint/libpayload_tint.patch +++ b/payloads/external/tint/libpayload_tint.patch @@ -376,7 +376,7 @@ rand_init (); /* must be called before engine_init () */ engine_init (&engine,score_function); /* must be called before using engine.curshape */ finished = shownext = FALSE; -@@ -673,11 +692,20 @@ int main (int argc,char *argv[]) +@@ -673,11 +692,31 @@ int main (int argc,char *argv[]) /* Restore console settings and exit */ io_close (); +#if 0 @@ -389,9 +389,20 @@ savescores (GETSCORE (engine.score)); } +#endif -+ printf("Bye.\n"); ++ printf("Press 'q' to reboot...\n"); + refresh(); -+ for(;;); //halt(); ++ for (;;) { ++ in_flush (); ++ while ((ch = in_getch ()) == ERR) ; /* Wait for a key to be pressed */ ++ if (ch == 'q') { /* reboot */ ++ outb(0x6, 0xcf9); ++ for(;;); //halt(); ++ } ++ else { ++ in_flush (); ++ } ++ } ++ +#if 0 exit (EXIT_SUCCESS); +#endif -- To view, visit https://review.coreboot.org/23853 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: Ia56d639fa8e563047fb3d2723695626a449ead40 Gerrit-Change-Number: 23853 Gerrit-PatchSet: 1 Gerrit-Owner: Mike Banon <mikebdp2(a)gmail.com>

1 0

Change in coreboot[master]: tint: upgrade the outdated tint payload from 0.03b to 0.04+nmu1
by Mike Banon (Code Review) 23 Feb '18

23 Feb '18

Mike Banon has uploaded this change for review. ( https://review.coreboot.org/23852 Change subject: tint: upgrade the outdated tint payload from 0.03b to 0.04+nmu1 ...................................................................... tint: upgrade the outdated tint payload from 0.03b to 0.04+nmu1 Fixes two buffer overflows and opens a road to further improvements. All the previous adjustments to libpayload_tint.patch (including the latest "use the current time as random seed") have been preserved Change-Id: I22e65d18a0b1551f7049c4afe7f95868f584cf9b Signed-off-by: Mike Banon <mikebdp2(a)gmail.com> --- M payloads/external/tint/Makefile M payloads/external/tint/libpayload_tint.patch 2 files changed, 116 insertions(+), 634 deletions(-) git pull ssh://review.coreboot.org:29418/coreboot refs/changes/52/23852/1 diff --git a/payloads/external/tint/Makefile b/payloads/external/tint/Makefile index 0fba6e7..5ab8974 100644 --- a/payloads/external/tint/Makefile +++ b/payloads/external/tint/Makefile @@ -1,5 +1,5 @@ -project_url=http://snapshot.debian.org/archive/debian-archive/20110127T084257Z/debian/pool/main/t/tint/tint_0.03b.tar.gz -archive_name=tint_0.03b.tar.gz +project_url=http://http.debian.net/debian/pool/main/t/tint/tint_0.04+nmu1.tar.gz +archive_name=tint_0.04+nmu1.tar.gz unexport KCONFIG_AUTOHEADER unexport KCONFIG_AUTOCONFIG @@ -16,13 +16,17 @@ patch: download cd tint; \ - if [ -e debian ]; then patch -l -p1 < ../libpayload_tint.patch; fi + if [ -e debian ]; then \ + rm -rf debian typedefs.h Makefile; \ + touch Makefile; \ + patch -l -p1 < ../libpayload_tint.patch; \ + fi download: test -d tint || { wget $(project_url); \ tar -xvf $(archive_name); \ rm $(archive_name); \ - mv tint-0.03b tint; } + mv tint-0.04+nmu1 tint; } clean: test -d tint && $(MAKE) -C tint clean || exit 0 diff --git a/payloads/external/tint/libpayload_tint.patch b/payloads/external/tint/libpayload_tint.patch index 7c8a058..b743b2f 100644 --- a/payloads/external/tint/libpayload_tint.patch +++ b/payloads/external/tint/libpayload_tint.patch @@ -1,6 +1,6 @@ -diff -rupN tint-0.03b/config.h tint/config.h ---- tint-0.03b/config.h 2001-12-08 00:03:24.000000000 +0100 -+++ tint/config.h 2016-05-27 14:47:15.797402090 +0200 +diff -rupN tint-0.04+nmu1/config.h tint/config.h +--- tint-0.04+nmu1/config.h 2001-12-08 00:03:24.000000000 +0100 ++++ tint/config.h 2018-02-23 12:00:00.000000000 +0200 @@ -29,7 +29,15 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -17,439 +17,9 @@ +#endif #endif /* #ifndef CONFIG_H */ -diff -rupN tint-0.03b/debian/changelog tint/debian/changelog ---- tint-0.03b/debian/changelog 2005-07-17 13:32:20.000000000 +0200 -+++ tint/debian/changelog 1970-01-01 01:00:00.000000000 +0100 -@@ -1,53 +0,0 @@ --tint (0.03b) unstable; urgency=low -- -- * Added breaks at end of switch statements to keep gcc 3+ happy -- (Closes: #316022) -- * Added missing includes to engine.c -- * Fixed spelling mistake in NOTES -- * Updated debian policy version -- -- -- Abraham van der Merwe <abz(a)debian.org> Sun, 17 Jul 2005 13:32:17 +0200 -- --tint (0.03a) unstable; urgency=low -- -- * Applied patch with some minor tweaks from Marcello Mamino which -- adds a dotted background. -- * Applied patches from Robert Lemmen which add support for user logins as -- default name and an interactive mode for specifying the start level. -- * Show player statistics. -- -- -- Abraham van der Merwe <abz(a)debian.org> Mon, 16 Jun 2003 23:07:37 +0200 -- --tint (0.02d) unstable; urgency=low -- -- * Install man page in correct directory (Closes: #128923) -- * Created a postinst program that checks for old score files -- before installing the default score file (Closes: #136466) -- * Added a menu control file (Closes: #128924) -- -- -- Abraham van der Merwe <abz(a)debian.org> Wed, 19 Dec 2001 18:03:34 +0200 -- --tint (0.02c) unstable; urgency=low -- -- * Removed common-sense suggests from control file *g* (Closes: #123204) -- -- -- Abraham van der Merwe <abz(a)debian.org> Wed, 19 Dec 2001 18:03:34 +0200 -- --tint (0.02b) unstable; urgency=low -- -- * Changed the name from tclassic to tint (as in TINT Is Not Tetris(tm)) -- * Added a build dependancy on libncurses5-dev (Closes: #124241) -- * Changed the location for the score file to /var/games (Closes: #124236) -- * Made score file sgid games (Closes: #123595) -- -- -- Abraham van der Merwe <abz(a)debian.org> Wed, 19 Dec 2001 18:03:34 +0200 -- --tclassic (0.02a) unstable; urgency=low -- -- * Initial Release. (Closes: #122839) -- -- -- Abraham van der Merwe <abz(a)debian.org> Fri, 7 Dec 2001 17:59:25 +0200 -- --Local variables: --mode: debian-changelog --End: -diff -rupN tint-0.03b/debian/control tint/debian/control ---- tint-0.03b/debian/control 2005-07-17 13:31:13.000000000 +0200 -+++ tint/debian/control 1970-01-01 01:00:00.000000000 +0100 -@@ -1,19 +0,0 @@ --Source: tint --Section: games --Priority: optional --Maintainer: Abraham van der Merwe <abz(a)debian.org> --Build-Depends: debhelper (>> 3.0.0), libncurses5-dev --Standards-Version: 3.6.1 -- --Package: tint --Architecture: any --Depends: ${shlibs:Depends} --Replaces: tclassic --Conflicts: tclassic --Description: TINT Is Not Tetris(tm) ...at least the name isn't -- As the title suggests, this is a clone of the original tetris game -- written by Alexey Pajitnov, Dmitry Pavlovsky, and Vadim Gerasimov. -- . -- I've tried to keep the game as close to the original as possible, but -- there is a few differences. Nevertheless, it's probably the closest to -- the original that you'll ever find in the UNIX world... -diff -rupN tint-0.03b/debian/copyright tint/debian/copyright ---- tint-0.03b/debian/copyright 2001-12-19 17:08:42.000000000 +0100 -+++ tint/debian/copyright 1970-01-01 01:00:00.000000000 +0100 -@@ -1,39 +0,0 @@ --This is the Debian GNU/Linux prepackaged version of tint. These --files were written and packaged by Abraham van der Merwe <abz(a)debian.org> -- --The games is released under a derivative of the BSD license. For more --information see http://www.opensource.org/licenses/bsd-license.html -- --The original source can be found at: http://oasis.frogfoot.net -- --Copyright: -- -- Copyright (c) Abraham vd Merwe <abz(a)blio.net> -- All rights reserved. -- -- Redistribution and use in source and binary forms, with or without -- modification, are permitted provided that the following conditions -- are met: -- -- 1. Redistributions of source code must retain the above copyright -- notice, this list of conditions and the following disclaimer. -- -- 2. Redistributions in binary form must reproduce the above copyright -- notice, this list of conditions and the following disclaimer in the -- documentation and/or other materials provided with the distribution. -- -- 3. Neither the name of the author nor the names of other contributors -- may be used to endorse or promote products derived from this software -- without specific prior written permission. -- -- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -- THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- -diff -rupN tint-0.03b/debian/.depends tint/debian/.depends ---- tint-0.03b/debian/.depends 2002-03-16 17:26:42.000000000 +0100 -+++ tint/debian/.depends 1970-01-01 01:00:00.000000000 +0100 -@@ -1 +0,0 @@ --tint.postinst.o: tint.postinst.c -diff -rupN tint-0.03b/debian/dirs tint/debian/dirs ---- tint-0.03b/debian/dirs 2002-03-16 17:58:42.000000000 +0100 -+++ tint/debian/dirs 1970-01-01 01:00:00.000000000 +0100 -@@ -1,2 +0,0 @@ --usr/games --usr/share/man/man6 -diff -rupN tint-0.03b/debian/docs tint/debian/docs ---- tint-0.03b/debian/docs 2001-12-07 17:25:17.000000000 +0100 -+++ tint/debian/docs 1970-01-01 01:00:00.000000000 +0100 -@@ -1,2 +0,0 @@ --NOTES --CREDITS -diff -rupN tint-0.03b/debian/Makefile tint/debian/Makefile ---- tint-0.03b/debian/Makefile 2002-03-16 18:41:18.000000000 +0100 -+++ tint/debian/Makefile 1970-01-01 01:00:00.000000000 +0100 -@@ -1,28 +0,0 @@ -- --# -*- sh -*- -- --# Written by Abraham van der Merwe <abz(a)blio.net> --# Last updated: 2002-03-26 -- --CC = gcc --CFLAGS = -Wall -Os -pipe --LDFLAGS = -s -- --STRIP = strip --STRIPFLAGS = --strip-all --remove-section=.note --remove-section=.comment -- --OBJ = --SRC = $(OBJ:%.o=%.c) --PRG = -- --all: #$(PRG) -- --$(PRG): $(OBJ) -- $(CC) $(CPPFLAGS) $(CFLAGS) $^ -o $@ $(LDFLAGS) $(LDLIBS) -- --clean: -- rm -rf tint -- rm -f *~ $(OBJ) $(PRG) *.substvars *.debhelper -- --.PHONY: all clean -- -diff -rupN tint-0.03b/debian/menu tint/debian/menu ---- tint-0.03b/debian/menu 2002-03-16 18:31:13.000000000 +0100 -+++ tint/debian/menu 1970-01-01 01:00:00.000000000 +0100 -@@ -1,4 +0,0 @@ --?package(tint):needs="text" section="Games/Tetris-like" \ -- title="TINT Is Not Tetris(tm)" \ -- command="sh -c '/usr/games/tint -l 5;echo;echo PRESS ENTER;read line'" \ -- hints="Text" -diff -rupN tint-0.03b/debian/postinst tint/debian/postinst ---- tint-0.03b/debian/postinst 2002-03-16 18:44:34.000000000 +0100 -+++ tint/debian/postinst 1970-01-01 01:00:00.000000000 +0100 -@@ -1,13 +0,0 @@ --#!/bin/sh -e -- --scorefile="/var/games/tint.scores" -- --if [ ! -e $scorefile ] --then -- touch $scorefile -- chmod 0664 $scorefile -- chown root:games $scorefile --fi -- --#DEBHELPER# -- -diff -rupN tint-0.03b/debian/postinst.c tint/debian/postinst.c ---- tint-0.03b/debian/postinst.c 2002-03-16 18:15:32.000000000 +0100 -+++ tint/debian/postinst.c 1970-01-01 01:00:00.000000000 +0100 -@@ -1,143 +0,0 @@ -- --/* -- * Hacked up postinst program to install the default score file. We have to do it this -- * way, since the old score file is overwritten if the score file already exists in the -- * package - abz -- */ -- --#include <sys/types.h> --#include <sys/stat.h> --#include <unistd.h> --#include <fcntl.h> --#include <pwd.h> --#include <grp.h> --#include <inttypes.h> --#include <stdlib.h> --#include <stdio.h> --#include <string.h> -- --/* location of score file */ --static const char filename[] = "/var/games/tint.scores"; -- --/* user name of default score file */ --static const char user[] = "root"; -- --/* group name of default score file */ --static const char group[] = "games"; -- --/* contents of default score file */ --static const uint8_t contents[] = --{ -- 0x54, 0x69, 0x6e, 0x74, 0x20, 0x30, 0x2e, 0x30, -- 0x32, 0x62, 0x20, 0x28, 0x63, 0x29, 0x20, 0x41, -- 0x62, 0x72, 0x61, 0x68, 0x61, 0x6d, 0x20, 0x76, -- 0x64, 0x20, 0x4d, 0x65, 0x72, 0x77, 0x65, 0x20, -- 0x2d, 0x20, 0x53, 0x63, 0x6f, 0x72, 0x65, 0x73, -- 0x52, 0x69, 0x61, 0x61, 0x6e, 0x20, 0x45, 0x6e, -- 0x67, 0x65, 0x6c, 0x62, 0x72, 0x65, 0x63, 0x68, -- 0x74, 0x00, 0x10, 0x5f, 0x00, 0x00, 0xb7, 0xc8, -- 0x20, 0x3c, 0x41, 0x62, 0x7a, 0x00, 0x80, 0x3a, -- 0x00, 0x00, 0x94, 0xc5, 0x20, 0x3c, 0x52, 0x69, -- 0x61, 0x61, 0x6e, 0x20, 0x45, 0x6e, 0x67, 0x65, -- 0x6c, 0x62, 0x72, 0x65, 0x63, 0x68, 0x74, 0x00, -- 0x66, 0x21, 0x00, 0x00, 0x31, 0xc9, 0x20, 0x3c, -- 0x52, 0x69, 0x61, 0x61, 0x6e, 0x20, 0x45, 0x6e, -- 0x67, 0x65, 0x6c, 0x62, 0x72, 0x65, 0x63, 0x68, -- 0x74, 0x00, 0xdc, 0x1a, 0x00, 0x00, 0x79, 0xc6, -- 0x20, 0x3c, 0x52, 0x69, 0x61, 0x61, 0x6e, 0x20, -- 0x45, 0x6e, 0x67, 0x65, 0x6c, 0x62, 0x72, 0x65, -- 0x63, 0x68, 0x74, 0x00, 0x2f, 0x16, 0x00, 0x00, -- 0xf9, 0xc5, 0x20, 0x3c, 0x52, 0x69, 0x61, 0x61, -- 0x6e, 0x20, 0x45, 0x6e, 0x67, 0x65, 0x6c, 0x62, -- 0x72, 0x65, 0x63, 0x68, 0x74, 0x00, 0x8b, 0x11, -- 0x00, 0x00, 0x82, 0xc7, 0x20, 0x3c, 0x41, 0x62, -- 0x7a, 0x00, 0x23, 0x10, 0x00, 0x00, 0xa9, 0xc9, -- 0x20, 0x3c, 0x44, 0x6f, 0x70, 0x70, 0x65, 0x6c, -- 0x67, 0x61, 0x6e, 0x67, 0x65, 0x72, 0x00, 0x13, -- 0x0b, 0x00, 0x00, 0x21, 0xc7, 0x20, 0x3c, 0x4a, -- 0x6f, 0x68, 0x61, 0x6e, 0x6e, 0x20, 0x42, 0x6f, -- 0x74, 0x68, 0x61, 0x00, 0x5a, 0x09, 0x00, 0x00, -- 0xef, 0xc6, 0x20, 0x3c, 0x41, 0x62, 0x7a, 0x00, -- 0xd7, 0x07, 0x00, 0x00, 0xad, 0xc6, 0x20, 0x3c --}; -- --static void debhelper_stuff() --{ -- /* dh_installdocs */ -- system ("if [ -d /usr/doc -a ! -e /usr/doc/tint -a -d /usr/share/doc/tint ]; then\n" -- " ln -sf ../share/doc/tint /usr/doc/tint\n" -- "fi\n"); -- -- /* dh_installmenu */ -- system ("if [ -x /usr/bin/update-menus ]; then update-menus ; fi"); --} -- --int main (int argc,char *argv[]) --{ -- struct stat sb; -- -- /* we only do something if we're called as <program> configure ... */ -- if (argc < 2 || strcmp (argv[1],"configure")) exit (EXIT_SUCCESS); -- -- /* if the score file doesn't exist, create it */ -- if (stat (filename,&sb) < 0) -- { -- int fd,result; -- struct passwd *u; -- struct group *g; -- uid_t uid; -- gid_t gid; -- -- /* get uid */ -- if ((u = getpwnam (user)) == NULL) -- { -- fprintf (stderr,"Couldn't obtain uid for %s: %m\n",user); -- exit (EXIT_FAILURE); -- } -- uid = u->pw_uid; -- -- /* get gid */ -- if ((g = getgrnam (group)) == NULL) -- { -- fprintf (stderr,"Couldn't obtain gid for %s: %m\n",group); -- exit (EXIT_FAILURE); -- } -- gid = g->gr_gid; -- -- /* create default score file */ -- if ((fd = creat (filename,0664)) < 0) -- { -- fprintf (stderr,"Couldn't create score file %s: %m\n",filename); -- exit (EXIT_FAILURE); -- } -- result = write (fd,contents,sizeof (contents)); -- if (result < 0) -- { -- fprintf (stderr,"Unable to write to %s: %m\n",filename); -- close (fd); -- unlink (filename); -- exit (EXIT_FAILURE); -- } -- if (result < sizeof (contents)) -- { -- fprintf (stderr,"Short write count. %d/%d bytes written to %s\n",result,sizeof (contents),filename); -- close (fd); -- unlink (filename); -- exit (EXIT_FAILURE); -- } -- close (fd); -- -- /* change ownership of score file */ -- if (chown (filename,uid,gid) < 0) -- { -- fprintf (stderr,"Couldn't change ownership of %s to %s:%s: %m\n",filename,user,group); -- unlink (filename); -- exit (EXIT_FAILURE); -- } -- } -- -- debhelper_stuff (); -- -- exit (EXIT_SUCCESS); --} -- -diff -rupN tint-0.03b/debian/rules tint/debian/rules ---- tint-0.03b/debian/rules 2002-03-16 18:00:11.000000000 +0100 -+++ tint/debian/rules 1970-01-01 01:00:00.000000000 +0100 -@@ -1,82 +0,0 @@ --#!/usr/bin/make -f -- --# -*- sh -*- -- --# Uncomment this to turn on verbose mode. --export DH_VERBOSE=1 -- --# This is the debhelper compatability version to use. --export DH_COMPAT=3 -- --configure: configure-stamp --configure-stamp: -- dh_testdir -- # Add here commands to configure the package. -- -- -- touch configure-stamp -- --build: configure-stamp build-stamp --build-stamp: -- dh_testdir -- -- # Add here commands to compile the package. -- $(MAKE) -- -- touch build-stamp -- --clean: -- dh_testdir -- dh_testroot -- rm -f build-stamp configure-stamp -- -- # Add here commands to clean up after the build process. -- -$(MAKE) clean -- -- dh_clean -- --install: build -- dh_testdir -- dh_testroot -- dh_clean -k -- dh_installdirs -- -- # Add here commands to install the package into debian/tint. -- $(MAKE) install DESTDIR=$(CURDIR)/debian/tint -- --# Build architecture-independent files here. --binary-indep: build install --# We have nothing to do by default. -- --# Build architecture-dependent files here. --binary-arch: build install -- dh_testdir -- dh_testroot --# dh_installdebconf -- dh_installdocs --# dh_installexamples -- dh_installmenu --# dh_installlogrotate --# dh_installemacsen --# dh_installpam --# dh_installmime --# dh_installinit --# dh_installcron -- dh_installman --# dh_installinfo --# dh_undocumented -- dh_installchangelogs -- dh_link -- dh_strip -- dh_compress --# dh_fixperms --exclude /usr/games/tint --# dh_makeshlibs -- dh_installdeb --# dh_perl -- dh_shlibdeps -- dh_gencontrol -- dh_md5sums -- dh_builddeb -- --binary: binary-indep binary-arch --.PHONY: build clean binary-indep binary-arch binary install configure -diff -rupN tint-0.03b/engine.c tint/engine.c ---- tint-0.03b/engine.c 2005-07-17 13:26:22.000000000 +0200 -+++ tint/engine.c 2016-05-27 19:05:21.681035752 +0200 +diff -rupN tint-0.04+nmu1/engine.c tint/engine.c +--- tint-0.04+nmu1/engine.c 2005-07-17 13:26:22.000000000 +0200 ++++ tint/engine.c 2018-02-23 12:00:00.000000000 +0200 @@ -27,10 +27,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -465,9 +35,9 @@ #include "utils.h" #include "io.h" #include "engine.h" -diff -rupN tint-0.03b/engine.h tint/engine.h ---- tint-0.03b/engine.h 2001-12-07 16:48:08.000000000 +0100 -+++ tint/engine.h 2016-05-27 19:04:32.456828081 +0200 +diff -rupN tint-0.04+nmu1/engine.h tint/engine.h +--- tint-0.04+nmu1/engine.h 2001-12-07 16:48:08.000000000 +0100 ++++ tint/engine.h 2018-02-23 12:00:00.000000000 +0200 @@ -29,7 +29,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -477,9 +47,9 @@ /* * Macros -diff -rupN tint-0.03b/io.c tint/io.c ---- tint-0.03b/io.c 2001-12-07 16:48:20.000000000 +0100 -+++ tint/io.c 2016-05-27 14:47:15.798402053 +0200 +diff -rupN tint-0.04+nmu1/io.c tint/io.c +--- tint-0.04+nmu1/io.c 2010-06-23 15:05:12.000000000 +0100 ++++ tint/io.c 2018-02-23 12:00:00.000000000 +0200 @@ -27,9 +27,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -492,9 +62,9 @@ #include <unistd.h> /* gettimeofday() */ +#endif - #include <curses.h> + #include "io.h" -@@ -70,7 +74,11 @@ static int in_timeleft; +@@ -68,7 +72,11 @@ static int in_timeleft; /* Initialize screen */ void io_init () { @@ -506,7 +76,7 @@ start_color (); curs_set (CURSOR_INVISIBLE); out_attr = A_NORMAL; -@@ -176,11 +184,17 @@ void out_beep () +@@ -177,11 +185,17 @@ void out_beep () /* Read a character. Please note that you MUST call in_timeout() before in_getch() */ int in_getch () { @@ -524,7 +94,7 @@ gettimeofday (&endtv,NULL); /* Timeout? */ if (ch == ERR) -@@ -198,6 +212,7 @@ int in_getch () +@@ -199,6 +213,7 @@ int in_getch () in_timeleft -= endtv.tv_usec; if (in_timeleft <= 0) in_timeleft = in_timetotal; } @@ -532,26 +102,55 @@ return ch; } -diff -rupN tint-0.03b/Makefile tint/Makefile ---- tint-0.03b/Makefile 2005-07-17 13:30:54.000000000 +0200 -+++ tint/Makefile 2016-05-27 21:04:02.374391088 +0200 -@@ -28,85 +28,79 @@ - # OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE - # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - --#CROSS = arm-linux- +diff -rupN tint-0.04+nmu1/io.h tint/io.h +--- tint-0.04+nmu1/io.h 2010-06-23 14:55:03.000000000 +0100 ++++ tint/io.h 2018-02-23 12:00:00.000000000 +0200 +@@ -29,9 +29,8 @@ + * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ - --bindir = $(DESTDIR)/usr/games --mandir = $(DESTDIR)/usr/share/man --localstatedir = $(DESTDIR)/var/games ++ + #include <curses.h> +-#include <wchar.h> - --ifeq ($(CC),) --CC = gcc --else --ifeq ($(CC),colorgcc) -- ifneq ($(CROSS),) -- CC = gcc -- endif ++ + /* + * Colors + */ +diff -rupN tint-0.04+nmu1/Makefile tint/Makefile +--- tint-0.04+nmu1/Makefile 2010-06-23 15:06:11.000000000 +0200 ++++ tint/Makefile 2018-02-23 12:00:00.000000000 +0200 +@@ -1,0 +1,106 @@ ++ ++# -*- sh -*- ++ ++# Copyright (c) Abraham vd Merwe <abz(a)blio.net> ++# All rights reserved. ++# ++# Redistribution and use in source and binary forms, with or without ++# modification, are permitted provided that the following conditions ++# are met: ++# 1. Redistributions of source code must retain the above copyright ++# notice, this list of conditions and the following disclaimer. ++# ++# 2. Redistributions in binary form must reproduce the above copyright ++# notice, this list of conditions and the following disclaimer in the ++# documentation and/or other materials provided with the distribution. ++# 3. Neither the name of the author nor the names of other contributors ++# may be used to endorse or promote products derived from this software ++# without specific prior written permission. ++# ++# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" ++# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, ++# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ++# ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE ++# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL ++# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR ++# SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER ++# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, ++# OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ +# in addition to the dependency below, create the file if it doesn't exist +# to silence warnings about a file that would be generated anyway. +$(if $(wildcard .xcompile),,$(eval $(shell ../../../../util/xcompile/xcompile $(XGCCPATH) > .xcompile || rm -f .xcompile))) @@ -588,32 +187,8 @@ +# Make is silent per default, but 'make V=1' will show all compiler calls. +ifneq ($(V),1) +Q := @ - endif --endif -- --CFLAGS = -Wall -Os -pipe --CPPFLAGS = -DSCOREFILE=\"$(localstatedir)/$(PRG).scores\" #-DUSE_RAND --LDFLAGS = -s --LDLIBS = -lncurses -- --STRIP = strip --STRIPFLAGS = --strip-all --remove-section=.note --remove-section=.comment -- --INSTALL = install -- --OBJ = engine.o utils.o io.o tint.o --SRC = $(OBJ:%.o=%.c) --PRG = tint -- -- ########### NOTHING TO EDIT BELOW THIS ########### -- --.PHONY: all clean do-it-all depend with-depends without-depends debian postinst -- --all: do-it-all postinst - --ifeq (.depends,$(wildcard .depends)) --include .depends --do-it-all: with-depends ++endif ++ +all: $(TARGET).elf +# printf" CC $(CC)\n" + @@ -635,63 +210,26 @@ +ifneq ($(strip $(HAVE_LIBPAYLOAD)),) +libpayload: + $(Q)printf "Found Libpayload $(LIBPAYLOAD_DIR).\n" - else --do-it-all: without-depends --endif -- --without-depends: depend with-depends -- --depend: -- rm -f .depends -- set -e; for F in $(SRC); do $(CC) -MM $(CFLAGS) $(CPPFLAGS) $$F >> .depends; done -- --with-depends: $(PRG) -- --$(PRG): $(OBJ) -- $(CROSS)$(CC) $(LDFLAGS) $^ -o $@ $(LDLIBS) -- $(CROSS)$(STRIP) $(STRIPFLAGS) $@ -- --ifneq ($(DESTDIR),) --install: $(PRG) -- $(INSTALL) -d $(bindir) $(mandir) $(localstatedir) -- $(INSTALL) -s -g games -o root -m 2755 $(PRG) $(bindir) -- $(INSTALL) -g games -o root -m 0644 $(PRG).6 $(mandir)/man6 --# cp tint.scores $(localstatedir)/$(PRG).scores --# chown root.games $(localstatedir)/$(PRG).scores --# chmod 0664 $(localstatedir)/$(PRG).scores -- --uninstall: -- rm -f $(bindir)/$(PRG) $(mandir)/man6/$(PRG).6 $(localstatedir)/$(PRG).scores ++else +libpayload: + $(Q)printf "Building libpayload @ $(LIBCONFIG_PATH).\n" + $(Q)make -C $(LIBCONFIG_PATH) distclean + $(Q)make -C $(LIBCONFIG_PATH) defconfig KBUILD_DEFCONFIG=$(LIB_CONFIG) + $(Q)make -C $(LIBCONFIG_PATH) DESTDIR=$(tint_obj) install - endif - --postinst: -- $(MAKE) -C debian -- --debian: -- dpkg-buildpackage -rfakeroot -k2B555AEE -- - clean: -- rm -f .depends *~ $(OBJ) $(PRG) {configure,build}-stamp gmon.out a.out -- rm -rf debian/$(PRG) -- rm -f debian/*.{debhelper,substvars} debian/files debian/*~ ++endif ++ ++clean: + $(Q)rm -f $(TARGET).elf $(TARGET).debug *.o + $(Q)rm .xcompile - - distclean: clean -- $(MAKE) -C debian clean ++ ++distclean: clean + $(Q)rm -rf $(tint_obj) - ++ + +.PHONY: all clean do-it-all depend with-depends without-depends debian postinst -Binary files tint-0.03b/.Makefile.swp and tint/.Makefile.swp differ -diff -rupN tint-0.03b/tint.c tint/tint.c ---- tint-0.03b/tint.c 2005-07-17 13:26:43.000000000 +0200 -+++ tint/tint.c 2016-05-27 18:59:53.838346317 +0200 +diff -rupN tint-0.04+nmu1/tint.c tint/tint.c +--- tint-0.04+nmu1/tint.c 2010-08-08 19:42:50.000000000 +0200 ++++ tint/tint.c 2018-02-23 12:00:00.000000000 +0200 @@ -1,4 +1,3 @@ - /* @@ -715,7 +253,14 @@ #include "utils.h" #include "io.h" #include "config.h" -@@ -321,6 +321,7 @@ typedef struct +@@ -306,4 +306,4 @@ + /* Header for scorefile */ +-#define SCORE_HEADER "Tint 0.02b (c) Abraham vd Merwe - Scores" ++#define SCORE_HEADER "Tint 0.04+nmu1 (c) Abraham vd Merwe - Scores" +- ++ + /* Header for score title */ +@@ -322,6 +322,7 @@ typedef struct time_t timestamp; } score_t; @@ -723,7 +268,7 @@ static void getname (char *name) { struct passwd *pw = getpwuid (geteuid ()); -@@ -337,7 +338,9 @@ static void getname (char *name) +@@ -338,7 +339,9 @@ static void getname (char *name) name[NAMELEN - 1] = '\0'; } } @@ -733,7 +278,7 @@ static void err1 () { fprintf (stderr,"Error creating %s\n",scorefile); -@@ -349,10 +352,11 @@ static void err2 () +@@ -350,10 +353,11 @@ static void err2 () fprintf (stderr,"Error writing to %s\n",scorefile); exit (EXIT_FAILURE); } @@ -746,7 +291,7 @@ "\n\t PLAYER STATISTICS\n\n\t" "Score %11d\n\t" "Efficiency %11d\n\t" -@@ -360,6 +364,7 @@ void showplayerstats (engine_t *engine) +@@ -361,6 +365,7 @@ void showplayerstats (engine_t *engine) GETSCORE (engine->score),engine->status.efficiency,GETSCORE (engine->score) / getsum ()); } @@ -754,7 +299,7 @@ static void createscores (int score) { FILE *handle; -@@ -394,7 +399,9 @@ static void createscores (int score) +@@ -395,7 +400,9 @@ static void createscores (int score) fprintf (stderr,"%s",scoretitle); fprintf (stderr,"\t 1* %7d %s\n\n",score,scores[0].name); } @@ -764,7 +309,7 @@ static int cmpscores (const void *a,const void *b) { int result; -@@ -412,7 +419,9 @@ static int cmpscores (const void *a,cons +@@ -413,7 +420,9 @@ static int cmpscores (const void *a,cons /* timestamps is equal */ return 0; } @@ -774,7 +319,7 @@ static void savescores (int score) { FILE *handle; -@@ -490,11 +499,13 @@ static void savescores (int score) +@@ -491,11 +500,13 @@ static void savescores (int score) } fprintf (stderr,"\n"); } @@ -787,9 +332,9 @@ +#if 0 static void showhelp () { - fprintf (stderr,"USAGE: tint [-h] [-l level] [-n]\n"); -@@ -504,9 +515,11 @@ static void showhelp () - fprintf (stderr," -d Draw vertical dotted lines\n"); + fprintf (stderr,"USAGE: tint [-h] [-l level] [-n] [-d] [-b char]\n"); +@@ -506,9 +517,11 @@ static void showhelp () + fprintf (stderr," -b <char> Use this character to draw blocks instead of spaces\n"); exit (EXIT_FAILURE); } +#endif @@ -800,7 +345,7 @@ int i = 1; while (i < argc) { -@@ -536,10 +549,12 @@ static void parse_options (int argc,char +@@ -544,10 +557,12 @@ static void parse_options (int argc,char } i++; } @@ -813,7 +358,7 @@ char buf[NAMELEN]; do -@@ -549,6 +564,8 @@ static void choose_level () +@@ -557,6 +572,8 @@ static void choose_level () buf[strlen (buf) - 1] = '\0'; } while (!str2int (&level,buf) || level < MINLEVEL || level > MAXLEVEL); @@ -822,7 +367,7 @@ } /***************************************************************************/ -@@ -561,6 +578,8 @@ int main (int argc,char *argv[]) +@@ -569,6 +586,8 @@ int main (int argc,char *argv[]) int ch; engine_t engine; /* Initialize */ @@ -831,14 +376,19 @@ rand_init (); /* must be called before engine_init () */ engine_init (&engine,score_function); /* must be called before using engine.curshape */ finished = shownext = FALSE; -@@ -663,8 +682,15 @@ +@@ -673,11 +692,20 @@ int main (int argc,char *argv[]) + /* Restore console settings and exit */ + io_close (); ++#if 0 + /* Don't bother the player if he want's to quit */ if (ch != 'q') { ++#endif showplayerstats (&engine); +#if 0 savescores (GETSCORE (engine.score)); -+#endif } ++#endif + printf("Bye.\n"); + refresh(); + for(;;); //halt(); @@ -847,81 +397,9 @@ +#endif } -diff -rupN tint-0.03b/typedefs.h tint/typedefs.h ---- tint-0.03b/typedefs.h 2001-12-07 16:49:06.000000000 +0100 -+++ tint/typedefs.h 1970-01-01 01:00:00.000000000 +0100 -@@ -1,68 +0,0 @@ --#ifndef TYPEDEFS_H --#define TYPEDEFS_H -- --/* -- * Copyright (c) Abraham vd Merwe <abz(a)blio.net> -- * All rights reserved. -- * -- * Redistribution and use in source and binary forms, with or without -- * modification, are permitted provided that the following conditions -- * are met: -- * 1. Redistributions of source code must retain the above copyright -- * notice, this list of conditions and the following disclaimer. -- * 2. Redistributions in binary form must reproduce the above copyright -- * notice, this list of conditions and the following disclaimer in the -- * documentation and/or other materials provided with the distribution. -- * 3. Neither the name of the author nor the names of other contributors -- * may be used to endorse or promote products derived from this software -- * without specific prior written permission. -- * -- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -- * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -- * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -- * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- */ -- --/* -- * Boolean definitions -- */ -- --#ifndef bool --#define bool int --#endif -- --#if !defined(false) || (false != 0) --#define false 0 --#endif -- --#if !defined(true) || (true != 0) --#define true 1 --#endif -- --#if !defined(FALSE) || (FALSE != false) --#define FALSE false --#endif -- --#if !defined(TRUE) || (TRUE != true) --#define TRUE true --#endif -- --/* -- * Error flags -- */ -- --#if !defined(ERR) || (ERR != -1) --#define ERR -1 --#endif -- --#if !defined(OK) || (OK != 0) --#define OK 0 --#endif -- --#endif /* #ifndef TYPEDEFS_H */ -diff -rupN tint-0.03b/utils.c tint/utils.c ---- tint-0.03b/utils.c 2001-12-07 16:49:19.000000000 +0100 -+++ tint/utils.c 2016-05-27 19:05:40.313351887 +0200 +diff -rupN tint-0.04+nmu1/utils.c tint/utils.c +--- tint-0.04+nmu1/utils.c 2001-12-07 16:49:19.000000000 +0100 ++++ tint/utils.c 2018-02-23 12:00:00.000000000 +0200 @@ -27,11 +27,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ @@ -951,9 +429,9 @@ } +#endif -diff -rupN tint-0.03b/utils.h tint/utils.h ---- tint-0.03b/utils.h 2001-12-07 16:49:35.000000000 +0100 -+++ tint/utils.h 2016-05-27 19:00:34.120754123 +0200 +diff -rupN tint-0.04+nmu1/utils.h tint/utils.h +--- tint-0.04+nmu1/utils.h 2001-12-07 16:49:35.000000000 +0100 ++++ tint/utils.h 2018-02-23 12:00:00.000000000 +0200 @@ -29,7 +29,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -- To view, visit https://review.coreboot.org/23852 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: newchange Gerrit-Change-Id: I22e65d18a0b1551f7049c4afe7f95868f584cf9b Gerrit-Change-Number: 23852 Gerrit-PatchSet: 1 Gerrit-Owner: Mike Banon <mikebdp2(a)gmail.com>

1 0

Change in coreboot[master]: soc/intel/denverton_ns: Fill dimm info for SMBIOS table 17
by build bot (Jenkins) (Code Review) 23 Feb '18

23 Feb '18

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/23851 ) Change subject: soc/intel/denverton_ns: Fill dimm info for SMBIOS table 17 ...................................................................... Patch Set 1: Verified+1 Build Successful https://qa.coreboot.org/job/coreboot-gerrit/67836/ : SUCCESS https://qa.coreboot.org/job/coreboot-checkpatch/22330/ : SUCCESS -- To view, visit https://review.coreboot.org/23851 To unsubscribe, or for help writing mail filters, visit https://review.coreboot.org/settings Gerrit-Project: coreboot Gerrit-Branch: master Gerrit-MessageType: comment Gerrit-Change-Id: Id5c4ceaf4e65359f72ec764f0914b5daa82f257e Gerrit-Change-Number: 23851 Gerrit-PatchSet: 1 Gerrit-Owner: Julien Viard de Galbert <jviarddegalbert(a)online.net> Gerrit-Reviewer: build bot (Jenkins) <no-reply(a)coreboot.org> Gerrit-Comment-Date: Fri, 23 Feb 2018 17:18:12 +0000 Gerrit-HasComments: No Gerrit-HasLabels: Yes

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

coreboot-gerrit February 2018