From b5aba70efb2c676b1f981464e1495cf864638f40 Mon Sep 17 00:00:00 2001 From: Clifford Wolf Date: Sat, 28 Mar 2009 18:06:08 +0000 Subject: [PATCH] Clifford Wolf : Fixed libdrm vs. linux26-headers usr/include/drm conflict diff --git a/package/base/linux/linux.conf b/package/base/linux/linux.conf index c32163c..66ddba8 100644 [2009032608153728069] (https://www.rocklinux.net/submaster) git-svn-id: http://www.rocklinux.org/svn/rock-linux/trunk@9436 c5f82cb5-29bc-0310-9cd0-bff59a50e3bc --- package/base/linux/linux.conf | 1 + package/x11/libdrm/kernel-shared-hotfix.patch | 37 ------------------- 2 files changed, 1 insertion(+), 37 deletions(-) delete mode 100644 package/x11/libdrm/kernel-shared-hotfix.patch diff --git a/package/base/linux/linux.conf b/package/base/linux/linux.conf index c32163c2a..66ddba8d4 100644 --- a/package/base/linux/linux.conf +++ b/package/base/linux/linux.conf @@ -559,6 +559,7 @@ main_lx_headers() { $MAKE mrproper $MAKE INSTALL_HDR_PATH=dest headers_check find dest/ -name '.check.*' | xargs rm -vf + mv dest/drm dest/kernel-drm mkdir -p $CLFS/$prefix/include for x in $(ls dest/include/); do diff --git a/package/x11/libdrm/kernel-shared-hotfix.patch b/package/x11/libdrm/kernel-shared-hotfix.patch deleted file mode 100644 index 102e2bd91..000000000 --- a/package/x11/libdrm/kernel-shared-hotfix.patch +++ /dev/null @@ -1,37 +0,0 @@ ---- ./shared-core/Makefile.am.orig 2009-03-25 09:01:44.000000000 +0100 -+++ ./shared-core/Makefile.am 2009-03-25 09:07:27.000000000 +0100 -@@ -24,15 +24,6 @@ - - klibdrmincludedir = ${includedir}/drm - klibdrminclude_HEADERS = \ -- drm.h \ -- drm_sarea.h \ -- i915_drm.h \ - mach64_drm.h \ -- mga_drm.h \ -- r128_drm.h \ -- radeon_drm.h \ -- savage_drm.h \ -- sis_drm.h \ -- via_drm.h \ - r300_reg.h \ - via_3d_reg.h ---- ./shared-core/Makefile.in.orig 2009-03-25 09:01:56.000000000 +0100 -+++ ./shared-core/Makefile.in 2009-03-25 09:08:03.000000000 +0100 -@@ -183,16 +183,7 @@ - target_alias = @target_alias@ - klibdrmincludedir = ${includedir}/drm - klibdrminclude_HEADERS = \ -- drm.h \ -- drm_sarea.h \ -- i915_drm.h \ - mach64_drm.h \ -- mga_drm.h \ -- r128_drm.h \ -- radeon_drm.h \ -- savage_drm.h \ -- sis_drm.h \ -- via_drm.h \ - r300_reg.h \ - via_3d_reg.h -