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

[Thomas Bächler]

    Date: Monday, December 29, 2008 @ 19:10:14
  Author: thomas
Revision: 22942

Fix 2.6.28 build and ext4 detection

Added:
  klibc/trunk/klibc-fix-2.6.28-includes.patch
  klibc/trunk/klibc-fix-ext4-detection.patch
Modified:
  klibc/trunk/PKGBUILD

---------------------------------+
 PKGBUILD                        |   16 ++++++++++++----
 klibc-fix-2.6.28-includes.patch |   12 ++++++++++++
 klibc-fix-ext4-detection.patch  |   33 +++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 4 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-12-29 23:54:58 UTC (rev 22941)
+++ PKGBUILD	2008-12-30 00:10:14 UTC (rev 22942)
@@ -11,8 +11,8 @@
 pkgname=klibc
 pkgver=1.5.14
 _klibcbranch=Testing #Stable/Testing
-_kver=2.6.26-ARCH
-pkgrel=1
+_kver=2.6.28-ARCH
+pkgrel=2
 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
         klibc-compile-shared-by-default.patch
         klibc-Kbuild.patch
-        klibc-x86_64-fix-io.h.patch)
+        klibc-x86_64-fix-io.h.patch
+        klibc-fix-2.6.28-includes.patch
+        klibc-fix-ext4-detection.patch)
 md5sums=('8c65712a24c4bde5ec9870f5a4f8113e'
          'c263a7c3fd290fcc84a4e230d456d022'
          'ff5b113024256de31af59c2f1a966516'
-         'fcee75cfaa65638b07f9cc4a7719fa29')
+         'fcee75cfaa65638b07f9cc4a7719fa29'
+         '85e39751debc304119eb481d6bc26d59'
+         '3884d68f83e63a7e83301d55adbea40c')
                   
 build()
 {
@@ -41,6 +45,10 @@
   patch -p1 -i ../klibc-Kbuild.patch || return 1
   # fix errors in io.h header
   patch -p1 -i ../klibc-x86_64-fix-io.h.patch || return 1
+  # fix includes for 2.6.28 build
+  patch -p1 -i ../klibc-fix-2.6.28-includes.patch || return 1
+  # fix ext4 detection
+  patch -p1 -i ../klibc-fix-ext4-detection.patch || return 1
   
   make EXTRA_KLIBCFLAGS='' || return 1
   make INSTALLROOT=$startdir/pkg install || return 1

Added: klibc-fix-2.6.28-includes.patch
===================================================================
--- klibc-fix-2.6.28-includes.patch	                        (rev 0)
+++ klibc-fix-2.6.28-includes.patch	2008-12-30 00:10:14 UTC (rev 22942)
@@ -0,0 +1,12 @@
+diff -Nur klibc-1.5.14.orig/scripts/Kbuild.klibc klibc-1.5.14/scripts/Kbuild.klibc
+--- klibc-1.5.14.orig/scripts/Kbuild.klibc	2008-07-30 23:06:03.000000000 +0200
++++ klibc-1.5.14/scripts/Kbuild.klibc	2008-12-29 23:59:14.000000000 +0100
+@@ -103,7 +103,7 @@
+                     -I$(KLIBCINC)
+ # kernel include paths
+ KLIBCKERNELSRC	 ?= $(srctree)/
+-KLIBCCPPFLAGS    += -I$(KLIBCKERNELSRC)include		\
++KLIBCCPPFLAGS    += -I$(KLIBCKERNELSRC)include -I$(KLIBCKERNELSRC)arch/x86/include		\
+                      $(if $(KBUILD_SRC),-I$(KLIBCKERNELOBJ)include2 -I$(KLIBCKERNELOBJ)include -I$(srctree)/include)    \
+ 		     $(KLIBCARCHINCFLAGS)
+ 

Added: klibc-fix-ext4-detection.patch
===================================================================
--- klibc-fix-ext4-detection.patch	                        (rev 0)
+++ klibc-fix-ext4-detection.patch	2008-12-30 00:10:14 UTC (rev 22942)
@@ -0,0 +1,33 @@
+--- klibc-1.5.14.orig/usr/kinit/fstype/fstype.c	2008-07-30 23:06:03.000000000 +0200
++++ klibc-1.5.14/usr/kinit/fstype/fstype.c	2008-12-30 00:59:40.000000000 +0100
+@@ -115,17 +115,14 @@
+ 	const struct ext3_super_block *sb =
+ 		(const struct ext3_super_block *)buf;
+ 
+-	/* ext4dev needs ext2 + journal + test_fs flag + one !ext3 feature */
++	/* ext4 needs ext2 + journal + one !ext3 feature */
+ 	if (sb->s_magic == __cpu_to_le16(EXT2_SUPER_MAGIC)
+ 		&& (sb->s_feature_compat
+ 		& __cpu_to_le32(EXT3_FEATURE_COMPAT_HAS_JOURNAL))
+-		&& (sb->s_flags & __cpu_to_le32(EXT2_FLAGS_TEST_FILESYS))
+-		&& (sb->s_feature_incompat
+-		& __cpu_to_le32(EXT3_FEATURE_RO_COMPAT_SUPP)
++		&& (sb->s_feature_ro_compat
++		& __cpu_to_le32(EXT3_FEATURE_RO_COMPAT_UNSUPPORTED)
+ 		|| sb->s_feature_incompat
+-		& __cpu_to_le32(EXT3_FEATURE_INCOMPAT_UNSUPPORTED)
+-		|| sb->s_feature_incompat
+-		& __cpu_to_le32(EXT4_FEATURE_INCOMPAT_MMP))) {
++		& __cpu_to_le32(EXT3_FEATURE_INCOMPAT_UNSUPPORTED))) {
+ 		*bytes = (unsigned long long)__le32_to_cpu(sb->s_blocks_count)
+ 		    << (10 + __le32_to_cpu(sb->s_log_block_size));
+ 		return 1;
+@@ -370,7 +367,7 @@
+ 	{0, "romfs", romfs_image},
+ 	{0, "xfs", xfs_image},
+ 	{0, "squashfs", squashfs_image},
+-	{1, "ext4dev", ext4_image},
++	{1, "ext4", ext4_image},
+ 	{1, "ext3", ext3_image},
+ 	{1, "ext2", ext2_image},
+ 	{1, "minix", minix_image},