From 455bde17d1572ae25593182dd80d31046888e2ed Mon Sep 17 00:00:00 2001 From: Aurelien Degremont Date: Tue, 14 Jan 2025 11:44:04 +0100 Subject: [PATCH] LU-18632 debian: add uapi headers to dkms module package Kernel-related header files (uapi) are only packaged in 'lustre-client-modules' package, and not with dkms. Ensure they are packages for both type of packages. We need to provide them alongside the kernel module packages to avoid future conflicts if Lustre is available through the distro linux kernel. Test-Parameters: trivial Change-Id: Iab154cf46c121fa6cc8d559ba6ad63ffe19f52a5 Signed-off-by: Aurelien Degremont Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/57749 Tested-by: jenkins Tested-by: Maloo Reviewed-by: James Simmons Reviewed-by: Timothy Day Reviewed-by: Oleg Drokin --- debian/rules | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/debian/rules b/debian/rules index 3a06c4f..090667d 100755 --- a/debian/rules +++ b/debian/rules @@ -456,6 +456,10 @@ binary-$(DKMS_PKG): build-stamp # Clean it up $(MAKE) -C debian/$(DKMS_PKG)/usr/src/lustre-client-modules-$(UPVERSION) -f debian/rules clean + $(MAKE) install -C lustre/include DESTDIR=$(CURDIR)/debian/$(DKMS_PKG) + $(MAKE) install -C lnet/include DESTDIR=$(CURDIR)/debian/$(DKMS_PKG) + rm -rf $(CURDIR)/debian/$(DKMS_PKG)/usr/include/lustre + # Put the DKMS configuration file in place sed -e 's/[@]UPVERSION[@]/$(UPVERSION)/' debian/dkms.conf.in > debian/$(DKMS_PKG)/usr/src/lustre-client-modules-$(UPVERSION)/dkms.conf dh_install -p $(DKMS_PKG) -- 1.8.3.1