[meta-networking] frr: add PACKAGECONFIG for fpm

Message ID 20220425063030.814264-1-yi.zhao@windriver.com
State New
Headers show
Series [meta-networking] frr: add PACKAGECONFIG for fpm | expand

Commit Message

Yi Zhao April 25, 2022, 6:30 a.m. UTC
The Forwarding Plane Manager support is optional, make it as
PACKAGECONFIG.

Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
---
 meta-networking/recipes-protocols/frr/frr/frr.pam  | 2 +-
 meta-networking/recipes-protocols/frr/frr_8.2.2.bb | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Khem Raj April 26, 2022, 6:18 a.m. UTC | #1
I am seeing

https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/1681

This could be an intermittent failure due to build time race or
related to this change perhaps, I have seen this before too. Can you
look into it ?

On Sun, Apr 24, 2022 at 11:30 PM Yi Zhao <yi.zhao@windriver.com> wrote:
>
> The Forwarding Plane Manager support is optional, make it as
> PACKAGECONFIG.
>
> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
> ---
>  meta-networking/recipes-protocols/frr/frr/frr.pam  | 2 +-
>  meta-networking/recipes-protocols/frr/frr_8.2.2.bb | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/meta-networking/recipes-protocols/frr/frr/frr.pam b/meta-networking/recipes-protocols/frr/frr/frr.pam
> index 3541a975a..83c403c2b 100644
> --- a/meta-networking/recipes-protocols/frr/frr/frr.pam
> +++ b/meta-networking/recipes-protocols/frr/frr/frr.pam
> @@ -1,5 +1,5 @@
>  #
> -# The PAM configuration file for the quagga `vtysh' service
> +# The PAM configuration file for the frr `vtysh' service
>  #
>
>  # This allows root to change user infomation without being
> diff --git a/meta-networking/recipes-protocols/frr/frr_8.2.2.bb b/meta-networking/recipes-protocols/frr/frr_8.2.2.bb
> index 91e306f08..b6e180e2c 100644
> --- a/meta-networking/recipes-protocols/frr/frr_8.2.2.bb
> +++ b/meta-networking/recipes-protocols/frr/frr_8.2.2.bb
> @@ -36,6 +36,7 @@ RDEPENDS:${PN}:class-target = "iproute2 python3-core bash"
>  PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
>  PACKAGECONFIG:class-native = ""
>
> +PACKAGECONFIG[fpm] = "--enable-fpm,--disable-fpm"
>  PACKAGECONFIG[pam] = "--with-libpam,--without-libpam,libpam"
>  PACKAGECONFIG[grpc] = "--enable-grpc,--disable-grpc,grpc-native grpc"
>  PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp"
> @@ -52,7 +53,6 @@ EXTRA_OECONF:class-target = "--sbindir=${libdir}/frr \
>                               --sysconfdir=${sysconfdir}/frr \
>                               --localstatedir=${localstatedir}/run/frr \
>                               --enable-vtysh \
> -                             --enable-fpm \
>                               --enable-multipath=64 \
>                               --enable-user=frr \
>                               --enable-group=frr \
> --
> 2.25.1
>
>
> -=-=-=-=-=-=-=-=-=-=-=-
> Links: You receive all messages sent to this group.
> View/Reply Online (#96760): https://lists.openembedded.org/g/openembedded-devel/message/96760
> Mute This Topic: https://lists.openembedded.org/mt/90679546/1997914
> Group Owner: openembedded-devel+owner@lists.openembedded.org
> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
> -=-=-=-=-=-=-=-=-=-=-=-
>
Yi Zhao April 26, 2022, 1:52 p.m. UTC | #2
On 4/26/22 14:18, Khem Raj wrote:
> I am seeing
>
> https://autobuilder.yoctoproject.org/typhoon/#/builders/88/builds/1681
>
> This could be an intermittent failure due to build time race or
> related to this change perhaps, I have seen this before too. Can you
> look into it ?


OK. I will look into it. Thanks.


//Yi


>
> On Sun, Apr 24, 2022 at 11:30 PM Yi Zhao <yi.zhao@windriver.com> wrote:
>> The Forwarding Plane Manager support is optional, make it as
>> PACKAGECONFIG.
>>
>> Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
>> ---
>>   meta-networking/recipes-protocols/frr/frr/frr.pam  | 2 +-
>>   meta-networking/recipes-protocols/frr/frr_8.2.2.bb | 2 +-
>>   2 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/meta-networking/recipes-protocols/frr/frr/frr.pam b/meta-networking/recipes-protocols/frr/frr/frr.pam
>> index 3541a975a..83c403c2b 100644
>> --- a/meta-networking/recipes-protocols/frr/frr/frr.pam
>> +++ b/meta-networking/recipes-protocols/frr/frr/frr.pam
>> @@ -1,5 +1,5 @@
>>   #
>> -# The PAM configuration file for the quagga `vtysh' service
>> +# The PAM configuration file for the frr `vtysh' service
>>   #
>>
>>   # This allows root to change user infomation without being
>> diff --git a/meta-networking/recipes-protocols/frr/frr_8.2.2.bb b/meta-networking/recipes-protocols/frr/frr_8.2.2.bb
>> index 91e306f08..b6e180e2c 100644
>> --- a/meta-networking/recipes-protocols/frr/frr_8.2.2.bb
>> +++ b/meta-networking/recipes-protocols/frr/frr_8.2.2.bb
>> @@ -36,6 +36,7 @@ RDEPENDS:${PN}:class-target = "iproute2 python3-core bash"
>>   PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
>>   PACKAGECONFIG:class-native = ""
>>
>> +PACKAGECONFIG[fpm] = "--enable-fpm,--disable-fpm"
>>   PACKAGECONFIG[pam] = "--with-libpam,--without-libpam,libpam"
>>   PACKAGECONFIG[grpc] = "--enable-grpc,--disable-grpc,grpc-native grpc"
>>   PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp"
>> @@ -52,7 +53,6 @@ EXTRA_OECONF:class-target = "--sbindir=${libdir}/frr \
>>                                --sysconfdir=${sysconfdir}/frr \
>>                                --localstatedir=${localstatedir}/run/frr \
>>                                --enable-vtysh \
>> -                             --enable-fpm \
>>                                --enable-multipath=64 \
>>                                --enable-user=frr \
>>                                --enable-group=frr \
>> --
>> 2.25.1
>>
>>
>> -=-=-=-=-=-=-=-=-=-=-=-
>> Links: You receive all messages sent to this group.
>> View/Reply Online (#96760): https://lists.openembedded.org/g/openembedded-devel/message/96760
>> Mute This Topic: https://lists.openembedded.org/mt/90679546/1997914
>> Group Owner: openembedded-devel+owner@lists.openembedded.org
>> Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [raj.khem@gmail.com]
>> -=-=-=-=-=-=-=-=-=-=-=-
>>

Patch

diff --git a/meta-networking/recipes-protocols/frr/frr/frr.pam b/meta-networking/recipes-protocols/frr/frr/frr.pam
index 3541a975a..83c403c2b 100644
--- a/meta-networking/recipes-protocols/frr/frr/frr.pam
+++ b/meta-networking/recipes-protocols/frr/frr/frr.pam
@@ -1,5 +1,5 @@ 
 #
-# The PAM configuration file for the quagga `vtysh' service
+# The PAM configuration file for the frr `vtysh' service
 #
 
 # This allows root to change user infomation without being
diff --git a/meta-networking/recipes-protocols/frr/frr_8.2.2.bb b/meta-networking/recipes-protocols/frr/frr_8.2.2.bb
index 91e306f08..b6e180e2c 100644
--- a/meta-networking/recipes-protocols/frr/frr_8.2.2.bb
+++ b/meta-networking/recipes-protocols/frr/frr_8.2.2.bb
@@ -36,6 +36,7 @@  RDEPENDS:${PN}:class-target = "iproute2 python3-core bash"
 PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}"
 PACKAGECONFIG:class-native = ""
 
+PACKAGECONFIG[fpm] = "--enable-fpm,--disable-fpm"
 PACKAGECONFIG[pam] = "--with-libpam,--without-libpam,libpam"
 PACKAGECONFIG[grpc] = "--enable-grpc,--disable-grpc,grpc-native grpc"
 PACKAGECONFIG[snmp] = "--enable-snmp,--disable-snmp,net-snmp"
@@ -52,7 +53,6 @@  EXTRA_OECONF:class-target = "--sbindir=${libdir}/frr \
                              --sysconfdir=${sysconfdir}/frr \
                              --localstatedir=${localstatedir}/run/frr \
                              --enable-vtysh \
-                             --enable-fpm \
                              --enable-multipath=64 \
                              --enable-user=frr \
                              --enable-group=frr \