[PATCH 1/1] UBUNTU: temporarily suppress drm headers in linux-libc-dev for libdrm-dev

[Mario Limonciello]

Hi Andy:

Perhaps it's better to ask the libdrm-dev maintainer to divert the
headers if they install that package until things are resolved?  That
would prevent churn in the kernel package for this change and then
reverting this change later.

Regards

Andy Whitcroft wrote:
> Bug: #308387
>
> When we included all of the exported header files in our linux-libc-dev
> package (as is done in Debian upstream) we caused a collision with copies
> of these headers in libdrm-dev.  The ones in libdrm-dev are currently
> hand modified to simplify their use, so it is not trivial to just drop
> them from there.  With the -alpha2 builds coming up very soon it seems
> expedient to remove the drm headers from linux-libc-dev.  We should
> expect the X11 people to look at and sort out their header after the
> -alpha2 transition and we can then revert this change in step with that.
>
> Signed-off-by: Andy Whitcroft <apw at canonical.com>
> ---
>  debian/rules.d/2-binary-arch.mk |    6 +++++-
>  1 files changed, 5 insertions(+), 1 deletions(-)
>
> diff --git a/debian/rules.d/2-binary-arch.mk b/debian/rules.d/2-binary-arch.mk
> index 800c9b0..45ab6c9 100644
> --- a/debian/rules.d/2-binary-arch.mk
> +++ b/debian/rules.d/2-binary-arch.mk
> @@ -182,8 +182,12 @@ install-arch-headers:
>  	$(hmake) silentoldconfig
>  	$(hmake) headers_install
>  
> +	# Temporarily exclude drm headers to prevent clash with libdrm-dev
> +	# see bug #303387.
>  	( cd $(headers_tmp)/install/include/ && \
> -		find . -name '.' -o -name '.*' -prune -o -print | \
> +		find . -name '.' -o -name '.*' -prune \
> +			-o -name drm -prune \
> +			-o -print | \
>                  cpio -pvd --preserve-modification-time \
>  			$(headers_dir)/usr/include/ )
>  
>   

-- 
Mario Limonciello
*Dell | Linux Engineering*
mario_limonciello at dell.com
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20081216/84c4dcd0/attachment.html>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 260 bytes
Desc: OpenPGP digital signature
URL: <https://lists.ubuntu.com/archives/kernel-team/attachments/20081216/84c4dcd0/attachment.sig>