Patchwork [meta-oe/meta-gnome,15/15] rp-pppoe: move chmod form postinst to offline do_install

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

Comments

Andreas Müller - May 7, 2013, 10:41 p.m.
Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
---
 .../recipes-protocols/rp-pppoe/rp-pppoe_3.8.bb     |   10 ++--------
 1 files changed, 2 insertions(+), 8 deletions(-)

Patch

diff --git a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.8.bb b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.8.bb
index d4cc664..56246bc 100644
--- a/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.8.bb
+++ b/meta-networking/recipes-protocols/rp-pppoe/rp-pppoe_3.8.bb
@@ -4,7 +4,7 @@  SECTION = "console/network"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://doc/LICENSE;md5=a194eaefae2be54ee3221339b10d0581"
 
-PR = "r9"
+PR = "r10"
 
 SRC_URI = "http://www.roaringpenguin.com/files/download/${P}.tar.gz \
            file://top-autoconf.patch \
@@ -29,6 +29,7 @@  do_install() {
     install -m 0755 ${WORKDIR}/pppoe-server.init ${D}${sysconfdir}/init.d/pppoe-server
     # Install
     oe_runmake -C ${S} RPM_INSTALL_ROOT=${D} docdir=${docdir} install
+    chmod 4755 ${D}${sbindir}/pppoe
 }
 
 # Insert server package before main package
@@ -41,13 +42,6 @@  FILES_${PN}-server = "${sysconfdir}/default/pppoe-server \
 FILES_${PN}-relay = "${sbindir}/pppoe-relay"
 FILES_${PN}-sniff = "${sbindir}/pppoe-sniff"
 
-pkg_postinst_${PN} () {
-    if [ x"$D" != "x" ]; then
-        exit 1
-    fi
-    chmod 4755 ${sbindir}/pppoe
-}
-
 CONFFILES_${PN} = "${sysconfdir}/ppp/pppoe.conf \
                    ${sysconfdir}/ppp/firewall-standalone \
                    ${sysconfdir}/ppp/firewall-masq"