From 75a9f5618edbc6f45979714c4bf4b995d7f2a20a Mon Sep 17 00:00:00 2001 From: graysky Date: Sun, 18 Aug 2024 12:04:44 -0400 Subject: [PATCH] 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 --- core/linux-aarch64-rc/PKGBUILD | 3 +-- core/linux-aarch64-rc/linux.preset | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/core/linux-aarch64-rc/PKGBUILD b/core/linux-aarch64-rc/PKGBUILD index 15244dc56..33152f209 100644 --- a/core/linux-aarch64-rc/PKGBUILD +++ b/core/linux-aarch64-rc/PKGBUILD @@ -34,7 +34,7 @@ md5sums=('41d2f438d53dc25c998379d139ff0201' '7c97cf141750ad810235b1ad06eb9f75' '61c5ff73c136ed07a7aadbf58db3d96a' '584777ae88bce2c5659960151b64c7d8' - '41cb5fef62715ead2dd109dbea8413d6' + '33ba82001fca579d43172a6db25d6aca' '0a5f16bfec6ad982a2f6782724cca8ba' '3dc88030a8f2f5a5f97266d99b149f77') @@ -74,7 +74,6 @@ _package() { provides=("linux=${pkgver}" "WIREGUARD-MODULE") replaces=('linux-armv8-rc') conflicts=('linux') - backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=${pkgname}.install cd $_srcname diff --git a/core/linux-aarch64-rc/linux.preset b/core/linux-aarch64-rc/linux.preset index f3430fba3..7f3444e16 100644 --- a/core/linux-aarch64-rc/linux.preset +++ b/core/linux-aarch64-rc/linux.preset @@ -1,6 +1,6 @@ # mkinitcpio preset file for the '%PKGBASE%' package -ALL_config="/etc/mkinitcpio.conf" +#ALL_config="/etc/mkinitcpio.conf" ALL_kver="%KERNVER%" PRESETS=('default' 'fallback')