diff options
| -rw-r--r-- | mk/linux-ver.mk | 4 | ||||
| -rw-r--r-- | package/freetype/patches/patch-include_freetype_config_ftoption_h | 11 | ||||
| -rw-r--r-- | target/linux/Config.in.kernelversion | 2 | ||||
| -rw-r--r-- | target/linux/patches/6.12.25/armnommu-versatile.patch (renamed from target/linux/patches/6.12.23/armnommu-versatile.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/6.12.25/hppa-cross-compile.patch (renamed from target/linux/patches/6.12.23/hppa-cross-compile.patch) | 0 | ||||
| -rw-r--r-- | target/linux/patches/6.12.25/macsonic.patch (renamed from target/linux/patches/6.12.23/macsonic.patch) | 0 |
6 files changed, 14 insertions, 3 deletions
diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index 91707f848..27f0525ec 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -22,10 +22,10 @@ KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) KERNEL_HASH:= c5c682a354ea3190139357a57d34a79e5c37221ace823a938e10116b577a2e1b endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_12),y) -KERNEL_FILE_VER:= 6.12.23 +KERNEL_FILE_VER:= 6.12.25 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= d8d95404f8deeb7ff6992c0df855025062e9e8182bca6daa27ef2e9275d27749 +KERNEL_HASH:= c8af780f6f613ca24622116e4c512a764335ab66e75c6643003c16e49a8e3b90 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6),y) KERNEL_FILE_VER:= 6.6.82 diff --git a/package/freetype/patches/patch-include_freetype_config_ftoption_h b/package/freetype/patches/patch-include_freetype_config_ftoption_h new file mode 100644 index 000000000..2ef6bb7f2 --- /dev/null +++ b/package/freetype/patches/patch-include_freetype_config_ftoption_h @@ -0,0 +1,11 @@ +--- freetype-2.13.3.orig/include/freetype/config/ftoption.h 2024-07-18 07:14:58.000000000 +0000 ++++ freetype-2.13.3/include/freetype/config/ftoption.h 2025-04-29 09:05:47.004181201 +0000 +@@ -255,7 +255,7 @@ FT_BEGIN_HEADER + * stream support, in the cases where file stream support is not necessary + * such as memory loading of font files. + */ +-/* #define FT_CONFIG_OPTION_DISABLE_STREAM_SUPPORT */ ++#define FT_CONFIG_OPTION_DISABLE_STREAM_SUPPORT + + + /************************************************************************** diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index 1d1e262a8..fc5774a24 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -51,7 +51,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_6_14 depends on !ADK_TARGET_ARCH_NDS32 config ADK_TARGET_LINUX_KERNEL_VERSION_6_12 - bool "6.12.23" + bool "6.12.25" depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN depends on !ADK_TARGET_ARCH_C6X diff --git a/target/linux/patches/6.12.23/armnommu-versatile.patch b/target/linux/patches/6.12.25/armnommu-versatile.patch index f8f10f50b..f8f10f50b 100644 --- a/target/linux/patches/6.12.23/armnommu-versatile.patch +++ b/target/linux/patches/6.12.25/armnommu-versatile.patch diff --git a/target/linux/patches/6.12.23/hppa-cross-compile.patch b/target/linux/patches/6.12.25/hppa-cross-compile.patch index 51c24fff2..51c24fff2 100644 --- a/target/linux/patches/6.12.23/hppa-cross-compile.patch +++ b/target/linux/patches/6.12.25/hppa-cross-compile.patch diff --git a/target/linux/patches/6.12.23/macsonic.patch b/target/linux/patches/6.12.25/macsonic.patch index 51e76113b..51e76113b 100644 --- a/target/linux/patches/6.12.23/macsonic.patch +++ b/target/linux/patches/6.12.25/macsonic.patch |