From 1fd3c5e165aa0df8b9fbeb76f5d85251450e7324 Mon Sep 17 00:00:00 2001 From: graysky Date: Wed, 15 Mar 2023 16:14:34 -0400 Subject: [PATCH] core/linux-rpi to 6.1.19-1 --- core/linux-rpi/PKGBUILD | 17 ++++++----------- core/linux-rpi/config | 6 +----- core/linux-rpi/config8 | 7 +------ 3 files changed, 8 insertions(+), 22 deletions(-) diff --git a/core/linux-rpi/PKGBUILD b/core/linux-rpi/PKGBUILD index 1363213e7..bab879786 100644 --- a/core/linux-rpi/PKGBUILD +++ b/core/linux-rpi/PKGBUILD @@ -5,12 +5,12 @@ # Contributer: Jan Alexander Steffens (heftig) pkgbase=linux-rpi -_commit=02928eb7eb435c6ec86745dcbb6ff99992128149 +_commit=1cd16c5d102a6d91c7903b133ac973c6a872950b _srcname=linux-${_commit} _kernelname=${pkgbase#linux} _regen= -pkgver=6.1.16 -pkgrel=3 +pkgver=6.1.19 +pkgrel=1 pkgdesc='Linux' url="http://www.kernel.org/" arch=(armv7h aarch64) @@ -24,23 +24,21 @@ source_aarch64=('config8' 'config8.txt') source=("linux-$pkgver-${_commit:0:10}.tar.gz::https://github.com/raspberrypi/linux/archive/${_commit}.tar.gz" cmdline.txt 0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch - 0002-blk-cgroup-Revert-changes-causing-NULL-derefs-on-unm.patch linux.preset 60-linux.hook 90-linux.hook archarm.diffconfig ) -md5sums=('40bc7797903c3730848cf1e692c9feb7' +md5sums=('b5a6cfbb1dfef2b3e173adccc28c69fe' '3bab7426d8c8818dda8353da3892a41f' 'f66a7ea3feb708d398ef57e4da4815e9' - '2e0affdf7f2290e5c214745d2318d5db' '86d4a35722b5410e3b29fc92dae15d4b' '0a5f16bfec6ad982a2f6782724cca8ba' '441ec084c47cddc53e592fb0cbce4edf' 'd1a9b105e3d6b8c4cf2a8411258f7fdf') -md5sums_armv7h=('114d92ee6b6d0ce2f7bec2c3d0d76fdd' +md5sums_armv7h=('3de023782880c2a6736e4c131ffd30fe' '177bbdbe1baa46a04dcba86352cfa3fe') -md5sums_aarch64=('483578bf0d98024edba2e512516f8f3a' +md5sums_aarch64=('2915c3e47347949feb7a737842d69500' '7e4403dea857e40005bf76beda9927ff') # setup vars @@ -56,9 +54,6 @@ prepare() { # consistent behavior of lscpu on arm/arm64 patch -p1 -i ../0001-Make-proc-cpuinfo-consistent-on-arm64-and-arm.patch - # https://bugs.archlinux.org/task/77811 - patch -p1 -i ../0002-blk-cgroup-Revert-changes-causing-NULL-derefs-on-unm.patch - echo "Setting version..." scripts/setlocalversion --save-scmversion echo "-$pkgrel" > localversion.10-pkgrel diff --git a/core/linux-rpi/config b/core/linux-rpi/config index cb0fb3ffe..92a181a05 100644 --- a/core/linux-rpi/config +++ b/core/linux-rpi/config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm 6.1.15 Kernel Configuration +# Linux/arm 6.1.19 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0" CONFIG_CC_IS_GCC=y @@ -1438,7 +1438,6 @@ CONFIG_NET_SCH_PLUG=m # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m @@ -3878,7 +3877,6 @@ CONFIG_SENSORS_LM75=m # CONFIG_SENSORS_PC87427 is not set # CONFIG_SENSORS_NTC_THERMISTOR is not set # CONFIG_SENSORS_NCT6683 is not set -# CONFIG_SENSORS_NCT6775 is not set # CONFIG_SENSORS_NCT6775_I2C is not set # CONFIG_SENSORS_NCT7802 is not set # CONFIG_SENSORS_NCT7904 is not set @@ -5277,8 +5275,6 @@ CONFIG_DRM_VC4=m CONFIG_DRM_VC4_HDMI_CEC=y # CONFIG_DRM_ETNAVIV is not set # CONFIG_DRM_LOGICVC is not set -# CONFIG_DRM_MXSFB is not set -# CONFIG_DRM_IMX_LCDIF is not set # CONFIG_DRM_ARCPGU is not set # CONFIG_DRM_BOCHS is not set # CONFIG_DRM_CIRRUS_QEMU is not set diff --git a/core/linux-rpi/config8 b/core/linux-rpi/config8 index e7681e372..512e4a9b0 100644 --- a/core/linux-rpi/config8 +++ b/core/linux-rpi/config8 @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# Linux/arm64 6.1.15 Kernel Configuration +# Linux/arm64 6.1.19 Kernel Configuration # CONFIG_CC_VERSION_TEXT="gcc (GCC) 12.1.0" CONFIG_CC_IS_GCC=y @@ -1498,7 +1498,6 @@ CONFIG_NET_SCH_PLUG=m # CONFIG_NET_CLS=y CONFIG_NET_CLS_BASIC=m -CONFIG_NET_CLS_TCINDEX=m CONFIG_NET_CLS_ROUTE4=m CONFIG_NET_CLS_FW=m CONFIG_NET_CLS_U32=m @@ -5386,8 +5385,6 @@ CONFIG_DRM_VC4_HDMI_CEC=y # CONFIG_DRM_HISI_HIBMC is not set # CONFIG_DRM_HISI_KIRIN is not set # CONFIG_DRM_LOGICVC is not set -# CONFIG_DRM_MXSFB is not set -# CONFIG_DRM_IMX_LCDIF is not set # CONFIG_DRM_ARCPGU is not set # CONFIG_DRM_BOCHS is not set # CONFIG_DRM_CIRRUS_QEMU is not set @@ -6718,7 +6715,6 @@ CONFIG_DMA_BCM2835=y # CONFIG_DW_AXI_DMAC is not set # CONFIG_FSL_EDMA is not set # CONFIG_FSL_QDMA is not set -# CONFIG_HISI_DMA is not set # CONFIG_INTEL_IDMA64 is not set # CONFIG_MV_XOR_V2 is not set # CONFIG_PL330_DMA is not set @@ -7883,7 +7879,6 @@ CONFIG_TMPFS_XATTR=y # CONFIG_TMPFS_INODE64 is not set CONFIG_ARCH_SUPPORTS_HUGETLBFS=y # CONFIG_HUGETLBFS is not set -CONFIG_ARCH_WANT_HUGETLB_PAGE_OPTIMIZE_VMEMMAP=y CONFIG_MEMFD_CREATE=y CONFIG_ARCH_HAS_GIGANTIC_PAGE=y CONFIG_CONFIGFS_FS=y