Patchwork [v2,1/2] ppp-2.4.5: own package for PPPoL2TP plugin

login
register
mail settings
Submitter Steffen Sledz
Date July 4, 2011, 8:31 a.m.
Message ID <1309768279-4797-1-git-send-email-sledz@dresearch-fe.de>
Download mbox | patch
Permalink /patch/6931/
State Accepted
Headers show

Comments

Steffen Sledz - July 4, 2011, 8:31 a.m.
Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
---
 recipes/ppp/ppp_2.4.5.bb |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)
Paul Menzel - July 4, 2011, 8:52 a.m.
Am Montag, den 04.07.2011, 10:31 +0200 schrieb Steffen Sledz:

Could you please add the following to the commit message before you
commit?

Adding that package fixes the following error message.

        NOTE: package ppp-2.4.5-r1: task do_qa_staging: Started
        WARNING: the following files were installed but not shipped in any package:
        WARNING:   /usr/lib/pppd/2.4.5/pppol2tp.so
        WARNING:   /usr/lib/pppd/2.4.5/openl2tp.so

> Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de>
> ---
>  recipes/ppp/ppp_2.4.5.bb |    6 ++++--
>  1 files changed, 4 insertions(+), 2 deletions(-)
> 
> diff --git a/recipes/ppp/ppp_2.4.5.bb b/recipes/ppp/ppp_2.4.5.bb
> index 2b6b6f7..883b695 100644
> --- a/recipes/ppp/ppp_2.4.5.bb
> +++ b/recipes/ppp/ppp_2.4.5.bb
> @@ -3,7 +3,7 @@ DESCRIPTION = "Point-to-Point Protocol (PPP) daemon"
>  HOMEPAGE = "http://samba.org/ppp/"
>  DEPENDS = "libpcap"
>  LICENSE = "BSD GPLv2"
> -PR = "r1"
> +PR = "r2"
>  # Not well tested
>  DEFAULT_PREFERENCE = "-1"
>  
> @@ -49,11 +49,12 @@ do_install_append () {
>  }
>  
>  CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options"
> -PACKAGES =+ "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools"
> +PACKAGES =+ "ppp-oa ppp-l2tp ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools"
>  FILES_${PN}        = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd"
>  FILES_${PN}_nylon  = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${sbindir}/tdbread"
>  FILES_${PN}-dbg += "${libdir}/pppd/${PV}/.debug"
>  FILES_${PN}-oa       = "${libdir}/pppd/${PV}/pppoatm.so"
> +FILES_${PN}-l2tp     = "${libdir}/pppd/${PV}/pppol2tp.so ${libdir}/pppd/${PV}/openl2tp.so"
>  FILES_${PN}-oe       = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/rp-pppoe.so"
>  FILES_${PN}-radius   = "${libdir}/pppd/${PV}/radius.so ${libdir}/pppd/${PV}/radattr.so ${libdir}/pppd/${PV}/radrealms.so"
>  FILES_${PN}-winbind  = "${libdir}/pppd/${PV}/winbind.so"
> @@ -61,6 +62,7 @@ FILES_${PN}-minconn  = "${libdir}/pppd/${PV}/minconn.so"
>  FILES_${PN}-password = "${libdir}/pppd/${PV}/pass*.so"
>  FILES_${PN}-tools    = "${sbindir}/pppstats ${sbindir}/pppdump"
>  DESCRIPTION_ppp-oa       = "Plugin for PPP needed for PPP-over-ATM"
> +DESCRIPTION_ppp-l2tp     = "Plugin for PPP needed for PPP-over-L2TP"
>  DESCRIPTION_ppp-oe       = "Plugin for PPP needed for PPP-over-Ethernet"
>  DESCRIPTION_ppp-radius   = "Plugin for PPP that are related to RADIUS"
>  DESCRIPTION_ppp-winbind  = "Plugin for PPP to authenticate against Samba or Windows"

Putting these additions one line above would sort it alphabetically,
would not it? If yes, it would be nice to fix this too before pushing
the commit.

Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>


Thanks,

Paul
Steffen Sledz - July 4, 2011, 10:58 a.m.
On 04.07.2011 10:52, Paul Menzel wrote:
> Am Montag, den 04.07.2011, 10:31 +0200 schrieb Steffen Sledz:
> 
> Could you please add the following to the commit message before you commit?
> 
> Adding that package fixes the following error message.
> 
> NOTE: package ppp-2.4.5-r1: task do_qa_staging: Started WARNING: the following files were installed but not shipped in any package: WARNING:   /usr/lib/pppd/2.4.5/pppol2tp.so WARNING:   /usr/lib/pppd/2.4.5/openl2tp.so

added

>> Signed-off-by: Steffen Sledz <sledz@dresearch-fe.de> --- recipes/ppp/ppp_2.4.5.bb |    6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-)
>> 
>> diff --git a/recipes/ppp/ppp_2.4.5.bb b/recipes/ppp/ppp_2.4.5.bb index 2b6b6f7..883b695 100644 --- a/recipes/ppp/ppp_2.4.5.bb +++ b/recipes/ppp/ppp_2.4.5.bb @@ -3,7 +3,7 @@ DESCRIPTION = "Point-to-Point Protocol (PPP) daemon" HOMEPAGE = "http://samba.org/ppp/" DEPENDS = "libpcap" LICENSE = "BSD GPLv2" -PR = "r1" +PR = "r2" # Not well tested DEFAULT_PREFERENCE = "-1"
>> 
>> @@ -49,11 +49,12 @@ do_install_append () { }
>> 
>> CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options" -PACKAGES =+ "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools" +PACKAGES =+ "ppp-oa ppp-l2tp ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools" FILES_${PN}        = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd" FILES_${PN}_nylon  = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${sbindir}/tdbread" FILES_${PN}-dbg += "${libdir}/pppd/${PV}/.debug" FILES_${PN}-oa       = "${libdir}/pppd/${PV}/pppoatm.so" +FILES_${PN}-l2tp     = "${libdir}/pppd/${PV}/pppol2tp.so ${libdir}/pppd/${PV}/openl2tp.so" FILES_${PN}-oe       = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/rp-pppoe.so" FILES_${PN}-radius   = "${libdir}/pppd/${PV}/radius.so ${libdir}/pppd/${PV}/radattr.so ${libdir}/pppd/${PV}/radrealms.so" FILES_${PN}-winbind  = "${libdir}/pppd/${PV}/winbind.so" @@ -61,6 +62,7 @@ FILES_${PN}-minconn  =
>> "${libdir}/pppd/${PV}/minconn.so" FILES_${PN}-password = "${libdir}/pppd/${PV}/pass*.so" FILES_${PN}-tools    = "${sbindir}/pppstats ${sbindir}/pppdump" DESCRIPTION_ppp-oa       = "Plugin for PPP needed for PPP-over-ATM" +DESCRIPTION_ppp-l2tp     = "Plugin for PPP needed for PPP-over-L2TP" DESCRIPTION_ppp-oe       = "Plugin for PPP needed for PPP-over-Ethernet" DESCRIPTION_ppp-radius   = "Plugin for PPP that are related to RADIUS" DESCRIPTION_ppp-winbind  = "Plugin for PPP to authenticate against Samba or Windows"
> 
> Putting these additions one line above would sort it alphabetically, would not it? If yes, it would be nice to fix this too before pushing the commit.

sorted

> Acked-by: Paul Menzel <paulepanter@users.sourceforge.net>

and pushed

Patch

diff --git a/recipes/ppp/ppp_2.4.5.bb b/recipes/ppp/ppp_2.4.5.bb
index 2b6b6f7..883b695 100644
--- a/recipes/ppp/ppp_2.4.5.bb
+++ b/recipes/ppp/ppp_2.4.5.bb
@@ -3,7 +3,7 @@  DESCRIPTION = "Point-to-Point Protocol (PPP) daemon"
 HOMEPAGE = "http://samba.org/ppp/"
 DEPENDS = "libpcap"
 LICENSE = "BSD GPLv2"
-PR = "r1"
+PR = "r2"
 # Not well tested
 DEFAULT_PREFERENCE = "-1"
 
@@ -49,11 +49,12 @@  do_install_append () {
 }
 
 CONFFILES_${PN} = "${sysconfdir}/ppp/pap-secrets ${sysconfdir}/ppp/chap-secrets ${sysconfdir}/ppp/options"
-PACKAGES =+ "ppp-oa ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools"
+PACKAGES =+ "ppp-oa ppp-l2tp ppp-oe ppp-radius ppp-winbind ppp-minconn ppp-password ppp-tools"
 FILES_${PN}        = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd"
 FILES_${PN}_nylon  = "${sysconfdir} ${bindir} ${sbindir}/chat ${sbindir}/pppd ${sbindir}/tdbread"
 FILES_${PN}-dbg += "${libdir}/pppd/${PV}/.debug"
 FILES_${PN}-oa       = "${libdir}/pppd/${PV}/pppoatm.so"
+FILES_${PN}-l2tp     = "${libdir}/pppd/${PV}/pppol2tp.so ${libdir}/pppd/${PV}/openl2tp.so"
 FILES_${PN}-oe       = "${sbindir}/pppoe-discovery ${libdir}/pppd/${PV}/rp-pppoe.so"
 FILES_${PN}-radius   = "${libdir}/pppd/${PV}/radius.so ${libdir}/pppd/${PV}/radattr.so ${libdir}/pppd/${PV}/radrealms.so"
 FILES_${PN}-winbind  = "${libdir}/pppd/${PV}/winbind.so"
@@ -61,6 +62,7 @@  FILES_${PN}-minconn  = "${libdir}/pppd/${PV}/minconn.so"
 FILES_${PN}-password = "${libdir}/pppd/${PV}/pass*.so"
 FILES_${PN}-tools    = "${sbindir}/pppstats ${sbindir}/pppdump"
 DESCRIPTION_ppp-oa       = "Plugin for PPP needed for PPP-over-ATM"
+DESCRIPTION_ppp-l2tp     = "Plugin for PPP needed for PPP-over-L2TP"
 DESCRIPTION_ppp-oe       = "Plugin for PPP needed for PPP-over-Ethernet"
 DESCRIPTION_ppp-radius   = "Plugin for PPP that are related to RADIUS"
 DESCRIPTION_ppp-winbind  = "Plugin for PPP to authenticate against Samba or Windows"