diff options
| author | Ermine <mustela@erminea.space> | 2025-02-12 15:24:13 +0000 |
|---|---|---|
| committer | Zach van Rijn <me@zv.io> | 2025-02-12 15:24:13 +0000 |
| commit | 9b201769d0fde905fafb4732bca4df77b3cccb80 (patch) | |
| tree | 08bc29be393cf43b115834523675664ca4276663 | |
| parent | ec7c66aa5c2cb57da6ec8fc667305cabface26fa (diff) | |
| download | packages-9b201769d0fde905fafb4732bca4df77b3cccb80.tar.gz packages-9b201769d0fde905fafb4732bca4df77b3cccb80.tar.bz2 packages-9b201769d0fde905fafb4732bca4df77b3cccb80.tar.xz packages-9b201769d0fde905fafb4732bca4df77b3cccb80.zip | |
user/linux-firmware: remove symlinks from -other
| -rw-r--r-- | user/linux-firmware/APKBUILD | 39 | ||||
| -rw-r--r-- | user/linux-firmware/linux-firmware-other.post-upgrade | 16 |
2 files changed, 38 insertions, 17 deletions
diff --git a/user/linux-firmware/APKBUILD b/user/linux-firmware/APKBUILD index 345cfa89a..e0b9c54d2 100644 --- a/user/linux-firmware/APKBUILD +++ b/user/linux-firmware/APKBUILD @@ -4,7 +4,7 @@ # Maintainer: Síle Ekaterin Liszka <sheila@vulpine.house> pkgname=linux-firmware pkgver=20241210 -pkgrel=1 +pkgrel=2 pkgdesc="firmware files for linux" url="http://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git;a=summary" arch="all" @@ -27,25 +27,29 @@ vxge wfx xe yam yamaha" subpackages="$pkgname-other" depends="linux-firmware-other" for i in $_folders; do - subpackages="$pkgname-$i:folder $subpackages" - depends="$pkgname-$i $depends" + subpackages="$pkgname-$i:folder $subpackages" + depends="$pkgname-$i $depends" done package() { - make DESTDIR="${pkgdir}" FIRMWAREDIR="/lib/firmware" install-zst + make DESTDIR="${pkgdir}" FIRMWAREDIR="/lib/firmware" install-zst make DESTDIR="${pkgdir}" FIRMWAREDIR="/lib/firmware" dedup - rm -f "${pkgdir}/usr/lib/firmware/{Makefile,README,configure,GPL-3}" + rm -f "${pkgdir}/usr/lib/firmware/{Makefile,README,configure,GPL-3}" } folder() { - folder=${subpkgname##linux-firmware-} - pkgdesc="firmware files for linux ($folder folder)" - depends="" + folder=${subpkgname##linux-firmware-} + pkgdesc="firmware files for linux ($folder folder)" + depends="" - # Move /lib/firmware/$folder (case insensitive) - mkdir -p "$subpkgdir/lib/firmware" - mv "$(find "$pkgdir/lib/firmware" -iname "$folder" -type d)" \ - "$subpkgdir/lib/firmware" + # Move /lib/firmware/$folder (case insensitive) + mkdir -p "$subpkgdir/lib/firmware" + mv "$(find "$pkgdir/lib/firmware" -iname "$folder" -type d)" \ + "$subpkgdir/lib/firmware" + + # Move related symlinks so they do not get in -other + find "$pkgdir/lib/firmware" -maxdepth 1 -ilname "$folder"/\* \ + -exec mv -- '{}' "$subpkgdir/lib/firmware" \; } other() { @@ -62,11 +66,12 @@ other() { return 1 fi - # Move /lib/firmware (which doesn't have subfolders now) - pkgdesc="firmware files for linux (uncategorized)" - depends="" - mkdir -p "$subpkgdir"/ - mv "$pkgdir"/lib "$subpkgdir"/ + # Move /lib/firmware (which doesn't have subfolders now) + pkgdesc="firmware files for linux (uncategorized)" + depends="" + install="$subpkgname.post-upgrade" + mkdir -p "$subpkgdir"/ + mv "$pkgdir"/lib "$subpkgdir"/ } sha512sums="75e2d7383e209c2f787a4369e171e2d9bd16dc9cc1cd74920874d1dc56a950df95981be942fd7aa95620ef18da3e50d0fd95886c1497c91c4e54f564fe381fc3 linux-firmware-20241210.tar.gz" diff --git a/user/linux-firmware/linux-firmware-other.post-upgrade b/user/linux-firmware/linux-firmware-other.post-upgrade new file mode 100644 index 000000000..e821b1015 --- /dev/null +++ b/user/linux-firmware/linux-firmware-other.post-upgrade @@ -0,0 +1,16 @@ +#!/bin/sh -e + +vnew="$1" +vold="$2" + +if test `apk version -t $vnew 20241210-r0` = '>' && test `apk version -t $vold 20241210-r0` != '>' ; then + echo + echo '***' + echo 'The linux-firmware package was repartitioned. Due to this, firmware' + echo 'files from go7007, mediatek, ath10k, qcom and ti folders might have' + echo 'been removed. If your hardware needs these files, please install' + echo 'relevant linux-firmware subpackage.' + echo 'If unsure, install the whole linux-firmware package.' + echo '***' + echo +fi |