From d371fbfb442b11a50d5f2b1ae947870b5257df59 Mon Sep 17 00:00:00 2001 From: graysky Date: Sun, 18 Aug 2024 12:06:45 -0400 Subject: [PATCH] core/linux-espressobin to 5.10.16-2 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-espressobin/PKGBUILD | 5 ++--- core/linux-espressobin/linux.preset | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/linux-espressobin/PKGBUILD b/core/linux-espressobin/PKGBUILD index ba3653b73..cb3b208fb 100644 --- a/core/linux-espressobin/PKGBUILD +++ b/core/linux-espressobin/PKGBUILD @@ -8,7 +8,7 @@ _srcname=linux-5.10 _kernelname=${pkgbase#linux} _desc="Globalscale ESPRESSOBin" pkgver=5.10.16 -pkgrel=1 +pkgrel=2 arch=('aarch64') url="http://www.kernel.org/" license=('GPL2') @@ -24,7 +24,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz" md5sums=('753adc474bf799d569dec4f165ed92c3' '6eb3cfa9872f7c0cbc59e5c17eca854c' '91db2c2612382a535c851169c5873612' - '86d4a35722b5410e3b29fc92dae15d4b' + '8b93b6ca167f70c60277f352f7b78024' 'ce6c81ad1ad1f8b333fd6077d47abdaf' '3dc88030a8f2f5a5f97266d99b149f77' '9d68f10566962252c5190b386cd1584a') @@ -81,7 +81,6 @@ _package() { optdepends=('crda: to set the correct wireless channels of your country') provides=("linux=${pkgver}" "WIREGUARD-MODULE") conflicts=('linux') - backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=${pkgname}.install cd ${_srcname} diff --git a/core/linux-espressobin/linux.preset b/core/linux-espressobin/linux.preset index 8d7f379c9..5250366af 100644 --- a/core/linux-espressobin/linux.preset +++ b/core/linux-espressobin/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')