diff options
Diffstat (limited to 'sys-firmware/intel-microcode')
| -rw-r--r-- | sys-firmware/intel-microcode/Manifest | 6 | ||||
| -rw-r--r-- | sys-firmware/intel-microcode/files/35-intel-microcode-systemd.install | 23 | ||||
| -rw-r--r-- | sys-firmware/intel-microcode/files/35-intel-microcode.install | 10 | ||||
| -rw-r--r-- | sys-firmware/intel-microcode/intel-microcode-20240531_p20240526-r2.ebuild (renamed from sys-firmware/intel-microcode/intel-microcode-20240531_p20240526-r1.ebuild) | 22 |
4 files changed, 39 insertions, 22 deletions
diff --git a/sys-firmware/intel-microcode/Manifest b/sys-firmware/intel-microcode/Manifest index 0098c1aa2459..46e993d54618 100644 --- a/sys-firmware/intel-microcode/Manifest +++ b/sys-firmware/intel-microcode/Manifest @@ -1,5 +1,5 @@ -AUX 35-intel-microcode-systemd.install 1274 BLAKE2B 302f5428a8ca7590ced274f3aef251fd7a00a922466d5599dde8f20c088a38438f9f1a4d4c99dd5752e5788927142bc3beff7c64ec6b93922af405a570dbe925 SHA512 cb1a2c8e31dd79550bcce854f7ddd4a955cac25caebc94b9fbe803274fc3e503055ea515420faaf750f39b341cddf9d8b436d05e5c1895a44d6d3c060a5549c2 -AUX 35-intel-microcode.install 1320 BLAKE2B 6b4209e1e622c50eefae1666d3192e2c5a2f1e558be25b0dabc8fda1d065495c398ef39162ce7c1e6729d30770fca47f1e58ba9c43e49570fbb0d3395998363d SHA512 2c36f6af1f26e5596c9cac120d82152ac84c7c32db722c8b50e43365f434562a7e4ae87a36bcc4c695793b6a4a4930811e8aa71e30fddfaff786c5ae4cd7b93b +AUX 35-intel-microcode-systemd.install 1441 BLAKE2B d730b8297190a11952e136b6471f174b6a62f85365281cab21006e82a73ce16c233c16d2203dd42e0f381352f100337eade1758f73fb824cee3d2138befca8c6 SHA512 8b4bf710f4684c08554a72f92d61b240a2fab808299e13f6cdc124ede67c98923271c9c734e23943e1db29193b715391f266168b4bcb61d37b2a7de109581bb1 +AUX 35-intel-microcode.install 1442 BLAKE2B 6f4bf74d05986836d4da4b4bd6a4d82243fe29f5f658f5475ff8a44ad45a3afd68001f18912865d5429d45788ffdd72be08d7862c65d40d108446f7828f22df9 SHA512 7d6a53ab788c3225ecda78997dabee7bc132245890a86a9cd5fcdfa633dd665de3870ee5b608a26b15276a0014d53312a69baa00d6a8ac9c5d33e1688128da5a DIST intel-microcode-collection-20240312.tar.xz 13484040 BLAKE2B 947f78698211b372472629e7fdf076021db97f156d812ec2a84c5ab3d5ee374e04191f7881c956c261c6a6a5935b2c779b837879677ee98d44cf8c753a4393b8 SHA512 de577f232035a92ce563475edb4572c6fa40a0a2ee8e76b858de1ca42f905d366d107bf02e4968127ad6fe150baf37e11ed93191e40c1c5913ba34fe77184c00 DIST intel-microcode-collection-20240514.tar.xz 13421016 BLAKE2B 83b7d213709bf8c1ea1b62456974cf6a2087470d9e2456ef3de93569007cfa8c94021a21a9f3f7b638ffe4b2ad0f516deda04a1c630e54f35709e92a113a7683 SHA512 4cc364b19355f133dae0178f7d10b50abcc0e6e7919e646cfc756c8ff8dc1d6d0819abae6f5cb7f659f0466ee31196625cf022bb994f500ab08e93238a66d104 DIST intel-microcode-collection-20240526.tar.xz 14673584 BLAKE2B 262f667ac46e190994e86f547c98ac776c73b1576c208fa32df96a2dd60af6cda9bd0b0367ca68bb6b85fd19f75913e73069d0064eb2b4c560068c3da50618c8 SHA512 4227c68ba60aea940b851f10d1006ee42b45d55425eb143210adeb363468238329d4a2720d117f5bdaeb9857ae29a6952a3df22769f4436638a9080ded6793ba @@ -9,5 +9,5 @@ DIST microcode-20240514.tar.gz 12870457 BLAKE2B 2a3a357ecf8d9f17fd20cd651386e568 DIST microcode-20240531.tar.gz 12870497 BLAKE2B 6a2c5ee6b6f3543b28f3753b30812e360bad50776b4f81e32a832e2169f38c11f8d5108ce0a81ddcdf1ecf7557baf1fd62c053a365f39a33ded5fd5018580b1f SHA512 fb9d772491f279ebb691248e4a665da45c986ca7b4668ecf311c5fcb91a42400f7a5b35e8bfc31ceb1c9d598e753c817359900e3fa316d825f8ecec21ec63cfe EBUILD intel-microcode-20240312_p20240312.ebuild 11701 BLAKE2B 311c85bb20393d56faf922bab93eb56ac9d4fcf61f25e00bb38e0610c74d6b90ac6d3f858be17bf4b701d66e95d637a57bf7e162284c799c347e4f1e58b9d1f9 SHA512 d6098dc85df3e8fe6e0538b95c24585d8c087e73f34b709c1f011492a50d91beb5bd627fa3d075a3d035e2817ac955f168b8da6f19675cf013ef92e2bf8bed59 EBUILD intel-microcode-20240514_p20240514.ebuild 11701 BLAKE2B 311c85bb20393d56faf922bab93eb56ac9d4fcf61f25e00bb38e0610c74d6b90ac6d3f858be17bf4b701d66e95d637a57bf7e162284c799c347e4f1e58b9d1f9 SHA512 d6098dc85df3e8fe6e0538b95c24585d8c087e73f34b709c1f011492a50d91beb5bd627fa3d075a3d035e2817ac955f168b8da6f19675cf013ef92e2bf8bed59 -EBUILD intel-microcode-20240531_p20240526-r1.ebuild 12041 BLAKE2B dfc50a9dcd8a1e334e206107d2d6d0c6c2f075fa24daa98ade7777274c678c5d3c8a61c31e12aefcd53e6d01bbc233868a1955b95a641572aa50fb024b8733ab SHA512 3fe2d5ba1fd6911600f4479de6281cdfa061a1f9003c64270873a5373d2c58d132f01b43e4c7fced562e833fe90f09274e840bf44afd83a4f232d9f4908601a8 +EBUILD intel-microcode-20240531_p20240526-r2.ebuild 12102 BLAKE2B bb133f39838ca995b90019bae4d3b67ab8fc5e8f106ddeb0455448e1bb91d35bacbe0fbfcabd72e550f67b3ae23dc88ce07e09fbc6c4dc10483d23aa074cd3d3 SHA512 944574fe929fc18dd06dc63f03da44e54838fbed17f96ff85e35036c9b5249c5aa180818fd0f0433cc2614c18d8ff39a7878d41ceb9a9b13e9777280a690cf61 MISC metadata.xml 853 BLAKE2B b9103bc6c00cd36211b33060a28dc72159fa1309644f6dc8005c415c8eb435217f1e39ba70a289bf9f93a3edac7e73f2227bfe711e745f8743ae455e2d1caa4a SHA512 c425c341725210af9693ed50ae9b9f91cd4c44539f1abe5fff9f59c3441eed39aee6746c881f7a812aec1bab1a8c4974e111980211cf4cfb55e1bdb12e394631 diff --git a/sys-firmware/intel-microcode/files/35-intel-microcode-systemd.install b/sys-firmware/intel-microcode/files/35-intel-microcode-systemd.install index 7ad7b8c49e83..58593a675b37 100644 --- a/sys-firmware/intel-microcode/files/35-intel-microcode-systemd.install +++ b/sys-firmware/intel-microcode/files/35-intel-microcode-systemd.install @@ -35,13 +35,18 @@ opts=( --no-downgrade ) -if [[ ${KERNEL_INSTALL_VERBOSE} == 1 ]]; then - echo "Generating Intel CPU Microcode early initramfs image..." - opts+=( - --list-all - --list - ) +if [[ -d /lib/firmware/intel-ucode ]]; then + if [[ ${KERNEL_INSTALL_VERBOSE} == 1 ]]; then + echo "Generating Intel CPU Microcode early initramfs image..." + opts+=( + --list-all + --list + ) + fi + + iucode_tool /lib/firmware/intel-ucode "${opts[@]}" || + { echo "iucode_tool failed" && exit 1; } +else + [[ ${KERNEL_INSTALL_VERBOSE} == 1 ]] && echo \ + "No Intel CPU Microcode installed, nothing to do here." fi - -iucode_tool /lib/firmware/intel-ucode "${opts[@]}" || - { echo "iucode_tool failed" && exit 1; } diff --git a/sys-firmware/intel-microcode/files/35-intel-microcode.install b/sys-firmware/intel-microcode/files/35-intel-microcode.install index d4e9ef19d56b..513b3a84d08e 100644 --- a/sys-firmware/intel-microcode/files/35-intel-microcode.install +++ b/sys-firmware/intel-microcode/files/35-intel-microcode.install @@ -41,9 +41,13 @@ main() { --list ) - einfo "Generating Intel CPU Microcode early initramfs image..." - iucode_tool /lib/firmware/intel-ucode "${opts[@]}" || - die "iucode_tool failed" + if [[ -d /lib/firmware/intel-ucode ]]; then + einfo "Generating Intel CPU Microcode early initramfs image..." + iucode_tool /lib/firmware/intel-ucode "${opts[@]}" || + die "iucode_tool failed" + else + einfo "No Intel CPU Microcode installed, nothing to do here." + fi } main diff --git a/sys-firmware/intel-microcode/intel-microcode-20240531_p20240526-r1.ebuild b/sys-firmware/intel-microcode/intel-microcode-20240531_p20240526-r2.ebuild index 55f66f30803d..947e22ff9bc2 100644 --- a/sys-firmware/intel-microcode/intel-microcode-20240531_p20240526-r1.ebuild +++ b/sys-firmware/intel-microcode/intel-microcode-20240531_p20240526-r2.ebuild @@ -45,16 +45,24 @@ LICENSE="intel-ucode" SLOT="0" KEYWORDS="-* ~amd64 ~x86" IUSE="dist-kernel hostonly +initramfs +split-ucode vanilla" -REQUIRED_USE="!dist-kernel? ( || ( initramfs split-ucode ) )" +REQUIRED_USE=" + || ( initramfs split-ucode ) + dist-kernel? ( split-ucode ) +" RESTRICT="binchecks strip" BDEPEND=">=sys-apps/iucode_tool-2.3" # !<sys-apps/microcode-ctl-1.17-r2 due to bug #268586 RDEPEND=" - dist-kernel? ( virtual/dist-kernel ) - hostonly? ( sys-apps/iucode_tool ) + dist-kernel? ( + virtual/dist-kernel + initramfs? ( + sys-apps/iucode_tool + ) + ) " IDEPEND=" + hostonly? ( sys-apps/iucode_tool ) dist-kernel? ( initramfs? ( sys-kernel/installkernel ) ) @@ -84,10 +92,10 @@ MICROCODE_SIGNATURES_DEFAULT="" pkg_pretend() { if use initramfs; then - if [[ -z ${ROOT} ]] && use dist-kernel; then + if use dist-kernel; then # Check, but don't die because we can fix the problem and then # emerge --config ... to re-run installation. - nonfatal mount-boot_check_status + [[ -z ${ROOT} ]] && nonfatal mount-boot_check_status else mount-boot_pkg_pretend fi @@ -302,8 +310,8 @@ pkg_postrm() { pkg_postinst() { if use initramfs; then - if [[ -z ${ROOT} ]] && use dist-kernel; then - dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" + if use dist-kernel; then + [[ -z ${ROOT} ]] && dist-kernel_reinstall_initramfs "${KV_DIR}" "${KV_FULL}" else # Don't forget to umount /boot if it was previously mounted by us. mount-boot_pkg_postinst |