aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKevin Strasser <kevin.strasser@linux.intel.com>2012-12-03 15:22:42 -0800
committerPaul Eggleton <paul.eggleton@linux.intel.com>2012-12-05 16:27:36 +0000
commit9a80f62b1874bbb0819068cf394e9fd920bb84b7 (patch)
treef2f106c57731cc4ae431949d6b2d3dbdd8495f1a
parentad1dfa139195f39a72b8e0fb47de5c3339397b8b (diff)
downloadmeta-baryon-9a80f62b1874bbb0819068cf394e9fd920bb84b7.tar.gz
meta-baryon-9a80f62b1874bbb0819068cf394e9fd920bb84b7.tar.bz2
meta-baryon-9a80f62b1874bbb0819068cf394e9fd920bb84b7.zip
proftpd: conditionally remove /usr/libexec
As of poky commit id 1d18224b24a515a07170ce36dbd725cb203d3300 libexecdir has been changed to ${libdir}/${BPN} which is typically /usr/lib. This change introduces a check to see if /usr/libexec is being used before attempting to remove it. Fixes [YOCTO #3504] Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
-rw-r--r--recipes-extended/proftpd/proftpd_1.3.4b.bb5
1 files changed, 4 insertions, 1 deletions
diff --git a/recipes-extended/proftpd/proftpd_1.3.4b.bb b/recipes-extended/proftpd/proftpd_1.3.4b.bb
index 8ebafbf..2b2b4e2 100644
--- a/recipes-extended/proftpd/proftpd_1.3.4b.bb
+++ b/recipes-extended/proftpd/proftpd_1.3.4b.bb
@@ -34,7 +34,10 @@ FTPGROUP = "ftp"
do_install () {
oe_runmake DESTDIR=${D} install
- rmdir ${D}${libexecdir} ${D}${libdir}/proftpd ${D}${datadir}/locale
+ rmdir ${D}${libdir}/proftpd ${D}${datadir}/locale
+ if [ -d ${D}/usr/libexec ] ; then
+ rmdir ${D}/usr/libexec
+ fi
sed -i '/ *User[ \t]*/s/ftp/${FTPUSER}/' ${D}${sysconfdir}/proftpd.conf
sed -i '/ *Group[ \t]*/s/ftp/${FTPGROUP}/' ${D}${sysconfdir}/proftpd.conf
install -d ${D}${sysconfdir}/init.d