Merge "Add Module.symvers for A14 GKI KMI checking" into main

gki/kmi_abi_chk/kmi_compatibility_test.mk

@@ -16,26 +16,26 @@ LOCAL_PATH := $(call my-dir)
 KMI_CHK_SCRIPT := $(LOCAL_PATH)/kmi_compatibility_test.sh
 
 # Current kernel symbol files to be checked
-# Use the one under $(LOCAL_PATH)/sym-5.* by default for self testing.
+# Use the one under $(LOCAL_PATH)/sym-[56].* by default for self testing.
 # The reason not to use the one under kernel/prebuilts/5.* by default
 # is because the KMI ABI may not be stable during development.
 #
-# Set CURR_5_15_SYMVERS/CURR_5_10_SYMVERS explicitly for the actual
+# Set CURR_5_15_SYMVERS/CURR_6_1_SYMVERS explicitly for the actual
 # current kernel symbol file to be checked. E.g.,
-# $ m CURR_5_10_SYMVERS=kernel/prebuilts/5.10/arm64/vmlinux.symvers \
-#     gki_5_10_kmi_compatibility_test
-CURR_5_15_SYMVERS ?= development/gki/kmi_abi_chk/sym-5.15/vmlinux.symvers
-CURR_5_10_SYMVERS ?= development/gki/kmi_abi_chk/sym-5.10/vmlinux.symvers
+# $ m CURR_6_1_SYMVERS=kernel/prebuilts/6.1/arm64/Module.symvers \
+#     gki_6_1_kmi_compatibility_test
+CURR_5_15_SYMVERS ?= development/gki/kmi_abi_chk/sym-5.15/Module.symvers
+CURR_6_1_SYMVERS ?= development/gki/kmi_abi_chk/sym-6.1/Module.symvers
 
 # Previous kernel symbol files, against which the latest one is checked
 # The file names of previous kernel symbol files are of this form:
 #     *.symvers-$(BID)
 # Here *.symvers is a symbolic link to the latest build.
-PREV_5_15_SYMVERS := $(LOCAL_PATH)/sym-5.15/vmlinux.symvers
-PREV_5_10_SYMVERS := $(LOCAL_PATH)/sym-5.10/vmlinux.symvers
+PREV_5_15_SYMVERS := $(LOCAL_PATH)/sym-5.15/Module.symvers
+PREV_6_1_SYMVERS := $(LOCAL_PATH)/sym-6.1/Module.symvers
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := a13_5_15_kmi_compatibility_test
+LOCAL_MODULE := a14_5_15_kmi_compatibility_test
 LOCAL_MODULE_CLASS := FAKE
 LOCAL_MODULE_TAGS := optional
 LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
@@ -48,21 +48,21 @@ $(LOCAL_BUILT_MODULE): $(KMI_CHK_SCRIPT) $(CURR_5_15_SYMVERS) $(PREV_5_15_SYMVER
 	$(hide) touch $@
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := a13_5_10_kmi_compatibility_test
+LOCAL_MODULE := a14_6_1_kmi_compatibility_test
 LOCAL_MODULE_CLASS := FAKE
 LOCAL_MODULE_TAGS := optional
 LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
 LOCAL_LICENSE_CONDITIONS := notice
 include $(BUILD_SYSTEM)/base_rules.mk
 
-$(LOCAL_BUILT_MODULE): $(KMI_CHK_SCRIPT) $(CURR_5_10_SYMVERS) $(PREV_5_10_SYMVERS)
+$(LOCAL_BUILT_MODULE): $(KMI_CHK_SCRIPT) $(CURR_6_1_SYMVERS) $(PREV_6_1_SYMVERS)
 	@mkdir -p $(dir $@)
-	$(hide) $(KMI_CHK_SCRIPT) $(CURR_5_10_SYMVERS) $(PREV_5_10_SYMVERS)
+	$(hide) $(KMI_CHK_SCRIPT) $(CURR_6_1_SYMVERS) $(PREV_6_1_SYMVERS)
 	$(hide) touch $@
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := a13_kmi_compatibility_test
-LOCAL_REQUIRED_MODULES := a13_5_15_kmi_compatibility_test a13_5_10_kmi_compatibility_test
+LOCAL_MODULE := a14_kmi_compatibility_test
+LOCAL_REQUIRED_MODULES := a14_5_15_kmi_compatibility_test a14_6_1_kmi_compatibility_test
 LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
 LOCAL_LICENSE_CONDITIONS := notice
 include $(BUILD_PHONY_PACKAGE)

gki/kmi_abi_chk/kmi_compatibility_test.sh

@@ -58,7 +58,7 @@ shift
 # break KMI ABI, because the requirement is "relaxed". We want this case to
 # pass so a keyword like "...EXPORT_SYMBOL" in the current symbol file can
 # still match "...EXPORT_SYMBOL_GPL" in the previous symbol file.
-grep "vmlinux.EXPORT_SYMBOL" $curr | sed 's/[ \t]*$//' > $tmp
+grep "EXPORT_SYMBOL" $curr | sed 's/[ \t]*$//' > $tmp
 
 echo "Current kernel symbol file, $curr, is checking against:"
 

gki/kmi_abi_chk/sym-5.15/Module.symvers

@@ -0,0 +1 @@
+Module.symvers-10342779

gki/kmi_abi_chk/sym-6.1/Module.symvers

@@ -0,0 +1 @@
+Module.symvers-10342778