Merge pull request #6476 from AuxXxilium/dev

Dev
AuxXxilium · Mar 3, 2025 · 6017f06 · 6017f06
2 parents 5b7386c + d9520cf
commit 6017f06
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 3 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -95,7 +95,9 @@ jobs:
           getLKMs "files/p3/lkms"
           getTheme "files/p1/boot/grub"
           getBuildroot "evo" "bre"
+          echo "BRETAG=${BRTAG}" >> $GITHUB_ENV
           getBuildroot "minimal" "brm"
+          echo "BRMTAG=${BRTAG}" >> $GITHUB_ENV
 
           # Export Dependencies Version to env
           echo "ADDONTAG=${ADDONTAG}" >> $GITHUB_ENV
@@ -105,8 +107,6 @@ jobs:
           echo "CUSTOMTAG=${CUSTOMTAG}" >> $GITHUB_ENV
           echo "LKMTAG=${LKMTAG}" >> $GITHUB_ENV
           echo "THEMETAG=${THEMETAG}" >> $GITHUB_ENV
-          echo "BRETAG=${BRETAG}" >> $GITHUB_ENV
-          echo "BRMTAG=${BRMTAG}" >> $GITHUB_ENV
           echo "BUILD_TIME=$(date +'%Y-%m-%d %H:%M')" >> $GITHUB_ENV
 
           echo "OK"

diff --git a/files/initrd/opt/arc/arc-functions.sh b/files/initrd/opt/arc/arc-functions.sh
@@ -3454,6 +3454,22 @@ function getnetinfo() {
     IPCON="$(getIP "${N}")"
     [ -n "${IPCON}" ] && break
   done
-
   IPCON="${IPCON:-noip}"
+}
+
+###############################################################################
+# Create Microcode for Kernel
+function createMicrocode() {
+  rm -rf ${TMP_PATH}/kernel
+  if [ -d /usr/lib/firmware/amd-ucode ]; then
+    mkdir -p ${TMP_PATH}/kernel/x86/microcode
+    cat /usr/lib/firmware/amd-ucode/microcode_amd*.bin >${TMP_PATH}/kernel/x86/microcode/AuthenticAMD.bin
+  fi
+  if [ -d /usr/lib/firmware/intel-ucode ]; then
+    mkdir -p ${TMP_PATH}/kernel/x86/microcode
+    cat /usr/lib/firmware/intel-ucode/* >${TMP_PATH}/kernel/x86/microcode/GenuineIntel.bin
+  fi
+  if [ -d ${TMP_PATH}/kernel/x86/microcode ]; then
+    (cd ${TMP_PATH} && find kernel 2>/dev/null | cpio -o -H newc -R root:root >"${MC_RAMDISK_FILE}") >/dev/null 2>&1
+  fi
 }
diff --git a/files/initrd/opt/arc/arc.sh b/files/initrd/opt/arc/arc.sh
@@ -164,6 +164,10 @@ elif [ "${ARC_MODE}" = "config" ]; then
       write_menu_value "W" "RD Compression" "${RD_COMPRESSED}"
       write_menu_value "X" "Sata DOM" "${SATADOM}"
       write_menu_value "u" "LKM Version" "${LKM}"
+      if [ "${ARC_BRACH}" = "evo" ]; then
+        MICROCODEIMG="$([ -f "${MC_RAMDISK_FILE}" ] && echo "true" || echo "false")"
+        write_menu_value "R" "Microcode Update" "${MICROCODEIMG}"
+      fi
       write_menu "C" "Clone Loader to another Disk"
       write_menu "n" "Grub Bootloader Config"
       write_menu "y" "Choose a Keymap for Loader"
@@ -334,6 +338,14 @@ elif [ "${ARC_MODE}" = "config" ]; then
             ;;
           L) greplogs; NEXT="L" ;;
           w) resetLoader; NEXT="w" ;;
+          R) MICROCODEIMG="$([ -f "${MC_RAMDISK_FILE}" ] && echo "true" || echo "false")"
+              if [ "${MICROCODEIMG}" = "true" ]; then
+                rm -f "${MC_RAMDISK_FILE}"
+              else
+                createMicrocode
+              fi
+              NEXT="R"
+              ;;
           C) cloneLoader; NEXT="C" ;;
           n) editGrubCfg; NEXT="n" ;;
           y) keymapMenu; NEXT="y" ;;