ppp: convert to new style staging

diff --git a/recipes/ppp/ppp_2.4.3.bb b/recipes/ppp/ppp_2.4.3.bb
index 4c7b168..6936dd9 100644 (file)
--- a/recipes/ppp/ppp_2.4.3.bb
+++ b/recipes/ppp/ppp_2.4.3.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Point-to-Point Protocol (PPP) daemon"
 HOMEPAGE = "http://samba.org/ppp/"
 DEPENDS = "libpcap"
 LICENSE = "BSD GPLv2"
-PR = "r7"
+PR = "r8"
 
 SRC_URI = "http://ppp.samba.org/ftp/ppp/ppp-${PV}.tar.gz \
         file://ppp-2.4.3-mppe-mppc-1.1.patch;patch=1 \
@@ -30,11 +30,8 @@ inherit autotools
 EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}/usr/include LIBDIR=${D}/usr/lib/pppd/${PV} BINDIR=${D}/usr/sbin"
 EXTRA_OECONF = "--disable-strip"
 
-do_stage () {
-         make INCDIR=${STAGING_INCDIR} install-devel
-}
-
 do_install_append () {
+       make INCDIR=${includedir} install-devel
        make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp
        mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d
        mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/

diff --git a/recipes/ppp/ppp_2.4.4.bb b/recipes/ppp/ppp_2.4.4.bb
index b76a0c2..81ec3e0 100644 (file)
--- a/recipes/ppp/ppp_2.4.4.bb
+++ b/recipes/ppp/ppp_2.4.4.bb
@@ -32,11 +32,8 @@ inherit autotools
 EXTRA_OEMAKE = "STRIPPROG=${STRIP} MANDIR=${D}${datadir}/man/man8 INCDIR=${D}${includedir} LIBDIR=${D}${libdir}/pppd/${PV} BINDIR=${D}${sbindir}"
 EXTRA_OECONF = "--disable-strip"
 
-do_stage () {
-         make INCDIR=${STAGING_INCDIR} install-devel
-}
-
 do_install_append () {
+       make INCDIR=${includedir} install-devel
        make install-etcppp ETCDIR=${D}/${sysconfdir}/ppp
        mkdir -p ${D}${bindir}/ ${D}${sysconfdir}/init.d
        mkdir -p ${D}${sysconfdir}/ppp/ip-up.d/