From 0b09411c8397181d3892cbeb25f9e0f03e425942 Mon Sep 17 00:00:00 2001 From: amazingfate Date: Fri, 14 Jun 2024 00:59:44 +0800 Subject: [PATCH] bump sm8250-edge to 6.10 --- config/sources/families/sm8250.conf | 4 +-- .../0000.patching_config.yaml | 6 ++-- .../dt/sm8250-xiaomi-umi-common.dtsi | 0 .../dt/sm8250-xiaomi-umi-csot.dts | 0 .../dt/sm8250-xiaomi-umi-sms.dts | 0 ...Makefile-delete-missing-cgroup_clean.patch | 34 ------------------- 6 files changed, 4 insertions(+), 40 deletions(-) rename patch/kernel/archive/{sm8250-6.8 => sm8250-6.10}/0000.patching_config.yaml (94%) rename patch/kernel/archive/{sm8250-6.8 => sm8250-6.10}/dt/sm8250-xiaomi-umi-common.dtsi (100%) rename patch/kernel/archive/{sm8250-6.8 => sm8250-6.10}/dt/sm8250-xiaomi-umi-csot.dts (100%) rename patch/kernel/archive/{sm8250-6.8 => sm8250-6.10}/dt/sm8250-xiaomi-umi-sms.dts (100%) delete mode 100644 patch/kernel/archive/sm8250-6.8/0001-tools-Makefile-delete-missing-cgroup_clean.patch diff --git a/config/sources/families/sm8250.conf b/config/sources/families/sm8250.conf index 74d9f3a69be2..b9388d67d0ce 100644 --- a/config/sources/families/sm8250.conf +++ b/config/sources/families/sm8250.conf @@ -21,9 +21,7 @@ case $BRANCH in ;; edge) - declare -g KERNEL_MAJOR_MINOR="6.8" # Major and minor versions of this kernel. - declare -g KERNELBRANCH='tag:v6.8.6' - declare -g KERNELPATCHDIR='archive/sm8250-6.8' + declare -g KERNEL_MAJOR_MINOR="6.10" # Major and minor versions of this kernel. ;; esac diff --git a/patch/kernel/archive/sm8250-6.8/0000.patching_config.yaml b/patch/kernel/archive/sm8250-6.10/0000.patching_config.yaml similarity index 94% rename from patch/kernel/archive/sm8250-6.8/0000.patching_config.yaml rename to patch/kernel/archive/sm8250-6.10/0000.patching_config.yaml index a458d5ea166e..8fa367ff5ccb 100644 --- a/patch/kernel/archive/sm8250-6.8/0000.patching_config.yaml +++ b/patch/kernel/archive/sm8250-6.10/0000.patching_config.yaml @@ -1,11 +1,11 @@ config: # This is file 'patch/kernel/archive/sm8250-6.7/0000.patching_config.yaml' # Just some info stuff; not used by the patching scripts - name: sm8250-6.8 + name: sm8250-6.10 kind: kernel type: mainline # or: vendor - branch: linux-6.8.y - last-known-good-tag: v6.8.0 + branch: linux-6.10.y + last-known-good-tag: v6.10-rc2 maintainers: - { github: rpardini, name: Ricardo Pardini, email: ricardo@pardini.net, armbian-forum: rpardini } diff --git a/patch/kernel/archive/sm8250-6.8/dt/sm8250-xiaomi-umi-common.dtsi b/patch/kernel/archive/sm8250-6.10/dt/sm8250-xiaomi-umi-common.dtsi similarity index 100% rename from patch/kernel/archive/sm8250-6.8/dt/sm8250-xiaomi-umi-common.dtsi rename to patch/kernel/archive/sm8250-6.10/dt/sm8250-xiaomi-umi-common.dtsi diff --git a/patch/kernel/archive/sm8250-6.8/dt/sm8250-xiaomi-umi-csot.dts b/patch/kernel/archive/sm8250-6.10/dt/sm8250-xiaomi-umi-csot.dts similarity index 100% rename from patch/kernel/archive/sm8250-6.8/dt/sm8250-xiaomi-umi-csot.dts rename to patch/kernel/archive/sm8250-6.10/dt/sm8250-xiaomi-umi-csot.dts diff --git a/patch/kernel/archive/sm8250-6.8/dt/sm8250-xiaomi-umi-sms.dts b/patch/kernel/archive/sm8250-6.10/dt/sm8250-xiaomi-umi-sms.dts similarity index 100% rename from patch/kernel/archive/sm8250-6.8/dt/sm8250-xiaomi-umi-sms.dts rename to patch/kernel/archive/sm8250-6.10/dt/sm8250-xiaomi-umi-sms.dts diff --git a/patch/kernel/archive/sm8250-6.8/0001-tools-Makefile-delete-missing-cgroup_clean.patch b/patch/kernel/archive/sm8250-6.8/0001-tools-Makefile-delete-missing-cgroup_clean.patch deleted file mode 100644 index ef5fd9d1acf0..000000000000 --- a/patch/kernel/archive/sm8250-6.8/0001-tools-Makefile-delete-missing-cgroup_clean.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 2fd526ca3197f01c5075e3c81948c4decd016f06 Mon Sep 17 00:00:00 2001 -From: amazingfate -Date: Wed, 24 Jan 2024 18:03:52 +0800 -Subject: [PATCH] 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 37e9f68048..9903abe51d 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 \ --- -2.34.1 -