diff --git a/.oebuild/manifest.yaml b/.oebuild/manifest.yaml index c438588a189e37b89721d505c202f42e2e5dc2d6..a0babef770c1cbedd7d8afec1877b7a811bf39b9 100644 --- a/.oebuild/manifest.yaml +++ b/.oebuild/manifest.yaml @@ -983,7 +983,7 @@ manifest_list: version: 80744f17a0ec0300e9bc4e140c35120460a05a8a mcs: remote_url: https://gitee.com/openeuler/mcs.git - version: 5cb49156276be04d54a77a630b8600dcc122fdba + version: d49f81470d2bcbc8d0e1bfa7b466db7b993c7916 mcs-x86: remote_url: https://gitee.com/openeuler/mcs.git version: e1a51d29fb09c3fb35f1666fbe7138840e8f26f8 diff --git a/meta-openeuler/recipes-kernel/linux/linux-openeuler.inc b/meta-openeuler/recipes-kernel/linux/linux-openeuler.inc index f14cfbb44d63e33f3e1c6530280fbbe19a5730de..3645fd7e7456ddeaafcb47b071a3c9eaf387cc42 100644 --- a/meta-openeuler/recipes-kernel/linux/linux-openeuler.inc +++ b/meta-openeuler/recipes-kernel/linux/linux-openeuler.inc @@ -106,9 +106,17 @@ KERNEL_FEATURES:append = " \ KERNEL_FEATURES:append:x86-64 = " \ ${@bb.utils.contains('MCS_FEATURES', 'openamp', 'features/mcs/0001-x86-irq-add-a-vector-define-for-mcs.patch', '', d)} \ " + +python () { + pv = d.getVar("PV", True) + if pv == "5.10": + d.setVar("MCS_EXPORT_SYMBOL_PATCH", ' ') + else: + d.setVar("MCS_EXPORT_SYMBOL_PATCH", 'features/mcs/0005-arm64-cpu-export-cpu_logical_map-symbol-for-mcs.patch') +} KERNEL_FEATURES:append:aarch64 = " \ - ${@bb.utils.contains('MCS_FEATURES', 'openamp', 'features/mcs/0005-arm64-cpu-export-cpu_logical_map-symbol-for-mcs.patch', '', d)} \ -" + ${@bb.utils.contains('MCS_FEATURES', 'openamp', "${MCS_EXPORT_SYMBOL_PATCH}", '', d)} \ + " # xen kernel support KERNEL_FEATURES:append = "${@bb.utils.contains('DISTRO_FEATURES', 'xen', ' features/xen/xen.scc', '', d)}"