diff --git a/danctnix-besser-pkgbuild/kernel/PKGBUILD b/danctnix-besser-pkgbuild/kernel/PKGBUILD index 76e2492b3..64eb1c01a 100644 --- a/danctnix-besser-pkgbuild/kernel/PKGBUILD +++ b/danctnix-besser-pkgbuild/kernel/PKGBUILD @@ -103,7 +103,9 @@ _package() { provides=( KSMBD-MODULE WIREGUARD-MODULE + "linux-pinetab2=$pkgver-$pkgrel" ) + conflicts=(linux-pinetab2) replaces=( wireguard-arch ) @@ -126,12 +128,12 @@ _package() { echo "Installing device trees..." make INSTALL_DTBS_PATH="$pkgdir/boot/dtbs" dtbs_install - # Removing unnecessary device tree - for dtb in "$pkgdir"/boot/dtbs/rockchip/*; do - [[ $dtb = *-pinetab2-* ]] && continue - echo "Removing $(basename "$dtb")" - rm "$dtb" - done + # Removing unnecessary device trees (keep only pinetab2 variants). + # Use find -delete instead of a bash for-loop: the previous for-loop + # silently no-op'd in the makepkg environment, leaving 234 unrelated + # board DTBs in the package. find is robust to nullglob/cwd quirks. + find "$pkgdir"/boot/dtbs/rockchip/ -mindepth 1 -maxdepth 1 -type f \ + ! -name 'rk3566-pinetab2-*' -delete # remove build link rm "$modulesdir"/build