From 098a191c578aebfa88af9195531d395ce270bd67 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 27 Aug 2024 21:58:48 +0200 Subject: [PATCH] sysutils/cpu-microcode: merge the plugin code bases using variants Should have done this from the start, but now this looks much cooler. ;) --- README.md | 3 +-- sysutils/cpu-microcode-amd/Makefile | 9 --------- .../src/etc/rc.loader.d/40-cpu-microcode | 2 -- sysutils/cpu-microcode-intel/Makefile | 9 --------- sysutils/cpu-microcode-intel/pkg-descr | 6 ------ .../src/etc/rc.loader.d/40-cpu-microcode | 2 -- .../src/etc/rc.syshook.d/early/40-cpu-microcode | 5 ----- sysutils/cpu-microcode/Makefile | 17 +++++++++++++++++ .../pkg-descr | 6 +++--- .../src/etc/rc.loader.d/40-cpu-microcode.in | 2 ++ .../src/etc/rc.syshook.d/early/40-cpu-microcode | 0 11 files changed, 23 insertions(+), 38 deletions(-) delete mode 100644 sysutils/cpu-microcode-amd/Makefile delete mode 100644 sysutils/cpu-microcode-amd/src/etc/rc.loader.d/40-cpu-microcode delete mode 100644 sysutils/cpu-microcode-intel/Makefile delete mode 100644 sysutils/cpu-microcode-intel/pkg-descr delete mode 100644 sysutils/cpu-microcode-intel/src/etc/rc.loader.d/40-cpu-microcode delete mode 100755 sysutils/cpu-microcode-intel/src/etc/rc.syshook.d/early/40-cpu-microcode create mode 100644 sysutils/cpu-microcode/Makefile rename sysutils/{cpu-microcode-amd => cpu-microcode}/pkg-descr (60%) create mode 100644 sysutils/cpu-microcode/src/etc/rc.loader.d/40-cpu-microcode.in rename sysutils/{cpu-microcode-amd => cpu-microcode}/src/etc/rc.syshook.d/early/40-cpu-microcode (100%) diff --git a/README.md b/README.md index 8cb7fd41d..7b970ba60 100644 --- a/README.md +++ b/README.md @@ -92,8 +92,7 @@ security/tor -- The Onion Router security/wazuh-agent -- Agent for the open source security platform Wazuh sysutils/apcupsd -- APCUPSD - APC UPS daemon sysutils/apuled -- PC Engine APU LED control (development only) -sysutils/cpu-microcode-amd -- AMD CPU microcode updates -sysutils/cpu-microcode-intel -- Intel CPU microcode updates +sysutils/cpu-microcode -- CPU microcode updates sysutils/dec-hw -- Deciso hardware specific information sysutils/dmidecode -- Display hardware information on the dashboard sysutils/git-backup -- Track config changes using git diff --git a/sysutils/cpu-microcode-amd/Makefile b/sysutils/cpu-microcode-amd/Makefile deleted file mode 100644 index c5a40b6f7..000000000 --- a/sysutils/cpu-microcode-amd/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -PLUGIN_NAME= cpu-microcode-amd -PLUGIN_VERSION= 1.0 -PLUGIN_COMMENT= AMD CPU microcode updates -PLUGIN_DEPENDS= cpu-microcode-amd x86info -PLUGIN_CONFLICTS= cpu-microcode-intel -PLUGIN_MAINTAINER= franco@opnsense.org -PLUGIN_TIER= 2 - -.include "../../Mk/plugins.mk" diff --git a/sysutils/cpu-microcode-amd/src/etc/rc.loader.d/40-cpu-microcode b/sysutils/cpu-microcode-amd/src/etc/rc.loader.d/40-cpu-microcode deleted file mode 100644 index c7cbf86a3..000000000 --- a/sysutils/cpu-microcode-amd/src/etc/rc.loader.d/40-cpu-microcode +++ /dev/null @@ -1,2 +0,0 @@ -cpu_microcode_load="YES" -cpu_microcode_name="/boot/firmware/amd-ucode.bin" diff --git a/sysutils/cpu-microcode-intel/Makefile b/sysutils/cpu-microcode-intel/Makefile deleted file mode 100644 index f349390dc..000000000 --- a/sysutils/cpu-microcode-intel/Makefile +++ /dev/null @@ -1,9 +0,0 @@ -PLUGIN_NAME= cpu-microcode-intel -PLUGIN_VERSION= 1.0 -PLUGIN_COMMENT= Intel CPU microcode updates -PLUGIN_DEPENDS= cpu-microcode-intel x86info -PLUGIN_CONFLICTS= cpu-microcode-amd -PLUGIN_MAINTAINER= franco@opnsense.org -PLUGIN_TIER= 2 - -.include "../../Mk/plugins.mk" diff --git a/sysutils/cpu-microcode-intel/pkg-descr b/sysutils/cpu-microcode-intel/pkg-descr deleted file mode 100644 index cdf882f5f..000000000 --- a/sysutils/cpu-microcode-intel/pkg-descr +++ /dev/null @@ -1,6 +0,0 @@ -Updating your microcode can help to mitigate certain potential security -vulnerabilities in CPUs as well as address certain functional issues that could, -for example, result in unpredictable system behavior such as hangs, crashes, -unexpected reboots, data errors, etc. - -The microcode update will be loaded when the system is rebooted. diff --git a/sysutils/cpu-microcode-intel/src/etc/rc.loader.d/40-cpu-microcode b/sysutils/cpu-microcode-intel/src/etc/rc.loader.d/40-cpu-microcode deleted file mode 100644 index 976a36fa5..000000000 --- a/sysutils/cpu-microcode-intel/src/etc/rc.loader.d/40-cpu-microcode +++ /dev/null @@ -1,2 +0,0 @@ -cpu_microcode_load="YES" -cpu_microcode_name="/boot/firmware/intel-ucode.bin" diff --git a/sysutils/cpu-microcode-intel/src/etc/rc.syshook.d/early/40-cpu-microcode b/sysutils/cpu-microcode-intel/src/etc/rc.syshook.d/early/40-cpu-microcode deleted file mode 100755 index 4dab1e32c..000000000 --- a/sysutils/cpu-microcode-intel/src/etc/rc.syshook.d/early/40-cpu-microcode +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -export microcode_update_enable="YES" - -/usr/local/etc/rc.d/microcode_update start diff --git a/sysutils/cpu-microcode/Makefile b/sysutils/cpu-microcode/Makefile new file mode 100644 index 000000000..9251d5fd5 --- /dev/null +++ b/sysutils/cpu-microcode/Makefile @@ -0,0 +1,17 @@ +PLUGIN_NAME= cpu-microcode-amd +PLUGIN_VERSION= 1.0 +PLUGIN_COMMENT= CPU microcode updates +PLUGIN_DEPENDS= x86info +PLUGIN_MAINTAINER= franco@opnsense.org +PLUGIN_TIER= 2 +PLUGIN_VARIANTS= amd intel + +amd_NAME= cpu-microcode-amd +amd_DEPENDS= cpu-microcode-amd +amd_COMMENT:= AMD ${PLUGIN_COMMENT} + +intel_NAME= cpu-microcode-intel +intel_DEPENDS= cpu-microcode-intel +intel_COMMENT:= Intel ${PLUGIN_COMMENT} + +.include "../../Mk/plugins.mk" diff --git a/sysutils/cpu-microcode-amd/pkg-descr b/sysutils/cpu-microcode/pkg-descr similarity index 60% rename from sysutils/cpu-microcode-amd/pkg-descr rename to sysutils/cpu-microcode/pkg-descr index cdf882f5f..c84f69902 100644 --- a/sysutils/cpu-microcode-amd/pkg-descr +++ b/sysutils/cpu-microcode/pkg-descr @@ -1,6 +1,6 @@ Updating your microcode can help to mitigate certain potential security -vulnerabilities in CPUs as well as address certain functional issues that could, -for example, result in unpredictable system behavior such as hangs, crashes, -unexpected reboots, data errors, etc. +vulnerabilities in CPUs as well as address certain functional issues that +could, for example, result in unpredictable system behavior such as hangs, +crashes, unexpected reboots, data errors, etc. The microcode update will be loaded when the system is rebooted. diff --git a/sysutils/cpu-microcode/src/etc/rc.loader.d/40-cpu-microcode.in b/sysutils/cpu-microcode/src/etc/rc.loader.d/40-cpu-microcode.in new file mode 100644 index 000000000..b20660e00 --- /dev/null +++ b/sysutils/cpu-microcode/src/etc/rc.loader.d/40-cpu-microcode.in @@ -0,0 +1,2 @@ +cpu_microcode_load="YES" +cpu_microcode_name="/boot/firmware/%%PLUGIN_VARIANT%%-ucode.bin" diff --git a/sysutils/cpu-microcode-amd/src/etc/rc.syshook.d/early/40-cpu-microcode b/sysutils/cpu-microcode/src/etc/rc.syshook.d/early/40-cpu-microcode similarity index 100% rename from sysutils/cpu-microcode-amd/src/etc/rc.syshook.d/early/40-cpu-microcode rename to sysutils/cpu-microcode/src/etc/rc.syshook.d/early/40-cpu-microcode