summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorSaul Wold <sgw@linux.intel.com>2012-04-19 22:11:01 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-05-31 20:15:08 (GMT)
commita518e1e3b15ded2645f5c32697fca4c0bfb131ed (patch)
treec1969c511b736bb0fdcba092d6760759d9cd90a7 /meta/recipes-devtools
parentfc9716930a4bc4b0552adb1db538fb11a3fd46c6 (diff)
downloadpoky-a518e1e3b15ded2645f5c32697fca4c0bfb131ed.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: aec4cdc6efda430a0965d6b3b4f84c7943390273) Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-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
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"
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 7efea02..9345d88 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 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 @@
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 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"
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"