diff options
| -rw-r--r-- | classes/patch.bbclass | 8 | ||||
| -rw-r--r-- | packages/lsof/lsof_4.78.bb (renamed from packages/lsof/lsof_4.77.bb) | 1 |
2 files changed, 6 insertions, 3 deletions
diff --git a/classes/patch.bbclass b/classes/patch.bbclass index 2ba6729af8..0cc202820f 100644 --- a/classes/patch.bbclass +++ b/classes/patch.bbclass @@ -1,5 +1,8 @@ # Copyright (C) 2006 OpenedHand LTD +# Point to an empty file so any user's custom settings don't break things +QUILTRCFILE ?= "${STAGING_BINDIR_NATIVE}/quiltrc" + def patch_init(d): import os, sys @@ -180,9 +183,10 @@ def patch_init(d): class QuiltTree(PatchSet): def _runcmd(self, args, run = True): + quiltrc = bb.data.getVar('QUILTRCFILE', self.d, 1) if not run: - return ["quilt"] + args - runcmd(["quilt"] + args, self.dir) + return ["quilt"] + ["--quiltrc"] + [quiltrc] + args + runcmd(["quilt"] + ["--quiltrc"] + [quiltrc] + args, self.dir) def _quiltpatchpath(self, file): return os.path.join(self.dir, "patches", os.path.basename(file)) diff --git a/packages/lsof/lsof_4.77.bb b/packages/lsof/lsof_4.78.bb index 054875b861..8a7138396b 100644 --- a/packages/lsof/lsof_4.77.bb +++ b/packages/lsof/lsof_4.78.bb @@ -2,7 +2,6 @@ DESCRIPTION = "Lsof is a Unix-specific diagnostic tool. \ Its name stands for LiSt Open Files, and it does just that." SECTION = "devel" LICENSE = "BSD" -PR = "r1" SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2" LOCALSRC = "file://${WORKDIR}/lsof_${PV}/lsof_${PV}_src.tar" |