Patchwork [meta-oe/meta-gnome,13/15] proftpd: remove postinst - directory can be setup offline in do_install

login
register
mail settings
Submitter Andreas Müller
Date May 7, 2013, 10:41 p.m.
Message ID <1367966513-12566-14-git-send-email-schnitzeltony@googlemail.com>
Download mbox | patch
Permalink /patch/49521/
State Accepted, archived
Commit 8c709eb9fda970e06a7114c00c5e027fd3621259
Headers show

Comments

Andreas Müller - May 7, 2013, 10:41 p.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-daemons/proftpd/proftpd_1.3.4b.bb      |   16 +++++-----------
 1 files changed, 5 insertions(+), 11 deletions(-)

Patch

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