[Accel-config] [PATCH 2/5] accel-config: Remove libkmod dependencies in build files
Ramesh Thomas <ramesh.thomas at intel.com> Wed, 01 Dec 2021 18:59:06 -0500
| Newsgroups | dev.linux.lists.accel-config |
|---|---|
| Message-ID | <[email protected]> |
From: Ramesh Thomas <ramesh.thomas(a)linux.intel.com>
Remove libkmod package dependencies and references in build files and
README.
Signed-off-by: Ramesh Thomas <ramesh.thomas(a)linux.intel.com>
---
Makefile.am.in | 1 -
README.md | 4 ++--
accfg-test.spec.in | 1 -
accfg.spec.in | 1 -
accfg/Makefile.am | 3 +--
accfg/lib/Makefile.am | 3 +--
configure.ac | 1 -
debian/control | 1 -
test/Makefile.am | 2 +-
9 files changed, 5 insertions(+), 12 deletions(-)
diff --git a/Makefile.am.in b/Makefile.am.in
index 419a478..992551b 100644
--- a/Makefile.am.in
+++ b/Makefile.am.in
@@ -12,7 +12,6 @@ AM_CPPFLAGS = \
-I${top_srcdir}/accfg/lib \
-I${top_srcdir}/accfg \
-I${top_srcdir}/ \
- $(KMOD_CFLAGS) \
$(UDEV_CFLAGS) \
$(UUID_CFLAGS) \
$(JSON_CFLAGS)
diff --git a/README.md b/README.md
index aaee01f..abf1e1b 100644
--- a/README.md
+++ b/README.md
@@ -9,13 +9,13 @@ sub-system in the Linux kernel
```bash
yum groupinstall "Development Tools"
yum install autoconf automake libtool pkgconf rpm-build rpmdevtools
-yum install asciidoc xmlto libuuid-devel json-c-devel kmod-devel libudev-devel
+yum install asciidoc xmlto libuuid-devel json-c-devel libudev-devel
```
### Debian
```bash
apt install build-essential
apt install autoconf automake autotools-dev libtool pkgconf asciidoc xmlto
-apt install uuid-dev libjson-c-dev libkmod-dev libudev-dev libkeyutils-dev
+apt install uuid-dev libjson-c-dev libudev-dev libkeyutils-dev
apt install debhelper devscripts debmake quilt fakeroot lintian asciidoctor
apt install file gnupg patch patchutils
```
diff --git a/accfg-test.spec.in b/accfg-test.spec.in
index d1292e0..14bc5c4 100644
--- a/accfg-test.spec.in
+++ b/accfg-test.spec.in
@@ -13,7 +13,6 @@ BuildRequires: xmlto
BuildRequires: automake
BuildRequires: libtool
BuildRequires: pkgconfig
-BuildRequires: pkgconfig(libkmod)
BuildRequires: pkgconfig(uuid)
BuildRequires: pkgconfig(json-c)
BuildRequires: pkgconfig(libudev)
diff --git a/accfg.spec.in b/accfg.spec.in
index 826c2a8..1939e73 100644
--- a/accfg.spec.in
+++ b/accfg.spec.in
@@ -13,7 +13,6 @@ BuildRequires: xmlto
BuildRequires: automake
BuildRequires: libtool
BuildRequires: pkgconfig
-BuildRequires: pkgconfig(libkmod)
BuildRequires: pkgconfig(uuid)
BuildRequires: pkgconfig(json-c)
BuildRequires: pkgconfig(libudev)
diff --git a/accfg/Makefile.am b/accfg/Makefile.am
index 327433b..8172d24 100644
--- a/accfg/Makefile.am
+++ b/accfg/Makefile.am
@@ -23,8 +23,7 @@ accel_config_LDADD =\
lib/libaccel-config.la \
../libutil.a \
$(JSON_LIBS) \
- $(UUID_LIBS) \
- $(KMOD_LIBS)
+ $(UUID_LIBS)
if ENABLE_TEST
accel_config_SOURCES += ../test/libaccfg.c \
diff --git a/accfg/lib/Makefile.am b/accfg/lib/Makefile.am
index 64610e1..ae450d0 100644
--- a/accfg/lib/Makefile.am
+++ b/accfg/lib/Makefile.am
@@ -24,8 +24,7 @@ libaccel_config_la_SOURCES =\
libaccel_config_la_LIBADD =\
$(UDEV_LIBS) \
- $(UUID_LIBS) \
- $(KMOD_LIBS)
+ $(UUID_LIBS)
EXTRA_DIST += libaccel-config.sym
diff --git a/configure.ac b/configure.ac
index b2ef6d0..5595754 100755
--- a/configure.ac
+++ b/configure.ac
@@ -97,7 +97,6 @@ AM_CONDITIONAL([ENABLE_TEST], [test "x$enable_test" = "xyes"])
PKG_CHECK_MODULES([UUID], [uuid],
[AC_DEFINE([HAVE_UUID], [1], [Define to 1 if using libuuid])])
PKG_CHECK_MODULES([JSON], [json-c])
-PKG_CHECK_MODULES([KMOD], [libkmod])
PKG_CHECK_MODULES([UDEV], [libudev])
AC_ARG_WITH([bash-completion-dir],
diff --git a/debian/control b/debian/control
index fcac5a9..f86498b 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,6 @@ Build-Depends: asciidoctor,
debhelper-compat (= 12),
libjson-c-dev,
libkeyutils-dev,
- libkmod-dev,
libudev-dev,
pkg-config,
uuid-dev
diff --git a/test/Makefile.am b/test/Makefile.am
index 1a0915a..83c9ad1 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -31,7 +31,7 @@ testcore =\
accfg_test.h
libaccfg_SOURCES = libaccfg.c $(testcore)
-libaccfg_LDADD = $(LIBACCFG_LIB) $(UUID_LIBS) $(KMOD_LIBS)
+libaccfg_LDADD = $(LIBACCFG_LIB) $(UUID_LIBS)
dsa_test_SOURCES = dsa_test.c dsa.c prep.c
dsa_test_LDADD = $(LIBACCFG_LIB) $(UUID_LIBS)
--
2.26.3