From 56098483c980a8255c75f34002f6a2ee9ee8b41d Mon Sep 17 00:00:00 2001 From: Raphael Druon Date: Mon, 7 Aug 2023 01:26:09 -0600 Subject: [PATCH] LU-17018 build: add 'linux-image-generic' as Depends Add 'linux-image-generic >= 3.10' as a dependency for Debian dkms package for Ubuntu support Test-Parameters: trivial Fixes: 621e0bc2f9 ("LU-16661 build: improve lustre.spec.in Requires") Signed-off-by: Raphael Druon Change-Id: Ie8bacbd55c379632d5554de8d72606c818c1771e Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/51879 Reviewed-by: Andreas Dilger Reviewed-by: James Simmons Reviewed-by: Oleg Drokin Tested-by: jenkins Tested-by: Maloo --- debian/control | 2 +- debian/control.main | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/control b/debian/control index 56db8ac..b356555 100644 --- a/debian/control +++ b/debian/control @@ -112,7 +112,7 @@ Package: lustre-client-modules-dkms Section: admin Architecture: i386 armhf powerpc ppc64el amd64 ia64 Priority: optional -Depends: autoconf, automake, bison, build-essential, dkms, flex, libaio-dev, libkeyutils-dev, libkrb5-dev, libtool, libselinux-dev, libssl-dev, libyaml-dev, linux-base, linux-image >= 3.10 | linux-image-amd64 >= 3.10 | linux-image-arm64 >= 3.10, linux-headers-generic | linux-headers-amd64, module-assistant, pkg-config, python3-distutils | python3-distutils-extra, python3-dev, libnl-genl-3-dev, zlib1g-dev, libmount1, libmount-dev, libkeyutils1, libkeyutils-dev +Depends: autoconf, automake, bison, build-essential, dkms, flex, libaio-dev, libkeyutils-dev, libkrb5-dev, libtool, libselinux-dev, libssl-dev, libyaml-dev, linux-base, linux-image (>= 3.10) | linux-image-generic (>= 3.10) | linux-image-amd64 (>= 3.10) | linux-image-arm64 (>= 3.10), linux-headers-generic | linux-headers-amd64, module-assistant, pkg-config, python3-distutils | python3-distutils-extra, python3-dev, libnl-genl-3-dev, zlib1g-dev, libmount1, libmount-dev, libkeyutils1, libkeyutils-dev Provides: lustre-client-modules Description: Lustre Linux kernel module (DKMS) This package contains the loadable kernel modules for the patchless client diff --git a/debian/control.main b/debian/control.main index d2ae3a9..e5ffd75 100644 --- a/debian/control.main +++ b/debian/control.main @@ -112,7 +112,7 @@ Package: lustre-client-modules-dkms Section: admin Architecture: i386 armhf powerpc ppc64el amd64 ia64 Priority: optional -Depends: autoconf, automake, bison, build-essential, dkms, flex, libaio-dev, libkeyutils-dev, libkrb5-dev, libtool, libselinux-dev, libssl-dev, libyaml-dev, linux-base, linux-image >= 3.10 | linux-image-amd64 >= 3.10 | linux-image-arm64 >= 3.10, linux-headers-generic | linux-headers-amd64, module-assistant, pkg-config, python3-distutils | python3-distutils-extra, python3-dev, libnl-genl-3-dev, zlib1g-dev, libmount1, libmount-dev, libkeyutils1, libkeyutils-dev +Depends: autoconf, automake, bison, build-essential, dkms, flex, libaio-dev, libkeyutils-dev, libkrb5-dev, libtool, libselinux-dev, libssl-dev, libyaml-dev, linux-base, linux-image (>= 3.10) | linux-image-generic (>= 3.10) | linux-image-amd64 (>= 3.10) | linux-image-arm64 (>= 3.10), linux-headers-generic | linux-headers-amd64, module-assistant, pkg-config, python3-distutils | python3-distutils-extra, python3-dev, libnl-genl-3-dev, zlib1g-dev, libmount1, libmount-dev, libkeyutils1, libkeyutils-dev Provides: lustre-client-modules Description: Lustre Linux kernel module (DKMS) This package contains the loadable kernel modules for the patchless client -- 1.8.3.1