From nobody Mon Jun 19 10:25:10 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ql5Vt4KlQz4flCX; Mon, 19 Jun 2023 10:25:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ql5Vt3gvQz4Xsn; Mon, 19 Jun 2023 10:25:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687170310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kHZOalnnajoMCs/EsAURy7hCMO7sQbKZC9gh2p6pFMk=; b=aR5PMpj0dvZjxRwqGeYt8hGC5rNZyco4utwdwLvqSdhh2h2bStsq94nA5V2av4WfWrKZUf qP9+cOhCoon/DARSdDZcfSa+fH23BzzduhUZ60pqCvLCQuYzWMmOuMKcdNoZbsZEhuwjxz rEDmF/uO+5dk2yKUZTwY87/66+HQ+kAwESFwCREukJc7K/OYdNAEIuOH9Bj+SZjAlJIGN2 tFGzfCB97uUIaFxjqn4DooOKUxqyUIcY55IcwrXMw421IRdqiTA3uw+rwdNV96AkI4TVi2 9ToB7pMoqumxqJYuaP30ju0sW7CTxR2ceveXr3tCcbXihDjjbvRSB4CoKdKfTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1687170310; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kHZOalnnajoMCs/EsAURy7hCMO7sQbKZC9gh2p6pFMk=; b=hiV6VkNjfI+OHqbDSGHh9Lxb37u2oCsWhl5ltiC/KYeiUhX9wqx/w7VVr/lSZpg1DepPX2 tOZpU5+aGM5+GZKWZyXRWivNq5JWvZItA+cKgCQJBtqwzGwNqIaRJ2DrfbFcj4mUnHoCff K+3V3kfzafbhxkWo5y9Njghle+XdCN8PQW6xbXpt36lPflO1bXOfQ9xCELqnOvkH7gR04z bpVM7ykp5AwYQa7Gcz8SG8z9lEmaqTYJsJcFeC5TGKyZMG/+p++dlYSYY71wOCoA7Ikkfp 5AkpdMU3RjHxClCUJps8ZTfjsomuFxCZ0iRgakQI49UVDhn5DudJKvLOb9QwSw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1687170310; a=rsa-sha256; cv=none; b=aiSyAfx6/hm9bzTbF7rkIJeDAGZqhDa7Nvy572HkEVDrbaPlk9m5eoKiHslXaM5g0f3HEI tfccWLUL1WdeTjVcul6oM5+hOirJW6JQobYa4K7uG63n9k2dh/aaI/fYjEN4I4f/lsO8C5 jG0HcqLb6cx4Vx++bi98dENoWhpQ3S2dvwPBGbgQCgMkdiouJ9jc8zPjyTY0T0ckRci/yx gDiG9uNYONSaWSQiaQrXu+4p3gHgVQ5No7SfGENmM3yyDQ3mb2VYccv3UzgYPjVJHdR9Mg MeDQBCvIa39/yqUmvWlDA38yUvcGmFw7hJ6y8Nl1TozOKbG/iCs+xMRlI/aKzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ql5Vt2ZvqzDgR; Mon, 19 Jun 2023 10:25:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 35JAPAZa071600; Mon, 19 Jun 2023 10:25:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 35JAPAnj071599; Mon, 19 Jun 2023 10:25:10 GMT (envelope-from git) Date: Mon, 19 Jun 2023 10:25:10 GMT Message-Id: <202306191025.35JAPAnj071599@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Eugene Grosbein Subject: git: 6667c5ca7ab3 - main - sysutils/cpupdate: fix microcode download for package users List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6667c5ca7ab31bc463a357f217371661620a730b Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by eugen: URL: https://cgit.FreeBSD.org/ports/commit/?id=6667c5ca7ab31bc463a357f217371661620a730b commit 6667c5ca7ab31bc463a357f217371661620a730b Author: Eugene Grosbein AuthorDate: 2023-06-19 10:18:46 +0000 Commit: Eugene Grosbein CommitDate: 2023-06-19 10:25:03 +0000 sysutils/cpupdate: fix microcode download for package users * adopt for changes in Mk/ that broke microcode download for package users; * update for platomav/CPUMicrocodes r268; * update for Intel pack microcode-20230613. Bump PORTREVISION. PR: 271801 --- sysutils/cpupdate/Makefile | 23 ++++++++++++++--------- sysutils/cpupdate/distinfo | 10 +++++----- sysutils/cpupdate/files/cpupdate.in | 4 ++-- 3 files changed, 21 insertions(+), 16 deletions(-) diff --git a/sysutils/cpupdate/Makefile b/sysutils/cpupdate/Makefile index 2374265640de..8a93ce68e515 100644 --- a/sysutils/cpupdate/Makefile +++ b/sysutils/cpupdate/Makefile @@ -1,6 +1,6 @@ PORTNAME= cpupdate DISTVERSION= g20180513 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= sysutils MAINTAINER= eugen@FreeBSD.org @@ -25,8 +25,8 @@ ONLY_FOR_ARCHS_REASON= specific to x86 processors SUB_FILES= pkg-message SUB_LIST= CPM_DIR="${CPM_DIR}" INTEL_DIR="${INTEL_DIR}" \ CPM_DATADIR="${CPM_DATADIR}" INTEL_DATADIR="${INTEL_DATADIR}" \ - FETCH_CMD="${FETCH_CMD}" MASTER_SITES="${MASTER_SITES}" \ - DISTFILES="${DISTFILES}" + FETCH_CMD="${FETCH_CMD}" CPUPDATE_SITES="${CPUPDATE_SITES}" \ + CPUPDATE_DISTFILES="${CPUPDATE_DISTFILES}" USE_GITHUB= yes GH_ACCOUNT= kernschmelze @@ -35,20 +35,22 @@ GH_TAGNAME= 48e42d5 PLIST_FILES= sbin/${PORTNAME} man/man8/${PORTNAME}.8.gz -# MCE DB r181 +# MCE DB r268 CPM_ACCOUNT= platomav CPM_PROJECT= CPUMicrocodes -CPM_TAGNAME= 044f53b +CPM_TAGNAME= 246a49d OPTIONS_DEFINE= CPM INTEL CPM_DESC= Download platomav/CPUMicrocodes collection CPM_GH_ACCOUNT= ${CPM_ACCOUNT}:cpm CPM_GH_PROJECT= ${CPM_PROJECT}:cpm CPM_GH_TAGNAME= ${CPM_TAGNAME}:cpm +CPM_PACK= ${CPM_ACCOUNT}-${CPM_PROJECT}-${CPM_TAGNAME}_GH0 +CPM_MASTER_SITES= https://codeload.github.com/platomav/${CPM_PROJECT}/tar.gz/${CPM_TAGNAME}?dummy=/${CPM_PACK}.tar.gz CPM_DIR= ${WRKDIR}/${CPM_PROJECT}-${CPM_TAGNAME} CPM_DATADIR= ${DATADIR}/CPUMicrocodes/secondary/Intel -INTEL_PACK= microcode-20210216 +INTEL_PACK= microcode-20230613 INTEL_DESC= Download Intel microcode pack ${INTEL_PACK} INTEL_PROJECT= Intel-Linux-Processor-Microcode-Data-Files INTEL_MASTER_SITES= https://codeload.github.com/intel/${INTEL_PROJECT}/tar.gz/:intel @@ -56,6 +58,9 @@ INTEL_DISTFILES= ${INTEL_PACK}:intel INTEL_DIR= ${WRKDIR}/${INTEL_PROJECT}-${INTEL_PACK}/intel-ucode INTEL_DATADIR= ${DATADIR}/CPUMicrocodes/primary/Intel +CPUPDATE_SITES?= ${CPM_MASTER_SITES}:cpm ${INTEL_MASTER_SITES} +CPUPDATE_DISTFILES?= ${CPM_PACK}:cpm ${INTEL_PACK}:intel + post-patch: ${REINPLACE_CMD} -e "s,/usr/local/share/cpupdate,${DATADIR},g" ${WRKSRC}/cpupdate.h @@ -65,15 +70,15 @@ do-install: .include -install-microcodes: +install-microcodes: extract .if ${PORT_OPTIONS:MINTEL} - ${RM} -rf ${INTEL_DATADIR} + ${RM} -r ${INTEL_DATADIR} ${MKDIR} ${INTEL_DATADIR} (cd ${INTEL_DIR} && ${COPYTREE_SHARE} . ${INTEL_DATADIR}) (cd ${INTEL_DIR}-with-caveats && ${COPYTREE_SHARE} . ${INTEL_DATADIR}) .endif .if ${PORT_OPTIONS:MCPM} - ${RM} -rf ${CPM_DATADIR} + ${RM} -r ${CPM_DATADIR} ${MKDIR} ${CPM_DATADIR} cpupdate -q -IC -S ${CPM_DIR}/Intel -T ${CPM_DATADIR} >/dev/null .endif diff --git a/sysutils/cpupdate/distinfo b/sysutils/cpupdate/distinfo index 3c38ffbd9125..29fae8c8d2f9 100644 --- a/sysutils/cpupdate/distinfo +++ b/sysutils/cpupdate/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1615675326 -SHA256 (microcode-20210216) = b855c81f78705f35341248a0603aa1a6e199ca7f59cd425e061b579329aa9eaa -SIZE (microcode-20210216) = 3506111 +TIMESTAMP = 1687165633 +SHA256 (microcode-20230613) = 894d822d2347222a2595d4fc47d358e01d35a54780123100c317dfc31b1b0cc9 +SIZE (microcode-20230613) = 12338446 SHA256 (kernschmelze-cpupdate-g20180513-48e42d5_GH0.tar.gz) = d28582fe7edfb57da99fb2466417033ee619c32de9c6b5f1a5fae7d9be8253da SIZE (kernschmelze-cpupdate-g20180513-48e42d5_GH0.tar.gz) = 4566722 -SHA256 (platomav-CPUMicrocodes-044f53b_GH0.tar.gz) = 674923cf907545d8ea5a384af21f52e1df911b121969e81a0ecf47dda9064aea -SIZE (platomav-CPUMicrocodes-044f53b_GH0.tar.gz) = 9437937 +SHA256 (platomav-CPUMicrocodes-246a49d_GH0.tar.gz) = 2f5d49aa504b5579395ce75cca6051877766fdf7843defb6441337ffa571b67a +SIZE (platomav-CPUMicrocodes-246a49d_GH0.tar.gz) = 21633497 diff --git a/sysutils/cpupdate/files/cpupdate.in b/sysutils/cpupdate/files/cpupdate.in index 027058fdc613..d9ce46c686f7 100644 --- a/sysutils/cpupdate/files/cpupdate.in +++ b/sysutils/cpupdate/files/cpupdate.in @@ -28,8 +28,8 @@ load_rc_config $name : ${cpupdate_flags:="-w -u"} : ${cpupdate_ibrs_enable:="YES"} : ${cpupdate_fetch:=%%FETCH_CMD%%} -: ${cpupdate_sites:=%%MASTER_SITES%%} -: ${cpupdate_distfiles:=%%DISTFILES%%} +: ${cpupdate_sites:=%%CPUPDATE_SITES%%} +: ${cpupdate_distfiles:=%%CPUPDATE_DISTFILES%%} command=%%PREFIX%%/sbin/${name} download_cmd="cpupdate_download"