diff options
| author | Saul Wold <sgw@linux.intel.com> | 2012-04-19 15:11:01 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-04-24 15:51:35 +0100 |
| commit | 1af73900cea82e63fb0f94e6f057144f723146ec (patch) | |
| tree | b812b035f8348ce18f010360cb2125bb9199786a | |
| parent | aff48c514174ba5fa3bb1e5df5293376b567da09 (diff) | |
| download | openembedded-core-1af73900cea82e63fb0f94e6f057144f723146ec.tar.gz openembedded-core-1af73900cea82e63fb0f94e6f057144f723146ec.tar.bz2 openembedded-core-1af73900cea82e63fb0f94e6f057144f723146ec.zip | |
quilt: move empty quiltrc to native sysconfdir
patch.bbclass orignally pointed at /usr/bin/quiltrc for an empty
version to ensure that no user setting were picked up, change this
to /etc/quiltrc in the Native sysroot since we now have a native
sysconfdir.
Make sure that the quiltrc is actually installed in the Native
sysconfdir, not the target, so fix this after the recipe split.
Signed-off-by: Saul Wold <sgw@linux.intel.com>
| -rw-r--r-- | meta/classes/patch.bbclass | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt-0.51.inc | 5 | ||||
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt-native.inc | 6 | ||||
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt-native_0.51.bb | 2 | ||||
| -rw-r--r-- | meta/recipes-devtools/quilt/quilt_0.51.bb | 2 |
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" |