[oe] [oe-commits] Andreas Müller : proftpd: remove postinst - directory can be setup offline in do_install

[Martin Jansa]

FILES_${PN} needs to be updated after this

proftpd-1.3.4b: proftpd: Files/directories were installed but not shipped
  /home
  /home/ftp
  /home/ftp/pub



On Fri, May 10, 2013 at 10:57 AM, <git at git.openembedded.org> wrote:

> Module: meta-openembedded.git
> Branch: master
> Commit: 8c709eb9fda970e06a7114c00c5e027fd3621259
> URL:
> http://git.openembedded.org/?p=meta-openembedded.git&a=commit;h=8c709eb9fda970e06a7114c00c5e027fd3621259
>
> Author: Andreas Müller <schnitzeltony at googlemail.com>
> Date:   Mon Apr 29 17:01:13 2013 +0200
>
> proftpd: remove postinst - directory can be setup offline in do_install
>
> Signed-off-by: Andreas Müller <schnitzeltony at googlemail.com>
> Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>
>
> ---
>
>  .../recipes-daemons/proftpd/proftpd_1.3.4b.bb      |   16
> +++++-----------
>  1 files changed, 5 insertions(+), 11 deletions(-)
>
> diff --git a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bbb/meta-networking/recipes-daemons/proftpd/
> proftpd_1.3.4b.bb
> index 28a7357..806413b 100644
> --- a/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
> +++ b/meta-networking/recipes-daemons/proftpd/proftpd_1.3.4b.bb
> @@ -4,7 +4,7 @@ HOMEPAGE = "http://www.proftpd.org"
>  LICENSE = "GPLv2+"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=fb0d1484d11915fa88a6a7702f1dc184"
>
> -PR = "r1"
> +PR = "r2"
>
>  SRC_URI = "ftp://ftp.proftpd.org/distrib/source/${BPN}-${PV}.tar.gz \
>             file://make.patch \
> @@ -47,6 +47,10 @@ do_install () {
>
>      install -d ${D}${sysconfdir}/default
>      install -m 0755 ${WORKDIR}/default ${D}${sysconfdir}/default/proftpd
> +
> +    # create the pub directory
> +    mkdir -p ${D}/home/${FTPUSER}/pub/
> +    chown -R ${FTPUSER}:${FTPGROUP} ${D}/home/${FTPUSER}/pub
>  }
>
>  INITSCRIPT_NAME = "proftpd"
> @@ -55,13 +59,3 @@ INITSCRIPT_PARAM = "defaults 85 15"
>  USERADD_PACKAGES = "${PN}"
>  GROUPADD_PARAM_${PN} = "${FTPGROUP}"
>  USERADD_PARAM_${PN} = "--system -g ${FTPGROUP} ${FTPUSER}"
> -
> -pkg_postinst_${PN} () {
> -    if [ "x$D" != "x" ] ; then
> -        exit 1
> -    fi
> -
> -    # create the pub directory
> -    mkdir -p /home/${FTPUSER}/pub/
> -    chown -R ${FTPUSER}:${FTPGROUP} /home/${FTPUSER}/pub
> -}
>
>
> _______________________________________________
> Openembedded-commits mailing list
> Openembedded-commits at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-commits
>