Skip to contentSkip to conversation

proftpd: fix do_install failure after libexecdir change

PATCH In review Paul Eggleton 2 participants 2 messages Dec 5, 2012

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 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 <[email protected]>

---
 meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb +2 -1
index 8624c16..7279cfb 100644
@@ -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
Signature · 1 line
1.7.10.4
#1 lore raw
Quoted 20 lines · [[oe] [meta-networking][PATCH v2] proftpd: fix do_install failure after…

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 <[email protected]>

---
 meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb +0 -0
index 8624c16..7279cfb 100644

meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb FTPGROUP = "ftp" · line 41

Quoted 9 lines
meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb +2 -1
@@ -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

Seems sensible. Merged. Thanks.

Signature · 2 lines
-Joe MacDonald.
:wq