enoch/armbian-build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

rk3588-collabora: Bump to 6.9

Browse Source 
The default collabora kernel branch is a rolling branch and will be rebased.
This commit is contained in:
ColorfulRhino 2024-04-04 16:08:21 +02:00 committed by Ricardo Pardini
parent e83d1a0eab
commit 38ceb096a1
4 changed files with 489 additions and 339 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

780
config/kernel/linux-rockchip-rk3588-collabora.config
View File

File diff suppressed because it is too large Load Diff

8
config/sources/families/rockchip-rk3588.conf
View File

@ -66,11 +66,11 @@ case $BRANCH in
# Collabora's rk3588, where the action is these days
LINUXFAMILY=rockchip-rk3588
LINUXCONFIG='linux-rockchip-rk3588-'$BRANCH
KERNEL_MAJOR_MINOR="6.7" # Major and minor versions of this kernel.
KERNELPATCHDIR='rockchip-rk3588-collabora' # Empty/nonexisting, so zero patches, hopefully
KERNEL_MAJOR_MINOR="6.9" # Major and minor versions of this kernel.
KERNELPATCHDIR='rockchip-rk3588-collabora'
KERNELSOURCE='https://gitlab.collabora.com/hardware-enablement/rockchip-3588/linux.git'
KERNELBRANCH='branch:rk3588-v6.7'
KERNEL_DRIVERS_SKIP+=(driver_rtw88) # This is a custom kernel, while the rtw88 driver patching expects pure mainline
KERNELBRANCH='branch:rk3588' # Rolling kernel branch, will be rebased
KERNEL_DRIVERS_SKIP+=(driver_rtw88) # This is a custom kernel, while the rtw88 driver patching expects pure mainline
;;
esac

6
patch/kernel/rockchip-rk3588-collabora/0000.patching_config.yaml
View File

@ -1,11 +1,11 @@
config: # This is file 'patch/kernel/archive/meson64-6.4/0000.patching_config.yaml'
config: # This is file 'patch/kernel/rockchip-rk3588-collabora/0000.patching_config.yaml'
# Just some info stuff; not used by the patching scripts
name: rockchip-rk3588-collabora
kind: kernel
type: mainline # or: vendor
branch: linux-6.7.y
last-known-good-tag: v6.7-rc1
branch: linux-6.9.y
last-known-good-tag: v6.9-rc1
maintainers:
- { github: rpardini, name: Ricardo Pardini, email: ricardo@pardini.net, armbian-forum: rpardini }

34
patch/kernel/rockchip-rk3588-collabora/0033-tools-Makefile-delete-missing-cgroup_clean.patch Normal file
View File

@ -0,0 +1,34 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: amazingfate <liujianfeng1994@gmail.com>
Date: Wed, 24 Jan 2024 18:03:52 +0800
Subject: tools/Makefile: delete missing cgroup_clean
---
tools/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/Makefile b/tools/Makefile
index 37e9f6804832..9903abe51d5f 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -169,7 +169,7 @@ acpi_clean:
cpupower_clean:
$(call descend,power/cpupower,clean)
-cgroup_clean counter_clean hv_clean firewire_clean bootconfig_clean spi_clean usb_clean virtio_clean mm_clean wmi_clean bpf_clean iio_clean gpio_clean objtool_clean leds_clean pci_clean firmware_clean debugging_clean tracing_clean:
+counter_clean hv_clean firewire_clean bootconfig_clean spi_clean usb_clean virtio_clean mm_clean wmi_clean bpf_clean iio_clean gpio_clean objtool_clean leds_clean pci_clean firmware_clean debugging_clean tracing_clean:
$(call descend,$(@:_clean=),clean)
libapi_clean:
@@ -209,7 +209,7 @@ freefall_clean:
build_clean:
$(call descend,build,clean)
-clean: acpi_clean cgroup_clean counter_clean cpupower_clean hv_clean firewire_clean \
+clean: acpi_clean counter_clean cpupower_clean hv_clean firewire_clean \
perf_clean selftests_clean turbostat_clean bootconfig_clean spi_clean usb_clean virtio_clean \
mm_clean bpf_clean iio_clean x86_energy_perf_policy_clean tmon_clean \
freefall_clean build_clean libbpf_clean libsubcmd_clean \
--
Armbian