From ec63b5bb9dde85883124b1173ea3e882a9f79bea Mon Sep 17 00:00:00 2001 From: graysky Date: Sun, 18 Aug 2024 12:01:47 -0400 Subject: [PATCH] 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 --- core/linux-am33x/PKGBUILD | 5 ++--- core/linux-am33x/linux.preset | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/linux-am33x/PKGBUILD b/core/linux-am33x/PKGBUILD index c0fec2fa3..4f3041618 100644 --- a/core/linux-am33x/PKGBUILD +++ b/core/linux-am33x/PKGBUILD @@ -8,7 +8,7 @@ _srcname=linux-6.2 _kernelname=${pkgbase#linux} _desc="TI AM335x Beaglebone (Black)" pkgver=6.2.10 -pkgrel=1 +pkgrel=2 rcnver=6.2.1 rcnrel=bone8 arch=('armv7h') @@ -30,7 +30,7 @@ md5sums=('787862593d7bf354cf1a5c37e21fc147' 'SKIP' 'ee16bcdbbf978e714455933ecd6dd8fe' 'cca7518ee96ca87bcd2141e0a6d7625b' - '78ccc998f27eec49a9d5490218b1b1ab' + 'c733051a2f80ac8f250c8ce2338175b1' '79fa396e3f9a09a85156d6d7c2d34b58') prepare() { @@ -92,7 +92,6 @@ _package() { pkgdesc="The Linux Kernel and modules - ${_desc}" depends=('coreutils' 'linux-firmware' 'kmod' 'mkinitcpio>=0.7') optdepends=('crda: to set the correct wireless channels of your country') - backup=("etc/mkinitcpio.d/${pkgbase}.preset") provides=("linux=${pkgver}" "WIREGUARD-MODULE") conflicts=('linux') replaces=('linux-ti') diff --git a/core/linux-am33x/linux.preset b/core/linux-am33x/linux.preset index ac64f3fa8..6db321239 100644 --- a/core/linux-am33x/linux.preset +++ b/core/linux-am33x/linux.preset @@ -1,6 +1,6 @@ # 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" PRESETS=('default')