ANDROID: Drop CONFIG_LOCALVERSION/KMI_GENERATION from gki_defconfig.

jacky8hyf · Treehugger Robot · commit 3fbf22de8189 · 2023-03-15T14:09:33.000Z
The text -mainline is inferred from BRANCH instead.

Test: TH (kleaf integration test)
Bug: 272828027
Change-Id: Ie5d74b69246873ac583d2abb90b1909b44c70ce0
Signed-off-by: Yifan Hong &lt;elsk@google.com&gt;
diff --git a/arch/arm64/configs/gki_defconfig b/arch/arm64/configs/gki_defconfig
@@ -1,5 +1,4 @@
 CONFIG_UAPI_HEADER_TEST=y
-CONFIG_LOCALVERSION="-mainline"
 CONFIG_AUDIT=y
 CONFIG_NO_HZ=y
 CONFIG_HIGH_RES_TIMERS=y
diff --git a/arch/x86/configs/gki_defconfig b/arch/x86/configs/gki_defconfig
@@ -1,5 +1,4 @@
 CONFIG_UAPI_HEADER_TEST=y
-CONFIG_LOCALVERSION="-mainline"
 CONFIG_KERNEL_LZ4=y
 CONFIG_AUDIT=y
 CONFIG_NO_HZ=y
diff --git a/build.config.common b/build.config.common
@@ -1,7 +1,5 @@
 . ${ROOT_DIR}/${KERNEL_DIR}/build.config.constants
 
-KMI_GENERATION=0
-
 LLVM=1
 DEPMOD=depmod
 CLANG_PREBUILT_BIN=prebuilts/clang/host/linux-x86/clang-${CLANG_VERSION}/bin

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`CONFIG_UAPI_HEADER_TEST=y`
`2`		`-CONFIG_LOCALVERSION="-mainline"`
`3`	`2`	`CONFIG_AUDIT=y`
`4`	`3`	`CONFIG_NO_HZ=y`
`5`	`4`	`CONFIG_HIGH_RES_TIMERS=y`