From d377356690d60ab79e07354cdaeb7d2102557173 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Sat, 19 Jan 2019 00:41:41 +0000 Subject: subr/pkg_install{,_rpm}.subr: honour ${PKG_{PKGLIST,RPM}_DISABLE}. vars/build.vars:host_tools: moves mpackage from dist as mpackage_host. vars/build.vars:{ntctty,psxscl{,_strace},ptycon}: specify ${PKG_SRC_TARBALL_DISABLE:=1}. vars/build.vars:minipix: specify ${{PKGLIST,RPM}=1}. vars/dist_etc.vars: removed. vars/env.vars: adds {PKGLIST,RPM,SRC_TARBALL}_DISABLE. vars/invariants_tarballs.vars:pkgp_dist_tarball_src(): honour ${PKG_SRC_TARBALL_DISABLE}. vars/invariants_zipdist.vars: ensure build directories for packages in the pkglist.native exist. vars/{invariants_zipdist,mpackage_host}.vars: {reference,provide} mpackage/ symlink. --- subr/pkg_install_rpm.subr | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'subr/pkg_install_rpm.subr') 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 -- cgit v1.2.3