mirror of
https://github.com/archlinuxarm/PKGBUILDs.git
synced 2024-11-08 22:45:43 +00:00
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:
parent
ec63b5bb9d
commit
e5dbb216e0
2 changed files with 2 additions and 3 deletions
|
@ -47,7 +47,7 @@ md5sums=('41d2f438d53dc25c998379d139ff0201'
|
||||||
'0963ff6490be16935370812fc75fa065'
|
'0963ff6490be16935370812fc75fa065'
|
||||||
'61c5ff73c136ed07a7aadbf58db3d96a'
|
'61c5ff73c136ed07a7aadbf58db3d96a'
|
||||||
'584777ae88bce2c5659960151b64c7d8'
|
'584777ae88bce2c5659960151b64c7d8'
|
||||||
'ae7ccb81e057c4d81401e725f102ee5f'
|
'62e81181b7c646f2d6a52c0047248b8e'
|
||||||
'79fa396e3f9a09a85156d6d7c2d34b58')
|
'79fa396e3f9a09a85156d6d7c2d34b58')
|
||||||
|
|
||||||
prepare() {
|
prepare() {
|
||||||
|
@ -109,7 +109,6 @@ _package() {
|
||||||
pkgdesc="The Linux Kernel and modules - ${_desc}"
|
pkgdesc="The Linux Kernel and modules - ${_desc}"
|
||||||
depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
|
depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7')
|
||||||
optdepends=('wireless-regdb: to set the correct wireless channels of your country')
|
optdepends=('wireless-regdb: to set the correct wireless channels of your country')
|
||||||
backup=("etc/mkinitcpio.d/${pkgbase}.preset")
|
|
||||||
provides=("linux=${pkgver}" "WIREGUARD-MODULE")
|
provides=("linux=${pkgver}" "WIREGUARD-MODULE")
|
||||||
conflicts=('linux')
|
conflicts=('linux')
|
||||||
replaces=('linux-mvebu')
|
replaces=('linux-mvebu')
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# mkinitcpio preset file for the linux-armv7-rc package
|
# 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"
|
ALL_kver="4.10.0-rc4-1-ARCH"
|
||||||
|
|
||||||
PRESETS=('default')
|
PRESETS=('default')
|
||||||
|
|
Loading…
Reference in a new issue