Add architecture type to the os::build::rpm::format_nvr function

Author: jhadvig

hack/build-rpm-release.sh

@@ -17,7 +17,7 @@ else
 fi
 
 os::log::info 'Building Origin release RPMs with tito...'
-os::build::rpm::get_nvr_vars
+os::build::rpm::get_nvra_vars
 tito tag --use-version="${OS_RPM_VERSION}" \
          --use-release="${OS_RPM_RELEASE}" \
          --no-auto-changelog --offline

hack/lib/build/rpm.sh

@@ -13,9 +13,11 @@
 #  - OS_RPM_NAME
 #  - OS_RPM_VERSION
 #  - OS_RPM_RELEASE
-function os::build::rpm::get_nvr_vars() {
+#  - OS_RPM_ARCHITECTURE
+function os::build::rpm::get_nvra_vars() {
 	# the package name can be overwritten but is normally 'origin'
 	OS_RPM_NAME="${OS_RPM_NAME:-"origin"}"
+	OS_RPM_ARCHITECTURE="$(uname -i)"
 
 	# we can extract the pacakge version from the build version
 	os::build::get_version_vars
@@ -58,25 +60,26 @@ function os::build::rpm::get_nvr_vars() {
 		os::log::fatal "Malformed git version metadata: ${metadata}"
 	fi
 
-	export OS_RPM_NAME OS_RPM_VERSION OS_RPM_RELEASE
+	export OS_RPM_NAME OS_RPM_VERSION OS_RPM_RELEASE OS_RPM_ARCHITECTURE
 }
 
 
-# os::build::rpm::format_nvr formats the rpm NVR vars generated by
-# os::build::rpm::get_nvr_vars and will generate them if necessary
+# os::build::rpm::format_nvra formats the rpm NVRA vars generated by
+# os::build::rpm::get_nvra_vars and will generate them if necessary
 #
 # Globals:
 #  - OS_RPM_NAME
 #  - OS_RPM_VERSION
 #  - OS_RPM_RELEASE
+#  - OS_RPM_ARCHITECTURE
 # Arguments:
 #  None
 # Returns:
 #  None
-function os::build::rpm::format_nvr() {
+function os::build::rpm::format_nvra() {
 	if [[ -z "${OS_RPM_NAME:-}" || -z "${OS_RPM_VERSION:-}" || -z "${OS_RPM_RELEASE:-}" ]]; then
-		os::build::rpm::get_nvr_vars
+		os::build::rpm::get_nvra_vars
 	fi
 
-	echo "${OS_RPM_NAME}-${OS_RPM_VERSION}-${OS_RPM_RELEASE}"
-}
+	echo "${OS_RPM_NAME}-${OS_RPM_VERSION}-${OS_RPM_RELEASE}.${OS_RPM_ARCHITECTURE}"
+}