klibc, klibc-utils-static: bump to Testing/1.5.15

4 files changed, 22 insertions, 22 deletions

diff --git a/recipes/klibc/files/fstype-sane-vfat-and-jffs2-for-1.5.patch b/recipes/klibc/files/fstype-sane-vfat-and-jffs2-for-1.5.patch
index b52b3e309b..6eb604e45c 100644
--- a/recipes/klibc/files/fstype-sane-vfat-and-jffs2-for-1.5.patch
+++ b/recipes/klibc/files/fstype-sane-vfat-and-jffs2-for-1.5.patch
@@ -3,17 +3,17 @@ Index: klibc-1.5/usr/kinit/fstype/fstype.c
 --- klibc-1.5.orig/usr/kinit/fstype/fstype.c	2008-02-28 00:48:35.319254938 +0100
 +++ klibc-1.5/usr/kinit/fstype/fstype.c	2008-02-28 00:52:20.583257793 +0100
 @@ -20,7 +20,7 @@
- #include <endian.h>
  #include <netinet/in.h>
+ #include <sys/utsname.h>
  #include <sys/vfs.h>
 -
 +#include <linux/types.h>
  #define cpu_to_be32(x) __cpu_to_be32(x)	/* Needed by romfs_fs.h */
  
  #include "romfs_fs.h"
-@@ -33,6 +33,12 @@
- #include "lvm2_sb.h"
- #include "iso9660_sb.h"
+@@ -37,6 +37,12 @@
+ #include "ocfs2_fs.h"
+ #include "nilfs_fs.h"
  
 +#if __BYTE_ORDER == __BIG_ENDIAN
 +#include <linux/byteorder/big_endian.h>
@@ -24,7 +24,7 @@ Index: klibc-1.5/usr/kinit/fstype/fstype.c
  /*
   * Slightly cleaned up version of jfs_superblock to
   * avoid pulling in other kernel header files.
-@@ -54,6 +60,27 @@
+@@ -59,6 +65,27 @@
  /* Swap needs the definition of block size */
  #include "swap_fs.h"
  
@@ -50,14 +50,14 @@ Index: klibc-1.5/usr/kinit/fstype/fstype.c
 +}
 +
  static int gzip_image(const void *buf, unsigned long long *bytes)
- {
+ {277 304
  	const unsigned char *p = buf;
-@@ -277,6 +304,8 @@
+@@ -490,6 +517,8 @@
  	{1, "ext3", ext3_image},
  	{1, "ext2", ext2_image},
  	{1, "minix", minix_image},
 +	{0, "jffs2", jffs2_image},
 +	{0, "vfat", vfat_image},
+	{1, "nilfs2", nilfs2_image},
+	{2, "ocfs2", ocfs2_image},
  	{8, "reiserfs", reiserfs_image},
- 	{64, "reiserfs", reiserfs_image},
- 	{32, "jfs", jfs_image},
diff --git a/recipes/klibc/files/modprobe.patch b/recipes/klibc/files/modprobe.patch
index 074b0b6311..61ee340ff9 100644
--- a/recipes/klibc/files/modprobe.patch
+++ b/recipes/klibc/files/modprobe.patch
@@ -7,16 +7,16 @@ Index: klibc-1.5/usr/utils/Kbuild
  
  progs := chroot dd mkdir mkfifo mknod mount pivot_root umount
 -progs += true false sleep ln nuke minips cat
--progs += insmod uname halt kill readlink cpio
+-progs += uname halt kill readlink cpio sync dmesg
 +progs += true false sleep ln nuke minips cat losetup
-+progs += insmod uname halt kill readlink cpio modprobe
++progs += uname halt kill readlink cpio sync dmesg modprobe
  
  static-y := $(addprefix static/, $(progs))
  shared-y := $(addprefix shared/, $(progs))
-@@ -52,7 +52,10 @@
- shared/readlink-y   := readlink.o
- static/cpio-y	    := cpio.o
+@@ -54,7 +54,10 @@
  shared/cpio-y       := cpio.o
+ static/sync-y       := sync.o
+ shared/sync-y       := sync.o
 -
 +static/modprobe-y   := modprobe.o
 +shared/modprobe-y   := modprobe.o
diff --git a/recipes/klibc/files/staging.patch b/recipes/klibc/files/staging.patch
index 215daad456..390c214f94 100644
--- a/recipes/klibc/files/staging.patch
+++ b/recipes/klibc/files/staging.patch
@@ -26,13 +26,13 @@ Index: klibc-1.5/scripts/Kbuild.install
  	$(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 \
- 	  mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)include/$$d ; \
+	$(Q)set -e ; for d in linux asm asm-$(KLIBCARCH) asm-generic $(ASMKLIBCARCH); do \
  	  for r in $(KLIBCKERNELSRC)/include $(KLIBCKERNELOBJ)/include \
  	           $(KLIBCKERNELOBJ)/include2 ; do \
- 	    [ ! -d $$r/$$d ] || \
--	      cp -rfL $$r/$$d/. \
-+	      cp -rfd $$r/$$d/. \
+	    [ ! -d $$r/$$d ] && continue; \
+	    mkdir -p $(INSTALLROOT)$(INSTALLDIR)/$(KLIBCCROSS)include/$$d ; \
+-	    cp -rfL $$r/$$d/. \
++	    cp -rfd $$r/$$d/. \
  	          $(INSTALLROOT)$(INSTALLDIR)/$(KCROSS)include/$$d/. ; \
  	  done ; \
  	done
@@ -116,7 +116,7 @@ Index: klibc-1.5/usr/kinit/run-init/Kbuild
 ===================================================================
 --- klibc-1.5.orig/usr/kinit/run-init/Kbuild	2007-03-04 02:52:10.000000000 +0100
 +++ klibc-1.5/usr/kinit/run-init/Kbuild	2008-02-24 15:13:50.221824559 +0100
-@@ -21,5 +21,3 @@
+@@ -25,5 +25,3 @@
  # Cleaning
  clean-dirs := static shared
  
@@ -136,7 +136,7 @@ Index: klibc-1.5/usr/utils/Kbuild
 ===================================================================
 --- klibc-1.5.orig/usr/utils/Kbuild	2007-03-04 02:52:10.000000000 +0100
 +++ klibc-1.5/usr/utils/Kbuild	2008-02-24 15:13:50.229824358 +0100
-@@ -64,5 +64,3 @@
+@@ -66,5 +66,3 @@
  # Clean deletes the static and shared dir
  clean-dirs := static shared
  
diff --git a/recipes/klibc/files/wc.patch b/recipes/klibc/files/wc.patch
index 296a4f9d92..f54c49d3ab 100644
--- a/recipes/klibc/files/wc.patch
+++ b/recipes/klibc/files/wc.patch
@@ -8,7 +8,7 @@ Index: klibc-1.5/usr/utils/Kbuild
  progs := chroot dd mkdir mkfifo mknod mount pivot_root umount
 -progs += true false sleep ln nuke minips cat losetup
 +progs += true false sleep ln nuke minips cat losetup wc
- progs += insmod uname halt kill readlink cpio modprobe
+ progs += uname halt kill readlink cpio sync dmesg modprobe
  
  static-y := $(addprefix static/, $(progs))
 @@ -56,6 +56,9 @@