From 8a3e16effb73aa62de2c20dc3c2eb012d69e6665 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Mon, 08 Oct 2012 13:33:28 -0400
Subject: Update environment variable names in ob-* utils.

---
(limited to 'src')

diff --git a/src/ob-buildenv.sh b/src/ob-buildenv.sh
index 0b6acfd..7689c5d 100644
--- a/src/ob-buildenv.sh
+++ b/src/ob-buildenv.sh
@@ -47,7 +47,7 @@ setup_build_helper()
 
 setup_toolchain()
 {
-	tool_prefix="${OB_HOST_ARCH}-"
+	tool_prefix="${OPK_HOST_ARCH}-"
 
 	# Set toolchain environment variables.
 	# NB: This is written for GNU Binutils and GCC and won't work for, e.g.,
@@ -72,7 +72,7 @@ EOF
 
 setup_build_flags()
 {
-	build_flags="$(ob_get_system_path 'buildflags' "${OB_HOST_ARCH}")"
+	build_flags="$(ob_get_system_path 'buildflags' "${OPK_HOST_ARCH}")"
 	if [ -r "${build_flags}" ]; then
 		. "${build_flags}"
 	fi
diff --git a/src/ob-buildopk.sh b/src/ob-buildopk.sh
index c9fda81..9dc9891 100644
--- a/src/ob-buildopk.sh
+++ b/src/ob-buildopk.sh
@@ -34,10 +34,10 @@ main()
 
 	echo '2.0' >'debian-binary'
 	if [ -n "${OB_DO_SOURCE}" ]; then
-		build_opk "src-${OB_SOURCE}" "${OB_SOURCE_VERSION}"
+		build_opk "src-${OPK_SOURCE}" "${OPK_SOURCE_VERSION}"
 	else
 		for pkg in $(ob_get_binary_packages); do
-			build_opk "${pkg}" "${OB_BINARY_VERSION}"
+			build_opk "${pkg}" "${OPK_BINARY_VERSION}"
 		done
 	fi
 	rm 'debian-binary'
diff --git a/src/ob-gencontrol.sh b/src/ob-gencontrol.sh
index 858e69e..b181fe1 100644
--- a/src/ob-gencontrol.sh
+++ b/src/ob-gencontrol.sh
@@ -33,14 +33,14 @@ main()
 	ob_parse_package_metadata -c '.opkbuild.cache'
 
 	if [ -n "${OB_DO_SOURCE}" ]; then
-		gen_control "src-${OB_SOURCE}" "${OB_SOURCE_VERSION}" 'src' \
-			"${OB_SOURCE} source package" 'false'
-		gen_md5sums "src-${OB_SOURCE}"
+		gen_control "src-${OPK_SOURCE}" "${OPK_SOURCE_VERSION}" 'src' \
+			"${OPK_SOURCE} source package" 'false'
+		gen_md5sums "src-${OPK_SOURCE}"
 	else
 		for pkg in $(ob_get_binary_packages); do
 			arch="$(ob_get_binary_parameter "${pkg}" 'Architecture')"
-			[ "${arch}" != 'all' ] && arch="${OB_HOST_ARCH}"
-			gen_control "${pkg}" "${OB_BINARY_VERSION}" "${arch}" \
+			[ "${arch}" != 'all' ] && arch="${OPK_HOST_ARCH}"
+			gen_control "${pkg}" "${OPK_BINARY_VERSION}" "${arch}" \
 				"$(ob_get_binary_parameter "${pkg}" 'Description')" 'true'
 			install_maintainer_scripts "${pkg}"
 			gen_conffiles "${pkg}"
@@ -89,7 +89,7 @@ gen_control()
 
 	cat >"${binary}.control/control" <<EOF
 Package: ${binary}
-Source: ${OB_SOURCE}
+Source: ${OPK_SOURCE}
 Version: ${version}
 Architecture: ${arch}
 EOF
diff --git a/src/ob-installdocs.sh b/src/ob-installdocs.sh
index cf3aae3..dcc1125 100644
--- a/src/ob-installdocs.sh
+++ b/src/ob-installdocs.sh
@@ -37,11 +37,11 @@ main()
 		ob_error "$(ob_get_msg 'cant_get_doc_pkg')"
 	fi
 	doc_pkg_doc_dir="$(ob_get_system_path 'package-docs' \
-		"${doc_pkg}" "${OB_BINARY_VERSION}")"
+		"${doc_pkg}" "${OPK_BINARY_VERSION}")"
 
 	for pkg in $(ob_get_binary_packages); do
 		doc_dir="$(ob_get_system_path 'package-docs' \
-			"${pkg}" "${OB_BINARY_VERSION}")"
+			"${pkg}" "${OPK_BINARY_VERSION}")"
 		data_doc_dir="${pkg}.data/${doc_dir}"
 		mkdir -p "${data_doc_dir}" || \
 			ob_error "$(ob_get_msg 'cant_make_doc_dir')"
diff --git a/src/ob-installplatconf.sh b/src/ob-installplatconf.sh
index 33c87b5..488c1cd 100644
--- a/src/ob-installplatconf.sh
+++ b/src/ob-installplatconf.sh
@@ -63,9 +63,9 @@ copy_config()
 			ob_error "$(ob_get_msg 'cant_make_config_dest_dir')" "${dest%/*}"
 		# Find the config package files.
 		config_dir_base="$(ob_get_system_path 'platconf' \
-			"${OB_SOURCE}" "${OB_SOURCE_VERSION}" "${OB_HOST_PLATFORM}")"
-		if [ -d "${config_dir_base}-${OB_SOURCE_VERSION_UPSTREAM}" ]; then
-			src_base="${config_dir_base}-${OB_SOURCE_VERSION_UPSTREAM}"
+			"${OPK_SOURCE}" "${OPK_SOURCE_VERSION}" "${OPK_HOST_PLAT}")"
+		if [ -d "${config_dir_base}-${OPK_SOURCE_VERSION_UPSTREAM}" ]; then
+			src_base="${config_dir_base}-${OPK_SOURCE_VERSION_UPSTREAM}"
 		elif [ -d "${config_dir_base}" ]; then
 			src_base="${config_dir_base}"
 		else
diff --git a/src/ob-unpacksource.sh b/src/ob-unpacksource.sh
index 48e7269..09aedfa 100644
--- a/src/ob-unpacksource.sh
+++ b/src/ob-unpacksource.sh
@@ -60,7 +60,7 @@ unpack_upstream()
 
 get_upstream_archive()
 {
-	upstream_archive_base="${OB_SOURCE}-${OB_SOURCE_VERSION_UPSTREAM}.orig.tar."
+	upstream_archive_base="${OPK_SOURCE}-${OPK_SOURCE_VERSION_UPSTREAM}.orig.tar."
 	upstream_archive="$(find '..' -name "${upstream_archive_base}*")"
 	case "$(echo "${upstream_archive}" | grep -v '^$' | wc -l)" in
 		0)
--
cgit v0.9.1