[PATCH rdma-core] Do not install mlx5 kernel headers if mlx5 is not built

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



We don't build some providers if DMA is not supported, but we still
installed the renamed kernel header in this case. This causes package
builds to fail because the sed script in debian/rules will remove the mlx5
stuff indiscriminately if DMA is not supported.

Simple fix is to be consistent and not include any mlx5 stuff if mlx5 is
not built.

Cc: stable@xxxxxxxxxxxxxx
Signed-off-by: Jason Gunthorpe <jgg@xxxxxxxxxxxx>
---
 kernel-headers/CMakeLists.txt | 1 -
 providers/mlx5/CMakeLists.txt | 3 ++-
 2 files changed, 2 insertions(+), 2 deletions(-)

Benjamin, this should fix the build failures I saw from the debian
autobuilder..

What do you think?

diff --git a/kernel-headers/CMakeLists.txt b/kernel-headers/CMakeLists.txt
index 04b98966bb6816..16ba165e8d4511 100644
--- a/kernel-headers/CMakeLists.txt
+++ b/kernel-headers/CMakeLists.txt
@@ -75,6 +75,5 @@ rdma_kernel_provider_abi(
 
 publish_headers(infiniband
   rdma/ib_user_ioctl_verbs.h
-  rdma/mlx5_user_ioctl_verbs.h
   )
 
diff --git a/providers/mlx5/CMakeLists.txt b/providers/mlx5/CMakeLists.txt
index 17ccd0819dd707..5a4b47fffbd94b 100644
--- a/providers/mlx5/CMakeLists.txt
+++ b/providers/mlx5/CMakeLists.txt
@@ -22,6 +22,7 @@ rdma_shared_provider(mlx5 libmlx5.map
 )
 
 publish_headers(infiniband
-  mlx5dv.h
+  ../../kernel-headers/rdma/mlx5_user_ioctl_verbs.h
   mlx5_api.h
+  mlx5dv.h
 )
-- 
2.17.0

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux USB Devel]     [Video for Linux]     [Linux Audio Users]     [Photo]     [Yosemite News]     [Yosemite Photos]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux