6 files changed, 8 insertions, 71 deletions
diff --git a/source/a/mcelog/0001-mcelog-Change-name-of-skylake-interconnect-from-QPI-.patch b/source/a/mcelog/0001-mcelog-Change-name-of-skylake-interconnect-from-QPI-.patch
deleted file mode 100644
index 48829083..00000000
--- a/source/a/mcelog/0001-mcelog-Change-name-of-skylake-interconnect-from-QPI-.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 34f03e306c36487a3720ae96b8ed5fbaa5256b5f Mon Sep 17 00:00:00 2001
-From: Tony Luck <tony.luck@intel.com>
-Date: Tue, 25 Jul 2017 14:45:52 -0700
-Subject: [PATCH] mcelog: Change name of skylake interconnect from QPI to UPI
-
-Skylake interconnect is actually called "UPI" (Ultra Path Interconnect)
-
-Signed-off-by: Tony Luck <tony.luck@intel.com>
-Signed-off-by: Andi Kleen <ak@linux.intel.com>
----
- skylake_xeon.c | 14 +++++++-------
- 1 file changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/skylake_xeon.c b/skylake_xeon.c
-index fd71b98..16c6181 100644
---- a/skylake_xeon.c
-+++ b/skylake_xeon.c
-@@ -79,7 +79,7 @@ static struct field pcu_mc4[] = {
- 
- /* See IA32 SDM Vol3B Table 16-28 */
- 
--static char *qpi[] = {
-+static char *upi[] = {
- 	[0x00] = "UC Phy Initialization Failure",
- 	[0x01] = "UC Phy detected drift buffer alarm",
- 	[0x02] = "UC Phy detected latency buffer rollover",
-@@ -98,13 +98,13 @@ static char *qpi[] = {
- 	[0x31] = "COR LL Rx detected CRC error - successful LLR with Phy Reinit",
- };
- 
--static struct field qpi_mc[] = {
--	FIELD(16, qpi),
-+static struct field upi_mc[] = {
-+	FIELD(16, upi),
- 	{}
- };
- 
- /* These apply to MSCOD 0x12 "UC LL or Phy control error" */
--static struct field qpi_0x12[] = {
-+static struct field upi_0x12[] = {
- 	SBITFIELD(22, "Phy Control Error"),
- 	SBITFIELD(23, "Unexpected Retry.Ack flit"),
- 	SBITFIELD(24, "Unexpected Retry.Req flit"),
-@@ -194,10 +194,10 @@ void skylake_s_decode_model(int cputype, int bank, u64 status, u64 misc)
- 	case 5:
- 	case 12:
- 	case 19:
--		Wprintf("QPI: ");
--		decode_bitfield(status, qpi_mc);
-+		Wprintf("UPI: ");
-+		decode_bitfield(status, upi_mc);
- 		if (EXTRACT(status, 16, 21) == 0x12)
--			decode_bitfield(status, qpi_0x12);
-+			decode_bitfield(status, upi_0x12);
- 		break;
- 	case 7: case 8:
- 		Wprintf("M2M: ");
--- 
-2.14.1
-
diff --git a/source/a/mcelog/mcelog.SlackBuild b/source/a/mcelog/mcelog.SlackBuild
index 54e992f4..c0ee57fe 100755
--- a/source/a/mcelog/mcelog.SlackBuild
+++ b/source/a/mcelog/mcelog.SlackBuild
@@ -23,8 +23,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=mcelog
-VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-2}
+VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -54,8 +54,8 @@ mkdir -p $TMP $PKG
 
 cd $TMP
 rm -rf $PKGNAM-$VERSION
-tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
-cd $PKGNAM-$VERSION
+tar xvf $CWD/$PKGNAM-$VERSION.tar.?z || exit 1
+cd $PKGNAM-$VERSION || exit 1
 
 chown -R root:root .
 find . \
@@ -66,9 +66,6 @@ find . \
 
 zcat $CWD/mcelog.init.diff.gz | patch -p1 --verbose || exit 1
 
-# Include a commit from upstream git
-zcat $CWD/0001-mcelog-Change-name-of-skylake-interconnect-from-QPI-.patch.gz | patch -p1 --verbose || exit 1
-
 make $NUMJOBS DOCDIR=/usr/doc/mcelog-$VERSION MANDIR=/usr/man \
   || make DOCDIR=/usr/doc/mcelog-$VERSION MANDIR=/usr/man \
   || exit 1
diff --git a/source/a/mcelog/slack-desc b/source/a/mcelog/slack-desc
index 2c4624f5..099110a3 100644
--- a/source/a/mcelog/slack-desc
+++ b/source/a/mcelog/slack-desc
@@ -15,5 +15,5 @@ mcelog: errors. It primarily handles machine checks and thermal events, which
 mcelog: are reported for errors detected by the CPU. It is recommended that
 mcelog: mcelog runs on all x86 machines, both 64-bit and 32bit.
 mcelog:
-mcelog: mcelog home: ftp://ftp.kernel.org:/pub/linux/utils/cpu/mce
+mcelog: Homepage: https://git.kernel.org/pub/scm/utils/cpu/mce/mcelog.git/
 mcelog:
diff --git a/source/a/pkgtools/pkgtools.SlackBuild b/source/a/pkgtools/pkgtools.SlackBuild
index 81f8e0a6..15e0fb1b 100755
--- a/source/a/pkgtools/pkgtools.SlackBuild
+++ b/source/a/pkgtools/pkgtools.SlackBuild
@@ -30,7 +30,7 @@ PKGNAM=pkgtools
 # *** UPDATE THESE WITH EACH BUILD:
 VERSION=15.0
 ARCH=${ARCH:-noarch}
-BUILD=${BUILD:-14}
+BUILD=${BUILD:-15}
 
 # If the variable PRINT_PACKAGE_NAME is set, then this script will report what
 # the name of the created package would be, and then exit. This information
diff --git a/source/a/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg
index 453e391e..2b87bf36 100644
--- a/source/a/pkgtools/scripts/installpkg
+++ b/source/a/pkgtools/scripts/installpkg
@@ -182,7 +182,7 @@ package_name() {
 THREADS="$(nproc)"
 
 # Set default line length for terse mode:
-if which tput 1> /dev/null 2> /dev/null ; then
+if tty -s && which tput 1> /dev/null 2> /dev/null ; then
   TERSELENGTH=$(tput cols)
 else
   TERSELENGTH=80
diff --git a/source/a/pkgtools/scripts/upgradepkg b/source/a/pkgtools/scripts/upgradepkg
index bb150483..1acae7d6 100644
--- a/source/a/pkgtools/scripts/upgradepkg
+++ b/source/a/pkgtools/scripts/upgradepkg
@@ -119,7 +119,7 @@ if [ ! -d $INSTLOCKDIR ]; then
 fi
 
 # Set default line length for terse mode:
-if which tput 1> /dev/null 2> /dev/null ; then
+if tty -s && which tput 1> /dev/null 2> /dev/null ; then
   TERSELENGTH=$(tput cols)
 else
   TERSELENGTH=80