summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-04-19 15:11:01 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-26 10:05:11 +0100
commitb4d6cedcc3cf8cbd8ba317c9ff13cd70a1d80361 (patch)
tree23ce69aea1c8dd6df0fd702944ea6006bc50ea8d
parent67fbab3dd56d4278cbf1721d64d4bbc940bbd522 (diff)
downloadpoky-b4d6cedcc3cf8cbd8ba317c9ff13cd70a1d80361.tar.gz
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. (From OE-Core rev: 1af73900cea82e63fb0f94e6f057144f723146ec) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/patch.bbclass2
-rw-r--r--meta/recipes-devtools/quilt/quilt-0.51.inc5
-rw-r--r--meta/recipes-devtools/quilt/quilt-native.inc6
-rw-r--r--meta/recipes-devtools/quilt/quilt-native_0.51.bb2
-rw-r--r--meta/recipes-devtools/quilt/quilt_0.51.bb2
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 @@
1# Copyright (C) 2006 OpenedHand LTD 1# Copyright (C) 2006 OpenedHand LTD
2 2
3# Point to an empty file so any user's custom settings don't break things 3# Point to an empty file so any user's custom settings don't break things
4QUILTRCFILE ?= "${STAGING_BINDIR_NATIVE}/quiltrc" 4QUILTRCFILE ?= "${STAGING_ETCDIR_NATIVE}/quiltrc"
5 5
6PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_sysroot" 6PATCHDEPENDENCY = "${PATCHTOOL}-native:do_populate_sysroot"
7 7
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"
24# quilt ignores DESTDIR 24# quilt ignores DESTDIR
25do_install () { 25do_install () {
26 oe_runmake 'BUILD_ROOT=${D}' install 26 oe_runmake 'BUILD_ROOT=${D}' install
27 if [ "${BUILD_ARCH}" == "${HOST_ARCH}" ]; then
28 # Dummy quiltrc file for patch.bbclass
29 install -d ${D}${bindir}/
30 touch ${D}${bindir}/quiltrc
31 fi
32 # cleanup unpackaged files 27 # cleanup unpackaged files
33 rm -rf ${D}/${datadir}/emacs 28 rm -rf ${D}/${datadir}/emacs
34} 29}
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"
11do_configure () { 11do_configure () {
12 oe_runconf 12 oe_runconf
13} 13}
14
15do_install_append () {
16 # Dummy quiltrc file for patch.bbclass
17 install -d ${D}${sysconfdir}/
18 touch ${D}${sysconfdir}/quiltrc
19}
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 @@
1require quilt-${PV}.inc 1require quilt-${PV}.inc
2require quilt-native.inc 2require quilt-native.inc
3 3
4PR = "r0" 4PR = "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"
4SRC_URI += "file://aclocal.patch \ 4SRC_URI += "file://aclocal.patch \
5 file://gnu_patch_test_fix_target.patch \ 5 file://gnu_patch_test_fix_target.patch \
6 " 6 "
7PR = "r2" 7PR = "r3"