]> git.ipfire.org Git - thirdparty/util-linux.git/commitdiff
Merge branch 'close/issue_4146' of https://github.com/lord2y/util-linux
authorKarel Zak <kzak@redhat.com>
Mon, 27 Apr 2026 09:39:52 +0000 (11:39 +0200)
committerKarel Zak <kzak@redhat.com>
Mon, 27 Apr 2026 09:39:52 +0000 (11:39 +0200)
* 'close/issue_4146' of https://github.com/lord2y/util-linux:
  lsblk: move source files to dedicated lsblk-cmd/ directory

1  2 
lsblk-cmd/lsblk.8.adoc
lsblk-cmd/lsblk.c
lsblk-cmd/lsblk.h
misc-utils/Makemodule.am
misc-utils/meson.build

Simple merge
Simple merge
Simple merge
Simple merge
index a6f6d6c6abb18d4aebc9ba80bd7dc87f8dcd7cba,6a77d8cc3a0588a34ec0b616f3a0bff449be6ab3..7347f569f8cd4b3fad242d912ab05008f220a0e8
@@@ -45,19 -45,9 +45,10 @@@ whereis_manadocs = files('whereis.1.ado
  
  lslocks_sources = files(
    'lslocks.c',
 -)
 +) + \
 +  pager_c
  lslocks_manadocs = files('lslocks.8.adoc')
  
- lsblk_sources = files(
-   'lsblk.c',
-   'lsblk-mnt.c',
-   'lsblk-properties.c',
-   'lsblk-devtree.c',
-   'lsblk.h',
- )
- lsblk_manadocs = files('lsblk.8.adoc')
  uuidgen_sources = files(
    'uuidgen.c',
  )