commit: 2289c56e7ea222a3f37d25b07214281560deccb8 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Tue Sep 20 02:01:00 2022 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Tue Sep 20 02:07:27 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2289c56e
sys-kernel/linux-firmware: tweak directory removal logic Adjust the has_version call to check include 20220913 for those of us who upgraded at a bad time. Don't execute the same code in pkg_postinst. That just ends up removing the symlink. Bug: https://bugs.gentoo.org/871315 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> ...rmware-20220913-r1.ebuild => linux-firmware-20220913-r2.ebuild} | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/sys-kernel/linux-firmware/linux-firmware-20220913-r1.ebuild b/sys-kernel/linux-firmware/linux-firmware-20220913-r2.ebuild similarity index 97% rename from sys-kernel/linux-firmware/linux-firmware-20220913-r1.ebuild rename to sys-kernel/linux-firmware/linux-firmware-20220913-r2.ebuild index a7c4c4ee148e..49b0902920bc 100644 --- a/sys-kernel/linux-firmware/linux-firmware-20220913-r1.ebuild +++ b/sys-kernel/linux-firmware/linux-firmware-20220913-r2.ebuild @@ -316,7 +316,7 @@ pkg_preinst() { fi # Fix 'symlink is blocked by a directory' Bug #871315 - if has_version "<${CATEGORY}/${PN}-20220913" ; then + if has_version "<${CATEGORY}/${PN}-20220913-r2" ; then rm -rf "${ROOT}"/lib/firmware/qcom/LENOVO/21BX fi @@ -339,11 +339,6 @@ pkg_postinst() { fi done - # Fix 'symlink is blocked by a directory' Bug #871315 - if has_version "<${CATEGORY}/${PN}-20220913" ; then - rm -rf "${ROOT}"/lib/firmware/qcom/LENOVO/21BX - fi - # Don't forget to umount /boot if it was previously mounted by us. use initramfs && mount-boot_pkg_postinst }
