From ee009da38d016a129b975aa3db77c675a17c1c3d Mon Sep 17 00:00:00 2001 From: Thomas Stibor Date: Wed, 30 Jan 2019 14:47:46 +0100 Subject: [PATCH] LU-11902 build: Remove obsolete lustre-utils files and entries DEB packages can be build for server or client, where naming convention for server is: * lustre-server-modules-* * lustre-server-utils-* and for client: * lustre-client-modules-* * lustre-client-utils-* Previously the util package was named lustre-utils which is now obsolete due to the client and server separation and thus can be removed. Test-Parameters: clientdistro=ubuntu1604 trivial Signed-off-by: Thomas Stibor Change-Id: Id0a945d5b76e5c35cf858e3ab224efa342cde28d Reviewed-on: https://review.whamcloud.com/34137 Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Andreas Dilger Reviewed-by: Nathaniel Clark Reviewed-by: James Simmons Reviewed-by: Oleg Drokin --- debian/.gitignore | 1 - debian/README.Debian | 2 +- debian/control | 2 +- debian/control.main | 2 +- debian/control.modules.in | 4 ++-- debian/copyright | 2 +- debian/lustre-utils.docs | 2 -- debian/lustre-utils.examples | 2 -- debian/lustre-utils.install | 3 --- debian/lustre-utils.manpages | 1 - debian/rules | 2 +- 11 files changed, 7 insertions(+), 16 deletions(-) delete mode 100644 debian/lustre-utils.docs delete mode 100644 debian/lustre-utils.examples delete mode 100644 debian/lustre-utils.install delete mode 100644 debian/lustre-utils.manpages diff --git a/debian/.gitignore b/debian/.gitignore index 1cf3a24..1a5c37b 100644 --- a/debian/.gitignore +++ b/debian/.gitignore @@ -7,7 +7,6 @@ /lustre-iokit /lustre-tests /lustre-resource-agents -/lustre-utils /lustre-*.substvars /lustre-*-utils /lustre-server-utils.install diff --git a/debian/README.Debian b/debian/README.Debian index ea64bd2..670fa4b 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -22,7 +22,7 @@ and Installation Howtos from Lustre. #2. Preparing the system In the next step install: - - lustre-utils + - lustre-server-utils or lustre-client-utils This have to be done on every server system. diff --git a/debian/control b/debian/control index 133acd8..177eebe 100644 --- a/debian/control +++ b/debian/control @@ -109,7 +109,7 @@ Section: admin Architecture: i386 armhf powerpc ppc64el amd64 ia64 Priority: optional Depends: dkms, automake, libtool, linux-headers-generic | linux-headers | linux-headers-amd64 -Recommends: linux-image, lustre-utils +Recommends: linux-image, lustre-client-utils 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 133acd8..177eebe 100644 --- a/debian/control.main +++ b/debian/control.main @@ -109,7 +109,7 @@ Section: admin Architecture: i386 armhf powerpc ppc64el amd64 ia64 Priority: optional Depends: dkms, automake, libtool, linux-headers-generic | linux-headers | linux-headers-amd64 -Recommends: linux-image, lustre-utils +Recommends: linux-image, lustre-client-utils 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.modules.in b/debian/control.modules.in index 33735a5..972fdd1 100644 --- a/debian/control.modules.in +++ b/debian/control.modules.in @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 9.0.0), bzip2 Package: lustre-client-modules-_KVERS_ Architecture: any -Recommends: linux-image, lustre-utils +Recommends: linux-image, lustre-client-utils Provides: lustre-client-modules Description: Lustre Linux kernel module (kernel _KVERS_) This package contains the lustre loadable kernel modules for the @@ -18,7 +18,7 @@ Description: Lustre Linux kernel module (kernel _KVERS_) Package: lustre-server-modules-_KVERS_ Architecture: any -Recommends: linux-image, lustre-utils +Recommends: linux-image, lustre-server-utils Provides: lustre-server-modules, lustre-client-modules Conflicts: lustre-client-modules-_KVERS_ Replaces: lustre-client-modules-_KVERS_ diff --git a/debian/copyright b/debian/copyright index 3316605..49afd3f 100644 --- a/debian/copyright +++ b/debian/copyright @@ -10,7 +10,7 @@ Lustre is Copyright (C) 2002-2009 Sun Microsystems, Inc. and is licensed under the GNU Public License Version 2; it was downloaded from https://wiki.whamcloud.com/display/PUB/Lustre+Releases -The documentation (included in lustre-utils) is covered by +The documentation (included in lustre-{server,client}-utils) is covered by the GNU Free Documentation License; there are no invariant-clauses included in this documentation, and hence it is considered to be free under the Debian Free Software Guidelines (DFSG). diff --git a/debian/lustre-utils.docs b/debian/lustre-utils.docs deleted file mode 100644 index 7fa45817..0000000 --- a/debian/lustre-utils.docs +++ /dev/null @@ -1,2 +0,0 @@ -lustre/BUGS -README diff --git a/debian/lustre-utils.examples b/debian/lustre-utils.examples deleted file mode 100644 index b16e58d..0000000 --- a/debian/lustre-utils.examples +++ /dev/null @@ -1,2 +0,0 @@ -lustre/tests/llmountcleanup.sh -lustre/tests/llmount.sh diff --git a/debian/lustre-utils.install b/debian/lustre-utils.install deleted file mode 100644 index 3dcd0ca..0000000 --- a/debian/lustre-utils.install +++ /dev/null @@ -1,3 +0,0 @@ -debian/tmp/sbin/* sbin -debian/tmp/usr/sbin/* usr/sbin -debian/tmp/usr/bin/* usr/bin diff --git a/debian/lustre-utils.manpages b/debian/lustre-utils.manpages deleted file mode 100644 index 7f0e0c2..0000000 --- a/debian/lustre-utils.manpages +++ /dev/null @@ -1 +0,0 @@ -debian/tmp/usr/share/man/*/* diff --git a/debian/rules b/debian/rules index c7546af..5913409 100755 --- a/debian/rules +++ b/debian/rules @@ -63,7 +63,7 @@ UPVERSION=$(shell echo $(VERSION) | sed -e 's/-[^-]*$$//') KVER?=$(LINUXRELEASE) # KVERS, KSRC are the kernel version and source to use when building lustre -# Will be the default when building lustre-utils, etc but whatever module-assistant +# Will be the default when building lustre-{server,client}-utils, etc but whatever module-assistant # supplied when building modules KVERS?=$(KVER) KSRC?=$(LINUX_OBJ) -- 1.8.3.1