[arch-commits] CVS update of core/base/klibc (3 files)

Thomas Baechler thomas at archlinux.org
Mon Jan 28 17:28:24 UTC 2008


    Date: Monday, January 28, 2008 @ 18:28:24
  Author: thomas
    Path: /home/cvs-core/core/base/klibc

   Added: klibc-1.5-2.6.24-asmarch.patch (1.1)
          klibc-1.5-klibcasmarch.patch (1.1)
Modified: PKGBUILD (1.12 -> 1.13)

try to update to 2.6.24


--------------------------------+
 PKGBUILD                       |   18 +++++++++++++-----
 klibc-1.5-2.6.24-asmarch.patch |   17 +++++++++++++++++
 klibc-1.5-klibcasmarch.patch   |   25 +++++++++++++++++++++++++
 3 files changed, 55 insertions(+), 5 deletions(-)


Index: core/base/klibc/PKGBUILD
diff -u core/base/klibc/PKGBUILD:1.12 core/base/klibc/PKGBUILD:1.13
--- core/base/klibc/PKGBUILD:1.12	Wed Oct 31 09:25:30 2007
+++ core/base/klibc/PKGBUILD	Mon Jan 28 18:28:23 2008
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD,v 1.12 2007/10/31 08:25:30 thomas Exp $
+# $Id: PKGBUILD,v 1.13 2008/01/28 17:28:23 thomas Exp $
 # Maintainer: Aaron Griffin <aaron at archlinux.org>
 # Maintainer: Thomas Baechler <thomas at archlinux.org>
 
@@ -11,8 +11,8 @@
 pkgname=klibc
 pkgver=1.5
 _klibcbranch=Stable #Stable/Testing
-_kver=2.6.23-ARCH
-pkgrel=3
+_kver=2.6.24-ARCH
+pkgrel=4
 pkgdesc="a minimal libc made for early-userspace"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/libs/klibc/"
@@ -22,11 +22,15 @@
 source=(http://www.kernel.org/pub/linux/libs/klibc/$_klibcbranch/$pkgname-$pkgver.tar.gz
         multiple_raid_assembly_fix.patch
         klibc-compile-shared-by-default.patch
-        klibc-module-init-tools.patch)
+        klibc-module-init-tools.patch
+        klibc-1.5-2.6.24-asmarch.patch
+        klibc-1.5-klibcasmarch.patch)
 md5sums=('d55ce89c0656a7d6896ec0b2af07b5dc'
          '8d257d50a4554d57b8f461c6a87a2877'
          'c263a7c3fd290fcc84a4e230d456d022'
-         '4d78311ebce63f2fbb711f8518e71839')
+         '4d78311ebce63f2fbb711f8518e71839'
+         'b8ba229af36d7c23a658160871a049bf'
+         'aab928db6a0d81f108a7aeb552acf215')
                   
 build()
 {
@@ -41,10 +45,14 @@
   patch -p1 -i ../klibc-module-init-tools.patch || return 1
   # compile binaries shared by default
   patch -p1 -i ../klibc-compile-shared-by-default.patch
+  # fix compilation on 2.6.24
+  patch -p1 -i ../klibc-1.5-2.6.24-asmarch.patch || return 1
+  patch -p1 -i ../klibc-1.5-klibcasmarch.patch || return 1
   make EXTRA_KLIBCFLAGS='' || return 1
   make INSTALLROOT=$startdir/pkg install
   #simplify
   mv $startdir/pkg/usr/lib/klibc/bin/sh.shared $startdir/pkg/usr/lib/klibc/bin/sh
   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
 }
Index: core/base/klibc/klibc-1.5-2.6.24-asmarch.patch
diff -u /dev/null core/base/klibc/klibc-1.5-2.6.24-asmarch.patch:1.1
--- /dev/null	Mon Jan 28 18:28:24 2008
+++ core/base/klibc/klibc-1.5-2.6.24-asmarch.patch	Mon Jan 28 18:28:23 2008
@@ -0,0 +1,17 @@
+diff -Nur klibc-1.5.orig/usr/klibc/arch/i386/MCONFIG klibc-1.5/usr/klibc/arch/i386/MCONFIG
+--- klibc-1.5.orig/usr/klibc/arch/i386/MCONFIG	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/klibc/arch/i386/MCONFIG	2008-01-27 16:06:08.000000000 +0100
+@@ -31,3 +31,4 @@
+ # calls, and work on the memory models for this architecture
+ # 96 MB - normal binaries start at 128 MB
+ KLIBCSHAREDFLAGS	= -Ttext 0x06000200
++KLIBCASMARCH = x86
+diff -Nur klibc-1.5.orig/usr/klibc/arch/x86_64/MCONFIG klibc-1.5/usr/klibc/arch/x86_64/MCONFIG
+--- klibc-1.5.orig/usr/klibc/arch/x86_64/MCONFIG	2007-03-04 02:52:10.000000000 +0100
++++ klibc-1.5/usr/klibc/arch/x86_64/MCONFIG	2008-01-27 16:05:43.000000000 +0100
+@@ -36,4 +36,4 @@
+ KLIBCSHAREDFLAGS     = -Ttext 0x00200200 -z max-page-size=0x100000
+ 
+ # Additional asm- directories needed during installation
+-ASMARCH = asm-i386
++KLIBCASMARCH = x86
Index: core/base/klibc/klibc-1.5-klibcasmarch.patch
diff -u /dev/null core/base/klibc/klibc-1.5-klibcasmarch.patch:1.1
--- /dev/null	Mon Jan 28 18:28:24 2008
+++ core/base/klibc/klibc-1.5-klibcasmarch.patch	Mon Jan 28 18:28:23 2008
@@ -0,0 +1,25 @@
+--- a/scripts/Kbuild.install	2007-03-04 02:52:10.000000000 +0100
++++ b/scripts/Kbuild.install    2007-11-04 15:43:28.000000000 +0100
+@@ -84,6 +84,13 @@
+ # 1) Create directories, install headers and man pages
+ # 2) Tell that we now install binaries
+ # 3) Install binaries by descending
++
++# Arch specific definitions for klibc
++include $(KLIBCSRC)/arch/$(KLIBCARCHDIR)/MCONFIG
++
++# include/asm-* architecture
++KLIBCASMARCH      ?= $(KLIBCARCH)
++
+ .PHONY: header footer descend
+ header:
+ 	$(Q)echo "  INSTALL headers + man pages to $(INSTALLROOT)$(INSTALLDIR)"
+@@ -95,7 +102,7 @@
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)lib
+ 	$(Q)mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)bin
+-	$(Q)set -e ; for d in linux scsi asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \
++	$(Q)set -e ; for d in linux scsi asm-$(KLIBCASMARCH) asm-generic $(ASMKLIBCARCH); do \
+ 	  mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)include/$$d ; \
+ 	  for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \
+ 	           $(KLIBCKERNELOBJ)/include2 ; do \




More information about the arch-commits mailing list