Skip to contentSkip to conversation

iproute2: add devlink support to iproute2

PATCH Superseded Scott Branden 2 participants 4 messages Feb 9, 2020 – Feb 18, 2020

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 iproute2: add devlink support to iproute2

Add devlink support to iproute2 recipe.

---
 meta/recipes-connectivity/iproute2/iproute2.inc | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
meta/recipes-connectivity/iproute2/iproute2.inc +7 -3
index fc31b8444e..6ef9201258 100644
@@ -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}"
Signature · 1 line
2.17.1
#1 lore raw

Could somebody have a look at merging this patch?

Quoted 45 lines · Scott Branden

Add devlink support to iproute2 recipe.

---
  meta/recipes-connectivity/iproute2/iproute2.inc | 10 +++++++---
  1 file changed, 7 insertions(+), 3 deletions(-)
meta/recipes-connectivity/iproute2/iproute2.inc +7 -3
index fc31b8444e..6ef9201258 100644
@@ -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 lore raw
In reply to Scott Branden
Quoted 9 lines · Scott Branden via Openembedded-core

-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

#3 lore raw
Quoted 13 lines · Anuj
Quoted 9 lines · Scott Branden via Openembedded-core

-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.

Quoted 4 lines

Thanks,

Anuj