5 files changed, 9 insertions, 8 deletions

diff --git a/meta/classes/patch.bbclass b/meta/classes/patch.bbclass
index 31db9e372a..3c4d997833 100644
--- a/meta/classes/patch.bbclass
+++ b/meta/classes/patch.bbclass
@@ -1,7 +1,7 @@
 # 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"
+QUILTRCFILE ?= "${STAGING_ETCDIR_NATIVE}/quiltrc"
 
 PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_sysroot"
 
diff --git a/meta/recipes-devtools/quilt/quilt-0.51.inc b/meta/recipes-devtools/quilt/quilt-0.51.inc
index e89013aab0..824e624a43 100644
--- a/meta/recipes-devtools/quilt/quilt-0.51.inc
+++ b/meta/recipes-devtools/quilt/quilt-0.51.inc
@@ -24,11 +24,6 @@ RDEPENDS_${PN} = "bash"
 # quilt ignores DESTDIR
 do_install () {
         oe_runmake 'BUILD_ROOT=${D}' install
-        if [ "${BUILD_ARCH}" == "${HOST_ARCH}" ]; then
-                # Dummy quiltrc file for patch.bbclass
-                install -d ${D}${bindir}/
-                touch ${D}${bindir}/quiltrc
-        fi
         # cleanup unpackaged files
         rm -rf ${D}/${datadir}/emacs
 }
diff --git a/meta/recipes-devtools/quilt/quilt-native.inc b/meta/recipes-devtools/quilt/quilt-native.inc
index 7efea0213d..9345d88273 100644
--- a/meta/recipes-devtools/quilt/quilt-native.inc
+++ b/meta/recipes-devtools/quilt/quilt-native.inc
@@ -11,3 +11,9 @@ EXTRA_OECONF = "--disable-nls"
 do_configure () {
         oe_runconf
 }
+
+do_install_append () {
+        # Dummy quiltrc file for patch.bbclass
+        install -d ${D}${sysconfdir}/
+        touch ${D}${sysconfdir}/quiltrc
+}
diff --git a/meta/recipes-devtools/quilt/quilt-native_0.51.bb b/meta/recipes-devtools/quilt/quilt-native_0.51.bb
index b99b9b65d2..1494bf2eb4 100644
--- a/meta/recipes-devtools/quilt/quilt-native_0.51.bb
+++ b/meta/recipes-devtools/quilt/quilt-native_0.51.bb
@@ -1,4 +1,4 @@
 require quilt-${PV}.inc
 require quilt-native.inc
 
-PR = "r0"
+PR = "r1"
diff --git a/meta/recipes-devtools/quilt/quilt_0.51.bb b/meta/recipes-devtools/quilt/quilt_0.51.bb
index bc62161761..6865cd8738 100644
--- a/meta/recipes-devtools/quilt/quilt_0.51.bb
+++ b/meta/recipes-devtools/quilt/quilt_0.51.bb
@@ -4,4 +4,4 @@ RDEPENDS_${PN} += "patch diffstat bzip2 util-linux"
 SRC_URI += "file://aclocal.patch \
             file://gnu_patch_test_fix_target.patch \
            "
-PR = "r2"
+PR = "r3"