mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-06-05 02:50:46 +00:00
proftpd: fix do_install failure after libexecdir change
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@linux.intel.com>
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
This commit is contained in:
committed by
Joe MacDonald
parent
10cd81211f
commit
c75fc2573b
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user