From ee194909e301fba93b45fdd99f04a4ff1f74094c Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 6 Oct 2021 11:11:16 +0200 Subject: [PATCH] build-sys: cleanup lsfd related stuff - add lsfd to meson.build - add Masatake to AUTHORS - add me to lsfd.c header and man page Signed-off-by: Karel Zak --- AUTHORS | 1 + meson.build | 13 +++++++++++++ misc-utils/Makemodule.am | 1 + misc-utils/lsfd.1.adoc | 3 ++- misc-utils/lsfd.c | 1 + misc-utils/meson.build | 13 +++++++++++++ 6 files changed, 31 insertions(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index 0488b70314..5c76a19b30 100644 --- a/AUTHORS +++ b/AUTHORS @@ -43,6 +43,7 @@ AUTHORS (merged projects & commands): lscpu: Cai Qian lsblk: Milan Broz Karel Zak + lsfd: Masatake YAMATO lsipc: Ondrej Oprala Karel Zak lslocks: Davidlohr Bueso diff --git a/meson.build b/meson.build index f315cbb171..378c3431a3 100644 --- a/meson.build +++ b/meson.build @@ -2335,6 +2335,19 @@ if not is_disabler(exe) manadocs += ['misc-utils/lsblk.8.adoc'] endif +exe = executable( + 'lsfd', + lsfd_sources, + include_directories : includes, + link_with : [lib_common, + lib_smartcols], + install_dir : usrbin_exec_dir, + install : true) +if not is_disabler(exe) + exes += exe + manadocs += ['misc-utils/lsfd.1.adoc'] +endif + exe = executable( 'uuidgen', uuidgen_sources, diff --git a/misc-utils/Makemodule.am b/misc-utils/Makemodule.am index 17f988910e..abfddf3b39 100644 --- a/misc-utils/Makemodule.am +++ b/misc-utils/Makemodule.am @@ -249,6 +249,7 @@ endif if BUILD_LSFD bin_PROGRAMS += lsfd MANPAGES += misc-utils/lsfd.1 +dist_noinst_DATA += misc-utils/lsfd.1.adoc lsfd_SOURCES = \ misc-utils/lsfd.c \ misc-utils/lsfd.h \ diff --git a/misc-utils/lsfd.1.adoc b/misc-utils/lsfd.1.adoc index b168ca3d59..0b796ad75b 100644 --- a/misc-utils/lsfd.1.adoc +++ b/misc-utils/lsfd.1.adoc @@ -152,7 +152,8 @@ The *lsfd* command is part of the util-linux package since v2.38. == AUTHORS -mailto:yamato@redhat.com[Masatake YAMATO] +mailto:yamato@redhat.com[Masatake YAMATO], +mailto:kzak@redhat.com[Karel Zak] == SEE ALSO diff --git a/misc-utils/lsfd.c b/misc-utils/lsfd.c index 8ab9f147d1..77019489f7 100644 --- a/misc-utils/lsfd.c +++ b/misc-utils/lsfd.c @@ -3,6 +3,7 @@ * * Copyright (C) 2021 Red Hat, Inc. All rights reserved. * Written by Masatake YAMATO + * Karel Zak * * Very generally based on lsof(8) by Victor A. Abell * It supports multiple OSes. lsfd specializes to Linux. diff --git a/misc-utils/meson.build b/misc-utils/meson.build index 71e1f4d836..bff8947b05 100644 --- a/misc-utils/meson.build +++ b/misc-utils/meson.build @@ -39,6 +39,19 @@ lsblk_sources = files( 'lsblk.h', ) +lsfd_sources = files ( + 'lsfd.c', + 'lsfd.h', + 'lsfd-filter.h', + 'lsfd-filter.c', + 'lsfd-file.c', + 'lsfd-cdev.c', + 'lsfd-bdev.c', + 'lsfd-sock.c', + 'lsfd-unkn.c', + 'lsfd-fifo.c', +) + uuidgen_sources = files( 'uuidgen.c', ) -- 2.39.2