system/microcode_ctl: Updated for version 1.17

4 files changed, 66 insertions, 15 deletions

diff --git a/system/microcode_ctl/README b/system/microcode_ctl/README
index 4ab6a69276..c1cf47a6f8 100644
--- a/system/microcode_ctl/README
+++ b/system/microcode_ctl/README
@@ -16,6 +16,11 @@ back to the old microcode.
 To use this utility you need to compile the kernel driver (found under
 "Processor type and features").  The microcode itself can be found at
 http://downloadcenter.intel.com/default.aspx and should be placed under
-/etc/microcode.dat You probably want to have your microcode updated
-each time the system boots, then call "/usr/sbin/microcode_ctl -u" from
-/etc/rc.d/rc.local
+/lib/firmware/microcode.dat.
+
+To have the microcode updated each time at boot, start the included
+init script in rc.local:
+
+if [ -e "/etc/rc.d/rc.microcode_ctl" ];
+  /etc/rc.d/rc.microcode_ctl start
+fi
\ No newline at end of file
diff --git a/system/microcode_ctl/doinst.sh b/system/microcode_ctl/doinst.sh
new file mode 100644
index 0000000000..c78bd94e8b
--- /dev/null
+++ b/system/microcode_ctl/doinst.sh
@@ -0,0 +1,22 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+# Keep same perms on rc.microcode_ctl.new:
+if [ -e etc/rc.d/rc.microcode_ctl ]; then
+  cp -a etc/rc.d/rc.microcode_ctl etc/rc.d/rc.microcode_ctl.new.incoming
+  cat etc/rc.d/rc.microcode_ctl.new > etc/rc.d/rc.microcode_ctl.new.incoming
+  mv etc/rc.d/rc.microcode_ctl.new.incoming etc/rc.d/rc.microcode_ctl.new
+fi
+
+config etc/rc.d/rc.microcode_ctl.new
+
diff --git a/system/microcode_ctl/microcode_ctl.SlackBuild b/system/microcode_ctl/microcode_ctl.SlackBuild
index 5fd4e3d0c9..b255490bf6 100644
--- a/system/microcode_ctl/microcode_ctl.SlackBuild
+++ b/system/microcode_ctl/microcode_ctl.SlackBuild
@@ -6,7 +6,7 @@
 PRGNAM=microcode_ctl
 VERSION=1.17
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
@@ -20,23 +20,45 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
-make || exit 1
-strip --strip-unneeded microcode_ctl
 
-mkdir -p $PKG/usr/{sbin,man/man8,doc/$PRGNAM-$VERSION}
-cp microcode_ctl $PKG/usr/sbin
-cp microcode_ctl.8 $PKG/usr/man/man8
-gzip -9f $PKG/usr/man/man8/microcode_ctl.8
+# use our CFLAGS
+sed -i "s/-O2/$SLKCFLAGS/" Makefile
+
+# look for microcode.dat file in a more appropriate place
+sed -i "s|/etc/|/lib/firmware/|" microcode_ctl.c
+sed -i "s|/etc/microcode.dat|/lib/firmware/microcode.dat|" \
+  microcode_ctl.start
+
+make \
+  PREFIX=/usr \
+  RCHOMEDIR=rc.d
+
+make \
+  PREFIX=/usr \
+  RCHOMEDIR=rc.d \
+  DESTDIR=$PKG \
+  install
+
+# This is way outdated
+rm -f $PKG/etc/microcode.dat
+
+# move init-script into place
+mv $PKG/etc/rc.d/microcode_ctl $PKG/etc/rc.d/rc.microcode_ctl.new
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp Changelog README $PKG/usr/doc/$PRGNAM-$VERSION
+cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir $PKG/install
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/microcode_ctl/microcode_ctl.info b/system/microcode_ctl/microcode_ctl.info
index 241724bfda..eec361ee30 100644
--- a/system/microcode_ctl/microcode_ctl.info
+++ b/system/microcode_ctl/microcode_ctl.info
@@ -2,7 +2,9 @@ PRGNAM="microcode_ctl"
 VERSION="1.17"
 HOMEPAGE="http://www.urbanmyth.org/microcode/"
 DOWNLOAD="http://www.urbanmyth.org/microcode/microcode_ctl-1.17.tar.gz"
+DOWNLOAD_x86_64=""
 MD5SUM="98a7f06acef8459c8ef2a1b0fb86a99e"
+MD5SUM_x86_64=""
 MAINTAINER="Andrzej Telszewski"
 EMAIL="atelszewski@gmail.com"
-APPROVED="dsomero"
+APPROVED="dsomero,pprkut"