Skip to contentSkip to conversation

ndctl,daxctl,util/build: Reconcile 'iniparser' dependency

PATCH Superseded Vaibhav Jain 2 participants 3 messages Mar 15, 2022 – Mar 16, 2022

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ndctl,daxctl,util/build: Reconcile 'iniparser' dependency

This trivial patch updates 'meson.build' files for daxctl, ndctl to remove explicit dependency on 'iniparser'. Instead util/meson.build is updated to add a dependency to 'iniparser' which than get tricked to daxctl, ndctl via 'util_dep' dependency.

---
 daxctl/meson.build | 1 -
 ndctl/meson.build  | 1 -
 util/meson.build   | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)
daxctl/meson.build +0 -1
index ec2e2b648d40..8474d02f2c0d 100644
@@ -15,7 +15,6 @@ daxctl_tool = executable('daxctl',
   dependencies : [
     daxctl_dep,
     ndctl_dep,
-    iniparser,
     util_dep,
     uuid,
     kmod,
ndctl/meson.build +0 -1
index 6a3d0e5348c2..c7889af36084 100644
@@ -27,7 +27,6 @@ deps = [
   uuid,
   kmod,
   json,
-  iniparser,
   versiondep,
 ]
 
util/meson.build +1 -0
index 784b27915649..695037a924b9 100644
@@ -11,6 +11,7 @@ util = static_library('util', [
   'abspath.c',
   'iomem.c',
   ],
+  dependencies: iniparser,
   include_directories : root_inc,
 )
 util_dep = declare_dependency(link_with : util)

base-commit: dd58d43458943d20ff063850670bf54a5242c9c5

Signature · 1 line
2.35.1
maintainer
#1 lore raw
Quoted 5 lines · Vaibhav Jain

This trivial patch updates 'meson.build' files for daxctl, ndctl to remove
explicit dependency on 'iniparser'. Instead util/meson.build is updated to add a
dependency to 'iniparser' which than get tricked to daxctl, ndctl via

s/tricked/trickled/

Otherwise looks good to me.

Quoted 48 lines

'util_dep'
dependency.

---
 daxctl/meson.build | 1 -
 ndctl/meson.build  | 1 -
 util/meson.build   | 1 +

 3 files changed, 1 insertion(+), 2 deletions(-)
daxctl/meson.build +0 -0
index ec2e2b648d40..8474d02f2c0d 100644
@@ -15,7 +15,6 @@ daxctl_tool = executable('daxctl',

   dependencies : [
     daxctl_dep,
     ndctl_dep,
-    iniparser,
     util_dep,
     uuid,
     kmod,

ndctl/meson.build +0 -1
index 6a3d0e5348c2..c7889af36084 100644
@@ -27,7 +27,6 @@ deps = [
    uuid,
    kmod,
    json,
-  iniparser,
    versiondep,

 ]

util/meson.build +1 -0
index 784b27915649..695037a924b9 100644
@@ -11,6 +11,7 @@ util = static_library('util', [
    'abspath.c',
    'iomem.c',
    ],
+  dependencies: iniparser,
    include_directories : root_inc,
  )
  util_dep = declare_dependency(link_with : util)

base-commit: dd58d43458943d20ff063850670bf54a5242c9c5

#2 lore raw

Thanks for looking into this patch Vishal.

Quoted 8 lines · Vishal L
Quoted 5 lines · Vaibhav Jain

This trivial patch updates 'meson.build' files for daxctl, ndctl to remove
explicit dependency on 'iniparser'. Instead util/meson.build is updated to add a
dependency to 'iniparser' which than get tricked to daxctl, ndctl via

s/tricked/trickled/

Addressed this in V2 of the patch. Thanks for pointing this out.

Quoted 52 lines

Otherwise looks good to me.

Quoted 48 lines

'util_dep'
dependency.

---
 daxctl/meson.build | 1 -
 ndctl/meson.build  | 1 -
 util/meson.build   | 1 +

 3 files changed, 1 insertion(+), 2 deletions(-)
daxctl/meson.build +0 -0
index ec2e2b648d40..8474d02f2c0d 100644
@@ -15,7 +15,6 @@ daxctl_tool = executable('daxctl',

   dependencies : [
     daxctl_dep,
     ndctl_dep,
-    iniparser,
     util_dep,
     uuid,
     kmod,

ndctl/meson.build +0 -1
index 6a3d0e5348c2..c7889af36084 100644
@@ -27,7 +27,6 @@ deps = [
    uuid,
    kmod,
    json,
-  iniparser,
    versiondep,

 ]

util/meson.build +1 -0
index 784b27915649..695037a924b9 100644
@@ -11,6 +11,7 @@ util = static_library('util', [
    'abspath.c',
    'iomem.c',
    ],
+  dependencies: iniparser,
    include_directories : root_inc,
  )
  util_dep = declare_dependency(link_with : util)

base-commit: dd58d43458943d20ff063850670bf54a5242c9c5

Signature · 2 lines
Cheers
~ Vaibhav