From nobody Mon Jul 31 11:31:36 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 4RDx1Z2TMYz4q3nD; Mon, 31 Jul 2023 11:32:13 +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 4RDx090Q6rz3vdJ; Mon, 31 Jul 2023 11:31:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690803097; 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=HOf9d+jK0aeDBFGEfWU550K51bfG8jLCH7SIe76zFSg=; b=uB0ft0xuxoY0EUqMvtMaafNzIjQ5TKc7A12mUUPn8qgUPzMzCajyCJscbLMaRYe3kaWshU FLmzU7veMZwLSvJHLDejSL2sIELnsgNNSlLEcOmTLzbYxbzAKV5rpMrcLWgieFiP07dqnH jwqXEYNWByvvaG84PiY9UF7DTEVOAQ097g8vO2qgt+o45dhiv7kY+UIYwSXAF+hN5MSD+w ghKYGnOIkuGBla3wNT2JUnJ460hwHVeXviTGlZajvWbk7bCM5mbAZ6CSrlweuc176XKZhs eIx4oo4Kk5pawzh9l5CHzM5LgsSvl+tgqZx8vQ59P4jzq6I2yXSZJJzKqPKzAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1690803097; 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=HOf9d+jK0aeDBFGEfWU550K51bfG8jLCH7SIe76zFSg=; b=eKEzv37JpIbtbWjJCwUU/+nBWVkFLBanNPiD5/4PpPdxZIJKFDQJWX7ccutcBU0bJRs3VD RMi5mLcJuOphrYlNhs1dstbM0PDhvrlC/hsJcuu5xtkL6e7a+fZgkoRP40eTPpCoNoPrv6 njZ1Ascg5lJuPUzgIoB3OF0SCazpeMaWycjmqZh+kjwDYJXPOSRruBQ5z39gweVjivMwtf 0DBcrsig/V/pDhNYCbMM8ZZItIr9gDoP9PIkZjrWZCDS2mSD5pmglI+uZgvl6c632I1EQi PwAxBzqP510aiFJ6AJtf1hRgsqBOsIqZcx3XMEmm9HVtXjw5RjzLLOflPCVnYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1690803097; a=rsa-sha256; cv=none; b=Y10zuGUn7DhNSmU+PsSzou9zEc2+JXVTmRg1lu5J55xW5PDNdqcFZEow+5rQgoVK7gjPd5 aU6g3qIMruDk3nQ2vQKVIhfuvBbYD4lsj9WfJKnX+XIcTT6HucWToTuFc1kn2khyJaNn2c WzZNr9SKX2t/9asJvhNViKieWlhUOUwMMrYFfvChY/BySqpMmWlxlFhPz5ZtWtyTF2M1Kh YS8vd8Wz+htCMTWZoX1H+CjJt7a03Xh7PyQF06n4XaMFbgHEmgtmUwyG9XRplo/R7LKDGh V8TAfsrWGmoUwVQdBkYTij51EHTlFeFwqFHU3/0UkPLtFzT4t9nXGODIIruWUg== 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 4RDx085ppYzv9y; Mon, 31 Jul 2023 11:31:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36VBVa8j054990; Mon, 31 Jul 2023 11:31:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36VBVaGx054989; Mon, 31 Jul 2023 11:31:36 GMT (envelope-from git) Date: Mon, 31 Jul 2023 11:31:36 GMT Message-Id: <202307311131.36VBVaGx054989@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Renato Botelho Subject: git: 18bc11a2bc16 - main - sysutils/devcpu-data: Fix typo in rc script 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: garga X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18bc11a2bc16e0cf649464f17312c6092a19780d Auto-Submitted: auto-generated The branch main has been updated by garga: URL: https://cgit.FreeBSD.org/ports/commit/?id=18bc11a2bc16e0cf649464f17312c6092a19780d commit 18bc11a2bc16e0cf649464f17312c6092a19780d Author: Thomas Hurst AuthorDate: 2023-07-31 11:29:04 +0000 Commit: Renato Botelho CommitDate: 2023-07-31 11:30:47 +0000 sysutils/devcpu-data: Fix typo in rc script The microcode_update rc script spells "required_modules" as "requires_modules", masking this by duplicating the missing functionality in its own precmd. This patch fixes the typo and removes the superfluous precmd. PR: 272781 Approved by: sbruno (maintainer) --- sysutils/devcpu-data/Makefile | 1 + sysutils/devcpu-data/files/microcode_update.in | 13 +------------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/sysutils/devcpu-data/Makefile b/sysutils/devcpu-data/Makefile index 639501ac8550..b8f7e54f2af0 100644 --- a/sysutils/devcpu-data/Makefile +++ b/sysutils/devcpu-data/Makefile @@ -1,5 +1,6 @@ PORTNAME= data PORTVERSION= 20230617 +PORTREVISION= 1 CATEGORIES= sysutils MASTER_SITES= # none PKGNAMEPREFIX= devcpu- diff --git a/sysutils/devcpu-data/files/microcode_update.in b/sysutils/devcpu-data/files/microcode_update.in index b06b21d6f903..e2ad59592c06 100644 --- a/sysutils/devcpu-data/files/microcode_update.in +++ b/sysutils/devcpu-data/files/microcode_update.in @@ -21,22 +21,11 @@ name="microcode_update" rcvar=microcode_update_enable stop_cmd=":" -start_precmd="microcode_update_prepare" start_cmd="microcode_update_start" -requires_modules="cpuctl" +required_modules="cpuctl" CMT="/usr/sbin/cpucontrol" -microcode_update_prepare() -{ - if ! kldstat -q -m cpuctl; then - if ! kldload cpuctl > /dev/null 2>&1; then - warn "Can't load cpuctl module." - return 1 - fi - fi -} - microcode_update_start() { echo "Updating CPU Microcode..."