From 4febe6f438f4cfef1a0b8a932ad79cdc2106d671 Mon Sep 17 00:00:00 2001
From: Patrick McDermott <patrick.mcdermott@libiquity.com>
Date: Sun, 21 Jun 2020 23:45:30 -0400
Subject: ob-*: Architecture-qualify package names

---
(limited to 'src/ob-buildopk.sh')

diff --git a/src/ob-buildopk.sh b/src/ob-buildopk.sh
index b781abb..d7486fc 100644
--- a/src/ob-buildopk.sh
+++ b/src/ob-buildopk.sh
@@ -27,12 +27,15 @@ build_opk()
 	local plat="${4}"
 	local date="${5}"
 	shift 5
+	local binary_qual=
 	local find_not_link=
 	local touch_noderef=
 	local sort_r=
 
+	binary_qual="$(ob_qualify_package_name "${binary}" "${OPK_HOST_ARCH}")"
+
 	ob_info "$(ob_get_msg 'build_opk')" \
-		"${binary}_${version}_${arch}_${plat}.opk"
+		"${binary_qual}_${version}_${arch}_${plat}.opk"
 
 	mkdir -p '.opkbuild'
 
@@ -78,13 +81,14 @@ build_opk()
 	${TOUCH} -t "${date}" 'control.tar' 'data.tar'
 	${GZIP} 'control.tar' 'data.tar'
 
-	${TAR} -cf "../../${binary}_${version}_${arch}_${plat}.tar" \
+	${TAR} -cf "../../${binary_qual}_${version}_${arch}_${plat}.tar" \
 		'debian-binary' 'control.tar.gz' 'data.tar.gz'
 	rm -Rf 'control.tar.gz' 'data.tar.gz'
-	${TOUCH} -t "${date}" "../../${binary}_${version}_${arch}_${plat}.tar"
-	${GZIP} "../../${binary}_${version}_${arch}_${plat}.tar"
-	mv "../../${binary}_${version}_${arch}_${plat}.tar.gz" \
-		"../../${binary}_${version}_${arch}_${plat}.opk"
+	${TOUCH} -t "${date}" \
+		"../../${binary_qual}_${version}_${arch}_${plat}.tar"
+	${GZIP} "../../${binary_qual}_${version}_${arch}_${plat}.tar"
+	mv "../../${binary_qual}_${version}_${arch}_${plat}.tar.gz" \
+		"../../${binary_qual}_${version}_${arch}_${plat}.opk"
 
 	return 0
 }
--
cgit v0.9.1