[arch-commits] Commit in klibc/trunk (PKGBUILD klibc-fix-nfs-defines.patch)

[Thomas Bächler]

    Date: Wednesday, October 21, 2009 @ 12:52:52
  Author: thomas
Revision: 56332

Fix compilation against 2.6.31

Added:
  klibc/trunk/klibc-fix-nfs-defines.patch
Modified:
  klibc/trunk/PKGBUILD

-----------------------------+
 PKGBUILD                    |   12 ++++++++----
 klibc-fix-nfs-defines.patch |   16 ++++++++++++++++
 2 files changed, 24 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-10-21 16:48:52 UTC (rev 56331)
+++ PKGBUILD	2009-10-21 16:52:52 UTC (rev 56332)
@@ -11,8 +11,8 @@
 pkgname=klibc
 pkgver=1.5.15
 _klibcbranch=Testing #Stable/Testing
-_kver=2.6.29-ARCH
-pkgrel=3
+_kver=2.6.31-ARCH
+pkgrel=4
 pkgdesc="A minimal libc made for early-userspace"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/libs/klibc/"
@@ -24,13 +24,15 @@
         klibc-Kbuild.patch
         klibc-x86_64-fix-io.h.patch
         klibc-fix-2.6.28-includes.patch
-        kinit-fix-init-cmdline.patch)
+        kinit-fix-init-cmdline.patch
+        klibc-fix-nfs-defines.patch)
 md5sums=('b5527be46f24779884557b11888c8075'
          'c263a7c3fd290fcc84a4e230d456d022'
          'ff5b113024256de31af59c2f1a966516'
          'fcee75cfaa65638b07f9cc4a7719fa29'
          '85e39751debc304119eb481d6bc26d59'
-         '70f306bcb91b39c9be27d99593d4dcae')
+         '70f306bcb91b39c9be27d99593d4dcae'
+         '0ddd04ece840f1f635933c91fef94406')
                   
 build()
 {
@@ -49,6 +51,8 @@
   patch -p1 -i ../klibc-fix-2.6.28-includes.patch || return 1
   # fix the commandline of the init program
   patch -p1 -i ../kinit-fix-init-cmdline.patch || return 1
+  # fix compilation due to missing nfs defines in the kernel
+  patch -p1 -i ../klibc-fix-nfs-defines.patch || return 1
   
   make EXTRA_KLIBCFLAGS='' || return 1
 }

Added: klibc-fix-nfs-defines.patch
===================================================================
--- klibc-fix-nfs-defines.patch	                        (rev 0)
+++ klibc-fix-nfs-defines.patch	2009-10-21 16:52:52 UTC (rev 56332)
@@ -0,0 +1,16 @@
+diff -Nur klibc-1.5.15.orig/usr/kinit/nfsmount/mount.c klibc-1.5.15/usr/kinit/nfsmount/mount.c
+--- klibc-1.5.15.orig/usr/kinit/nfsmount/mount.c	2009-01-04 20:28:03.000000000 +0100
++++ klibc-1.5.15/usr/kinit/nfsmount/mount.c	2009-10-21 18:39:21.587772034 +0200
+@@ -12,6 +12,12 @@
+ #include "nfsmount.h"
+ #include "sunrpc.h"
+ 
++
++/* These have been removed from the kernel header
++ * As a workaround, add them here */
++#define MNTPROC_MNT             1
++#define MNTPROC_UMNT            3
++
+ static uint32_t mount_port;
+ 
+ struct mount_call {