From 10fcf7975e58b17d569c5686628e863888e35144 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Igor=20Pe=C4=8Dovnik?= Date: Mon, 20 Jun 2022 08:51:47 +0200 Subject: [PATCH] Setting meson64 legacy to last known working tag (#3919) We are ditching this kernel when possible so its not use to maintain its HEAD. Currently it breaks compilation with default settings. --- config/kernel/linux-meson64-legacy.config | 16 +++++++++------- .../sources/families/include/meson64_common.inc | 3 ++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/config/kernel/linux-meson64-legacy.config b/config/kernel/linux-meson64-legacy.config index 6d8c0fac04..d996cdcf17 100644 --- a/config/kernel/linux-meson64-legacy.config +++ b/config/kernel/linux-meson64-legacy.config @@ -225,6 +225,7 @@ CONFIG_JUMP_LABEL=y # CONFIG_UPROBES is not set # CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_KRETPROBES=y CONFIG_HAVE_KPROBES=y CONFIG_HAVE_KRETPROBES=y CONFIG_HAVE_ARCH_TRACEHOOK=y @@ -1250,6 +1251,7 @@ CONFIG_NET_FLOW_LIMIT=y # Network testing # # CONFIG_NET_PKTGEN is not set +# CONFIG_NET_TCPPROBE is not set # CONFIG_NET_DROP_MONITOR is not set # CONFIG_HAMRADIO is not set CONFIG_CAN=m @@ -2571,7 +2573,7 @@ CONFIG_NET_VENDOR_MELLANOX=y # CONFIG_MLXSW_CORE is not set CONFIG_NET_VENDOR_MICREL=y # CONFIG_KS8851 is not set -# CONFIG_KS8851_MLL is not set +CONFIG_KS8851_MLL=m # CONFIG_KSZ884X_PCI is not set CONFIG_NET_VENDOR_MICROCHIP=y # CONFIG_ENC28J60 is not set @@ -6194,12 +6196,9 @@ CONFIG_FAT_DEFAULT_CODEPAGE=437 CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1" # CONFIG_FAT_DEFAULT_UTF8 is not set CONFIG_EXFAT_FS=m -CONFIG_EXFAT_DISCARD=y -CONFIG_EXFAT_DELAYED_SYNC=y -# CONFIG_EXFAT_KERNEL_DEBUG is not set -# CONFIG_EXFAT_DEBUG_MSG is not set -CONFIG_EXFAT_DEFAULT_CODEPAGE=437 CONFIG_EXFAT_DEFAULT_IOCHARSET="utf8" +CONFIG_EXFAT_VIRTUAL_XATTR=y +CONFIG_EXFAT_VIRTUAL_XATTR_SELINUX_LABEL="u:object_r:exfat:s0" CONFIG_NTFS_FS=m # CONFIG_NTFS_DEBUG is not set CONFIG_NTFS_RW=y @@ -6576,7 +6575,9 @@ CONFIG_BRANCH_PROFILE_NONE=y # CONFIG_PROFILE_ALL_BRANCHES is not set CONFIG_STACK_TRACER=y # CONFIG_BLK_DEV_IO_TRACE is not set -# CONFIG_PROBE_EVENTS is not set +CONFIG_KPROBE_EVENT=y +CONFIG_BPF_EVENTS=y +CONFIG_PROBE_EVENTS=y CONFIG_DYNAMIC_FTRACE=y CONFIG_FUNCTION_PROFILER=y CONFIG_FTRACE_MCOUNT_RECORD=y @@ -6592,6 +6593,7 @@ CONFIG_TRACING_EVENTS_GPIO=y # # CONFIG_LKDTM is not set # CONFIG_TEST_LIST_SORT is not set +# CONFIG_KPROBES_SANITY_TEST is not set # CONFIG_BACKTRACE_SELF_TEST is not set # CONFIG_RBTREE_TEST is not set # CONFIG_INTERVAL_TREE_TEST is not set diff --git a/config/sources/families/include/meson64_common.inc b/config/sources/families/include/meson64_common.inc index e4cfb33dee..333d87cff9 100644 --- a/config/sources/families/include/meson64_common.inc +++ b/config/sources/families/include/meson64_common.inc @@ -24,7 +24,8 @@ case $BRANCH in legacy) KERNELSOURCE='https://github.com/hardkernel/linux' - KERNELBRANCH='branch:odroidg12-4.9.y' + #KERNELBRANCH='branch:odroidg12-4.9.y' + KERNELBRANCH='tag:4.9.277-122' KERNELDIR='linux-odroid' ;;