core/linux-am33x to 6.2.10-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:01:47 -04:00
parent d371fbfb44
commit ec63b5bb9d
2 changed files with 3 additions and 4 deletions

View file

@ -8,7 +8,7 @@ _srcname=linux-6.2
_kernelname=${pkgbase#linux} _kernelname=${pkgbase#linux}
_desc="TI AM335x Beaglebone (Black)" _desc="TI AM335x Beaglebone (Black)"
pkgver=6.2.10 pkgver=6.2.10
pkgrel=1 pkgrel=2
rcnver=6.2.1 rcnver=6.2.1
rcnrel=bone8 rcnrel=bone8
arch=('armv7h') arch=('armv7h')
@ -30,7 +30,7 @@ md5sums=('787862593d7bf354cf1a5c37e21fc147'
'SKIP' 'SKIP'
'ee16bcdbbf978e714455933ecd6dd8fe' 'ee16bcdbbf978e714455933ecd6dd8fe'
'cca7518ee96ca87bcd2141e0a6d7625b' 'cca7518ee96ca87bcd2141e0a6d7625b'
'78ccc998f27eec49a9d5490218b1b1ab' 'c733051a2f80ac8f250c8ce2338175b1'
'79fa396e3f9a09a85156d6d7c2d34b58') '79fa396e3f9a09a85156d6d7c2d34b58')
prepare() { prepare() {
@ -92,7 +92,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=('crda: to set the correct wireless channels of your country') optdepends=('crda: 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-ti') replaces=('linux-ti')

View file

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