diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-02-16 10:14:11 +0000 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-02-16 10:19:36 +0000 |
| commit | cc101dbb2300868dd4c50561f41d55df71bca0fa (patch) | |
| tree | 77f0ed6b0821e9d9af187e99e36232079a8b677d /subr | |
| parent | b834f8bfdd06bc581633b40043c7f609e56af16e (diff) | |
| download | midipix_build-cc101dbb2300868dd4c50561f41d55df71bca0fa.tar.bz2 midipix_build-cc101dbb2300868dd4c50561f41d55df71bca0fa.tar.xz | |
subr/pkg_patch.subr: ensure parent package patches are applied for flavoured packages.
vars/build.vars: flavours bzip2, gzip, tar, and xz for minipix.
vars/ncursesw.vars: skip minipix post-install step.
Diffstat (limited to 'subr')
| -rw-r--r-- | subr/pkg_patch.subr | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/subr/pkg_patch.subr b/subr/pkg_patch.subr index 3730395c..de32fe30 100644 --- a/subr/pkg_patch.subr +++ b/subr/pkg_patch.subr @@ -4,23 +4,25 @@ pkg_patch() { local _patch_fname; - if [ -d "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}" ]; then - set +o noglob; - for _patch_fname in ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}/*.patch; do - patch -b -d "${WORKDIR}/${PKG_SUBDIR}" -p1 < "${_patch_fname}"; - done; - set -o noglob; - fi; + set +o noglob; for _patch_fname in \ - ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_SUBDIR}.local.patch \ - ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_SUBDIR}.local@${BUILD_HNAME}.patch \ - ${WORKDIR}/chainport/${PKG_SUBDIR}.midipix.patch \ - ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}.local.patch \ - ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR}.local@${BUILD_HNAME}.patch; do + ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_SUBDIR%-*}.local.patch \ + ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_NAME}.local.patch \ + ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_SUBDIR%-*}.local@${BUILD_HNAME}.patch \ + ${MIDIPIX_BUILD_PWD}/${WORKDIR}/${PKG_NAME}.local@${BUILD_HNAME}.patch \ + ${WORKDIR}/chainport/${PKG_SUBDIR%-*}.midipix.patch \ + ${WORKDIR}/chainport/${PKG_NAME}.midipix.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}/*.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}/*.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}.local.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_SUBDIR%-*}.local@${BUILD_HNAME}.patch \ + ${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local@${BUILD_HNAME}.patch; do if [ -r "${_patch_fname}" ]; then patch -b -d "${WORKDIR}/${PKG_SUBDIR}" -p1 < "${_patch_fname}"; fi; done; + set -o noglob; }; # vim:filetype=sh |