subr/*: reorganised as {ex{,_{pkg,rtl,setup}},pkg}_*.

1 files changed, 29 insertions, 29 deletions

diff --git a/vars/musl.vars b/vars/musl.vars
index c9d21883..5605872f 100644
--- a/vars/musl.vars
+++ b/vars/musl.vars
@@ -4,9 +4,9 @@
 #
 
 pkgp_musl_configure() {
-	build_fileop rm "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
-	build_fileop mkdir "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
-	build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+	ex_build_fileop rm "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+	ex_build_fileop mkdir "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+	ex_build_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
 	env	lz_cflags_cmdline=""			\
 		lz_debug="yes"				\
 	../lazy/lazy					\
@@ -27,31 +27,31 @@ pkg_musl_no_complex_all() {
 	export lz_arch="${ARCH}" lz_cflags_debug="-O2" lz_target="${TARGET}";
 	# Musl: build (no-complex)
 	_install=install_no_complex;
-	set_build_dir "musl-${PKG_MUSL_VERSION}" cross;
-	if ! is_build_script_done "${PKG_NAME}" fetch "${_restart_at}"; then
+	ex_pkg_state_build_dir "musl-${PKG_MUSL_VERSION}" cross;
+	if ! ex_pkg_state_test "${PKG_NAME}" fetch "${_restart_at}"; then
 		pkg_fetch_wget "http://www.musl-libc.org/releases/musl-${PKG_MUSL_VERSION}.tar.gz"	\
 			"${PKG_MUSL_NO_COMPLEX_SHA256SUM}";
-		build_fileop rm "${PKG_BASE_DIR}/mmglue";
+		ex_build_fileop rm "${PKG_BASE_DIR}/mmglue";
 		pkg_fetch_git "mmglue=${DEFAULT_GITROOT}/mmglue";
-		set_build_script_done "${PKG_NAME}" fetch -extract;
+		ex_pkg_state_push "${PKG_NAME}" fetch -extract;
 	fi;
-	if ! is_build_script_done "${PKG_NAME}" extract "${_restart_at}"; then
-		build_fileop rm "musl-${PKG_MUSL_VERSION}";
+	if ! ex_pkg_state_test "${PKG_NAME}" extract "${_restart_at}"; then
+		ex_build_fileop rm "musl-${PKG_MUSL_VERSION}";
 		tar -C "${PKG_BASE_DIR}" -xf "${DLCACHEDIR}/musl-${PKG_MUSL_VERSION}.tar.gz";
 		set +o noglob;
-		 build_fileop cp ${PKG_BASE_DIR}/mmglue/* "${PKG_BASE_DIR}/musl-${PKG_MUSL_VERSION}/";
+		 ex_build_fileop cp ${PKG_BASE_DIR}/mmglue/* "${PKG_BASE_DIR}/musl-${PKG_MUSL_VERSION}/";
 		set -o noglob;
-		set_build_script_done "${PKG_NAME}" extract -configure;
+		ex_pkg_state_push "${PKG_NAME}" extract -configure;
 	fi;
-	if ! is_build_script_done "${PKG_NAME}" configure "${_restart_at}"; then
+	if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then
 		pkgp_musl_configure;
-		set_build_script_done "${PKG_NAME}" configure -build;
+		ex_pkg_state_push "${PKG_NAME}" configure -build;
 	else
-		build_fileop cd "${PKG_BUILD_DIR}";
+		ex_build_fileop cd "${PKG_BUILD_DIR}";
 	fi;
-	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
+	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 		./lazy -e "${_install}" -x build;
-		set_build_script_done "${PKG_NAME}" build finish;
+		ex_pkg_state_push "${PKG_NAME}" build finish;
 	fi;
 	exit 0;
 };
@@ -64,17 +64,17 @@ pkg_musl_native_all() {
 	export lz_arch="${ARCH}" lz_cflags_debug="-O2" lz_target="${TARGET}";
 	# Musl: build (full)
 	_install=install;
-	set_build_dir "musl-${PKG_MUSL_VERSION}" native;
-	if ! is_build_script_done "${PKG_NAME}" configure "${_restart_at}"; then
+	ex_pkg_state_build_dir "musl-${PKG_MUSL_VERSION}" native;
+	if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then
 		pkgp_musl_configure;
-		set_build_script_done "${PKG_NAME}" configure -build;
+		ex_pkg_state_push "${PKG_NAME}" configure -build;
 	else
-		build_fileop cd "${PKG_BUILD_DIR}";
+		ex_build_fileop cd "${PKG_BUILD_DIR}";
 	fi;
-	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
+	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 		./lazy -e "${_install}" -x build;
-		build_fileop ln_symbolic ../lib/libc.so "${PKG_PREFIX}/bin/ldd";
-		set_build_script_done "${PKG_NAME}" build finish;
+		ex_build_fileop ln_symbolic ../lib/libc.so "${PKG_PREFIX}/bin/ldd";
+		ex_pkg_state_push "${PKG_NAME}" build finish;
 	fi;
 	exit 0;
 };
@@ -87,16 +87,16 @@ pkg_musl_full_all() {
 	export lz_arch="${ARCH}" lz_cflags_debug="-O2" lz_target="${TARGET}";
 	# Musl: build (full)
 	_install=install;
-	set_build_dir "musl-${PKG_MUSL_VERSION}" cross;
-	if ! is_build_script_done "${PKG_NAME}" configure "${_restart_at}"; then
+	ex_pkg_state_build_dir "musl-${PKG_MUSL_VERSION}" cross;
+	if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then
 		pkgp_musl_configure;
-		set_build_script_done "${PKG_NAME}" configure -build;
+		ex_pkg_state_push "${PKG_NAME}" configure -build;
 	else
-		build_fileop cd "${PKG_BUILD_DIR}";
+		ex_build_fileop cd "${PKG_BUILD_DIR}";
 	fi;
-	if ! is_build_script_done "${PKG_NAME}" build "${_restart_at}"; then
+	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 		./lazy -e "${_install}" -x build;
-		set_build_script_done "${PKG_NAME}" build finish;
+		ex_pkg_state_push "${PKG_NAME}" build finish;
 	fi;
 	exit 0;
 };