[Lunar-commits] <moonbase> kernel-headers-2.6: fix conflict with libdrm

[Paul Bredbury]

commit 3916870cb44790a439a16ca33d00aa970abc4aba
Author: Paul Bredbury <brebs at lunar-linux.org>
Date:   Fri Sep 25 16:35:29 2009 +0700

    kernel-headers-2.6: fix conflict with libdrm
    
    Also remove the useless .install and ..install.cmd files.
---
 kernel/kernel-headers-2.6/BUILD          |   13 ++++++++++---
 kernel/kernel-headers-2.6/DETAILS        |    2 +-
 kernel/kernel-headers-2.6/DETAILS.x86_64 |    2 +-
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/kernel/kernel-headers-2.6/BUILD b/kernel/kernel-headers-2.6/BUILD
index fdb2abf..0cf3ee4 100644
--- a/kernel/kernel-headers-2.6/BUILD
+++ b/kernel/kernel-headers-2.6/BUILD
@@ -2,16 +2,23 @@
 
   cd $SOURCE_DIRECTORY/include/ &&
 
+  # Don't conflict with libdrm
+  # As done in http://www.gentoo-portage.com/sys-kernel/linux-headers
+  rm -rf drm &&
+
+  # Delete useless files
+  find '(' -name '.install' -o -name '*.cmd' ')' -delete &&
+
   prepare_install &&
 
   for dir in ./* ; do
-     cp    -a $dir      /usr/include/
-     chown -R root.root /usr/include/$dir
+     cp    -a $dir      /usr/include/ &&
+     chown -R root.root /usr/include/$dir &&
 
      for subdir in `find /usr/include/$dir -type d`
      do
         chmod 755 $subdir
-     done
+     done &&
 
      for file in `find /usr/include/$dir -type f`
      do
diff --git a/kernel/kernel-headers-2.6/DETAILS b/kernel/kernel-headers-2.6/DETAILS
index dbddffa..af888f6 100644
--- a/kernel/kernel-headers-2.6/DETAILS
+++ b/kernel/kernel-headers-2.6/DETAILS
@@ -7,7 +7,7 @@
           WEB_SITE=http://www.lunar-linux.org
         MAINTAINER=moe at lunar-linux.org
            ENTERED=20040226
-           UPDATED=20090923
+           UPDATED=20090924
             SHORT="sanitized 2.6.x kernel headers for userspace"
 cat << EOF
 Sanitized 2.6.x kernel headers for userspace
diff --git a/kernel/kernel-headers-2.6/DETAILS.x86_64 b/kernel/kernel-headers-2.6/DETAILS.x86_64
index 415a6d7..578de3c 100644
--- a/kernel/kernel-headers-2.6/DETAILS.x86_64
+++ b/kernel/kernel-headers-2.6/DETAILS.x86_64
@@ -7,7 +7,7 @@
           WEB_SITE=http://www.lunar-linux.org
         MAINTAINER=moe at lunar-linux.org
            ENTERED=20040226
-           UPDATED=20090923
+           UPDATED=20090924
             SHORT="sanitized 2.6.x kernel headers for userspace"
 cat << EOF
 Sanitized 2.6.x kernel headers for userspace