Update sysutils/devcpu-data to version 1.15_1
authorDPorts Builder <nobody@home.ok>
Mon, 5 Feb 2018 06:06:43 +0000 (22:06 -0800)
committerDPorts Builder <nobody@home.ok>
Mon, 5 Feb 2018 06:06:43 +0000 (22:06 -0800)
sysutils/devcpu-data/Makefile
sysutils/devcpu-data/distinfo
sysutils/devcpu-data/files/Makefile
sysutils/devcpu-data/files/microcode_update.in
sysutils/devcpu-data/files/ucode-tool.c
sysutils/devcpu-data/pkg-plist

index dca461a..50469b5 100644 (file)
@@ -2,13 +2,14 @@
 # $FreeBSD$
 
 PORTNAME=      data
-PORTVERSION=   1.13
+PORTVERSION=   1.15
 PORTREVISION=  1
 CATEGORIES=    sysutils
-MASTER_SITES=  https://downloadmirror.intel.com/27431/eng/:intel \
+MASTER_SITES=  https://downloadmirror.intel.com/27337/eng/:intel \
                LOCAL/sbruno:amd
 PKGNAMEPREFIX= devcpu-
-DISTFILES=     microcode-20180108.tgz:intel amd-ucode-2014-12-01.tar.bz2:amd
+DISTFILES=     microcode-20171117.tgz:intel \
+               amd64-microcode_3.20171205.1.tar.xz:amd
 
 MAINTAINER=    clarkjc@runbox.com
 COMMENT=       Intel and AMD CPUs microcode updates
@@ -31,6 +32,10 @@ post-extract:
 
 do-install:
        ${MKDIR} ${STAGEDIR}${DATADIR}/
+       ${INSTALL_DATA} ${WRKSRC}/amd64-microcode-3.20171205.1/microcode_amd.bin ${STAGEDIR}${DATADIR}/
+       ${INSTALL_DATA} ${WRKSRC}/amd64-microcode-3.20171205.1/microcode_amd_fam15h.bin ${STAGEDIR}${DATADIR}/
+       ${INSTALL_DATA} ${WRKSRC}/amd64-microcode-3.20171205.1/microcode_amd_fam16h.bin ${STAGEDIR}${DATADIR}/
+       ${INSTALL_DATA} ${WRKSRC}/amd64-microcode-3.20171205.1/microcode_amd_fam17h.bin ${STAGEDIR}${DATADIR}/
        ${INSTALL_DATA} ${WRKSRC}/mcodes/* ${STAGEDIR}${DATADIR}/
 
 .include <bsd.port.mk>
index 197f4fc..99daf74 100644 (file)
@@ -1,5 +1,5 @@
-TIMESTAMP = 1515578462
-SHA256 (microcode-20180108.tgz) = 063f1aa3a546cb49323a5e0b516894e4b040007107b8c8ff017aca8a86204130
-SIZE (microcode-20180108.tgz) = 3676678
-SHA256 (amd-ucode-2014-12-01.tar.bz2) = e8f37ed12955585a625ee7cd48d89f9a04ceb2afa36081b52cc59d08a3bb8293
-SIZE (amd-ucode-2014-12-01.tar.bz2) = 20585
+TIMESTAMP = 1515706070
+SHA256 (microcode-20171117.tgz) = 93bd1da9fa58ece0016702e657f708b7e496e56da637a3fe9a6d21f1d6f524dc
+SIZE (microcode-20171117.tgz) = 3594762
+SHA256 (amd64-microcode_3.20171205.1.tar.xz) = a38bc072f535a3d3c1bf4e9e545197aa5114e979e94ef7e4a67e615df2f853a7
+SIZE (amd64-microcode_3.20171205.1.tar.xz) = 32584
index ff35cab..c23ef22 100644 (file)
@@ -1,14 +1,10 @@
-AMD_UCODE_DIR= amd-ucode
-AMD_UCODE=     $(AMD_UCODE_DIR)/microcode_amd.bin \
-               $(AMD_UCODE_DIR)/microcode_amd_fam15h.bin \
-               $(AMD_UCODE_DIR)/microcode_amd_fam16h.bin
+# $FreeBSD$
 INTEL_UCODE=   microcode.dat
 OUTPUT_DIR=    mcodes
 all:   ucode
 ucode: ucode-tool
        mkdir -p $(OUTPUT_DIR)
        ./ucode-tool -o $(OUTPUT_DIR) -i $(INTEL_UCODE)
-       ./ucode-tool -o $(OUTPUT_DIR) -a $(AMD_UCODE)
 
 # Use the host cc to compile ucode-tool in case of cross-compile
 ucode-tool: ucode-tool.c
index fa4d6dd..48d2de8 100644 (file)
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $FreeBSD: head/sysutils/devcpu-data/files/microcode_update.in 458664 2018-01-10 17:32:14Z sbruno $
+# $FreeBSD: head/sysutils/devcpu-data/files/microcode_update.in 459084 2018-01-15 17:05:37Z swills $
 #
 
 # PROVIDE:     microcode_update
@@ -56,13 +56,16 @@ microcode_update_start()
                    (echo "Microcode Update Failed." && exit 1)
        done
        if [ "${microcode_cpus}" = "ALL" ]; then
-               for i in ${cpus}; do
-                       ${CMT} -e /dev/cpuctl${i} >/dev/null 2>&1
+                CPUCONTROL_UPDATED=$(cpucontrol -h 2>&1 | grep -q -- -e; echo $?)
+                if [ ${CPUCONTROL_UPDATED} -ne 0 ]; then
+                        echo "Please update your system in order to update CPU microcode."
+                else
+                       ${CMT} -e /dev/cpuctl0 >/dev/null 2>&1
                        if [ $? -ne 0 ]; then
-                               echo "Re-evalutation of CPU flags Failed."
+                               echo "Re-evalulation of CPU flags Failed."
                                exit 1
                        fi
-               done
+                fi
        fi
        echo "Done."
 }
index b5c3b90..057e2dd 100644 (file)
@@ -24,6 +24,7 @@
  * SUCH DAMAGE.
  */
 
+/* $FreeBSD: head/sysutils/devcpu-data/files/ucode-tool.c 459464 2018-01-19 19:28:08Z sbruno $ */
 #include <stdarg.h>
 #include <stdint.h>
 #include <stdio.h>
index d9ac042..40b4082 100644 (file)
@@ -1,20 +1,4 @@
 %%DATADIR%%/2f0708.fw
-%%DATADIR%%/AMD-00001020-01000084.fw
-%%DATADIR%%/AMD-00001022-01000083.fw
-%%DATADIR%%/AMD-00001041-010000db.fw
-%%DATADIR%%/AMD-00001043-010000c8.fw
-%%DATADIR%%/AMD-00001062-010000c7.fw
-%%DATADIR%%/AMD-00001080-010000da.fw
-%%DATADIR%%/AMD-00001081-010000d9.fw
-%%DATADIR%%/AMD-000010a0-010000dc.fw
-%%DATADIR%%/AMD-00002031-02000032.fw
-%%DATADIR%%/AMD-00003010-03000027.fw
-%%DATADIR%%/AMD-00005010-05000029.fw
-%%DATADIR%%/AMD-00005020-05000119.fw
-%%DATADIR%%/AMD-00006012-0600063d.fw
-%%DATADIR%%/AMD-00006020-06000832.fw
-%%DATADIR%%/AMD-00006101-06001119.fw
-%%DATADIR%%/AMD-00007001-0700010f.fw
 %%DATADIR%%/M01106C2217.fw
 %%DATADIR%%/M01106CA107.fw
 %%DATADIR%%/M0120661104.fw
@@ -73,7 +57,7 @@
 %%DATADIR%%/m01f6402.fw
 %%DATADIR%%/m01f6508.fw
 %%DATADIR%%/m021066142.fw
-%%DATADIR%%/m02906eb_0000007f_00000080.fw
+%%DATADIR%%/m02906eb_00000071_00000072.fw
 %%DATADIR%%/m02f0a15.fw
 %%DATADIR%%/m02f241f.fw
 %%DATADIR%%/m02f252a.fw
 %%DATADIR%%/m0df330c.fw
 %%DATADIR%%/m101067660F.fw
 %%DATADIR%%/m101067770A.fw
-%%DATADIR%%/m1050662_00000014.fw
-%%DATADIR%%/m1050663_07000011.fw
+%%DATADIR%%/m1050662_0000000f.fw
+%%DATADIR%%/m1050663_0700000d.fw
 %%DATADIR%%/m1050664_0f00000a.fw
 %%DATADIR%%/m1069507.fw
 %%DATADIR%%/m106f76a.fw
 %%DATADIR%%/m206f6d1.fw
 %%DATADIR%%/m206fbBA.fw
 %%DATADIR%%/m206fda4.fw
-%%DATADIR%%/m2240671_0000001b.fw
-%%DATADIR%%/m22906ea_00000080.fw
+%%DATADIR%%/m2240671_00000017.fw
+%%DATADIR%%/m22906ea_0000006f_00000070.fw
 %%DATADIR%%/m22f6809.fw
-%%DATADIR%%/m2a906e9_0000007f_00000080.fw
-%%DATADIR%%/m32306c3_00000023.fw
-%%DATADIR%%/m3240661_00000018.fw
+%%DATADIR%%/m2a906e9_0000005d_0000005e.fw
+%%DATADIR%%/m32306c3_00000022.fw
+%%DATADIR%%/m3240661_00000017.fw
 %%DATADIR%%/m34f6404.fw
-%%DATADIR%%/m36506e3_000000c1_000000c2.fw
+%%DATADIR%%/m36506e3_000000b9_000000ba.fw
 %%DATADIR%%/m401067660F.fw
 %%DATADIR%%/m406f76b.fw
 %%DATADIR%%/m406fbBC.fw
 %%DATADIR%%/m5ff4807.fw
 %%DATADIR%%/m6d206d6_00000619.fw
 %%DATADIR%%/m6d206d7_00000710.fw
-%%DATADIR%%/m6f306f2_0000003b.fw
-%%DATADIR%%/m7240651_00000021.fw
+%%DATADIR%%/m6f306f2_0000003a.fw
+%%DATADIR%%/m7240651_00000020.fw
 %%DATADIR%%/m801066144.fw
 %%DATADIR%%/m801067660F.fw
-%%DATADIR%%/m80306f4_00000010.fw
+%%DATADIR%%/m80306f4_0000000f.fw
 %%DATADIR%%/m8069547.fw
 %%DATADIR%%/m806ec59.fw
 %%DATADIR%%/m806fa95.fw
 %%DATADIR%%/m9df4406.fw
 %%DATADIR%%/m9df4703.fw
 %%DATADIR%%/mA01067AA0B.fw
-%%DATADIR%%/m_01_706a1_00000022.fw
+%%DATADIR%%/m_01_706a1_0000001e.fw
 %%DATADIR%%/m_03_506c9_0000002c.fw
-%%DATADIR%%/mb750654_0200003c.fw
+%%DATADIR%%/mb750654_02000035.fw
 %%DATADIR%%/mbdf4117.fw
 %%DATADIR%%/mbdf4903.fw
-%%DATADIR%%/mc0306d4_00000028.fw
-%%DATADIR%%/mc0406e3_000000c1_000000c2.fw
-%%DATADIR%%/mc0806e9_0000007f_00000080.fw
-%%DATADIR%%/mc0806ea_0000007f_00000080.fw
-%%DATADIR%%/med306e4_0000042a.fw
+%%DATADIR%%/mc0306d4_00000025.fw
+%%DATADIR%%/mc0406e3_000000b9_000000ba.fw
+%%DATADIR%%/mc0806e9_00000061_00000062.fw
+%%DATADIR%%/mc0806ea_0000006f_00000070.fw
+%%DATADIR%%/med306e4_00000428.fw
 %%DATADIR%%/med306e6_00000600.fw
 %%DATADIR%%/med306e7_0000070d.fw
 %%DATADIR%%/mef406f1_0b000021.fw
+%%DATADIR%%/microcode_amd.bin
+%%DATADIR%%/microcode_amd_fam15h.bin
+%%DATADIR%%/microcode_amd_fam16h.bin
+%%DATADIR%%/microcode_amd_fam17h.bin
 %%DATADIR%%/mu267114.fw
 %%DATADIR%%/mu267238.fw
 %%DATADIR%%/mu26732e.fw