[arch-commits] Commit in klibc/trunk (PKGBUILD)

[Thomas Baechler]

    Date: Wednesday, May 14, 2008 @ 08:09:27
  Author: thomas
Revision: 1643

Rebuild klibc for 2.6.25, add new klibc-VERSION metapackage and remove some unnecessary binaries from klibc

Modified:
  klibc/trunk/PKGBUILD

----------+
 PKGBUILD |   24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-05-14 04:33:55 UTC (rev 1642)
+++ PKGBUILD	2008-05-14 12:09:27 UTC (rev 1643)
@@ -11,8 +11,8 @@
 pkgname=klibc
 pkgver=1.5
 _klibcbranch=Stable #Stable/Testing
-_kver=2.6.24-ARCH
-pkgrel=5
+_kver=2.6.25-ARCH
+pkgrel=6
 pkgdesc="a minimal libc made for early-userspace"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/libs/klibc/"
@@ -23,18 +23,20 @@
         multiple_raid_assembly_fix.patch
         klibc-compile-shared-by-default.patch
         klibc-module-init-tools.patch
-        klibc-2.6.24.patch)
+        klibc-2.6.24.patch
+        klibc-Kbuild.patch)
 md5sums=('d55ce89c0656a7d6896ec0b2af07b5dc'
          '8d257d50a4554d57b8f461c6a87a2877'
          'c263a7c3fd290fcc84a4e230d456d022'
          '4d78311ebce63f2fbb711f8518e71839'
-         'a98b3e96aff53339572ed0bdccc8aed2')
+         'a98b3e96aff53339572ed0bdccc8aed2'
+         'c928be0153585a487b72a7eb5dfa8b13')
                   
 build()
 {
   cd $startdir/src/$pkgname-$pkgver
   #INI_DEBUG causes ipconfig to fail within kinit
-  sed -i "/#define INI_DEBUG/d" usr/kinit/kinit.h
+  sed -i "/#define INI_DEBUG/d" usr/kinit/kinit.h || return 1
   ln -sf /usr/src/linux-${_kver} linux
 
   patch -p1 -i ../multiple_raid_assembly_fix.patch || return 1
@@ -42,15 +44,19 @@
   # don't build insmod
   patch -p1 -i ../klibc-module-init-tools.patch || return 1
   # compile binaries shared by default
-  patch -p1 -i ../klibc-compile-shared-by-default.patch
+  patch -p1 -i ../klibc-compile-shared-by-default.patch || return 1
   # fix compilation on 2.6.24
   patch -p1 -i ../klibc-2.6.24.patch || return 1
+  # don't build kill, gzip and cpio
+  patch -p1 -i ../klibc-Kbuild.patch || return 1  
+  
   make EXTRA_KLIBCFLAGS='' || return 1
-  make INSTALLROOT=$startdir/pkg install
+  make INSTALLROOT=$startdir/pkg install || return 1
   #simplify
   mv $startdir/pkg/usr/lib/klibc/bin/sh.shared $startdir/pkg/usr/lib/klibc/bin/sh
   mv $startdir/pkg/usr/lib/klibc/bin/kinit.shared $startdir/pkg/usr/lib/klibc/bin/kinit
-  rm $startdir/pkg/usr/lib/klibc/bin/mknod
-  rm $startdir/pkg/usr/lib/klibc/bin/kill
   ln -sf asm-x86 $startdir/pkg/usr/lib/klibc/include/asm
+  
+  provides[${#provides[@]}]="$(basename $startdir/pkg/lib/klibc-*.so .so)"
+  export provides
 }