From: Andreas Dilger Date: Tue, 5 Sep 2023 20:18:31 +0000 (-0600) Subject: LU-16661 build: remove -dev packages for Debian X-Git-Tag: 2.15.59~145 X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=c1ebcb0fae24c8238eb89ce06ebe9afb9e4ebe39;p=fs%2Flustre-release.git LU-16661 build: remove -dev packages for Debian Don't depend on libmount-dev, libsnmp-dev, libkeytils-dev for the lustre-client-utils and lustre-server-utils packages. These are only needed for build and for the lustre-client-dkms package. Disable SNMP by default as this is no longer used anywhere. Test-Parameters: trivial testlist=runtests clientdistro=ubuntu2204 Fixes: 7dc6e1128a ("LU-15888 build: Debian dkms-debs requires ed and libkeyutils") Fixes: af2f77633b ("LU-13818 build: use libsnmp-dev instead of libsnmp30") Signed-off-by: Andreas Dilger Change-Id: Ib788a97028ee40a9c61070d00b823620ec3ebbe5 Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/52281 Reviewed-by: Jian Yu Reviewed-by: Patrick Farrell Reviewed-by: James Simmons Reviewed-by: Oleg Drokin Tested-by: Maloo Tested-by: jenkins --- diff --git a/debian/control b/debian/control index b356555..790458d 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Lustre Developers Uploaders: Lustre Developers Standards-Version: 3.8.3 -Build-Depends: module-assistant, libreadline-dev, debhelper (>= 11), dpatch, automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, pkg-config, libtool, libyaml-dev, libnl-genl-3-dev, libselinux-dev, libsnmp-dev, mpi-default-dev, bzip2, quilt, linux-headers-generic | linux-headers-amd64 | linux-headers-arm64, rsync, libssl-dev, libpython3-dev, swig, libmount-dev, ed +Build-Depends: module-assistant, libreadline-dev, debhelper (>= 11), dpatch, automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, pkg-config, libtool, libyaml-dev, libnl-genl-3-dev, libselinux-dev, mpi-default-dev, bzip2, quilt, linux-headers-generic | linux-headers-amd64 | linux-headers-arm64, rsync, libssl-dev, libpython3-dev, swig, libmount-dev, ed Homepage: https://wiki.whamcloud.com/ Vcs-Git: git://git.whamcloud.com/fs/lustre-release.git @@ -12,7 +12,7 @@ Package: lustre-source Section: admin Architecture: all Priority: optional -Depends: module-assistant, bzip2, debhelper (>= 11), libtool, libyaml-dev, libnl-genl-3-dev, libselinux-dev, libsnmp-dev, mpi-default-dev, dpatch, pkg-config +Depends: module-assistant, bzip2, debhelper (>= 11), libtool, libyaml-dev, libnl-genl-3-dev, libselinux-dev, mpi-default-dev, dpatch, pkg-config Description: source for Lustre filesystem client kernel modules Lustre is a scalable, secure, robust, highly-available cluster file system. This release is maintained by Whamcloud and available from @@ -26,7 +26,7 @@ Package: lustre-client-utils Section: utils Architecture: i386 armhf powerpc ppc64el amd64 ia64 arm64 Priority: optional -Depends: ${shlibs:Depends}, ${misc:Depends}, libyaml-0-2, libselinux1, libsnmp-dev, zlib1g, libnl-genl-3-200, libmount1, libmount-dev, libkeyutils1, libkeyutils-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, libyaml-0-2, libselinux1, zlib1g, libnl-genl-3-200, libmount1, libkeyutils1 Recommends: perl Suggests: bash-completion Description: Userspace utilities for the Lustre filesystem (client) @@ -42,7 +42,7 @@ Package: lustre-server-utils Section: utils Architecture: i386 armhf powerpc ppc64el amd64 ia64 arm64 Priority: optional -Depends: ${shlibs:Depends}, ${misc:Depends}, libyaml-0-2, libselinux1, libsnmp-dev, zlib1g, libnl-genl-3-200, libmount1, libmount-dev, libkeyutils1, libkeyutils-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, libyaml-0-2, libselinux1, zlib1g, libnl-genl-3-200, libmount1, libkeyutils1 Recommends: perl, python3 Suggests: bash-completion Provides: lustre-server-utils, lustre-client-utils (= ${binary:Version}) diff --git a/debian/control.main b/debian/control.main index e5ffd75..f2208ac 100644 --- a/debian/control.main +++ b/debian/control.main @@ -4,7 +4,7 @@ Priority: optional Maintainer: Lustre Developers Uploaders: Lustre Developers Standards-Version: 3.8.3 -Build-Depends: module-assistant, libreadline-dev, debhelper (>= 11), dpatch, automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, pkg-config, libtool, libyaml-dev, libnl-genl-3-dev, libselinux-dev, libsnmp-dev, mpi-default-dev, bzip2, quilt, linux-headers-generic | linux-headers-amd64 | linux-headers-arm64, rsync, libssl-dev, libpython3-dev, swig, libmount-dev, ed +Build-Depends: module-assistant, libreadline-dev, debhelper (>= 11), dpatch, automake (>=1.7) | automake1.7 | automake1.8 | automake1.9, pkg-config, libtool, libyaml-dev, libnl-genl-3-dev, libselinux-dev, mpi-default-dev, bzip2, quilt, linux-headers-generic | linux-headers-amd64 | linux-headers-arm64, rsync, libssl-dev, libpython3-dev, swig, libmount-dev, ed Homepage: https://wiki.whamcloud.com/ Vcs-Git: git://git.whamcloud.com/fs/lustre-release.git @@ -12,7 +12,7 @@ Package: lustre-source Section: admin Architecture: all Priority: optional -Depends: module-assistant, bzip2, debhelper (>= 11), libtool, libyaml-dev, libnl-genl-3-dev, libselinux-dev, libsnmp-dev, mpi-default-dev, dpatch, pkg-config +Depends: module-assistant, bzip2, debhelper (>= 11), libtool, libyaml-dev, libnl-genl-3-dev, libselinux-dev, mpi-default-dev, dpatch, pkg-config Description: source for Lustre filesystem client kernel modules Lustre is a scalable, secure, robust, highly-available cluster file system. This release is maintained by Whamcloud and available from @@ -26,7 +26,7 @@ Package: lustre-client-utils Section: utils Architecture: i386 armhf powerpc ppc64el amd64 ia64 arm64 Priority: optional -Depends: ${shlibs:Depends}, ${misc:Depends}, libyaml-0-2, libselinux1, libsnmp-dev, zlib1g, libnl-genl-3-200, libmount1, libmount-dev, libkeyutils1, libkeyutils-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, libyaml-0-2, libselinux1, zlib1g, libnl-genl-3-200, libmount1, libkeyutils1 Recommends: perl Suggests: bash-completion Description: Userspace utilities for the Lustre filesystem (client) @@ -42,7 +42,7 @@ Package: lustre-server-utils Section: utils Architecture: i386 armhf powerpc ppc64el amd64 ia64 arm64 Priority: optional -Depends: ${shlibs:Depends}, ${misc:Depends}, libyaml-0-2, libselinux1, libsnmp-dev, zlib1g, libnl-genl-3-200, libmount1, libmount-dev, libkeyutils1, libkeyutils-dev +Depends: ${shlibs:Depends}, ${misc:Depends}, libyaml-0-2, libselinux1, zlib1g, libnl-genl-3-200, libmount1, libkeyutils1 Recommends: perl, python3 Suggests: bash-completion Provides: lustre-server-utils, lustre-client-utils (= ${binary:Version}) diff --git a/lustre.spec.in b/lustre.spec.in index 84b9dcc..28c8d9a 100644 --- a/lustre.spec.in +++ b/lustre.spec.in @@ -16,7 +16,7 @@ %bcond_without lustre_utils %bcond_without lustre_iokit %bcond_without lustre_modules -%bcond_with snmp +%bcond_without snmp %bcond_with gss %bcond_with gss_keyring %bcond_without manpages