summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-21 14:20:24 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-03-22 16:54:36 +0000
commitd988fe18312990a5cd3d517eb6bd119cdd46db98 (patch)
tree578d050ba52a92ca9ed9cd5aab11e066a8ae670a
parent4dce60bd7dcbd97c0fba88b1ff392fc32a8cf95f (diff)
downloadpoky-d988fe18312990a5cd3d517eb6bd119cdd46db98.tar.gz
xinted: Fix case where ${B} != ${S}
do_install needs to reference files in ${B} and we need to run do_configuze in ${S}. (From OE-Core rev: 5a5aff6a77dfc0bae66077589a93ba6d1755bcdc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-extended/xinetd/xinetd_2.3.15.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
index 87ea2b1b05..797657083e 100644
--- a/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
+++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
@@ -34,7 +34,7 @@ PACKAGECONFIG[tcp-wrappers] = "--with-libwrap,,tcp-wrappers"
34do_configure() { 34do_configure() {
35 # Looks like configure.in is broken, so we are skipping 35 # Looks like configure.in is broken, so we are skipping
36 # rebuilding configure and are just using the shipped one 36 # rebuilding configure and are just using the shipped one
37 gnu-configize --force 37 ( cd ${S}; gnu-configize --force )
38 oe_runconf 38 oe_runconf
39} 39}
40 40
@@ -49,8 +49,8 @@ do_install() {
49 install -m 644 "${WORKDIR}/xinetd.conf" "${D}${sysconfdir}" 49 install -m 644 "${WORKDIR}/xinetd.conf" "${D}${sysconfdir}"
50 install -m 755 "${WORKDIR}/xinetd.init" "${D}${sysconfdir}/init.d/xinetd" 50 install -m 755 "${WORKDIR}/xinetd.init" "${D}${sysconfdir}/init.d/xinetd"
51 install -m 644 "${WORKDIR}/xinetd.default" "${D}${sysconfdir}/default/xinetd" 51 install -m 644 "${WORKDIR}/xinetd.default" "${D}${sysconfdir}/default/xinetd"
52 install -m 755 "${S}/xinetd/xinetd" "${D}${sbindir}" 52 install -m 755 "${B}/xinetd/xinetd" "${D}${sbindir}"
53 install -m 755 "${S}/xinetd/itox" "${D}${sbindir}" 53 install -m 755 "${B}/xinetd/itox" "${D}${sbindir}"
54} 54}
55 55
56CONFFILES_${PN} = "${sysconfdir}/xinetd.conf" 56CONFFILES_${PN} = "${sysconfdir}/xinetd.conf"