[oe-commits] Khem Raj : quilt-native: Use the quilt.quiltrc from sysroot instead of /etc

[git version control]

Module: openembedded.git
Branch: master
Commit: 02634fb85a22a615f969eb918dcec0e03a176c5d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=02634fb85a22a615f969eb918dcec0e03a176c5d

Author: Khem Raj <raj.khem at gmail.com>
Date:   Tue Sep 28 13:42:10 2010 -0700

quilt-native: Use the quilt.quiltrc from sysroot instead of /etc

This fix is only applied on build systems using linux

Signed-off-by: Khem Raj <raj.khem at gmail.com>

---

 .../quilt-0.48/dont-allow-optional-quiltrc.patch   |   14 ++++++++++++++
 recipes/quilt/quilt-native.inc                     |    2 ++
 recipes/quilt/quilt-native_0.48.bb                 |    4 ++--
 3 files changed, 18 insertions(+), 2 deletions(-)

diff --git a/recipes/quilt/quilt-0.48/dont-allow-optional-quiltrc.patch b/recipes/quilt/quilt-0.48/dont-allow-optional-quiltrc.patch
new file mode 100644
index 0000000..05f087e
--- /dev/null
+++ b/recipes/quilt/quilt-0.48/dont-allow-optional-quiltrc.patch
@@ -0,0 +1,14 @@
+This patch assumes that the installation tree is <prefix>/usr/bin
+which is usually the case.
+
+--- quilt-0.48/bin/quilt.in.org	2010-09-28 12:58:21.136446572 -0700
++++ quilt-0.48/bin/quilt.in	2010-09-28 13:16:36.984446032 -0700
+@@ -14,7 +14,7 @@ export QUILT_DIR QUILT_LIB
+ 
+ if [ -z "$QUILTRC" ]
+ then
+-	for QUILTRC in $HOME/.quiltrc /etc/quilt.quiltrc; do
++	for QUILTRC in $HOME/.quiltrc $QUILT_DIR/../../../etc/quilt.quiltrc; do
+ 		[ -e $QUILTRC ] && break
+ 	done
+ 	export QUILTRC
diff --git a/recipes/quilt/quilt-native.inc b/recipes/quilt/quilt-native.inc
index 1306b1f..7cfa1ef 100644
--- a/recipes/quilt/quilt-native.inc
+++ b/recipes/quilt/quilt-native.inc
@@ -1,6 +1,8 @@
 require quilt.inc
 
 SRC_URI_append_build-darwin = "?   file://non-gnu.patch "
+SRC_URI_append_build-linux = " file://dont-allow-optional-quiltrc.patch "
+
 RDEPENDS_${PN} = "diffstat-native patch-native bzip2-native util-linux-native"
 
 FILESPATHPKG =. quilt-${PV}
diff --git a/recipes/quilt/quilt-native_0.48.bb b/recipes/quilt/quilt-native_0.48.bb
index efb37ca..2977b52 100644
--- a/recipes/quilt/quilt-native_0.48.bb
+++ b/recipes/quilt/quilt-native_0.48.bb
@@ -1,8 +1,8 @@
 require quilt-native.inc
 
-PR = "${INC_PR}"
+PR = "${INC_PR}.1"
 
-SRC_URI_append = "file://fix_new_GNU_patch_detection.patch"
+SRC_URI_append = " file://fix_new_GNU_patch_detection.patch"
 
 SRC_URI[md5sum] = "f77adda60039ffa753f3c584a286f12b"
 SRC_URI[sha256sum] = "73fd760d3b5cbf06417576591dc37d67380d189392db9000c21b7cbebee49ffc"