core/linux-aarch64-rc: fixes without bumping pkgrel

Fix drop-ins for mkinitcpio by shipping ALL_config comment out
in inux.preset.  With this line defined, *.conf placed in
/etc/mkinitcpio.conf.d/ are ignored in my testing.

Remove etc/mkinitcpio.d/${pkgbase}.preset from backup array
since having it there will cause breakage of mkinitcpio if
the user modified the preset.  This is due to our hard-coding
the kernel version in the file.  Closes #2029
This commit is contained in:
graysky 2024-08-18 12:04:44 -04:00
parent e5dbb216e0
commit 75a9f5618e
2 changed files with 2 additions and 3 deletions

View file

@ -34,7 +34,7 @@ md5sums=('41d2f438d53dc25c998379d139ff0201'
'7c97cf141750ad810235b1ad06eb9f75' '7c97cf141750ad810235b1ad06eb9f75'
'61c5ff73c136ed07a7aadbf58db3d96a' '61c5ff73c136ed07a7aadbf58db3d96a'
'584777ae88bce2c5659960151b64c7d8' '584777ae88bce2c5659960151b64c7d8'
'41cb5fef62715ead2dd109dbea8413d6' '33ba82001fca579d43172a6db25d6aca'
'0a5f16bfec6ad982a2f6782724cca8ba' '0a5f16bfec6ad982a2f6782724cca8ba'
'3dc88030a8f2f5a5f97266d99b149f77') '3dc88030a8f2f5a5f97266d99b149f77')
@ -74,7 +74,6 @@ _package() {
provides=("linux=${pkgver}" "WIREGUARD-MODULE") provides=("linux=${pkgver}" "WIREGUARD-MODULE")
replaces=('linux-armv8-rc') replaces=('linux-armv8-rc')
conflicts=('linux') conflicts=('linux')
backup=("etc/mkinitcpio.d/${pkgbase}.preset")
install=${pkgname}.install install=${pkgname}.install
cd $_srcname cd $_srcname

View file

@ -1,6 +1,6 @@
# mkinitcpio preset file for the '%PKGBASE%' package # mkinitcpio preset file for the '%PKGBASE%' package
ALL_config="/etc/mkinitcpio.conf" #ALL_config="/etc/mkinitcpio.conf"
ALL_kver="%KERNVER%" ALL_kver="%KERNVER%"
PRESETS=('default' 'fallback') PRESETS=('default' 'fallback')