[meta-baryon][PATCH 0/1] proftpd fix

[meta-baryon][PATCH 0/1] proftpd fix

[Kevin Strasser]

This change fixes a breakage introduced when the value of libexecdir was 
changed to "${libdir}/${BPN}".

The proftpd recipe in meta-networking will likely need a similar patch.

The following changes since commit ad1dfa139195f39a72b8e0fb47de5c3339397b8b:

  proftpd: add initscript and tidy up recipe (2012-10-28 01:47:32 +0100)

are available in the git repository at:

  git://git.yoctoproject.org/poky-contrib strassek/baryon-proftpd
  http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=strassek/poky-contrib

Kevin Strasser (1):
  proftpd: conditionally remove /usr/libexec

 recipes-extended/proftpd/proftpd_1.3.4b.bb |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

-- 
1.7.9.5

[meta-baryon][PATCH 1/1] proftpd: conditionally remove /usr/libexec

[Kevin Strasser]

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>
---
 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
-- 
1.7.9.5

Re: [meta-baryon][PATCH 1/1] proftpd: conditionally remove /usr/libexec

[Paul Eggleton]

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.strasser@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