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

[Thomas Bächler]

    Date: Sunday, January 11, 2009 @ 09:09:12
  Author: thomas
Revision: 23608

upgpkg: klibc 1.5.15-1

Modified:
  klibc/trunk/PKGBUILD
Deleted:
  klibc/trunk/klibc-fix-ext4-detection.patch

--------------------------------+
 PKGBUILD                       |   17 +++++++----------
 klibc-fix-ext4-detection.patch |   33 ---------------------------------
 2 files changed, 7 insertions(+), 43 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2009-01-11 14:07:55 UTC (rev 23607)
+++ PKGBUILD	2009-01-11 14:09:12 UTC (rev 23608)
@@ -9,10 +9,10 @@
 ###
 
 pkgname=klibc
-pkgver=1.5.14
+pkgver=1.5.15
 _klibcbranch=Testing #Stable/Testing
 _kver=2.6.28-ARCH
-pkgrel=2
+pkgrel=1
 pkgdesc="A minimal libc made for early-userspace"
 arch=(i686 x86_64)
 url="http://www.kernel.org/pub/linux/libs/klibc/"
@@ -23,14 +23,12 @@
         klibc-compile-shared-by-default.patch
         klibc-Kbuild.patch
         klibc-x86_64-fix-io.h.patch
-        klibc-fix-2.6.28-includes.patch
-        klibc-fix-ext4-detection.patch)
-md5sums=('8c65712a24c4bde5ec9870f5a4f8113e'
+        klibc-fix-2.6.28-includes.patch)
+md5sums=('b5527be46f24779884557b11888c8075'
          'c263a7c3fd290fcc84a4e230d456d022'
          'ff5b113024256de31af59c2f1a966516'
          'fcee75cfaa65638b07f9cc4a7719fa29'
-         '85e39751debc304119eb481d6bc26d59'
-         '3884d68f83e63a7e83301d55adbea40c')
+         '85e39751debc304119eb481d6bc26d59')
                   
 build()
 {
@@ -47,12 +45,11 @@
   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
-  ln -sf asm-x86 $startdir/pkg/usr/lib/klibc/include/asm
+  #ln -sf asm-x86 $startdir/pkg/usr/lib/klibc/include/asm
+  cp -a linux/arch/x86/include/asm/* $startdir/pkg/usr/lib/klibc/include/asm/
   
   provides[${#provides[@]}]="$(basename $startdir/pkg/lib/klibc-*.so .so)"
   export provides

Deleted: klibc-fix-ext4-detection.patch
===================================================================
--- klibc-fix-ext4-detection.patch	2009-01-11 14:07:55 UTC (rev 23607)
+++ klibc-fix-ext4-detection.patch	2009-01-11 14:09:12 UTC (rev 23608)
@@ -1,33 +0,0 @@
---- 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},