From: Paul Eggleton <paul.eggleton@linux.intel.com>
To: openembedded-devel@lists.openembedded.org
Subject: [meta-networking][PATCH v2] proftpd: fix do_install failure after libexecdir change
Date: Wed, 5 Dec 2012 17:03:44 +0000 [thread overview]
Message-ID: <1354727024-12231-1-git-send-email-paul.eggleton@linux.intel.com> (raw)
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>
---
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
next reply other threads:[~2012-12-05 17:18 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-05 17:03 Paul Eggleton [this message]
2012-12-05 19:14 ` [meta-networking][PATCH v2] proftpd: fix do_install failure after libexecdir change Joe MacDonald
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1354727024-12231-1-git-send-email-paul.eggleton@linux.intel.com \
--to=paul.eggleton@linux.intel.com \
--cc=openembedded-devel@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox