1 files changed, 22 insertions, 13 deletions
diff --git a/system/chipsec/chipsec.SlackBuild b/system/chipsec/chipsec.SlackBuild
index 0aeab00855..dc9bbc4bde 100644
--- a/system/chipsec/chipsec.SlackBuild
+++ b/system/chipsec/chipsec.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for chipsec
 
@@ -22,10 +22,16 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=chipsec
-VERSION=${VERSION:-1.3.6}
+VERSION=${VERSION:-1.9.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+
+KERNEL=${KERNEL:-$(uname -r)}
+PKGVER=${VERSION}_$(echo $KERNEL | tr - _)
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -35,7 +41,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# 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
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -54,10 +67,6 @@ else
   LIBDIRSUFFIX=""
 fi
 
-# Don't have ARCH in the environment when building a kernel module
-SLKARCH=$ARCH
-unset -v ARCH
-
 set -e
 
 rm -rf $PKG
@@ -73,13 +82,14 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-python setup.py install --root=$PKG
+mkdir -pv build/lib/chipsec/helper/linux
+env -u ARCH python3 setup.py build_ext install --root=$PKG
 
 # Sign the kernel module (if available)
 if [ -f /proc/config.gz ]
 then
   eval $(zgrep "^CONFIG_MODULE_SIG_HASH=" /proc/config.gz)
-  KERNSRC=${KERNSRC:-/lib/modules/$(uname -r)/source}
+  KERNSRC=${KERNSRC:-/lib/modules/$KERNEL/source}
   if [ -n "${CONFIG_MODULE_SIG_HASH}" ] && \
     [ -f $KERNSRC/certs/signing_key.pem ] && \
     [ -f $KERNSRC/certs/signing_key.x509 ] && \
@@ -89,7 +99,7 @@ then
       ${CONFIG_MODULE_SIG_HASH} \
       $KERNSRC/certs/signing_key.pem \
       $KERNSRC/certs/signing_key.x509 \
-      ${PKG}/usr/lib${LIBDIRSUFFIX}/python2.7/site-packages/chipsec/helper/linux/chipsec.ko
+      ${PKG}/usr/lib${LIBDIRSUFFIX}/python3.9/site-packages/chipsec/helper/linux/chipsec.ko
   fi
 fi
 
@@ -100,12 +110,11 @@ mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   AUTHORS COPYING LICENSE README README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
-mv -v ${PKG}/usr/share/doc/chipsec/chipsec-manual.pdf $PKG/usr/doc/$PRGNAM-$VERSION
-rmdir ${PKG}/usr/share/doc/chipsec ${PKG}/usr/share/doc ${PKG}/usr/share
+mv -v ${PKG}/usr/chipsec-manual.pdf $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$SLKARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$PKGVER-$ARCH-$BUILD$TAG.$PKGTYPE