git » linux-firmware.git » commit a9ffb40

Remove firmware before splitting

author Jan Alexander Steffens (heftig)
2023-06-29 20:13:51 UTC
committer Jan Alexander Steffens (heftig)
2023-06-30 13:17:45 UTC
parent 80432e684fcf960c1fd8822d4df11c2cf06e3547

Remove firmware before splitting

This keeps the split package functions uniform and makes the code easier
to read.

PKGBUILD +11 -8
keys/pgp/4CDE8575E547BF835FE15807A31B6BD72486CFD6.asc +65 -52

diff --git a/PKGBUILD b/PKGBUILD
index 145f341..e7c0903 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -75,16 +75,21 @@ package_linux-firmware() {
 
   ZSTD_CLEVEL=19 make DESTDIR="${pkgdir}" FIRMWAREDIR=/usr/lib/firmware install-zst
 
-  # useless (FS#46591)
-  # Trigger a microcode reload for configurations not using early updates
-  #echo 'w /sys/devices/system/cpu/microcode/reload - - - - 1' |
-  #  install -Dm644 /dev/stdin "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
+  # useless without CONFIG_MICROCODE_LATE_LOADING
+  # https://bugs.archlinux.org/task/46591
+  #
+  # # Trigger a microcode reload for configurations not using early updates
+  # echo 'w /sys/devices/system/cpu/microcode/reload - - - - 1' |
+  #   install -Dm644 /dev/stdin "${pkgdir}/usr/lib/tmpfiles.d/${pkgname}.conf"
 
   install -Dt "${pkgdir}/usr/share/licenses/${pkgname}" -m644 LICEN*
 
-  # split
   cd "${pkgdir}"
 
+  # remove arm64 firmware https://bugs.archlinux.org/task/76583
+  rm usr/lib/firmware/mrvl/prestera/mvsw_prestera_fw_arm64-v4.1.img.zst
+
+  # split
   _pick linux-firmware-nfp usr/lib/firmware/netronome
   _pick linux-firmware-nfp usr/share/licenses/${pkgname}/LICENCE.Netronome
 
@@ -131,10 +136,8 @@ package_linux-firmware-mellanox() {
 package_linux-firmware-marvell() {
   pkgdesc+=" - marvell / Firmware for Marvell devices"
   depends=('linux-firmware-whence')
-  
+
   mv -v linux-firmware-marvell/* "${pkgdir}"
-  # remove arm64 firmware #76583
-  rm "${pkgdir}"/usr/lib/firmware/mrvl/prestera/mvsw_prestera_fw_arm64-v4.1.img.zst
 }
 
 package_linux-firmware-qcom() {
diff --git a/keys/pgp/4CDE8575E547BF835FE15807A31B6BD72486CFD6.asc b/keys/pgp/4CDE8575E547BF835FE15807A31B6BD72486CFD6.asc
index 37d4288..3c11a0a 100644
--- a/keys/pgp/4CDE8575E547BF835FE15807A31B6BD72486CFD6.asc
+++ b/keys/pgp/4CDE8575E547BF835FE15807A31B6BD72486CFD6.asc
@@ -11,56 +11,69 @@ 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
-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
-Ph526dJouxjS2cRUHviwKE3dmFs5
-=rB6a
+tCZKb3NoIEJveWVyIDxqd2JveWVyQGZlZG9yYXByb2plY3Qub3JnPokCOAQTAQIA
+IgUCTo20NwIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AACgkQoxtr1ySGz9Yh
+BRAAvRyhcPaGxwgE2OMiHx1fPv1te6gZIci/+o6NSVimnHeAcQ0Yq95z/DsgrY2y
+fX/V8kcIOfGQ2423lD8AiFPGujsjJutYYuB3K1WkE5H5U9WTTebmV3cQrBjy60sL
+x3T24QcLVzVJP+x9POzVNc2X+Er961cRIVKalQLijwvpkFuyAuMED8aNuFwUZQX5
+JycbojqbogsA+TdVXKKoP3eAlS4jN25xkFMowwSTC+pk8ie4jEfepwVPG3QMS9gJ
+HE0tAiEKuo/uxL5XC4VleALAhplY+ln7NZVz/74uGZECZFXaAblYiPDFbYYd6NsU
+uEBYiuDqYuPC4OyMe+TxzdI6+5WmaI4KxIBb/1PGosXPqYjlV5h99E05RbGUpeOC
+qf7OyvVJILYubL5pvc9bXg1GQCJWbFWgEzx29hMIKIP+Ehy6+1PwBrqSghH/6DDN
+dCK0vuiA+qPwOdYfdA0+70esJbM0PCKdnYzNaFbgN/J5150EfBj1SH9eWTj0kSm0
+flQYj2SkekI3bb+3b0XaB+b6byLw+xqEpAHamNVj5YA1CoghCDtvoljp/XxvjtNF
+MYVb5ih8PkxT4pku8uQvDS/k0GGae6wNKNcznJMimo0wss2V5qBxqwqpsAlxJJ3E
+vATbQ44yaOWzaZ9V4us+Hnbp0mi7GNLZxFQe+LAoTd2YWzm0Hkpvc2ggQm95ZXIg
+PGpib3llckByZWRoYXQuY29tPokCOAQTAQIAIgUCTomz2AIbAwYLCQgHAwIGFQgC
+CQoLBBYCAwECHgECF4AACgkQoxtr1ySGz9Z9eA//Ysv3AZueXEWvAjNIMYV0Mbii
+aW9fsjtGMsAt5oNZtxOBbMXqYTI6nCgAkl6dTy5RWzoEINytja0Bb4qz0vGD1vGD
+31tT4b5wQNCIpOb2Y18oXV8xLi7Ga2i6DLt7uQSSdzP1YOBJi2CYjNKZ3XsGrZ3w
+a5m/wGZZZco4YSyFKWq7jqmErrbxnJc1jp/uKZDeJ4ZCv2I7gsLInPrfC79qZQX8
+U05ca1j535CnaUr+KK1QBLomcBZGqBa3x6jzj9asowVl6x30D6Kg6E1ccyJ/hU4J
+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
+DmtUgeBWSPWnSoAlIjsYDumNoHd5PpI=
+=Xq/w
 -----END PGP PUBLIC KEY BLOCK-----