From b2ff37a4e1bf043ad7dae6fe41d4fc5d1877c56a Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz (arab, vxp) Date: Jun 22 2016 10:45:22 +0000 Subject: Adds .gdbhistory to .gitignore. Apply ../${PKG_SUBDIR}.local.patch and ../${PKG_SUBDIR}.local@${BUILD_HNAME}.patch diff files if present. --- diff --git a/.gitignore b/.gitignore index ee47929..e26ccc2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ +.gdbhistory *.sw[op] TODO diff --git a/pkg.build b/pkg.build index 15e1eeb..95d511e 100644 --- a/pkg.build +++ b/pkg.build @@ -57,9 +57,11 @@ if ! is_build_script_done patch; then install -m 0700 ${MIDIPIX_BUILD_PWD}/config.sub build-aux/ &&\ ./autogen.sh && cd ${OLDPWD}; fi; - for PATCH_FNAME in portage/${PKG_SUBDIR}.midipix.patch \ - ${MIDIPIX_BUILD_PWD}/${PKG_SUBDIR}.local.patch \ - ${MIDIPIX_BUILD_PWD}/${PKG_SUBDIR}.local@${BUILD_HNAME}.patch; do + for PATCH_FNAME in portage/${PKG_SUBDIR}.midipix.patch \ + ${MIDIPIX_BUILD_PWD}/${PKG_SUBDIR}.local.patch \ + ${MIDIPIX_BUILD_PWD}/${PKG_SUBDIR}.local@${BUILD_HNAME}.patch \ + ${MIDIPIX_BUILD_PWD}/../${PKG_SUBDIR}.local.patch \ + ${MIDIPIX_BUILD_PWD}/../${PKG_SUBDIR}.local@${BUILD_HNAME}.patch; do [ -r ${PATCH_FNAME} ] &&\ patch -b -d ${PKG_SUBDIR} -p1 < ${PATCH_FNAME}; done; unset PATCH_FNAME;