[Beignet] [PATCH] BUGFIX: Prohibit 'make package' from doing system install of ICD vendor file

Zhigang Gong zhigang.gong at linux.intel.com
Fri Mar 20 02:41:27 PDT 2015


Thanks for the patch, could you reply with your signed-by signature
for the patch? Then I can merge it.

Thanks,
Zhigang Gong.

On Thu, Mar 19, 2015 at 02:07:54PM -0400, Brian Kloppenborg wrote:
> As presently written, a 'make package' will attempt to INSTALL the
> Beignet ICD loader to /etc/OpenCL/vendors whereas it should just
> do a local install and then package the file. The proposed change instructs
> CPack to include the `DESTDIR` variable when it calls `make install`, thus
> directing the desination for the ICD loader to a local directory instead
> of a system path.
> ---
>  CMakeLists.txt | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/CMakeLists.txt b/CMakeLists.txt
> index e11a3d0..a230e4b 100644
> --- a/CMakeLists.txt
> +++ b/CMakeLists.txt
> @@ -234,6 +234,7 @@ IF(BUILD_EXAMPLES)
>  ADD_SUBDIRECTORY(examples)
>  ENDIF(BUILD_EXAMPLES)
>  
> +SET(CPACK_SET_DESTDIR ON)
>  SET(CPACK_PACKAGE_VERSION_MAJOR "${LIBCL_DRIVER_VERSION_MAJOR}")
>  SET(CPACK_PACKAGE_VERSION_MINOR "${LIBCL_DRIVER_VERSION_MINOR}")
>  SET(CPACK_PACKAGE_VERSION_PATCH "${LIBCL_DRIVER_VERSION_PATCH}")
> -- 
> 2.1.0
> 
> _______________________________________________
> Beignet mailing list
> Beignet at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/beignet


More information about the Beignet mailing list