core/linux-armv7-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:15 -04:00
parent ec63b5bb9d
commit e5dbb216e0
2 changed files with 2 additions and 3 deletions

View file

@ -47,7 +47,7 @@ md5sums=('41d2f438d53dc25c998379d139ff0201'
'0963ff6490be16935370812fc75fa065'
'61c5ff73c136ed07a7aadbf58db3d96a'
'584777ae88bce2c5659960151b64c7d8'
'ae7ccb81e057c4d81401e725f102ee5f'
'62e81181b7c646f2d6a52c0047248b8e'
'79fa396e3f9a09a85156d6d7c2d34b58')
prepare() {
@ -109,7 +109,6 @@ _package() {
pkgdesc="The Linux Kernel and modules - ${_desc}"
depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
optdepends=('wireless-regdb: to set the correct wireless channels of your country')
backup=("etc/mkinitcpio.d/${pkgbase}.preset")
provides=("linux=${pkgver}" "WIREGUARD-MODULE")
conflicts=('linux')
replaces=('linux-mvebu')

View file

@ -1,6 +1,6 @@
# mkinitcpio preset file for the linux-armv7-rc package
ALL_config="/etc/mkinitcpio.conf"
#ALL_config="/etc/mkinitcpio.conf"
ALL_kver="4.10.0-rc4-1-ARCH"
PRESETS=('default')