diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2019-01-19 02:36:57 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2019-01-19 02:36:57 +0000 |
| commit | 0eaee4ebe96cb25601d8a4ea79bd475240c8fdf0 (patch) | |
| tree | 21f23f223f6561c13d4c4f1b928be0826a759553 /subr/pkg_install_rpm.subr | |
| parent | 242b1dbe3137cf6352bbe61644888d704552aff1 (diff) | |
| download | midipix_build-0eaee4ebe96cb25601d8a4ea79bd475240c8fdf0.tar.bz2 midipix_build-0eaee4ebe96cb25601d8a4ea79bd475240c8fdf0.tar.xz | |
build.sh, etc/build.usage, subr/*: merges {-[ptz],--rpm} into -D {minipix,pkg,rpm,t{bz2,gz,xz},zipdist}.
subr/{build_args,pkg_clean}.subr: cleanup ${ARG_CLEAN_BUILDS} usage.
vars/build.vars:dist: merged into invariants.
vars/invariants_minipix.vars: adapted from vars/dist_minipix_dist.vars.
vars/{invariants_tarballs,midipix}.vars: don't produce source tarballs.
Diffstat (limited to 'subr/pkg_install_rpm.subr')
| -rw-r--r-- | subr/pkg_install_rpm.subr | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/subr/pkg_install_rpm.subr b/subr/pkg_install_rpm.subr index cd920eb6..691fe04c 100644 --- a/subr/pkg_install_rpm.subr +++ b/subr/pkg_install_rpm.subr @@ -4,25 +4,23 @@ pkg_install_rpm() { local _pkg_url="" _pkg_version_full="" _pkg_version_rpm=""; - if [ "${ARG_RPM:-0}" -eq 0 ]\ - || [ "${PKG_RPM_DISABLE:-0}" -eq 1 ]\ - || ! [ -x "$(which rpmbuild 2>/dev/null)" ]; then - return 0; - fi; - if [ -n "${PKG_URL}" ]; then - _pkg_version_rpm="${PKG_VERSION%%-*}"; - _pkg_version_full="${PKG_VERSION}"; - _pkg_url="${PKG_URL}"; - elif [ -n "${PKG_URLS_GIT}" ]; then - _pkg_version_rpm="$(cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && git rev-parse HEAD)"; - _pkg_version_full="${_pkg_version_rpm} ($(cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && git rev-parse --abbrev-ref HEAD))"; - _pkg_url="${PKG_URLS_GIT%% *}"; - _pkg_url="${_pkg_url##*=}"; _pkg_url="${_pkg_url%%@*}"; - if [ "${_pkg_url#${DEFAULT_GITROOT_HEAD}}" != "${_pkg_url}" ]; then - _pkg_url="Unknown"; + if ex_rtl_lmatch "${ARG_DIST}" , rpm \ + && [ "${PKG_RPM_DISABLE:-0}" -eq 0 ] \ + && [ -x "$(which rpmbuild 2>/dev/null)" ]; then + if [ -n "${PKG_URL}" ]; then + _pkg_version_rpm="${PKG_VERSION%%-*}"; + _pkg_version_full="${PKG_VERSION}"; + _pkg_url="${PKG_URL}"; + elif [ -n "${PKG_URLS_GIT}" ]; then + _pkg_version_rpm="$(cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && git rev-parse HEAD)"; + _pkg_version_full="${_pkg_version_rpm} ($(cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && git rev-parse --abbrev-ref HEAD))"; + _pkg_url="${PKG_URLS_GIT%% *}"; + _pkg_url="${_pkg_url##*=}"; _pkg_url="${_pkg_url%%@*}"; + if [ "${_pkg_url#${DEFAULT_GITROOT_HEAD}}" != "${_pkg_url}" ]; then + _pkg_url="Unknown"; + fi; fi; - fi; - cat > "${PKG_BASE_DIR}/${PKG_NAME}-${_pkg_version_rpm}.spec" <<EOF + cat > "${PKG_BASE_DIR}/${PKG_NAME}-${_pkg_version_rpm}.spec" <<EOF Name: ${PKG_NAME} Version: ${_pkg_version_rpm} Release: 1 @@ -49,10 +47,11 @@ cp -pPr "${PKG_DESTDIR}/." "\${RPM_BUILD_ROOT}" %changelog EOF - rpmbuild -bb --define="_topdir ${PREFIX_RPM}/${PKG_NAME}-${_pkg_version_rpm}" --nodeps "${PKG_BASE_DIR}/${PKG_NAME}-${_pkg_version_rpm}.spec"; - find "${PREFIX_RPM}/${PKG_NAME}-${_pkg_version_rpm}/RPMS" -iname \*.rpm -exec cp -pP {} "${PREFIX_RPM}/" \;; - ex_rtl_fileop rm "${PREFIX_RPM}/${PKG_NAME}-${_pkg_version_rpm}"; - ex_rtl_fileop cp "${PKG_BASE_DIR}/${PKG_NAME}-${_pkg_version_rpm}.spec" "${PREFIX_RPM}/"; + rpmbuild -bb --define="_topdir ${PREFIX_RPM}/${PKG_NAME}-${_pkg_version_rpm}" --nodeps "${PKG_BASE_DIR}/${PKG_NAME}-${_pkg_version_rpm}.spec"; + find "${PREFIX_RPM}/${PKG_NAME}-${_pkg_version_rpm}/RPMS" -iname \*.rpm -exec cp -pP {} "${PREFIX_RPM}/" \;; + ex_rtl_fileop rm "${PREFIX_RPM}/${PKG_NAME}-${_pkg_version_rpm}"; + ex_rtl_fileop cp "${PKG_BASE_DIR}/${PKG_NAME}-${_pkg_version_rpm}.spec" "${PREFIX_RPM}/"; + fi; }; # vim:filetype=sh |