From: Karel Zak <kzak@redhat.com>
Date: Tue, 20 Jun 2023 11:15:45 +0000 (+0200)
Subject: lib: remove pager.c from libcommon
X-Git-Tag: v2.40-rc1~379
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=33e347832e77e821c62cfbc48eccff178f9ea6b5;p=thirdparty%2Futil-linux.git

lib: remove pager.c from libcommon

The libcommon is a binary archive to keep compilation and maintenance
simple. The library is not linked as shared or so. The unused symbols
are removed from binaries (for example, by "make install-strip").

But it isn't evident for license analyzers (and some humans) that the
library uses GPL and non-GPL stuff simultaneously. Let's avoid doubts
and keep pager.c (with GPL license) out of the archive

Signed-off-by: Karel Zak <kzak@redhat.com>
---

diff --git a/disk-utils/Makemodule.am b/disk-utils/Makemodule.am
index 2124612ab7..d08e95d4f3 100644
--- a/disk-utils/Makemodule.am
+++ b/disk-utils/Makemodule.am
@@ -157,7 +157,9 @@ fdisk_SOURCES = \
 	disk-utils/fdisk.h \
 	disk-utils/fdisk-menu.c \
 	disk-utils/fdisk-list.c \
-	disk-utils/fdisk-list.h
+	disk-utils/fdisk-list.h \
+	include/pager.h \
+	lib/pager.c
 
 fdisk_LDADD = $(LDADD) libcommon.la libfdisk.la \
 	      libsmartcols.la libtcolors.la $(READLINE_LIBS)
diff --git a/disk-utils/meson.build b/disk-utils/meson.build
index 2bf3558346..39b6cba96b 100644
--- a/disk-utils/meson.build
+++ b/disk-utils/meson.build
@@ -69,7 +69,8 @@ fdisk_sources = files(
   'fdisk.h',
   'fdisk-menu.c',
   'fdisk-list.c',
-  'fdisk-list.h')
+  'fdisk-list.h') + \
+  pager_c
 
 sfdisk_sources = files(
   'sfdisk.c',
diff --git a/lib/Makemodule.am b/lib/Makemodule.am
index 62801ca004..d95721ee22 100644
--- a/lib/Makemodule.am
+++ b/lib/Makemodule.am
@@ -30,7 +30,6 @@ libcommon_la_SOURCES = \
 	lib/mbsalign.c \
 	lib/mbsedit.c\
 	lib/md5.c \
-	lib/pager.c \
 	lib/pwdutils.c \
 	lib/randutils.c \
 	lib/sha1.c \
diff --git a/lib/meson.build b/lib/meson.build
index 57833aa748..58d5da43f8 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -17,7 +17,6 @@ lib_common_sources = '''
 	mbsalign.c
 	mbsedit.c
 	md5.c
-	pager.c
 	procfs.c
 	pwdutils.c
 	randutils.c
@@ -37,6 +36,7 @@ md5_c = files('md5.c')
 sha1_c = files('sha1.c')
 strutils_c = files('strutils.c')
 strv_c = files('strv.c')
+pager_c = files('pager.c')
 
 lib_common_sources += [idcache_c,
                        randutils_c,
diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
index 2584281fb7..00f7b51ca3 100644
--- a/sys-utils/Makemodule.am
+++ b/sys-utils/Makemodule.am
@@ -157,7 +157,7 @@ if BUILD_DMESG
 bin_PROGRAMS += dmesg
 MANPAGES += sys-utils/dmesg.1
 dist_noinst_DATA += sys-utils/dmesg.1.adoc
-dmesg_SOURCES = sys-utils/dmesg.c lib/monotonic.c
+dmesg_SOURCES = sys-utils/dmesg.c lib/monotonic.c include/pager.h lib/pager.c
 dmesg_LDADD = $(LDADD) libcommon.la libtcolors.la $(REALTIME_LIBS)
 dmesg_CFLAGS = $(AM_CFLAGS)
 check_PROGRAMS += test_dmesg
diff --git a/sys-utils/meson.build b/sys-utils/meson.build
index 98cc3ae0ac..ee00d1d39e 100644
--- a/sys-utils/meson.build
+++ b/sys-utils/meson.build
@@ -55,7 +55,7 @@ fstrim_sources = files(
 dmesg_sources = files(
   'dmesg.c',
 ) + \
-  monotonic_c
+  monotonic_c + pager_c
 
 ctrlaltdel_sources = files(
   'ctrlaltdel.c',