Update meson edge to 6.8 kernel (#6575)

* Meson8b update kernel to 6.8
* Fix error in clean tools 6.8 kernel
This commit is contained in:
kernelzru 2024-05-11 17:09:44 +03:00 committed by GitHub
parent de82b6ffd3
commit 96bed4e609
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
10 changed files with 35 additions and 1 deletions

View File

@ -51,7 +51,7 @@ case $BRANCH in
;;
edge)
declare -g KERNEL_MAJOR_MINOR="6.7"
declare -g KERNEL_MAJOR_MINOR="6.8"
;;
esac

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