[OE-core] [PATCH 06/10] quilt: move empty quiltrc to native
Saul Wold
sgw at linux.intel.com
Thu Apr 19 22:44:20 UTC 2012
The package.bbclass uses the native sysroot /usr/bin/quiltrc as an empty quiltrc
to ensure that the user quiltrc does not affect our patching scheme. This ensures
the correct file is in the correct sysroot.
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/recipes-devtools/quilt/quilt-0.51.inc | 5 -----
meta/recipes-devtools/quilt/quilt-native.inc | 6 ++++++
meta/recipes-devtools/quilt/quilt-native_0.51.bb | 2 +-
meta/recipes-devtools/quilt/quilt_0.51.bb | 2 +-
4 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-devtools/quilt/quilt-0.51.inc b/meta/recipes-devtools/quilt/quilt-0.51.inc
index e89013a..824e624 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 7efea02..8a03a5d 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}${bindir}/
+ touch ${D}${bindir}/quiltrc
+}
diff --git a/meta/recipes-devtools/quilt/quilt-native_0.51.bb b/meta/recipes-devtools/quilt/quilt-native_0.51.bb
index b99b9b6..1494bf2 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 bc62161..6865cd8 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"
--
1.7.7.6
More information about the Openembedded-core
mailing list