From 5c35761b434e094140cb6dbbca704cbe19065ad0 Mon Sep 17 00:00:00 2001 From: graysky Date: Tue, 17 Sep 2024 14:48:41 -0400 Subject: [PATCH] core/linux-armv7 to 6.11-2 Comment out non-existent upstream patch for 6.11.0 --- core/linux-armv7/PKGBUILD | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/core/linux-armv7/PKGBUILD b/core/linux-armv7/PKGBUILD index d1647c5ff..0ef40ed46 100644 --- a/core/linux-armv7/PKGBUILD +++ b/core/linux-armv7/PKGBUILD @@ -8,7 +8,7 @@ _srcname=linux-6.11 _kernelname=${pkgbase#linux} _desc="ARMv7 multi-platform" pkgver=6.11 -pkgrel=1 +pkgrel=2 rcnver=6.11.0 rcnrel=multiv7-r1 arch=('armv7h') @@ -17,7 +17,7 @@ license=('GPL2') makedepends=('xmlto' 'docbook-xsl' 'kmod' 'inetutils' 'bc' 'git' 'uboot-tools' 'vboot-utils' 'dtc') options=('!strip') source=("https://www.kernel.org/pub/linux/kernel/v6.x/${_srcname}.tar.xz" - "https://www.kernel.org/pub/linux/kernel/v6.x/patch-${pkgver}.xz" + #"https://www.kernel.org/pub/linux/kernel/v6.x/patch-${pkgver}.xz" "https://rcn-ee.com/deb/sid-armhf/v${rcnver}-${rcnrel}/patch-${rcnver%.0}-${rcnrel}.diff.gz" '0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch' '0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch' @@ -32,7 +32,6 @@ source=("https://www.kernel.org/pub/linux/kernel/v6.x/${_srcname}.tar.xz" 'kernel_data_key.vbprivk' 'linux.preset') md5sums=('612a9feef07be8663098a0a58cddf7a6' - '34b2dcd66d05861b6fd46bffd5228f3d' 'a8fee8d94b748323e10b256c3589dd10' 'f531ad638bb6dd9d8e9e2e880c97ea12' 'e3b3f3fa4ccd1f63b24fb6985c8052f3' @@ -55,7 +54,7 @@ prepare() { echo "${pkgbase#linux}" > localversion.20-pkgname # add upstream patch - git apply --whitespace=nowarn ../patch-${pkgver} + #git apply --whitespace=nowarn ../patch-${pkgver} # RCN patch git apply ../patch-${rcnver%.0}-${rcnrel}.diff