diff --git a/config/sources/families/include/meson_common.inc b/config/sources/families/include/meson_common.inc index 72271ee6c0..ed8384ab9f 100644 --- a/config/sources/families/include/meson_common.inc +++ b/config/sources/families/include/meson_common.inc @@ -51,7 +51,7 @@ case $BRANCH in ;; edge) - declare -g KERNEL_MAJOR_MINOR="6.7" + declare -g KERNEL_MAJOR_MINOR="6.8" ;; esac diff --git a/patch/kernel/archive/meson-6.8/0030-tools-Makefile-delete-missing-cgroup_clean.patch b/patch/kernel/archive/meson-6.8/0030-tools-Makefile-delete-missing-cgroup_clean.patch new file mode 100644 index 0000000000..295c38d575 --- /dev/null +++ b/patch/kernel/archive/meson-6.8/0030-tools-Makefile-delete-missing-cgroup_clean.patch @@ -0,0 +1,34 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: amazingfate +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 + diff --git a/patch/kernel/archive/meson-6.7/generic-0001-m8-m8b-m8m2-Support-HDMI.patch b/patch/kernel/archive/meson-6.8/generic-0001-m8-m8b-m8m2-Support-HDMI.patch similarity index 100% rename from patch/kernel/archive/meson-6.7/generic-0001-m8-m8b-m8m2-Support-HDMI.patch rename to patch/kernel/archive/meson-6.8/generic-0001-m8-m8b-m8m2-Support-HDMI.patch diff --git a/patch/kernel/archive/meson-6.7/generic-0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch b/patch/kernel/archive/meson-6.8/generic-0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch similarity index 100% rename from patch/kernel/archive/meson-6.7/generic-0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch rename to patch/kernel/archive/meson-6.8/generic-0002-m8-m8b-m8m2-drm-forcefully-enable-XRGB-format.patch diff --git a/patch/kernel/archive/meson-6.7/generic-0003-drm-meson-Support-meson-8-8b-hdmi-tx-components.patch b/patch/kernel/archive/meson-6.8/generic-0003-drm-meson-Support-meson-8-8b-hdmi-tx-components.patch similarity index 100% rename from patch/kernel/archive/meson-6.7/generic-0003-drm-meson-Support-meson-8-8b-hdmi-tx-components.patch rename to patch/kernel/archive/meson-6.8/generic-0003-drm-meson-Support-meson-8-8b-hdmi-tx-components.patch diff --git a/patch/kernel/archive/meson-6.7/generic-Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch b/patch/kernel/archive/meson-6.8/generic-Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch similarity index 100% rename from patch/kernel/archive/meson-6.7/generic-Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch rename to patch/kernel/archive/meson-6.8/generic-Revert-mmc-core-Set-HS-clock-speed-before-sending-HS-CMD13.patch diff --git a/patch/kernel/archive/meson-6.7/generic-Revert-pwm-meson-modify-and-simplify-calculation-in-.patch b/patch/kernel/archive/meson-6.8/generic-Revert-pwm-meson-modify-and-simplify-calculation-in-.patch similarity index 100% rename from patch/kernel/archive/meson-6.7/generic-Revert-pwm-meson-modify-and-simplify-calculation-in-.patch rename to patch/kernel/archive/meson-6.8/generic-Revert-pwm-meson-modify-and-simplify-calculation-in-.patch diff --git a/patch/kernel/archive/meson-6.7/odroidc1-dts-Enable-HDMI.patch b/patch/kernel/archive/meson-6.8/odroidc1-dts-Enable-HDMI.patch similarity index 100% rename from patch/kernel/archive/meson-6.7/odroidc1-dts-Enable-HDMI.patch rename to patch/kernel/archive/meson-6.8/odroidc1-dts-Enable-HDMI.patch diff --git a/patch/kernel/archive/meson-6.7/onecloud-0001-add-dts.patch b/patch/kernel/archive/meson-6.8/onecloud-0001-add-dts.patch similarity index 100% rename from patch/kernel/archive/meson-6.7/onecloud-0001-add-dts.patch rename to patch/kernel/archive/meson-6.8/onecloud-0001-add-dts.patch diff --git a/patch/kernel/archive/meson-6.7/onecloud-0002-dts-Support-HDMI.patch b/patch/kernel/archive/meson-6.8/onecloud-0002-dts-Support-HDMI.patch similarity index 100% rename from patch/kernel/archive/meson-6.7/onecloud-0002-dts-Support-HDMI.patch rename to patch/kernel/archive/meson-6.8/onecloud-0002-dts-Support-HDMI.patch