2 files changed, 31 insertions, 12 deletions
diff --git a/source/a/kernel-firmware/kernel-firmware.SlackBuild b/source/a/kernel-firmware/kernel-firmware.SlackBuild
index c7b50a5c..ba1582b3 100755
--- a/source/a/kernel-firmware/kernel-firmware.SlackBuild
+++ b/source/a/kernel-firmware/kernel-firmware.SlackBuild
@@ -1,6 +1,6 @@
-#!/bin/sh
+#!/bin/bash
 
-# Copyright 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2011, 2016, 2018  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -20,13 +20,29 @@
 #  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)
 
 PKGNAM=kernel-firmware
-VERSION=${VERSION:-$(date +%Y%m%d)git}
 ARCH=noarch
 BUILD=${BUILD:-1}
 
-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
+  # Internally, git considers the repo date to be the date the last committed
+  # patch was submitted. This is somewhat confusing, as it can lead to a newer
+  # git clone having a date older than the last one we used. To avoid this
+  # situation, we're going to deviate a little and use the date the HEAD
+  # patch or merge occured as the repo date, rather than the date of the
+  # patch itself.
+  #DATE="$(lynx -dump -width=256 https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=HEAD | grep "    author   " | head -n 1 | rev | cut -f 3 -d ' ' | rev | tr -d -)"
+  DATE="$(lynx -dump -width=256 https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=HEAD | grep "   committer " | head -n 1 | rev | cut -f 3 -d ' ' | rev | tr -d -)"
+  HEADISAT="$(lynx -dump -width=256 https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=HEAD | grep "    commit   " | head -n 1 | cut -f 2 -d ] | cut -b 1-7)"
+  echo "$PKGNAM-${DATE}_${HEADISAT}-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
@@ -34,7 +50,10 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 
 cd $PKG
-git clone git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git
+git clone git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
+# Better determine these the same way as above.
+DATE="$(lynx -dump -width=256 https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=HEAD | grep "   committer " | head -n 1 | rev | cut -f 3 -d ' ' | rev | tr -d -)"
+HEADISAT="$(lynx -dump -width=256 https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=HEAD | grep "    commit   " | head -n 1 | cut -f 2 -d ] | cut -b 1-7)"
 find . -name ".git*" -exec rm -rf "{}" \;
 chown -R root:root .
 mkdir -p lib
@@ -52,12 +71,12 @@ mv linux-firmware lib/firmware
 # Install documentation link:
 mkdir -p $PKG/usr/doc
 ( cd $PKG/usr/doc
-  ln -sf /lib/firmware kernel-firmware-$VERSION
+  ln -sf /lib/firmware kernel-firmware-${DATE}_${HEADISAT}
 )
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PKGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PKGNAM-${DATE}_${HEADISAT}-$ARCH-$BUILD.txz
 
diff --git a/source/a/kernel-firmware/slack-desc b/source/a/kernel-firmware/slack-desc
index 5231a426..3866645d 100644
--- a/source/a/kernel-firmware/slack-desc
+++ b/source/a/kernel-firmware/slack-desc
@@ -1,8 +1,8 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
                |-----handy-ruler------------------------------------------------------|
@@ -12,8 +12,8 @@ kernel-firmware: These are firmware files for the Linux kernel.
 kernel-firmware:
 kernel-firmware: You'll need these to use certain hardware drivers with Linux.
 kernel-firmware:
-kernel-firmware: Upstream site:  
+kernel-firmware: Upstream site: 
 kernel-firmware:
-kernel-firmware: git://git.kernel.org/pub/scm/linux/kernel/git/dwmw2/linux-firmware.git
+kernel-firmware: git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
 kernel-firmware:
 kernel-firmware: