main/linux-lts: rename kernel configs

use .config suffix for kernel configs.
No functional changes.

12 files changed, 30 insertions, 29 deletions

diff --git a/main/linux-lts/APKBUILD b/main/linux-lts/APKBUILD
index 39010fc5f9e..51074dd7ea5 100644
--- a/main/linux-lts/APKBUILD
+++ b/main/linux-lts/APKBUILD
@@ -22,26 +22,25 @@ source="https://cdn.kernel.org/pub/linux/kernel/v${pkgver%%.*}.x/linux-$_kernver
 	vmlinux-zstd.patch
 	0001-fs-exec-require-argv-0-presence-in-do_execveat_commo.patch
 
-	config-lts.aarch64
-	config-lts.armv7
-	config-lts.x86
-	config-lts.x86_64
-	config-lts.ppc64le
-	config-lts.s390x
-
-	config-virt.aarch64
-	config-virt.armv7
-	config-virt.ppc64le
-	config-virt.x86
-	config-virt.x86_64
+	lts.aarch64.config
+	lts.armv7.config
+	lts.x86.config
+	lts.x86_64.config
+	lts.ppc64le.config
+	lts.s390x.config
+
+	virt.aarch64.config
+	virt.armv7.config
+	virt.ppc64le.config
+	virt.x86.config
+	virt.x86_64.config
 	"
 subpackages="$pkgname-dev:_dev:$CBUILD_ARCH"
 _flavors=
 for _i in $source; do
 	case $_i in
-	config-*.$CARCH)
-		_f=${_i%.$CARCH}
-		_f=${_f#config-}
+	*.$CARCH.config)
+		_f=${_i%.$CARCH.config}
 		_flavors="$_flavors ${_f}"
 		if [ "linux-$_f" != "$pkgname" ]; then
 			subpackages="$subpackages linux-${_f}::$CBUILD_ARCH linux-${_f}-dev:_dev:$CBUILD_ARCH"
@@ -105,7 +104,7 @@ prepare() {
 
 oldconfig() {
 	for i in $_flavors; do
-		local _config=config-$i.${CARCH}
+		local _config=$i.${CARCH}.config
 		local _builddir="$srcdir"/build-$i.$CARCH
 		mkdir -p "$_builddir"
 		echo "-$pkgrel-$i" > "$_builddir"/localversion-alpine \
@@ -123,6 +122,7 @@ build() {
 	unset LDFLAGS
 	export KBUILD_BUILD_TIMESTAMP="$(date -Ru${SOURCE_DATE_EPOCH:+d @$SOURCE_DATE_EPOCH})"
 	for i in $_flavors; do
+		msg "Building $i kernel"
 		cd "$srcdir"/build-$i.$CARCH
 		make ARCH="$_carch" CC="${CC:-gcc}" AWK="${AWK:-mawk}" \
 			KBUILD_BUILD_VERSION="$((pkgrel + 1 ))-Alpine"
@@ -193,8 +193,9 @@ _dev() {
 	# first we import config, run prepare to set up for building
 	# external modules, and create the scripts
 	mkdir -p "$dir"
-	cp "$srcdir"/config-$_flavor.${CARCH} "$dir"/.config
-	echo "-$pkgrel-$_flavor" > "$dir"/localversion-alpine
+	local _builddir="$srcdir"/build-$_flavor.$CARCH
+	cp -a "$_builddir"/.config "$_builddir"/localversion-alpine \
+		"$dir"/
 
 	make -j1 -C "$srcdir"/linux-$_kernver O="$dir" ARCH="$_carch" \
 		syncconfig prepare modules_prepare scripts
@@ -232,16 +233,16 @@ d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e
 214c54a839ae37849715520f4b1049f0df5366ca32522701b43afecfad116794c4542940ba32d389f28f2549d08c03d148f884cb8e565b75aa3c0cad6a4887b7  0001-powerpc-config-defang-gcc-check-for-stack-protector-.patch
 d26d3f99fdcbd0f56e9af32a281870bbfd9fe6a12d17921ef3876e72bd1e92a3c131e06567078a45c11a41826b39d3068cc6f0e89f67d9e16a14825984869268  vmlinux-zstd.patch
 ecd4eed25126e238adaaafdb736599a6f963ba122f0b11eb014d04c3227fe59de4ab215a43aafc93a4890d29b09b99c5a46e4b1697c80768721f7d162299b366  0001-fs-exec-require-argv-0-presence-in-do_execveat_commo.patch
-76dd31b5fb35181ad0714efa4d14c2ebfa10351bdb0b3fb4d10db96dd746f900f027411e98de8eb58dbd37be43f00bd5666e25e72487e0968e72091cfe97947d  config-lts.aarch64
-8fd3bfac3ab8dcbe7d6933f57ddfcb8b7cb8068debf5272a4d9578d9753809aad1f29167accdc29bc8103ac53779e2414fa48a800d7abd57c929834a93854075  config-lts.armv7
-84025b080c62234330604a09898d9873f434f2f00f2ec21de126f7b584f7c48bc300a0d6315d8564801ceef5c9736ac82a2f368507ab3f16030082774c1908ff  config-lts.x86
-c6dcac767c7a18223ce624332f5bfe44c25d7070fdb5589e52f0f81a655d107d2c99672c71a0c2313124bc721cb74aece265def3fd2bdfc2ffced72eea379d29  config-lts.x86_64
-7ef56e331e1bc9078e3f6e7b8f49e7e6f0442b5d95fff0bd1b7132b438d862f5108cef53d3648552fbe4e48c9b0a32c7442e9eab9e8cd1bacddaf602b039e0f5  config-lts.ppc64le
-4109f6cb7da2e621dad66bf5140717eb72cfc132f257e39b61661b2f3b1b948c17df6626408f69b6bc5dc1df1d1fd6de3380ad561fbc5086d47eff9a4a4b6a74  config-lts.s390x
-d76c67bff7d14dfa4167b4b33060bc4d266ed5909f95c71dd2ac6103e664b91d0efb1f034d72318e3c29cb01024eea07bbac082006093de6bc9f682ebe714d97  config-virt.aarch64
-3770ebab99e7ed3e47268a334d37fed53bfaddc4c4a88c0571b5c1ca9e344c35ddce9c9906ecbf216b1dca851e04c0ae17a3c747a8673903983103084252ff8a  config-virt.armv7
-d5deb066a8cd7bba273217465b1bcc8bf87efb8b09468947b88fcfdefeb0fb5930571c20a2b040883b6e62c0453651e472dd4ecb916f15ca1a18b5d6865cd452  config-virt.ppc64le
-ae5eebff217de5e52b114cf0ad6ef505f11c742e7f5c7614852e6afa1484796e3512095c9fe60b300c0e0e6b007740ab2cd2732f4339fac5000051ddbe2b0c74  config-virt.x86
-49e96f4a131e6b5a5a63facfa6708f5e98c15203c82958995b3b6efc885695d578fbd5477939dd8d7dfbcdd044b67133e733c6b5f3ac6816c4d9c976b3c1c2c2  config-virt.x86_64
+76dd31b5fb35181ad0714efa4d14c2ebfa10351bdb0b3fb4d10db96dd746f900f027411e98de8eb58dbd37be43f00bd5666e25e72487e0968e72091cfe97947d  lts.aarch64.config
+8fd3bfac3ab8dcbe7d6933f57ddfcb8b7cb8068debf5272a4d9578d9753809aad1f29167accdc29bc8103ac53779e2414fa48a800d7abd57c929834a93854075  lts.armv7.config
+84025b080c62234330604a09898d9873f434f2f00f2ec21de126f7b584f7c48bc300a0d6315d8564801ceef5c9736ac82a2f368507ab3f16030082774c1908ff  lts.x86.config
+c6dcac767c7a18223ce624332f5bfe44c25d7070fdb5589e52f0f81a655d107d2c99672c71a0c2313124bc721cb74aece265def3fd2bdfc2ffced72eea379d29  lts.x86_64.config
+7ef56e331e1bc9078e3f6e7b8f49e7e6f0442b5d95fff0bd1b7132b438d862f5108cef53d3648552fbe4e48c9b0a32c7442e9eab9e8cd1bacddaf602b039e0f5  lts.ppc64le.config
+4109f6cb7da2e621dad66bf5140717eb72cfc132f257e39b61661b2f3b1b948c17df6626408f69b6bc5dc1df1d1fd6de3380ad561fbc5086d47eff9a4a4b6a74  lts.s390x.config
+d76c67bff7d14dfa4167b4b33060bc4d266ed5909f95c71dd2ac6103e664b91d0efb1f034d72318e3c29cb01024eea07bbac082006093de6bc9f682ebe714d97  virt.aarch64.config
+3770ebab99e7ed3e47268a334d37fed53bfaddc4c4a88c0571b5c1ca9e344c35ddce9c9906ecbf216b1dca851e04c0ae17a3c747a8673903983103084252ff8a  virt.armv7.config
+d5deb066a8cd7bba273217465b1bcc8bf87efb8b09468947b88fcfdefeb0fb5930571c20a2b040883b6e62c0453651e472dd4ecb916f15ca1a18b5d6865cd452  virt.ppc64le.config
+ae5eebff217de5e52b114cf0ad6ef505f11c742e7f5c7614852e6afa1484796e3512095c9fe60b300c0e0e6b007740ab2cd2732f4339fac5000051ddbe2b0c74  virt.x86.config
+49e96f4a131e6b5a5a63facfa6708f5e98c15203c82958995b3b6efc885695d578fbd5477939dd8d7dfbcdd044b67133e733c6b5f3ac6816c4d9c976b3c1c2c2  virt.x86_64.config
 2bb475910c8197877bf147a3531f821e3ee2f408350c6415e09ef07731877161079545540851fef736a57d77f5aae10c46064b06053f9f8e734b4b527622fef6  patch-5.15.26.xz
 "
diff --git a/main/linux-lts/config-lts.aarch64 b/main/linux-lts/lts.aarch64.config
index d8212ab8900..d8212ab8900 100644
--- a/main/linux-lts/config-lts.aarch64
+++ b/main/linux-lts/lts.aarch64.config
diff --git a/main/linux-lts/config-lts.armv7 b/main/linux-lts/lts.armv7.config
index 4b89929a012..4b89929a012 100644
--- a/main/linux-lts/config-lts.armv7
+++ b/main/linux-lts/lts.armv7.config
diff --git a/main/linux-lts/config-lts.ppc64le b/main/linux-lts/lts.ppc64le.config
index a3fb5c5e6b5..a3fb5c5e6b5 100644
--- a/main/linux-lts/config-lts.ppc64le
+++ b/main/linux-lts/lts.ppc64le.config
diff --git a/main/linux-lts/config-lts.s390x b/main/linux-lts/lts.s390x.config
index ba1caa95e79..ba1caa95e79 100644
--- a/main/linux-lts/config-lts.s390x
+++ b/main/linux-lts/lts.s390x.config
diff --git a/main/linux-lts/config-lts.x86 b/main/linux-lts/lts.x86.config
index c68cc2ac90b..c68cc2ac90b 100644
--- a/main/linux-lts/config-lts.x86
+++ b/main/linux-lts/lts.x86.config
diff --git a/main/linux-lts/config-lts.x86_64 b/main/linux-lts/lts.x86_64.config
index 542cd121ea8..542cd121ea8 100644
--- a/main/linux-lts/config-lts.x86_64
+++ b/main/linux-lts/lts.x86_64.config
diff --git a/main/linux-lts/config-virt.aarch64 b/main/linux-lts/virt.aarch64.config
index 7e23ec2f480..7e23ec2f480 100644
--- a/main/linux-lts/config-virt.aarch64
+++ b/main/linux-lts/virt.aarch64.config
diff --git a/main/linux-lts/config-virt.armv7 b/main/linux-lts/virt.armv7.config
index 0520e761022..0520e761022 100644
--- a/main/linux-lts/config-virt.armv7
+++ b/main/linux-lts/virt.armv7.config
diff --git a/main/linux-lts/config-virt.ppc64le b/main/linux-lts/virt.ppc64le.config
index 333b481b8f5..333b481b8f5 100644
--- a/main/linux-lts/config-virt.ppc64le
+++ b/main/linux-lts/virt.ppc64le.config
diff --git a/main/linux-lts/config-virt.x86 b/main/linux-lts/virt.x86.config
index 1e27a2397bf..1e27a2397bf 100644
--- a/main/linux-lts/config-virt.x86
+++ b/main/linux-lts/virt.x86.config
diff --git a/main/linux-lts/config-virt.x86_64 b/main/linux-lts/virt.x86_64.config
index 4a217fd25c8..4a217fd25c8 100644
--- a/main/linux-lts/config-virt.x86_64
+++ b/main/linux-lts/virt.x86_64.config