| Submitter | Paul Eggleton |
|---|---|
| Date | Dec. 5, 2012, 4:37 p.m. |
| Message ID | <1354725450-11856-1-git-send-email-paul.eggleton@linux.intel.com> |
| Download | mbox | patch |
| Permalink | /patch/40441/ |
| State | Superseded |
| Headers | show |
Comments
On Wednesday 05 December 2012 16:37:30 Paul Eggleton wrote: > From: Kevin Strasser <kevin.strasser@linux.intel.com> > > 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> > --- > meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb | 5 ++++- > 1 file changed, 4 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..ec943b7 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,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 Hmm, this fixes the build failure with master but I think there is a slightly better fix that handles a custom ${libexecdir}. I will send a v2. Cheers, Paul
Patch
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..ec943b7 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,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