[oe-commits] org.oe.dev merge of '0c093b26a4dcd73c59fdfd549e99d4e4d6ce6ff7'

[dyoung commit]

merge of '0c093b26a4dcd73c59fdfd549e99d4e4d6ce6ff7'
     and 'ad750d608664d7708c21300ab3eed2feec262c22'

Author: dyoung at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 49d6fb299ea52b27b881053a089d50fa688a1582
ViewMTN: http://monotone.openembedded.org/revision/info/49d6fb299ea52b27b881053a089d50fa688a1582
Files:
1
packages/klibc/files/fstype-sane-vfat-and-jffs2-for-1.5.patch
packages/gcc/gcc-4.2.2/intermask-bigendian.patch
packages/gcc/gcc-cross_4.2.2.bb
packages/gcc/gcc_4.2.2.bb
Diffs:

#
# mt diff -r0c093b26a4dcd73c59fdfd549e99d4e4d6ce6ff7 -r49d6fb299ea52b27b881053a089d50fa688a1582
#
# 
# 
# add_file "packages/klibc/files/fstype-sane-vfat-and-jffs2-for-1.5.patch"
#  content [89bfe802816f7fdaf10df01ec23cd9b28f9380dc]
# 
============================================================
--- packages/klibc/files/fstype-sane-vfat-and-jffs2-for-1.5.patch	89bfe802816f7fdaf10df01ec23cd9b28f9380dc
+++ packages/klibc/files/fstype-sane-vfat-and-jffs2-for-1.5.patch	89bfe802816f7fdaf10df01ec23cd9b28f9380dc
@@ -0,0 +1,63 @@
+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/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"
+ 
++#if __BYTE_ORDER == __BIG_ENDIAN
++#include <linux/byteorder/big_endian.h>
++#else
++#include <linux/byteorder/little_endian.h>
++#endif
++
+ /*
+  * Slightly cleaned up version of jfs_superblock to
+  * avoid pulling in other kernel header files.
+@@ -54,6 +60,27 @@
+ /* Swap needs the definition of block size */
+ #include "swap_fs.h"
+ 
++static int jffs2_image(const unsigned char *buf, unsigned long *blocks)
++{
++       // Very sloppy! ;-E
++       if (*buf == 0x85 && buf[1] == 0x19)
++               return 1;
++
++       return 0;
++}
++
++static int vfat_image(const unsigned char *buf, unsigned long *blocks)
++{
++        const struct romfs_super_block *sb =
++               (const struct romfs_super_block *)buf;
++       if (!strncmp(buf + 54, "FAT12   ", 8)
++           || !strncmp(buf + 54, "FAT16   ", 8)
++           || !strncmp(buf + 82, "FAT32   ", 8))
++               return 1;
++
++       return 0;
++}
++
+ static int gzip_image(const void *buf, unsigned long long *bytes)
+ {
+ 	const unsigned char *p = buf;
+@@ -277,6 +304,8 @@
+ 	{1, "ext3", ext3_image},
+ 	{1, "ext2", ext2_image},
+ 	{1, "minix", minix_image},
++	{0, "jffs2", jffs2_image},
++	{0, "vfat", vfat_image},
+ 	{8, "reiserfs", reiserfs_image},
+ 	{64, "reiserfs", reiserfs_image},
+ 	{32, "jfs", jfs_image},


#
# mt diff -rad750d608664d7708c21300ab3eed2feec262c22 -r49d6fb299ea52b27b881053a089d50fa688a1582
#
# 
# 
# add_file "packages/gcc/gcc-4.2.2/intermask-bigendian.patch"
#  content [ad15bc87222a9c4ea8cca2b19046728b65bfda5e]
# 
# patch "packages/gcc/gcc-cross_4.2.2.bb"
#  from [12e688f12323d409a909f9a932f8a7651c517ccc]
#    to [3b6b42b43c28b4581f0d2c60906b94a0526c461e]
# 
# patch "packages/gcc/gcc_4.2.2.bb"
#  from [8fcbf0f98f7f23e93b4fb6bb643e11c81f1390e1]
#    to [3cfd23868ea1e804e46091a60f0a9deade43033c]
# 
============================================================
--- packages/gcc/gcc-4.2.2/intermask-bigendian.patch	ad15bc87222a9c4ea8cca2b19046728b65bfda5e
+++ packages/gcc/gcc-4.2.2/intermask-bigendian.patch	ad15bc87222a9c4ea8cca2b19046728b65bfda5e
@@ -0,0 +1,24 @@
+--- gcc-4.2.0/gcc/config/arm/bpabi.h
++++ gcc-4.2.0/gcc/config/arm/bpabi.h
+@@ -33,9 +33,19 @@
+ #undef FPUTYPE_DEFAULT
+ #define FPUTYPE_DEFAULT FPUTYPE_VFP
+ 
++/*
++ * 'config.gcc' defines TARGET_BIG_ENDIAN_DEFAULT as 1 for arm*b-*
++ * (big endian) configurations.
++ */
++#if TARGET_BIG_ENDIAN_DEFAULT
++#define TARGET_ENDIAN_DEFAULT MASK_BIG_END
++#else
++#define TARGET_ENDIAN_DEFAULT 0
++#endif
++
+ /* EABI targets should enable interworking by default.  */
+ #undef TARGET_DEFAULT
+-#define TARGET_DEFAULT MASK_INTERWORK
++#define TARGET_DEFAULT (MASK_INTERWORK | TARGET_ENDIAN_DEFAULT)
+ 
+ /* The ARM BPABI functions return a boolean; they use no special
+    calling convention.  */
+
============================================================
--- packages/gcc/gcc-cross_4.2.2.bb	12e688f12323d409a909f9a932f8a7651c517ccc
+++ packages/gcc/gcc-cross_4.2.2.bb	3b6b42b43c28b4581f0d2c60906b94a0526c461e
@@ -5,7 +5,7 @@ FILESDIR = "${@os.path.dirname(bb.data.g
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
 # NOTE: split PR.  If the main .oe changes something that affects its *build*
 # remember to increment this one too.
-PR = "r5"
+PR = "r6"
 
 DEPENDS = "virtual/${TARGET_PREFIX}binutils virtual/${TARGET_PREFIX}libc-for-gcc gmp-native mpfr-native"
 PROVIDES = "virtual/${TARGET_PREFIX}gcc virtual/${TARGET_PREFIX}g++"
============================================================
--- packages/gcc/gcc_4.2.2.bb	8fcbf0f98f7f23e93b4fb6bb643e11c81f1390e1
+++ packages/gcc/gcc_4.2.2.bb	3cfd23868ea1e804e46091a60f0a9deade43033c
@@ -1,8 +1,8 @@ LICENSE = "GPL"
 DESCRIPTION = "The GNU cc and gcc C compilers."
 HOMEPAGE = "http://www.gnu.org/software/gcc/"
 SECTION = "devel"
 LICENSE = "GPL"
-PR = "r5"
+PR = "r6"
 
 inherit autotools gettext
 
@@ -43,6 +43,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gcc
 	file://gcc-4.0.2-e300c2c3.patch;patch=1 \
 	file://pr34130.patch;patch=1 \
 	file://fortran-static-linking.patch;patch=1 \
+	file://intermask-bigendian.patch;patch=1 \
 "
 
 SRC_URI_append_ep93xx = " \