From 82640c060aea4056997122a21b7c508b47b54c4d Mon Sep 17 00:00:00 2001 From: graysky Date: Sun, 18 Aug 2024 11:55:10 -0400 Subject: [PATCH] core/linux-odroid-c2 to 3.16.85-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-odroid-c2/PKGBUILD | 5 ++--- core/linux-odroid-c2/linux.preset | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/core/linux-odroid-c2/PKGBUILD b/core/linux-odroid-c2/PKGBUILD index 363e51407..4bc5582cb 100644 --- a/core/linux-odroid-c2/PKGBUILD +++ b/core/linux-odroid-c2/PKGBUILD @@ -9,7 +9,7 @@ _srcname=linux-${_commit} _kernelname=${pkgbase#linux} _desc="ODROID-C2" pkgver=3.16.85 -pkgrel=1 +pkgrel=2 arch=('aarch64') url="https://github.com/hardkernel/linux/tree/odroidc2-v3.16.y" license=('GPL2') @@ -49,7 +49,7 @@ md5sums=('594c5a6c9d16afff5504f83ccc886c37' '8c22925423abc152c24c8e120b9a9fb1' 'e1449557cf7ff2d17398e8d36708cf61' 'a4671795064a0ce28408584dd60520ac' - '86d4a35722b5410e3b29fc92dae15d4b' + '8b93b6ca167f70c60277f352f7b78024' 'b8956789318f49cec5b8bb0b41654a9b' 'ce6c81ad1ad1f8b333fd6077d47abdaf' '3dc88030a8f2f5a5f97266d99b149f77') @@ -116,7 +116,6 @@ _package() { optdepends=('crda: to set the correct wireless channels of your country') provides=('kernel26' "linux=${pkgver}") conflicts=('linux') - backup=("etc/mkinitcpio.d/${pkgbase}.preset") install=${pkgname}.install cd "${srcdir}/${_srcname}" diff --git a/core/linux-odroid-c2/linux.preset b/core/linux-odroid-c2/linux.preset index 8d7f379c9..5250366af 100644 --- a/core/linux-odroid-c2/linux.preset +++ b/core/linux-odroid-c2/linux.preset @@ -1,6 +1,6 @@ # mkinitcpio preset file for the '%PKGBASE%' package -ALL_config="/etc/mkinitcpio.conf" +#ALL_config="/etc/mkinitcpio.conf" ALL_kver="%KERNVER%" PRESETS=('default')