|
 |
2eb93d |
From 6d0e543f8bf01219b793cf4d7a603d3dfd7844ed Mon Sep 17 00:00:00 2001
|
|
|
2eb93d |
From: Dan Williams <dan.j.williams@intel.com>
|
|
|
2eb93d |
Date: Thu, 28 Apr 2022 15:10:05 -0700
|
|
|
2eb93d |
Subject: [PATCH 155/217] build: Move utility helpers to libutil.a
|
|
|
2eb93d |
|
|
|
2eb93d |
Stop listing util/json.c and util/log.c per command, just add them to
|
|
|
2eb93d |
the common libutil.a object.
|
|
|
2eb93d |
|
|
|
2eb93d |
Link: https://lore.kernel.org/r/165118380572.1676208.16232543117821121022.stgit@dwillia2-desk3.amr.corp.intel.com
|
|
|
2eb93d |
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
|
|
|
2eb93d |
Signed-off-by: Vishal Verma <vishal.l.verma@intel.com>
|
|
|
2eb93d |
---
|
|
|
2eb93d |
cxl/meson.build | 2 --
|
|
|
2eb93d |
daxctl/meson.build | 1 -
|
|
|
2eb93d |
ndctl/meson.build | 2 --
|
|
|
2eb93d |
util/meson.build | 2 ++
|
|
|
2eb93d |
4 files changed, 2 insertions(+), 5 deletions(-)
|
|
|
2eb93d |
|
|
|
2eb93d |
diff -up ndctl-71.1/cxl/meson.build.orig ndctl-71.1/cxl/meson.build
|
|
|
2eb93d |
--- ndctl-71.1/cxl/meson.build.orig 2022-10-07 16:54:43.451540066 -0400
|
|
|
2eb93d |
+++ ndctl-71.1/cxl/meson.build 2022-10-07 16:55:35.330716698 -0400
|
|
|
2eb93d |
@@ -3,8 +3,6 @@ cxl_src = [
|
|
|
2eb93d |
'list.c',
|
|
|
2eb93d |
'port.c',
|
|
|
2eb93d |
'memdev.c',
|
|
|
2eb93d |
- '../util/json.c',
|
|
|
2eb93d |
- '../util/log.c',
|
|
|
2eb93d |
'json.c',
|
|
|
2eb93d |
'filter.c',
|
|
|
2eb93d |
]
|
|
|
2eb93d |
diff -up ndctl-71.1/daxctl/meson.build.orig ndctl-71.1/daxctl/meson.build
|
|
|
2eb93d |
--- ndctl-71.1/daxctl/meson.build.orig 2022-10-07 16:54:43.333539664 -0400
|
|
|
2eb93d |
+++ ndctl-71.1/daxctl/meson.build 2022-10-07 16:55:35.330716698 -0400
|
|
|
2eb93d |
@@ -4,7 +4,6 @@ daxctl_src = [
|
|
|
2eb93d |
'list.c',
|
|
|
2eb93d |
'migrate.c',
|
|
|
2eb93d |
'device.c',
|
|
|
2eb93d |
- '../util/json.c',
|
|
|
2eb93d |
'json.c',
|
|
|
2eb93d |
'filter.c',
|
|
|
2eb93d |
]
|
|
|
2eb93d |
diff -up ndctl-71.1/ndctl/meson.build.orig ndctl-71.1/ndctl/meson.build
|
|
|
2eb93d |
--- ndctl-71.1/ndctl/meson.build.orig 2022-10-07 16:54:43.333539664 -0400
|
|
|
2eb93d |
+++ ndctl-71.1/ndctl/meson.build 2022-10-07 16:55:35.330716698 -0400
|
|
|
2eb93d |
@@ -6,11 +6,9 @@ ndctl_src = [
|
|
|
2eb93d |
'check.c',
|
|
|
2eb93d |
'region.c',
|
|
|
2eb93d |
'dimm.c',
|
|
|
2eb93d |
- '../util/log.c',
|
|
|
2eb93d |
'../daxctl/filter.c',
|
|
|
2eb93d |
'filter.c',
|
|
|
2eb93d |
'list.c',
|
|
|
2eb93d |
- '../util/json.c',
|
|
|
2eb93d |
'../daxctl/json.c',
|
|
|
2eb93d |
'json.c',
|
|
|
2eb93d |
'json-smart.c',
|
|
|
2eb93d |
diff -up ndctl-71.1/util/meson.build.orig ndctl-71.1/util/meson.build
|
|
|
2eb93d |
--- ndctl-71.1/util/meson.build.orig 2022-10-07 16:54:43.334539667 -0400
|
|
|
2eb93d |
+++ ndctl-71.1/util/meson.build 2022-10-07 16:55:35.330716698 -0400
|
|
|
2eb93d |
@@ -2,6 +2,8 @@ util = static_library('util', [
|
|
|
2eb93d |
'parse-options.c',
|
|
|
2eb93d |
'usage.c',
|
|
|
2eb93d |
'size.c',
|
|
|
2eb93d |
+ 'json.c',
|
|
|
2eb93d |
+ 'log.c',
|
|
|
2eb93d |
'main.c',
|
|
|
2eb93d |
'help.c',
|
|
|
2eb93d |
'strbuf.c',
|