build.sh: always build all steps for packages in the `INVARIANTS' target.

subr/post_sha256sums.subr: use relative pathnames in SHA256SUMS.

2 files changed, 9 insertions, 5 deletions

diff --git a/build.sh b/build.sh
index 1ef98bde..11ade034 100755
--- a/build.sh
+++ b/build.sh
@@ -64,6 +64,7 @@ for BUILD_TARGET_LC in $(subst_tgts invariants ${BUILD_TARGETS_META:-world}); do
 		fi;
 		(set -o errexit -o noglob;
 		if [ -n "${BUILD_PACKAGES_RESTART}" ]\
+		|| [ "${BUILD_TARGET}" = "INVARIANTS" ]\
 		|| ! is_build_script_done "${PKG_NAME}" finish; then
 			PKG_BUILD_STEPS="$(get_var_unsafe PKG_$(echo ${PKG_NAME} | tr a-z A-Z)_BUILD_STEPS)";
 			set -- ${PKG_BUILD_STEPS:-${BUILD_STEPS}};
@@ -73,7 +74,9 @@ for BUILD_TARGET_LC in $(subst_tgts invariants ${BUILD_TARGETS_META:-world}); do
 				abstract) _pkg_step_cmds="pkg_${PKG_NAME}_${1%:*}";
 					  _pkg_step_cmd_args="${ARG_RESTART_AT:-ALL}"; ;;
 				always)	  _pkg_step_cmds="pkg_${1%:*}"; ;;
-				main)	if [ -n "${BUILD_PACKAGES_RESTART}" ]; then
+				main)	if [ "${BUILD_TARGET}" = "INVARIANTS" ]; then
+						_pkg_step_cmds="pkg_${PKG_NAME}_${1%:*} pkg_${1%:*}";
+					elif [ -n "${BUILD_PACKAGES_RESTART}" ]; then
 						if [ -z "${ARG_RESTART_AT}" ]\
 						|| lmatch "${ARG_RESTART_AT}" , "${1%:*}"; then
 							_pkg_step_cmds="pkg_${PKG_NAME}_${1%:*} pkg_${1%:*}";
diff --git a/subr/post_sha256sums.subr b/subr/post_sha256sums.subr
index ed9f3ce7..41b131d9 100644
--- a/subr/post_sha256sums.subr
+++ b/subr/post_sha256sums.subr
@@ -10,11 +10,12 @@ post_sha256sums() {
 		if [ -e "${PREFIX}/SHA256SUMS" ]; then
 			build_fileop mv "${PREFIX}/SHA256SUMS" "${PREFIX}/SHA256SUMS.last";
 		fi;
-		for __ in $(find "${PREFIX_NATIVE}" -type f -perm /a=x	\
-				\( -path "${PREFIX_NATIVE}/bin/*" -or	\
-				   -path "${PREFIX_NATIVE}/lib/*" \)); do
+		(cd "${PREFIX}";
+		for __ in $(find "${PREFIX_NATIVE#${PREFIX}/}" -type f -perm /a=x	\
+				\( -path "${PREFIX_NATIVE#${PREFIX}/}/bin/*" -or	\
+				   -path "${PREFIX_NATIVE#${PREFIX}/}/lib/*" \)); do
 			sha256sum "${__}";
-		done > "${PREFIX}/SHA256SUMS";
+		done > "${PREFIX}/SHA256SUMS");
 	fi;
 };