On Monday 03 December 2012 15:22:42 Kevin Strasser wrote: > 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.stras...@linux.intel.com> > --- > recipes-extended/proftpd/proftpd_1.3.4b.bb | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > 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
Applied, thanks. I've also sent this over to be applied to meta-networking. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre _______________________________________________ yocto mailing list yocto@yoctoproject.org https://lists.yoctoproject.org/listinfo/yocto