[oe] [meta-networking][PATCH v2] proftpd: fix do_install failure after libexecdir change
Paul Eggleton
paul.eggleton at linux.intel.com
Wed Dec 5 17:03:44 UTC 2012
As of OE-Core commit id 406bd38b4232f9f399ef5ffe0b4fac72ed605a23
libexecdir has been changed to ${libdir}/${BPN}. As we are already
deleting ${libdir}/proftpd which is the same as ${libdir}/${BPN} in this
case, introduce a check to see if ${libexecdir} still exists before
attempting to remove it possibly a second time. This will handle if
libexecdir is set to its original value or a custom value in the distro
config.
Based on a patch by Kevin Strasser <kevin.strasser at linux.intel.com>
Signed-off-by: Paul Eggleton <paul.eggleton at linux.intel.com>
---
meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
index 8624c16..7279cfb 100644
--- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
+++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
@@ -34,7 +34,8 @@ 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
+ [ -d ${D}${libexecdir} ] && rmdir ${D}${libexecdir}
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
--
1.7.10.4
More information about the Openembedded-devel
mailing list