From b2ff37a4e1bf043ad7dae6fe41d4fc5d1877c56a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Wed, 22 Jun 2016 12:45:22 +0200 Subject: Adds .gdbhistory to .gitignore. Apply ../${PKG_SUBDIR}.local.patch and ../${PKG_SUBDIR}.local@${BUILD_HNAME}.patch diff files if present. --- .gitignore | 1 + pkg.build | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index ee479299..e26ccc28 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ +.gdbhistory *.sw[op] TODO diff --git a/pkg.build b/pkg.build index 15e1eeb6..95d511ed 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; -- cgit v1.2.3