* [PATCH] iproute2: add devlink support to iproute2
@ 2020-02-09 20:26 Scott Branden
2020-02-18 19:08 ` Scott Branden
2020-02-18 22:32 ` Mittal, Anuj
0 siblings, 2 replies; 4+ messages in thread
From: Scott Branden @ 2020-02-09 20:26 UTC (permalink / raw)
To: openembedded-core
Add devlink support to iproute2 recipe.
Signed-off-by: Scott Branden <scott.branden@broadcom.com>
---
meta/recipes-connectivity/iproute2/iproute2.inc | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc
index fc31b8444e..6ef9201258 100644
--- a/meta/recipes-connectivity/iproute2/iproute2.inc
+++ b/meta/recipes-connectivity/iproute2/iproute2.inc
@@ -15,11 +15,13 @@ inherit update-alternatives bash-completion pkgconfig
CLEANBROKEN = "1"
-PACKAGECONFIG ??= "tipc elf"
+PACKAGECONFIG ??= "tipc elf devlink"
PACKAGECONFIG[tipc] = ",,libmnl,"
PACKAGECONFIG[elf] = ",,elfutils,"
+PACKAGECONFIG[devlink] = ",,libmnl,"
-EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \
+EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib devlink tc ip bridge misc genl \
+ ${@bb.utils.contains('PACKAGECONFIG', 'devlink', 'devlink', '', d)} \
${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'"
do_configure_append () {
@@ -46,7 +48,8 @@ PACKAGES =+ "${PN}-tc \
${PN}-rtacct \
${PN}-nstat \
${PN}-ss \
- ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}"
+ ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)} \
+ ${@bb.utils.contains('PACKAGECONFIG', 'devlink', '${PN}-devlink', '', d)}"
FILES_${PN}-tc = "${base_sbindir}/tc* \
${libdir}/tc/*.so"
FILES_${PN}-lnstat = "${base_sbindir}/lnstat \
@@ -58,6 +61,7 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct"
FILES_${PN}-nstat = "${base_sbindir}/nstat"
FILES_${PN}-ss = "${base_sbindir}/ss"
FILES_${PN}-tipc = "${base_sbindir}/tipc"
+FILES_${PN}-devlink = "${base_sbindir}/devlink"
ALTERNATIVE_${PN} = "ip"
ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}"
--
2.17.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] iproute2: add devlink support to iproute2
2020-02-09 20:26 [PATCH] iproute2: add devlink support to iproute2 Scott Branden
@ 2020-02-18 19:08 ` Scott Branden
2020-02-18 22:32 ` Mittal, Anuj
1 sibling, 0 replies; 4+ messages in thread
From: Scott Branden @ 2020-02-18 19:08 UTC (permalink / raw)
To: openembedded-core
Could somebody have a look at merging this patch?
On 2020-02-09 12:26 p.m., Scott Branden wrote:
> Add devlink support to iproute2 recipe.
>
> Signed-off-by: Scott Branden <scott.branden@broadcom.com>
> ---
> meta/recipes-connectivity/iproute2/iproute2.inc | 10 +++++++---
> 1 file changed, 7 insertions(+), 3 deletions(-)
>
> diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc
> index fc31b8444e..6ef9201258 100644
> --- a/meta/recipes-connectivity/iproute2/iproute2.inc
> +++ b/meta/recipes-connectivity/iproute2/iproute2.inc
> @@ -15,11 +15,13 @@ inherit update-alternatives bash-completion pkgconfig
>
> CLEANBROKEN = "1"
>
> -PACKAGECONFIG ??= "tipc elf"
> +PACKAGECONFIG ??= "tipc elf devlink"
> PACKAGECONFIG[tipc] = ",,libmnl,"
> PACKAGECONFIG[elf] = ",,elfutils,"
> +PACKAGECONFIG[devlink] = ",,libmnl,"
>
> -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \
> +EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib devlink tc ip bridge misc genl \
> + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', 'devlink', '', d)} \
> ${@bb.utils.contains('PACKAGECONFIG', 'tipc', 'tipc', '', d)}' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'"
>
> do_configure_append () {
> @@ -46,7 +48,8 @@ PACKAGES =+ "${PN}-tc \
> ${PN}-rtacct \
> ${PN}-nstat \
> ${PN}-ss \
> - ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)}"
> + ${@bb.utils.contains('PACKAGECONFIG', 'tipc', '${PN}-tipc', '', d)} \
> + ${@bb.utils.contains('PACKAGECONFIG', 'devlink', '${PN}-devlink', '', d)}"
> FILES_${PN}-tc = "${base_sbindir}/tc* \
> ${libdir}/tc/*.so"
> FILES_${PN}-lnstat = "${base_sbindir}/lnstat \
> @@ -58,6 +61,7 @@ FILES_${PN}-rtacct = "${base_sbindir}/rtacct"
> FILES_${PN}-nstat = "${base_sbindir}/nstat"
> FILES_${PN}-ss = "${base_sbindir}/ss"
> FILES_${PN}-tipc = "${base_sbindir}/tipc"
> +FILES_${PN}-devlink = "${base_sbindir}/devlink"
>
> ALTERNATIVE_${PN} = "ip"
> ALTERNATIVE_TARGET[ip] = "${base_sbindir}/ip.${BPN}"
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] iproute2: add devlink support to iproute2
2020-02-09 20:26 [PATCH] iproute2: add devlink support to iproute2 Scott Branden
2020-02-18 19:08 ` Scott Branden
@ 2020-02-18 22:32 ` Mittal, Anuj
2020-02-18 22:43 ` Scott Branden
1 sibling, 1 reply; 4+ messages in thread
From: Mittal, Anuj @ 2020-02-18 22:32 UTC (permalink / raw)
To: openembedded-core, scott.branden
On Sun, 2020-02-09 at 12:26 -0800, Scott Branden via Openembedded-core
wrote:
> -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR}
> DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \
> +EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR}
> DOCDIR=${docdir}/iproute2 SUBDIRS='lib devlink tc ip bridge misc genl
> \
> + ${@bb.utils.contains('PACKAGECONFIG', 'devlink',
> 'devlink', '', d)} \
> ${@bb.utils.contains('PACKAGECONFIG', 'tipc',
> 'tipc', '', d)}'
Looks like you added devlink twice in SUBDIRS. The one being added
unconditionally should be removed.
Thanks,
Anuj
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] iproute2: add devlink support to iproute2
2020-02-18 22:32 ` Mittal, Anuj
@ 2020-02-18 22:43 ` Scott Branden
0 siblings, 0 replies; 4+ messages in thread
From: Scott Branden @ 2020-02-18 22:43 UTC (permalink / raw)
To: Mittal, Anuj, openembedded-core
On 2020-02-18 2:32 p.m., Mittal, Anuj wrote:
> On Sun, 2020-02-09 at 12:26 -0800, Scott Branden via Openembedded-core
> wrote:
>> -EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR}
>> DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl \
>> +EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR}
>> DOCDIR=${docdir}/iproute2 SUBDIRS='lib devlink tc ip bridge misc genl
>> \
>> + ${@bb.utils.contains('PACKAGECONFIG', 'devlink',
>> 'devlink', '', d)} \
>> ${@bb.utils.contains('PACKAGECONFIG', 'tipc',
>> 'tipc', '', d)}'
> Looks like you added devlink twice in SUBDIRS. The one being added
> unconditionally should be removed.
Yes, thanks for pointing that out. Will send v2 patch.
>
> Thanks,
>
> Anuj
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-02-18 22:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-02-09 20:26 [PATCH] iproute2: add devlink support to iproute2 Scott Branden
2020-02-18 19:08 ` Scott Branden
2020-02-18 22:32 ` Mittal, Anuj
2020-02-18 22:43 ` Scott Branden
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.