diff options
Diffstat (limited to 'subr')
| -rw-r--r-- | subr/pkg_install.subr | 3 | ||||
| -rw-r--r-- | subr/pkg_install_rpm.subr | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/subr/pkg_install.subr b/subr/pkg_install.subr index 36ff31db..cd55fdb4 100644 --- a/subr/pkg_install.subr +++ b/subr/pkg_install.subr @@ -18,8 +18,7 @@ pkg_install() { tar -C "${PKG_DESTDIR}" -cpf - . |\ gzip -c -9 - > "${PKG_BASE_DIR}/${PKG_NAME}.tgz" fi; - if [ "${PKG_NAME%_minipix}" = "${PKG_NAME}" ] \ - && [ "${PKG_NAME}" != "mpackage" ]; then + if [ [ "${PKG_PKGLIST_DISABLE:-0}" -eq 0 ]; then if [ ! -e "${PREFIX}/pkglist.${PKG_BUILD_TYPE}" ]; then touch "${PREFIX}/pkglist.${PKG_BUILD_TYPE}"; fi; diff --git a/subr/pkg_install_rpm.subr b/subr/pkg_install_rpm.subr index 8da10232..856370d0 100644 --- a/subr/pkg_install_rpm.subr +++ b/subr/pkg_install_rpm.subr @@ -5,8 +5,7 @@ pkg_install_rpm() { local _pkg_url="" _pkg_version_full="" _pkg_version_rpm=""; if [ "${ARG_RPM:-0}" -eq 0 ]\ - || ! [ -x "$(which rpmbuild 2>/dev/null)" ]\ - || [ "${PKG_NAME}" = "mpackage" ]; then + || [ "${PKG_RPM_DISABLE:-0}" -eq 1 ]; then return 0; fi; if [ -n "${PKG_URL}" ]; then |