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
This commit is contained in:
graysky 2024-08-18 12:06:45 -04:00
parent 82640c060a
commit d371fbfb44
2 changed files with 3 additions and 4 deletions

View file

@ -8,7 +8,7 @@ _srcname=linux-5.10
_kernelname=${pkgbase#linux} _kernelname=${pkgbase#linux}
_desc="Globalscale ESPRESSOBin" _desc="Globalscale ESPRESSOBin"
pkgver=5.10.16 pkgver=5.10.16
pkgrel=1 pkgrel=2
arch=('aarch64') arch=('aarch64')
url="http://www.kernel.org/" url="http://www.kernel.org/"
license=('GPL2') license=('GPL2')
@ -24,7 +24,7 @@ source=("http://www.kernel.org/pub/linux/kernel/v5.x/${_srcname}.tar.xz"
md5sums=('753adc474bf799d569dec4f165ed92c3' md5sums=('753adc474bf799d569dec4f165ed92c3'
'6eb3cfa9872f7c0cbc59e5c17eca854c' '6eb3cfa9872f7c0cbc59e5c17eca854c'
'91db2c2612382a535c851169c5873612' '91db2c2612382a535c851169c5873612'
'86d4a35722b5410e3b29fc92dae15d4b' '8b93b6ca167f70c60277f352f7b78024'
'ce6c81ad1ad1f8b333fd6077d47abdaf' 'ce6c81ad1ad1f8b333fd6077d47abdaf'
'3dc88030a8f2f5a5f97266d99b149f77' '3dc88030a8f2f5a5f97266d99b149f77'
'9d68f10566962252c5190b386cd1584a') '9d68f10566962252c5190b386cd1584a')
@ -81,7 +81,6 @@ _package() {
optdepends=('crda: to set the correct wireless channels of your country') optdepends=('crda: to set the correct wireless channels of your country')
provides=("linux=${pkgver}" "WIREGUARD-MODULE") provides=("linux=${pkgver}" "WIREGUARD-MODULE")
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') PRESETS=('default')