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>
This commit is contained in:
parent
67fbab3dd5
commit
b4d6cedcc3
|
@ -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"
|
||||
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -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
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
require quilt-${PV}.inc
|
||||
require quilt-native.inc
|
||||
|
||||
PR = "r0"
|
||||
PR = "r1"
|
||||
|
|
|
@ -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"
|
||||
|
|
Loading…
Reference in New Issue