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

@@ -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

sysutils/cpu-microcode-amd/Makefile

@@ -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"

sysutils/cpu-microcode-amd/src/etc/rc.loader.d/40-cpu-microcode

@@ -1,2 +0,0 @@
-cpu_microcode_load="YES"
-cpu_microcode_name="/boot/firmware/amd-ucode.bin"

sysutils/cpu-microcode-intel/Makefile

@@ -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"

sysutils/cpu-microcode-intel/pkg-descr

@@ -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.

sysutils/cpu-microcode-intel/src/etc/rc.loader.d/40-cpu-microcode

@@ -1,2 +0,0 @@
-cpu_microcode_load="YES"
-cpu_microcode_name="/boot/firmware/intel-ucode.bin"

sysutils/cpu-microcode-intel/src/etc/rc.syshook.d/early/40-cpu-microcode

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-export microcode_update_enable="YES"
-
-/usr/local/etc/rc.d/microcode_update start

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"

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.

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"