fix: use underscore (_) for subarch marking

When using / as the subarch marker, it would prevent autobuild/$ARCH or
.patch.$ARCH from working, using _ as a workaround.

Author: MingcongBai

lib/builtin.sh

@@ -42,7 +42,7 @@ ab_match_arch() {
 		abinfo "Usage: ab_match_arch \"match_pattern\""
 		abdie "Misuse of ab_match_arch()! Refuse to proceed."
 	fi
-	if [[ ${ABHOST%%\/*} = $1 ]]; then
+	if [[ ${ABHOST%%_*} = $1 ]]; then
 		abinfo "Architecture $ABHOST matches $1: taking true branch."
 		return 0
 	else
@@ -72,7 +72,7 @@ ab_match_archgroup() {
 		if [[ ${_grp%%\/*} = $1 ]]; then
 			abinfo "Member '${_grp}' in Architecture group '${ABHOST_GROUP[*]}' matches $1: taking true branch."
 			return 0
-		else 
+		else
 			abdbg "Member '${_grp}' in Architecture group '${ABHOST_GROUP[*]}' mismatches $1."
 		fi
 	done

pm/dpkg.sh

@@ -81,7 +81,7 @@ dpkgfield() {
 }
 
 dpkgctrl() {
-	local arch="${DPKG_ARCH%%\/*}"
+	local arch="${DPKG_ARCH%%_*}"
 	[[ "$arch" == noarch ]] && arch=all
 	echo "Package: $PKGNAME"
 	echo "Version: $(dpkgpkgver)"
@@ -135,7 +135,7 @@ dpkgctrl() {
 }
 
 dpkgctrl_dbg() {
-	local arch="${DPKG_ARCH%%\/*}"
+	local arch="${DPKG_ARCH%%_*}"
 	[[ "$arch" == noarch ]] && arch=all
 	echo "Package: $PKGNAME-dbg"
 	echo "Version: $(dpkgpkgver)"
@@ -165,7 +165,7 @@ pm_install_all() {
 }
 
 pm_build_package() {
-	local _file="${PKGNAME}_${PKGVER}-${PKGREL}${VERSTAMP:-}_${DPKG_ARCH%%\/*}.deb"
+	local _file="${PKGNAME}_${PKGVER}-${PKGREL}${VERSTAMP:-}_${DPKG_ARCH%%_*}.deb"
 	mkdir -p "$PKGDIR"/DEBIAN \
 		|| abdie "Failed to create DEBIAN directory for .deb metadata: $?."
 	cp -rl "$SRCDIR"/abscripts/* "$PKGDIR"/DEBIAN \
@@ -191,7 +191,7 @@ pm_build_package() {
 }
 
 pm_build_debug_package() {
-	local _file="${PKGNAME}-dbg_${PKGVER}-${PKGREL}${VERSTAMP:-}_${DPKG_ARCH%%\/*}.deb"
+	local _file="${PKGNAME}-dbg_${PKGVER}-${PKGREL}${VERSTAMP:-}_${DPKG_ARCH%%_*}.deb"
 	mkdir -p "$SYMDIR"/DEBIAN \
 			|| abdie "Failed to create DEBIAN directory for -dbg .deb metadata: $?."
 		dpkgctrl_dbg > "$SYMDIR"/DEBIAN/control \

proc/01-core-defines.sh

@@ -57,7 +57,7 @@ elif [[ "$ABHOST" != 'noarch' ]]; then
 	abdie "Cross-compilation is no longer supported."
 fi
 
-load_strict "$AB/arch/${ABHOST//\//_}.sh"
+load_strict "$AB/arch/${ABHOST}.sh"
 load_strict "$AB"/lib/default-flags.sh
 
 if ! abisdefined DPKG_ARCH ; then
@@ -84,7 +84,7 @@ if [ -n "$ALLOW_ARCH" ] && [ "${ABBUILD%%\/*}" != $ALLOW_ARCH ]; then
 	abdie "This package can only be built on $ALLOW_ARCH, not including $ABHOST."
 fi
 # shellcheck disable=SC2053
-[[ ${ABHOST%%\/*} != $FAIL_ARCH ]] ||
+[[ ${ABHOST} != $FAIL_ARCH ]] ||
 	abdie "This package cannot be built for $FAIL_ARCH, e.g. $ABHOST."
 
 if ! bool "$ABSTRIP" && bool "$ABSPLITDBG"; then

sets/arch_groups.json

@@ -3,7 +3,7 @@
     "amd64",
     "arm64",
     "loongarch64",
-    "loongarch64/nosimd",
+    "loongarch64_nosimd",
     "loongson3",
     "ppc64el",
     "riscv64"
@@ -27,7 +27,7 @@
     "amd64",
     "arm64",
     "loongarch64",
-    "loongarch64/nosimd",
+    "loongarch64_nosimd",
     "loongson3",
     "mips64r6el",
     "ppc64el",
@@ -50,7 +50,7 @@
   ],
   "without_dotnet": [
     "loongarch64",
-    "loongarch64/nosimd",
+    "loongarch64_nosimd",
     "loongson3",
     "ppc64el",
     "riscv64",

sets/arch_targets.json

@@ -1,7 +1,5 @@
 {
   "amd64": "x86_64-aosc-linux-gnu",
-  "amd64/avx+": "x86_64-aosc-linux-gnu",
-  "amd64/avx2+": "x86_64-aosc-linux-gnu",
   "arm64": "aarch64-aosc-linux-gnu",
   "armv4": "arm-aosc-linux-gnueabi",
   "armv6hf": "arm-aosc-linux-gnueabihf",
@@ -10,7 +8,7 @@
   "loongson2f": "mips64el-aosc-linux-gnuabi64",
   "loongson3": "mips64el-aosc-linux-gnuabi64",
   "loongarch64": "loongarch64-aosc-linux-gnu",
-  "loongarch64/nosimd": "loongarch64-aosc-linux-gnu",
+  "loongarch64_nosimd": "loongarch64-aosc-linux-gnu",
   "m68k": "m68k-aosc-linux-gnu",
   "mips32r6el": "mipsisa32r6el-aosc-linux-gnu",
   "mips64r6el": "mipsisa64r6el-aosc-linux-gnuabi64",