summaryrefslogtreecommitdiffhomepage
path: root/vars
diff options
context:
space:
mode:
Diffstat (limited to 'vars')
-rw-r--r--vars/busybox.vars6
-rw-r--r--vars/ca_certificates.vars2
-rw-r--r--vars/chainport_host.vars4
-rw-r--r--vars/clang_host.vars10
-rw-r--r--vars/cmake.vars2
-rw-r--r--vars/dbus_host.vars2
-rw-r--r--vars/env.vars20
-rw-r--r--vars/gcc.vars48
-rw-r--r--vars/ghostscript.vars8
-rw-r--r--vars/git.vars2
-rw-r--r--vars/install_strip_host.vars4
-rw-r--r--vars/invariants_digest.vars10
-rw-r--r--vars/invariants_gitref.vars2
-rw-r--r--vars/invariants_minipix.vars20
-rw-r--r--vars/invariants_zipdist.vars16
-rw-r--r--vars/libressl_host.vars2
-rw-r--r--vars/libtool_host.vars2
-rw-r--r--vars/libxml2.vars2
-rw-r--r--vars/llvm_host.vars10
-rw-r--r--vars/mpackage_host.vars4
-rw-r--r--vars/musl.vars6
-rw-r--r--vars/nasm_host.vars2
-rw-r--r--vars/nginx.vars2
-rw-r--r--vars/perl.vars10
-rw-r--r--vars/pkgconf_host.vars8
-rw-r--r--vars/psxstub_host.vars4
-rw-r--r--vars/python2.vars4
-rw-r--r--vars/python2_host.vars6
-rw-r--r--vars/python3.vars4
-rw-r--r--vars/python3_host.vars6
-rw-r--r--vars/rpm_host.vars2
-rw-r--r--vars/texinfo.vars4
-rw-r--r--vars/texinfo_host.vars2
-rw-r--r--vars/tzdb_host.vars2
-rw-r--r--vars/vim.vars4
35 files changed, 122 insertions, 120 deletions
diff --git a/vars/busybox.vars b/vars/busybox.vars
index 71dd3aa3..14b33b91 100644
--- a/vars/busybox.vars
+++ b/vars/busybox.vars
@@ -3,14 +3,14 @@
#
pkg_busybox_configure() {
- ex_rtl_fileop cp "${MIDIPIX_BUILD_PWD}/etc/busyboxconfig" "${PKG_BUILD_DIR}/.config";
+ rtl_fileop cp "${MIDIPIX_BUILD_PWD}/etc/busyboxconfig" "${PKG_BUILD_DIR}/.config";
};
pkg_busybox_install_make_post() {
set +o noglob
- ex_rtl_fileop cp "${PKG_BUILD_DIR}/_install/bin/"* "${PKG_DESTDIR}/bin/";
+ rtl_fileop cp "${PKG_BUILD_DIR}/_install/bin/"* "${PKG_DESTDIR}/bin/";
set -o noglob
- ex_rtl_fileop cp "${PKG_BUILD_DIR}/_install/lib/libbusybox.so.${PKG_VERSION}" "${PKG_DESTDIR}/lib/";
+ rtl_fileop cp "${PKG_BUILD_DIR}/_install/lib/libbusybox.so.${PKG_VERSION}" "${PKG_DESTDIR}/lib/";
};
# vim:filetype=sh
diff --git a/vars/ca_certificates.vars b/vars/ca_certificates.vars
index 65b8387b..69d7bfb7 100644
--- a/vars/ca_certificates.vars
+++ b/vars/ca_certificates.vars
@@ -7,7 +7,7 @@ pkg_ca_certificates_install_make_pre() {
};
pkg_ca_certificates_install_make_post() {
- ex_rtl_fileop cd "${PKG_DESTDIR}/share/ca-certificates";
+ rtl_fileop cd "${PKG_DESTDIR}/share/ca-certificates";
set +o noglob
find . -name '*.crt' | sort | cut -b3- > ${PKG_DESTDIR}/etc/ca-certificates.conf
set -o noglob
diff --git a/vars/chainport_host.vars b/vars/chainport_host.vars
index 5db2cdb9..aa4450f4 100644
--- a/vars/chainport_host.vars
+++ b/vars/chainport_host.vars
@@ -3,8 +3,8 @@
#
pkg_chainport_host_install_make() {
- ex_rtl_fileop rm "${BUILD_WORKDIR}/chainport";
- ex_rtl_fileop cp ../chainport "${BUILD_WORKDIR}/chainport";
+ rtl_fileop rm "${BUILD_WORKDIR}/chainport";
+ rtl_fileop cp ../chainport "${BUILD_WORKDIR}/chainport";
};
# vim:filetype=sh
diff --git a/vars/clang_host.vars b/vars/clang_host.vars
index 32e9cc70..ada3ba33 100644
--- a/vars/clang_host.vars
+++ b/vars/clang_host.vars
@@ -3,10 +3,10 @@
#
pkg_clang_host_configure() {
- ex_rtl_fileop rm "../cfe-${PKG_VERSION}-host";
- ex_rtl_fileop mkdir "../cfe-${PKG_VERSION}-host";
- ex_rtl_fileop cd "../cfe-${PKG_VERSION}-host";
- ex_rtl_log_msg info "Bootstrapping clang_host...";
+ rtl_fileop rm "../cfe-${PKG_VERSION}-host";
+ rtl_fileop mkdir "../cfe-${PKG_VERSION}-host";
+ rtl_fileop cd "../cfe-${PKG_VERSION}-host";
+ rtl_log_msg info "Bootstrapping clang_host...";
("${PREFIX}/bin/cmake" \
"../cfe-${PKG_VERSION}.src" \
-DCLANG_BUILD_EXAMPLES:BOOL=OFF \
@@ -19,7 +19,7 @@ pkg_clang_host_configure() {
-DLLVM_PREFIX="${PKG_PREFIX}" \
-G "Unix Makefiles" \
-Wno-dev);
- ex_rtl_log_msg info "Finished bootstrapping clang_host.";
+ rtl_log_msg info "Finished bootstrapping clang_host.";
};
# vim:filetype=sh
diff --git a/vars/cmake.vars b/vars/cmake.vars
index 21b22c48..4417026c 100644
--- a/vars/cmake.vars
+++ b/vars/cmake.vars
@@ -3,7 +3,7 @@
#
pkg_cmake_configure() {
- ex_rtl_fileop cp "${PREFIX}/share/cmake-${PKG_VERSION%.*}/Modules/Platform/BSDOS.cmake" \
+ rtl_fileop cp "${PREFIX}/share/cmake-${PKG_VERSION%.*}/Modules/Platform/BSDOS.cmake" \
"${PREFIX}/share/cmake-${PKG_VERSION%.*}/Modules/Platform/Midipix.cmake";
rm -f config.cache;
env CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}" \
diff --git a/vars/dbus_host.vars b/vars/dbus_host.vars
index 8536b3d6..65b6d7eb 100644
--- a/vars/dbus_host.vars
+++ b/vars/dbus_host.vars
@@ -3,7 +3,7 @@
#
pkg_dbus_host_install_pre() {
- ex_rtl_fileop rm "${PKG_DESTDIR}/etc" "${PKG_DESTDIR}/var";
+ rtl_fileop rm "${PKG_DESTDIR}/etc" "${PKG_DESTDIR}/var";
};
# vim:filetype=sh
diff --git a/vars/env.vars b/vars/env.vars
index 32383213..26fb4835 100644
--- a/vars/env.vars
+++ b/vars/env.vars
@@ -17,15 +17,17 @@ DEFAULT_BUILD_VARS="
CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA \
CFLAGS_INSTALL_EXTRA CONFIG_CACHE CONFIG_CACHE_EXTRA \
CONFIG_CACHE_LOCAL CONFIGURE CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA \
- CXX CXXFLAGS_CONFIGURE CXXFLAGS_CONFIGURE_EXTRA DEPENDS DESTDIR DISABLED \
- ENV_VARS_EXTRA FNAME GITROOT INHERIT_FROM INSTALL_FILES INSTALL_FILES \
+ CXX CXXFLAGS_CONFIGURE CXXFLAGS_CONFIGURE_EXTRA \
+ DEPENDS DESTDIR DISABLED ENV_VARS_EXTRA FNAME \
+ FORCE GITROOT INHERIT_FROM INSTALL_FILES INSTALL_FILES \
INSTALL_FILES_DESTDIR INSTALL_FILES_DESTDIR_EXTRA INSTALL_TARGET \
INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE \
LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA LIBTOOL MAKE \
- MAKE_INSTALL_VNAME MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL \
- MAKEFLAGS_INSTALL_EXTRA NO_CLEAN NO_CLEAN_BASE_DIR NO_LOG_VARS PYTHON \
- PATCHES_EXTRA PKG_CONFIG PKG_CONFIG_PATH PKGLIST_DISABLE PREFIX RANLIB \
- RPM_DISABLE SHA256SUM SUBDIR TARGET URL URL_TYPE URLS_GIT VERSION";
+ MAKE_INSTALL_VNAME MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA \
+ MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN \
+ NO_CLEAN_BASE_DIR NO_LOG_VARS PYTHON PATCHES_EXTRA PKG_CONFIG \
+ PKG_CONFIG_PATH PKGLIST_DISABLE PREFIX RANLIB RPM_DISABLE \
+ SHA256SUM SUBDIR TARGET URL URL_TYPE URLS_GIT VERSION";
# Path names
: ${PREFIX_ROOT:=${HOME}/midipix};
@@ -68,10 +70,10 @@ DEFAULT_BUILD_VARS="
: ${DEFAULT_CFLAGS_RELEASE:="-g0 -O0"};
: ${DEFAULT_CFLAGS_RELEASE_HOST:="-g0 -O0"};
: ${DEFAULT_CFLAGS_RELEASE_RUNTIME:="-g0 -O0"};
-: ${DEFAULT_CFLAGS:=$(ex_rtl_get_var_unsafe "DEFAULT_CFLAGS_$(ex_rtl_toupper "${BUILD}")")};
+: ${DEFAULT_CFLAGS:=$(rtl_get_var_unsafe "DEFAULT_CFLAGS_$(rtl_toupper "${BUILD}")")};
: ${DEFAULT_CFLAGS_CONFIGURE:=${DEFAULT_CFLAGS}};
-: ${DEFAULT_CFLAGS_HOST:=$(ex_rtl_get_var_unsafe "DEFAULT_CFLAGS_$(ex_rtl_toupper "${BUILD}")_HOST")};
-: ${DEFAULT_CFLAGS_RUNTIME:=$(ex_rtl_get_var_unsafe "DEFAULT_CFLAGS_$(ex_rtl_toupper "${BUILD}")_RUNTIME")};
+: ${DEFAULT_CFLAGS_HOST:=$(rtl_get_var_unsafe "DEFAULT_CFLAGS_$(rtl_toupper "${BUILD}")_HOST")};
+: ${DEFAULT_CFLAGS_RUNTIME:=$(rtl_get_var_unsafe "DEFAULT_CFLAGS_$(rtl_toupper "${BUILD}")_RUNTIME")};
: ${DEFAULT_GITROOT:=git://midipix.org};
: ${DEFAULT_GITROOT_HEAD:=git://midipix.org};
: ${DEFAULT_LOG_MSG_FAIL_COLOUR:=91};
diff --git a/vars/gcc.vars b/vars/gcc.vars
index 61675322..ec22fe62 100644
--- a/vars/gcc.vars
+++ b/vars/gcc.vars
@@ -61,9 +61,9 @@ pkgp_gcc_setup_env() {
};
pkgp_gcc_configure() {
- ex_rtl_fileop rm "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
- ex_rtl_fileop mkdir "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
- ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+ rtl_fileop rm "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+ rtl_fileop mkdir "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+ rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
"../cbb-gcc-${PKG_VERSION}/configure" "${@}"\
--disable-bootstrap \
--disable-libmudflap \
@@ -94,18 +94,18 @@ pkg_gcc_stage1_host_all() {
};
pkg_gcc_stage1_cross_mingw32_all() {
- ex_rtl_fileop ln_symbolic . "${PKG_PREFIX}/x86_64-w64-mingw32/mingw";
- ex_rtl_fileop mkdir "${PKG_DESTDIR}/x86_64-w64-mingw32";
- ex_rtl_fileop ln_symbolic . "${PKG_DESTDIR}/x86_64-w64-mingw32/mingw";
- ex_rtl_fileop mkdir "${PKG_PREFIX}/x86_64-w64-mingw32/include";
+ rtl_fileop ln_symbolic . "${PKG_PREFIX}/x86_64-w64-mingw32/mingw";
+ rtl_fileop mkdir "${PKG_DESTDIR}/x86_64-w64-mingw32";
+ rtl_fileop ln_symbolic . "${PKG_DESTDIR}/x86_64-w64-mingw32/mingw";
+ rtl_fileop mkdir "${PKG_PREFIX}/x86_64-w64-mingw32/include";
pkg_gcc_stage1_all "${@}";
};
pkg_gcc_stage1_native_mingw32_all() {
- ex_rtl_fileop ln_symbolic . "${PKG_PREFIX}/x86_64-w64-mingw32/mingw";
- ex_rtl_fileop mkdir "${PKG_DESTDIR}/x86_64-w64-mingw32";
- ex_rtl_fileop ln_symbolic . "${PKG_DESTDIR}/x86_64-w64-mingw32/mingw";
- ex_rtl_fileop mkdir "${PKG_PREFIX}/x86_64-w64-mingw32/include";
+ rtl_fileop ln_symbolic . "${PKG_PREFIX}/x86_64-w64-mingw32/mingw";
+ rtl_fileop mkdir "${PKG_DESTDIR}/x86_64-w64-mingw32";
+ rtl_fileop ln_symbolic . "${PKG_DESTDIR}/x86_64-w64-mingw32/mingw";
+ rtl_fileop mkdir "${PKG_PREFIX}/x86_64-w64-mingw32/include";
pkg_gcc_stage1_all "${@}";
};
@@ -113,8 +113,8 @@ pkg_gcc_stage1_all() {
local __="" _restart_at="${1}";
case "${PKG_NAME}" in
gcc_stage1_host)
- ex_rtl_fileop ln_symbolic . "${PREFIX_CROSS}/usr";
- ex_rtl_fileop mkdir "${PREFIX_CROSS}/usr/include";
+ rtl_fileop ln_symbolic . "${PREFIX_CROSS}/usr";
+ rtl_fileop mkdir "${PREFIX_CROSS}/usr/include";
pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" cross;
;;
gcc_stage1_cross_mingw32)
@@ -126,7 +126,7 @@ pkg_gcc_stage1_all() {
esac;
# GCC, stage1.
if ! ex_pkg_state_test "${PKG_NAME}" fetch "${_restart_at}"; then
- ex_rtl_fetch_urls_git "${PKG_BASE_DIR}" "cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}";
+ rtl_fetch_urls_git "${PKG_BASE_DIR}" "cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}";
pkgp_gcc_state_set fetch patch;
fi;
if ! ex_pkg_state_test "${PKG_NAME}" patch "${_restart_at}"; then
@@ -169,7 +169,7 @@ pkg_gcc_stage1_all() {
--without-headers; ;;
esac;
else
- ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+ rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
fi;
if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
make ${PKG_MAKEFLAGS_BUILD} all-gcc;
@@ -190,8 +190,8 @@ pkg_gcc_stage1_all() {
esac;
__="$(uname -s)";
if [ "${__#*CYGWIN*}" != "${__}" ]; then
- ex_rtl_fileop ln_symbolic "${PKG_DESTDIR}/libexec/gcc/${PKG_TARGET}/${PKG_VERSION}/liblto_plugin.dll.a" \
- ex_rtl_fileop ln_symbolic "${PKG_DESTDIR}/libexec/gcc/${PKG_TARGET}/${PKG_VERSION}/liblto_plugin.so";
+ rtl_fileop ln_symbolic "${PKG_DESTDIR}/libexec/gcc/${PKG_TARGET}/${PKG_VERSION}/liblto_plugin.dll.a" \
+ rtl_fileop ln_symbolic "${PKG_DESTDIR}/libexec/gcc/${PKG_TARGET}/${PKG_VERSION}/liblto_plugin.so";
fi;
pkgp_gcc_state_set install_make install;
fi;
@@ -206,7 +206,7 @@ pkg_gcc_runtime_host_all() {
local _vis_hide="vis_hide=-fvisibility=hidden";
export MAKE="make LIBTOOL=slibtool ${_vis_hide}";
pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" cross;
- ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+ rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
# GCC, compiler runtime.
if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
make ${PKG_MAKEFLAGS_BUILD} all-target-libgcc ${_vis_hide};
@@ -230,7 +230,7 @@ pkg_gcc_libstdcpp_v3_host_all() {
local _restart_at="${1}";
export MAKE="make LIBTOOL=slibtool";
pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" cross;
- ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+ rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
# GCC, libstdc++-v3.
if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
make ${PKG_MAKEFLAGS_BUILD} all-target-libstdc++-v3;
@@ -254,7 +254,7 @@ pkg_gcc_full_host_all() {
local _restart_at="${1}";
export MAKE="make LIBTOOL=slibtool";
pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" cross;
- ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+ rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
# GCC, everything else.
if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
make ${PKG_MAKEFLAGS_BUILD};
@@ -281,7 +281,7 @@ pkg_gcc_full_all() {
# GCC, native.
pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" native;
if ! ex_pkg_state_test "${PKG_NAME}" fetch "${_restart_at}"; then
- ex_rtl_fetch_urls_git "${PKG_BASE_DIR}" "cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}";
+ rtl_fetch_urls_git "${PKG_BASE_DIR}" "cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}";
pkgp_gcc_state_set fetch patch;
fi;
if ! ex_pkg_state_test "${PKG_NAME}" patch "${_restart_at}"; then
@@ -292,9 +292,9 @@ pkg_gcc_full_all() {
fi;
pkgp_gcc_setup_env "${PKG_VERSION}";
if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then
- ex_rtl_fileop mkdir "${PKG_PREFIX}/${PKG_TARGET}";
+ rtl_fileop mkdir "${PKG_PREFIX}/${PKG_TARGET}";
if [ \! -d "${PKG_PREFIX}/${PKG_TARGET}/usr" ]; then
- ex_rtl_fileop ln_symbolic . "${PKG_PREFIX}/${PKG_TARGET}/usr";
+ rtl_fileop ln_symbolic . "${PKG_PREFIX}/${PKG_TARGET}/usr";
fi;
if [ "${ARCH}" = nt32 ]; then
_configure_host="i686-nt32-midipix";
@@ -311,7 +311,7 @@ pkg_gcc_full_all() {
--with-mpfr="${PKG_PREFIX}" \
--with-sysroot=;
else
- ex_rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
+ rtl_fileop cd "${PKG_BASE_DIR}/${PKG_BUILD_DIR}";
fi;
if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
make ${PKG_MAKEFLAGS_BUILD} all-gcc;
diff --git a/vars/ghostscript.vars b/vars/ghostscript.vars
index aed92398..ee6ec5e2 100644
--- a/vars/ghostscript.vars
+++ b/vars/ghostscript.vars
@@ -3,10 +3,10 @@
#
pkg_ghostscript_configure_patch_pre() {
- ex_rtl_fileop rm "${PKG_BASE_DIR}/ghostscript-9.26/zlib";
- ex_rtl_fileop rm "${PKG_BASE_DIR}/ghostscript-9.26/libpng";
- ex_rtl_fileop rm "${PKG_PREFIX}/freetype";
- ex_rtl_fileop rm "${PKG_PREFIX}/lcms2mt";
+ rtl_fileop rm "${PKG_BASE_DIR}/ghostscript-9.26/zlib";
+ rtl_fileop rm "${PKG_BASE_DIR}/ghostscript-9.26/libpng";
+ rtl_fileop rm "${PKG_PREFIX}/freetype";
+ rtl_fileop rm "${PKG_PREFIX}/lcms2mt";
};
# vim:filetype=sh
diff --git a/vars/git.vars b/vars/git.vars
index 78e8746d..d872c7e8 100644
--- a/vars/git.vars
+++ b/vars/git.vars
@@ -10,7 +10,7 @@ pkg_git_install_make_post() {
local __="" _new="";
for __ in $(find "${PKG_DESTDIR}" -name "Git*::*" -type f); do
_new="$(echo ${__} | sed "s/::/./g")";
- ex_rtl_fileop mv "${__}" "${_new}";
+ rtl_fileop mv "${__}" "${_new}";
done;
};
diff --git a/vars/install_strip_host.vars b/vars/install_strip_host.vars
index 1fb33868..1a60be72 100644
--- a/vars/install_strip_host.vars
+++ b/vars/install_strip_host.vars
@@ -4,9 +4,9 @@
pkg_install_strip_host_all() {
if [ -e "${PREFIX}/bin/${PKG_TARGET}-install-strip" ]; then
- ex_rtl_fileop rm "${PREFIX}/bin/${PKG_TARGET}-install-strip";
+ rtl_fileop rm "${PREFIX}/bin/${PKG_TARGET}-install-strip";
fi;
- ex_rtl_fileop mkdir "${PREFIX}/bin";
+ rtl_fileop mkdir "${PREFIX}/bin";
cat > "${PREFIX}/bin/${PKG_TARGET}-install-strip" <<EOF
#!/bin/sh
install -s "\${@}";
diff --git a/vars/invariants_digest.vars b/vars/invariants_digest.vars
index 1a013f15..0a444655 100644
--- a/vars/invariants_digest.vars
+++ b/vars/invariants_digest.vars
@@ -4,12 +4,12 @@
pkg_invariants_digest_all() {
local _fname="";
- if ex_rtl_lmatch "${ARG_DIST}" "tbz2" "," \
- || ex_rtl_lmatch "${ARG_DIST}" "tgz" "," \
- || ex_rtl_lmatch "${ARG_DIST}" "txz" ","; then
- ex_rtl_log_msg info "Compiling SHA256 sums...";
+ if rtl_lmatch "${ARG_DIST}" "tbz2" "," \
+ || rtl_lmatch "${ARG_DIST}" "tgz" "," \
+ || rtl_lmatch "${ARG_DIST}" "txz" ","; then
+ rtl_log_msg info "Compiling SHA256 sums...";
if [ -e "${PREFIX}/SHA256SUMS" ]; then
- ex_rtl_fileop mv "${PREFIX}/SHA256SUMS" "${PREFIX}/SHA256SUMS.last";
+ rtl_fileop mv "${PREFIX}/SHA256SUMS" "${PREFIX}/SHA256SUMS.last";
fi;
(cd "${PREFIX}";
for _fname in $(find "${PREFIX_NATIVE#${PREFIX}/}" -type f -perm /a=x \
diff --git a/vars/invariants_gitref.vars b/vars/invariants_gitref.vars
index 83c50e24..755656c3 100644
--- a/vars/invariants_gitref.vars
+++ b/vars/invariants_gitref.vars
@@ -3,7 +3,7 @@
#
pkg_invariants_gitref_all() {
- (ex_rtl_fileop cd "${MIDIPIX_BUILD_PWD}" && git rev-parse HEAD > "${PREFIX}/build.gitref");
+ (rtl_fileop cd "${MIDIPIX_BUILD_PWD}" && git rev-parse HEAD > "${PREFIX}/build.gitref");
};
# vim:filetype=sh
diff --git a/vars/invariants_minipix.vars b/vars/invariants_minipix.vars
index 258a2cfd..1c188eca 100644
--- a/vars/invariants_minipix.vars
+++ b/vars/invariants_minipix.vars
@@ -16,22 +16,22 @@ pkgp_invariants_minipix_is_newer() {
pkg_invariants_minipix_all() {
local _dname="" _fname="" _pname="";
- if ex_rtl_lmatch "${ARG_DIST}" "minipix" ","; then
+ if rtl_lmatch "${ARG_DIST}" "minipix" ","; then
for _dname in "${PREFIX_MINIPIX}/bin" "${PREFIX_MINIPIX}/share"; do
if [ ! -e "${_dname}" ]; then
- ex_rtl_fileop mkdir "${_dname}";
+ rtl_fileop mkdir "${_dname}";
fi;
done;
for _fname in clear reset tset; do
if [ -e "${PREFIX_NATIVE}/bin/${_fname}" ]\
&& pkgp_invariants_minipix_is_newer "${PREFIX_NATIVE}/bin/${_fname}" "${PREFIX_MINIPIX}/bin"; then
- ex_rtl_fileop cp_follow "${PREFIX_NATIVE}/bin/${_fname}" "${PREFIX_MINIPIX}/bin";
+ rtl_fileop cp_follow "${PREFIX_NATIVE}/bin/${_fname}" "${PREFIX_MINIPIX}/bin";
fi;
done;
for _pname in $([ -e "${PREFIX}/minipix_dist/bin" ] && find "${PREFIX}/minipix_dist/bin" \
-maxdepth 1 -perm /a=x -type f -and \( -not -name "lib*" \)); do
if pkgp_invariants_minipix_is_newer "${_pname}" "${PREFIX_MINIPIX}/bin"; then
- ex_rtl_fileop cp_follow "${_pname}" "${PREFIX_MINIPIX}/bin";
+ rtl_fileop cp_follow "${_pname}" "${PREFIX_MINIPIX}/bin";
fi;
done;
for _fname in libc.so libcrypto.so.45 libexpat.so.1 liblzma.so.5 libmagic.so.1 \
@@ -41,7 +41,7 @@ pkg_invariants_minipix_all() {
libuuid.so.1; do
if [ -e "${PREFIX_NATIVE}/lib/${_fname}" ]\
&& pkgp_invariants_minipix_is_newer "${PREFIX_NATIVE}/lib/${_fname}" "${PREFIX_MINIPIX}/bin"; then
- ex_rtl_fileop cp_follow \
+ rtl_fileop cp_follow \
"${PREFIX_NATIVE}/lib/${_fname}" "${PREFIX_MINIPIX}/bin";
fi;
done;
@@ -53,23 +53,23 @@ pkg_invariants_minipix_all() {
for _fname in nano vim; do
if [ -e "${PREFIX}/minipix_dist/share/${_fname}" ]\
&& pkgp_invariants_minipix_is_newer "${PREFIX}/minipix_dist/share/${_fname}" "${PREFIX_MINIPIX}/share"; then
- ex_rtl_fileop cp_follow "${PREFIX}/minipix_dist/share/${_fname}" "${PREFIX_MINIPIX}/share";
+ rtl_fileop cp_follow "${PREFIX}/minipix_dist/share/${_fname}" "${PREFIX_MINIPIX}/share";
fi;
done;
if [ ! -L "${PREFIX_MINIPIX}/share/nanorc" ]; then
- ex_rtl_fileop ln_symbolic "nano/nanorc.nanorc" "${PREFIX_MINIPIX}/share/nanorc";
+ rtl_fileop ln_symbolic "nano/nanorc.nanorc" "${PREFIX_MINIPIX}/share/nanorc";
fi;
if [ ! -L "${PREFIX_MINIPIX}/share/vimrc" ]; then
- ex_rtl_fileop ln_symbolic "vim/vim74/vimrc_example.vim" "${PREFIX_MINIPIX}/share/vimrc";
+ rtl_fileop ln_symbolic "vim/vim74/vimrc_example.vim" "${PREFIX_MINIPIX}/share/vimrc";
fi;
for _fname in putty putty-256color screen screen-256color xterm xterm-256color; do
_dname="share/terminfo/${_fname%${_fname#[a-zA-Z]}}";
if [ ! -e "${PREFIX_MINIPIX}/${_dname}" ]; then
- ex_rtl_fileop mkdir "${PREFIX_MINIPIX}/${_dname}";
+ rtl_fileop mkdir "${PREFIX_MINIPIX}/${_dname}";
fi;
if [ -e "${PREFIX_NATIVE}/${_dname}/${_fname}" ]\
&& pkgp_invariants_minipix_is_newer "${PREFIX_NATIVE}/${_dname}/${_fname}" "${PREFIX_MINIPIX}/${_dname}"; then
- ex_rtl_fileop cp_follow "${PREFIX_NATIVE}/${_dname}/${_fname}" "${PREFIX_MINIPIX}/${_dname}";
+ rtl_fileop cp_follow "${PREFIX_NATIVE}/${_dname}/${_fname}" "${PREFIX_MINIPIX}/${_dname}";
fi;
done;
fi;
diff --git a/vars/invariants_zipdist.vars b/vars/invariants_zipdist.vars
index 58f87a41..eb47d249 100644
--- a/vars/invariants_zipdist.vars
+++ b/vars/invariants_zipdist.vars
@@ -4,18 +4,18 @@
pkg_invariants_zipdist_all() {
local _dist_fname="" _pkg_name="" _pkglist_fname="${PREFIX}/pkglist.native";
- if ex_rtl_lmatch "${ARG_DIST}" "zipdist" ","; then
- ex_rtl_log_msg info "Building deployable distribution ZIP archive...";
+ if rtl_lmatch "${ARG_DIST}" "zipdist" ","; then
+ rtl_log_msg info "Building deployable distribution ZIP archive...";
for _pkg_name in $(cat "${_pkglist_fname}"); do
if ! stat "${BUILD_WORKDIR}/${_pkg_name}-native-${DEFAULT_TARGET}" >/dev/null 2>&1; then
- ex_rtl_log_msg failexit "Error: missing package build directory for package \`${_pkg_name}'.";
+ rtl_log_msg failexit "Error: missing package build directory for package \`${_pkg_name}'.";
fi;
done;
_dist_fname="${DEFAULT_ZIPDIST_FNAME_PREFIX}${BUILD_USER}@${BUILD_HNAME}-${BUILD_DATE_START}.zip";
if [ -e "${BUILD_WORKDIR}/zipdist" ]; then
- ex_rtl_fileop rm "${BUILD_WORKDIR}/zipdist";
+ rtl_fileop rm "${BUILD_WORKDIR}/zipdist";
fi;
- ex_rtl_fileop mkdir "${BUILD_WORKDIR}/zipdist";
+ rtl_fileop mkdir "${BUILD_WORKDIR}/zipdist";
"${BUILD_WORKDIR}/mpackage/mpackage.sh" \
--defroot="${DEFAULT_ZIPDIST_DEFROOT}" \
--flysyms \
@@ -29,15 +29,15 @@ pkg_invariants_zipdist_all() {
--target="${DEFAULT_TARGET}" \
--tmproot="${BUILD_WORKDIR}/zipdist/tmproot" \
--zipfile="${PREFIX}/${_dist_fname}";
- ex_rtl_log_msg info "Finished building deployable distribution ZIP archive.";
+ rtl_log_msg info "Finished building deployable distribution ZIP archive.";
if [ -n "${DEFAULT_ZIPDIST_SIGN_GPG_KEY}" ]\
&& [ -x "$(which gpg 2>/dev/null)" ]\
&& gpg --list-keys "${DEFAULT_ZIPDIST_SIGN_GPG_KEY}" >/dev/null 2>&1; then
- ex_rtl_log_msg info "Signing deployable distribution ZIP archive...";
+ rtl_log_msg info "Signing deployable distribution ZIP archive...";
gpg --armor --passphrase-file /dev/null \
--local-user "${DEFAULT_ZIPDIST_SIGN_GPG_KEY}" \
--sign "${PREFIX}/${_dist_fname}";
- ex_rtl_log_msg info "Signed deployable distribution ZIP archive.";
+ rtl_log_msg info "Signed deployable distribution ZIP archive.";
fi;
fi;
};
diff --git a/vars/libressl_host.vars b/vars/libressl_host.vars
index f8bbe852..033aa5ab 100644
--- a/vars/libressl_host.vars
+++ b/vars/libressl_host.vars
@@ -3,7 +3,7 @@
#
pkg_libressl_host_install_pre() {
- ex_rtl_fileop rm "${PKG_DESTDIR}/etc";
+ rtl_fileop rm "${PKG_DESTDIR}/etc";
};
# vim:filetype=sh
diff --git a/vars/libtool_host.vars b/vars/libtool_host.vars
index d564ae91..2c37c031 100644
--- a/vars/libtool_host.vars
+++ b/vars/libtool_host.vars
@@ -10,7 +10,7 @@ pkg_libtool_host_build() {
# N.B. We only specify CC= here if the current package does not use GNU
# autoconf as it often abuses it by appending -std={gnu99,...} to it
# instead of amending CFLAGS.
- ex_rtl_run_cmd_unsplit make \
+ rtl_run_cmd_unsplit make \
${PKG_MAKEFLAGS_BUILD} \
${PKG_MAKEFLAGS_BUILD_EXTRA} \
"AR=${PKG_AR}" "${_no_autoconf:+CC=${PKG_CC}}" \
diff --git a/vars/libxml2.vars b/vars/libxml2.vars
index 8effa8da..99fecd56 100644
--- a/vars/libxml2.vars
+++ b/vars/libxml2.vars
@@ -4,7 +4,7 @@
pkg_libxml2_install_make_post() {
if [ -e "${PKG_DESTDIR}/bin/${PKG_TARGET}-xml2-config" ]; then
- ex_rtl_fileop rm "${PKG_DESTDIR}/bin/${PKG_TARGET}-xml2-config";
+ rtl_fileop rm "${PKG_DESTDIR}/bin/${PKG_TARGET}-xml2-config";
fi;
cat > "${PKG_DESTDIR}/bin/${PKG_TARGET}-xml2-config" <<EOF
#!/bin/sh
diff --git a/vars/llvm_host.vars b/vars/llvm_host.vars
index 41e10b2a..7d5f7a3a 100644
--- a/vars/llvm_host.vars
+++ b/vars/llvm_host.vars
@@ -3,10 +3,10 @@
#
pkg_llvm_host_configure() {
- ex_rtl_fileop rm "../llvm-${PKG_VERSION}-host";
- ex_rtl_fileop mkdir "../llvm-${PKG_VERSION}-host";
- ex_rtl_fileop cd "../llvm-${PKG_VERSION}-host";
- ex_rtl_log_msg info "Bootstrapping llvm_host...";
+ rtl_fileop rm "../llvm-${PKG_VERSION}-host";
+ rtl_fileop mkdir "../llvm-${PKG_VERSION}-host";
+ rtl_fileop cd "../llvm-${PKG_VERSION}-host";
+ rtl_log_msg info "Bootstrapping llvm_host...";
("${PREFIX}/bin/cmake" \
"../llvm-${PKG_VERSION}.src" \
-DCMAKE_BUILD_TYPE=Release \
@@ -20,7 +20,7 @@ pkg_llvm_host_configure() {
-DSPHINX_WARNINGS_AS_ERRORS=NO \
-G "Unix Makefiles" \
-Wno-dev);
- ex_rtl_log_msg info "Finished bootstrapping llvm_host.";
+ rtl_log_msg info "Finished bootstrapping llvm_host.";
};
# vim:filetype=sh
diff --git a/vars/mpackage_host.vars b/vars/mpackage_host.vars
index 7ec3ba99..f65d7e8a 100644
--- a/vars/mpackage_host.vars
+++ b/vars/mpackage_host.vars
@@ -3,8 +3,8 @@
#
pkg_mpackage_host_install_make() {
- ex_rtl_fileop rm "${BUILD_WORKDIR}/mpackage";
- ex_rtl_fileop ln_symbolic "${PKG_BASE_DIR}/${PKG_SUBDIR}" "${BUILD_WORKDIR}/mpackage";
+ rtl_fileop rm "${BUILD_WORKDIR}/mpackage";
+ rtl_fileop ln_symbolic "${PKG_BASE_DIR}/${PKG_SUBDIR}" "${BUILD_WORKDIR}/mpackage";
};
# vim:filetype=sh
diff --git a/vars/musl.vars b/vars/musl.vars
index feb20d41..05a3c067 100644
--- a/vars/musl.vars
+++ b/vars/musl.vars
@@ -3,15 +3,15 @@
#
pkg_musl_full_fetch_download_post() {
- ex_rtl_fileop mv "${PKG_BASE_DIR}/mmglue" "${PKG_BASE_DIR}/build/mmglue";
+ rtl_fileop mv "${PKG_BASE_DIR}/mmglue" "${PKG_BASE_DIR}/build/mmglue";
};
pkg_musl_full_host_fetch_download_post() {
- ex_rtl_fileop mv "${PKG_BASE_DIR}/mmglue" "${PKG_BASE_DIR}/build/mmglue";
+ rtl_fileop mv "${PKG_BASE_DIR}/mmglue" "${PKG_BASE_DIR}/build/mmglue";
};
pkg_musl_no_complex_host_fetch_download_post() {
- ex_rtl_fileop mv "${PKG_BASE_DIR}/mmglue" "${PKG_BASE_DIR}/build/mmglue";
+ rtl_fileop mv "${PKG_BASE_DIR}/mmglue" "${PKG_BASE_DIR}/build/mmglue";
};
# vim:filetype=sh
diff --git a/vars/nasm_host.vars b/vars/nasm_host.vars
index 802c3128..2b67eab5 100644
--- a/vars/nasm_host.vars
+++ b/vars/nasm_host.vars
@@ -5,7 +5,7 @@
pkg_nasm_host_install_make_post() {
local _fname="";
for _fname in bin/nasm bin/ndisasm share/man/man1/nasm.1 share/man/man1/ndisasm.1; do
- ex_rtl_fileop mv "${PKG_DESTDIR}/${_fname}" \
+ rtl_fileop mv "${PKG_DESTDIR}/${_fname}" \
"${PKG_DESTDIR}/${_fname%/*}/${PKG_TARGET}-${_fname##*/}";
done;
};
diff --git a/vars/nginx.vars b/vars/nginx.vars
index 1ce96bec..478d70d5 100644
--- a/vars/nginx.vars
+++ b/vars/nginx.vars
@@ -5,7 +5,7 @@
pkg_nginx_configure() {
export CFLAGS="${PKG_CFLAGS_CONFIGURE} -I${PKG_PREFIX}/include -pipe -W -Wall -Wpointer-arith -Wno-unused-parameter -Werror";
export LDFLAGS="${PKG_LDFLAGS_CONFIGURE} -L${PKG_PREFIX}/lib";
- ex_rtl_fileop mkdir objs/src objs/src/core objs/src/event objs/src/event/modules objs/src/http objs/src/http/modules objs/src/os/unix;
+ rtl_fileop mkdir objs/src objs/src/core objs/src/event objs/src/event/modules objs/src/http objs/src/http/modules objs/src/os/unix;
};
# vim:filetype=sh
diff --git a/vars/perl.vars b/vars/perl.vars
index 98c75f6e..6a42a4ef 100644
--- a/vars/perl.vars
+++ b/vars/perl.vars
@@ -4,17 +4,17 @@
pkg_perl_fetch_extract_post() {
local _fname_src="" _fname_dst="" _cflag="";
- (ex_rtl_fileop cd "${PKG_BASE_DIR}";
+ (rtl_fileop cd "${PKG_BASE_DIR}";
for _fname_src in $(find perl-cross -type f \
-not -path perl-cross/.git/\* -not -name .gitignore); do
_fname_dst="perl-${PKG_VERSION}${_fname_src#perl-cross}";
if [ -f "${_fname_dst}" ]; then
- ex_rtl_fileop mv "${_fname_dst}" "${_fname_dst}.orig";
+ rtl_fileop mv "${_fname_dst}" "${_fname_dst}.orig";
fi;
- if [ ! -d "$(ex_rtl_dirname "${_fname_dst}")" ]; then
- ex_rtl_fileop mkdir "$(ex_rtl_dirname "${_fname_dst}")";
+ if [ ! -d "$(rtl_dirname "${_fname_dst}")" ]; then
+ rtl_fileop mkdir "$(rtl_dirname "${_fname_dst}")";
fi;
- ex_rtl_fileop cp "${_fname_src}" "${_fname_dst}";
+ rtl_fileop cp "${_fname_src}" "${_fname_dst}";
done);
for _cflag in ${PKG_CFLAGS_CONFIGURE}; do
PKG_CONFIGURE_ARGS="${PKG_CONFIGURE_ARGS:+${PKG_CONFIGURE_ARGS} }-A ccflags=${_cflag}";
diff --git a/vars/pkgconf_host.vars b/vars/pkgconf_host.vars
index ed619639..df63adfb 100644
--- a/vars/pkgconf_host.vars
+++ b/vars/pkgconf_host.vars
@@ -4,7 +4,7 @@
pkg_pkgconf_host_install_make_post() {
if [ -e "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config" ]; then
- ex_rtl_fileop rm "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config";
+ rtl_fileop rm "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config";
fi;
cat > "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config" <<EOF
#!/bin/sh
@@ -19,14 +19,14 @@ else
fi;
EOF
chmod +x "${PKG_DESTDIR}/bin/${PKG_TARGET}-pkg-config";
- ex_rtl_fileop rm "${PKG_DESTDIR}/bin/pkg-config";
+ rtl_fileop rm "${PKG_DESTDIR}/bin/pkg-config";
};
pkg_pkgconf_install_make_post() {
if [ -e "${PREFIX_NATIVE}/bin/pkg-config" ]; then
- ex_rtl_fileop rm "${PREFIX_NATIVE}/bin/pkg-config";
+ rtl_fileop rm "${PREFIX_NATIVE}/bin/pkg-config";
fi;
- ex_rtl_fileop ln_symbolic pkgconf "${PREFIX_NATIVE}/bin/pkg-config";
+ rtl_fileop ln_symbolic pkgconf "${PREFIX_NATIVE}/bin/pkg-config";
};
# vim:filetype=sh
diff --git a/vars/psxstub_host.vars b/vars/psxstub_host.vars
index 835c8285..7cef39d5 100644
--- a/vars/psxstub_host.vars
+++ b/vars/psxstub_host.vars
@@ -5,10 +5,10 @@
pkg_psxstub_install_make() {
if [ "${PKG_TARGET}" = i686-nt32-midipix ] \
|| [ "${PKG_TARGET}" = x86_64-nt64-midipix ]; then
- ex_rtl_fileop cd "${PKG_BASE_DIR}/psxstub";
+ rtl_fileop cd "${PKG_BASE_DIR}/psxstub";
make ${PKG_MAKEFLAGS_BUILD} "DESTDIR=${PKG_PREFIX}" "TARGET=${PKG_TARGET}" install;
if [ -e "${PKG_PREFIX}/lib/libpsxscl.a" ]; then
- ex_rtl_fileop rm "${PKG_PREFIX}/lib/libpsxscl.a";
+ rtl_fileop rm "${PKG_PREFIX}/lib/libpsxscl.a";
fi;
fi;
};
diff --git a/vars/python2.vars b/vars/python2.vars
index 52912551..669e4626 100644
--- a/vars/python2.vars
+++ b/vars/python2.vars
@@ -4,8 +4,8 @@
pkg_python2_fetch_download() {
pkg_fetch_download;
- ex_rtl_fileop rm "${PKG_BASE_DIR}/sbpython2";
- ex_rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "sbpython2=${DEFAULT_GITROOT}/python/sbpython2@main";
+ rtl_fileop rm "${PKG_BASE_DIR}/sbpython2";
+ rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "sbpython2=${DEFAULT_GITROOT}/python/sbpython2@main";
ex_pkg_state_set "${PKG_NAME}" fetch_download -fetch_extract;
};
diff --git a/vars/python2_host.vars b/vars/python2_host.vars
index 05d0c263..2bb62d09 100644
--- a/vars/python2_host.vars
+++ b/vars/python2_host.vars
@@ -4,9 +4,9 @@
pkg_python2_host_fetch_download() {
pkg_fetch_download;
- ex_rtl_fileop rm "${PKG_BASE_DIR}/sbpython2";
- ex_rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "sbpython2=${DEFAULT_GITROOT}/python/sbpython2@main";
- ex_rtl_fileop cp ../sbpython2/project/config/cfgdefs.sh ../sbpython2/project/config/cfgdefs.sh.orig;
+ rtl_fileop rm "${PKG_BASE_DIR}/sbpython2";
+ rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "sbpython2=${DEFAULT_GITROOT}/python/sbpython2@main";
+ rtl_fileop cp ../sbpython2/project/config/cfgdefs.sh ../sbpython2/project/config/cfgdefs.sh.orig;
sed -i"" -e"s/-ltinfo/&w/" -e"s/mb_ncurses_libs='\([^']\+\)'/mb_ncurses_libs='\1 -ltinfow'/" ../sbpython2/project/config/cfgdefs.sh;
sed -i"" -e'108a\
cfgtest_ldflags_append "-L$mb_prefix/lib"' ../sbpython2/project/config/cfgdefs.sh;
diff --git a/vars/python3.vars b/vars/python3.vars
index 5edc9f87..2aeabae5 100644
--- a/vars/python3.vars
+++ b/vars/python3.vars
@@ -4,8 +4,8 @@
pkg_python3_fetch_download() {
pkg_fetch_download;
- ex_rtl_fileop rm "${PKG_BASE_DIR}/sbpython3";
- ex_rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "sbpython3=${DEFAULT_GITROOT}/python/sbpython3@main";
+ rtl_fileop rm "${PKG_BASE_DIR}/sbpython3";
+ rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "sbpython3=${DEFAULT_GITROOT}/python/sbpython3@main";
ex_pkg_state_set "${PKG_NAME}" fetch_download -fetch_extract;
};
diff --git a/vars/python3_host.vars b/vars/python3_host.vars
index 048f5023..020724e1 100644
--- a/vars/python3_host.vars
+++ b/vars/python3_host.vars
@@ -4,9 +4,9 @@
pkg_python3_host_fetch_download() {
pkg_fetch_download;
- ex_rtl_fileop rm "${PKG_BASE_DIR}/sbpython3";
- ex_rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "sbpython3=${DEFAULT_GITROOT}/python/sbpython3@main";
- ex_rtl_fileop cp ../sbpython3/project/config/cfgdefs.sh ../sbpython3/project/config/cfgdefs.sh.orig;
+ rtl_fileop rm "${PKG_BASE_DIR}/sbpython3";
+ rtl_fetch_urls_git "${PKG_BASE_DIR}/build" "sbpython3=${DEFAULT_GITROOT}/python/sbpython3@main";
+ rtl_fileop cp ../sbpython3/project/config/cfgdefs.sh ../sbpython3/project/config/cfgdefs.sh.orig;
sed -i"" -e"s/-ltinfo/&w/" -e"s/mb_ncurses_libs='\([^']\+\)'/mb_ncurses_libs='\1 -ltinfow'/" ../sbpython3/project/config/cfgdefs.sh;
sed -i"" -e'108a\
cfgtest_ldflags_append "-L$mb_prefix/lib"' ../sbpython3/project/config/cfgdefs.sh;
diff --git a/vars/rpm_host.vars b/vars/rpm_host.vars
index 8593d07b..dd977f74 100644
--- a/vars/rpm_host.vars
+++ b/vars/rpm_host.vars
@@ -5,7 +5,7 @@
pkg_rpm_host_install_pre() {
echo "#!/bin/true" > "${PKG_DESTDIR}/lib/rpm/elfdeps";
chmod +x "${PKG_DESTDIR}/lib/rpm/elfdeps";
- ex_rtl_fileop rm "${PKG_DESTDIR}/var";
+ rtl_fileop rm "${PKG_DESTDIR}/var";
};
# vim:filetype=sh
diff --git a/vars/texinfo.vars b/vars/texinfo.vars
index 59a60fea..3a7a3d07 100644
--- a/vars/texinfo.vars
+++ b/vars/texinfo.vars
@@ -3,12 +3,12 @@
#
pkg_texinfo_build_pre() {
- ex_rtl_run_cmd_unsplit make \
+ rtl_run_cmd_unsplit make \
${PKG_MAKEFLAGS_BUILD} \
${PKG_MAKEFLAGS_BUILD_EXTRA} \
"LIBTOOL=${PKG_LIBTOOL:-slibtool}" \
-C tools;
- ex_rtl_run_cmd_unsplit make \
+ rtl_run_cmd_unsplit make \
${PKG_MAKEFLAGS_BUILD} \
${PKG_MAKEFLAGS_BUILD_EXTRA} \
"LIBTOOL=${PKG_LIBTOOL:-slibtool}" \
diff --git a/vars/texinfo_host.vars b/vars/texinfo_host.vars
index 5aa6f961..2a441f28 100644
--- a/vars/texinfo_host.vars
+++ b/vars/texinfo_host.vars
@@ -4,7 +4,7 @@
pkg_texinfo_host_install_make_post() {
if [ -e "${PKG_DESTDIR}/bin/makeinfo" ]; then
- ex_rtl_fileop mv "${PKG_DESTDIR}/bin/makeinfo" "${PKG_DESTDIR}/bin/makeinfo.dist";
+ rtl_fileop mv "${PKG_DESTDIR}/bin/makeinfo" "${PKG_DESTDIR}/bin/makeinfo.dist";
fi;
cat > "${PKG_DESTDIR}/bin/makeinfo" <<EOF
#!/bin/sh
diff --git a/vars/tzdb_host.vars b/vars/tzdb_host.vars
index 9a609129..3fa187cd 100644
--- a/vars/tzdb_host.vars
+++ b/vars/tzdb_host.vars
@@ -3,7 +3,7 @@
#
pkg_tzdb_host_install_pre() {
- ex_rtl_fileop rm "${PKG_DESTDIR}/etc";
+ rtl_fileop rm "${PKG_DESTDIR}/etc";
};
# vim:filetype=sh
diff --git a/vars/vim.vars b/vars/vim.vars
index 414a7c3b..d91af66c 100644
--- a/vars/vim.vars
+++ b/vars/vim.vars
@@ -16,13 +16,13 @@ vim_cv_tty_group=tty
vim_cv_tty_mode=0666"};
pkg_vim_configure_autotools_post() {
- ex_rtl_fileop cp config.cache src/auto;
+ rtl_fileop cp config.cache src/auto;
};
: ${PKG_VIM_MINIPIX_CONFIG_CACHE_EXTRA=${PKG_VIM_CONFIG_CACHE_EXTRA}};
pkg_vim_minipix_configure_autotools_post() {
- ex_rtl_fileop cp config.cache src/auto;
+ rtl_fileop cp config.cache src/auto;
};
# vim:filetype=sh