[oe-commits] org.oe.dev merge of '49d6fb299ea52b27b881053a089d50fa688a1582'
mickeyl commit
openembedded-commits at lists.openembedded.org
Sun Mar 2 23:11:04 UTC 2008
merge of '49d6fb299ea52b27b881053a089d50fa688a1582'
and '89bcc665b5e831cc60b3aaef92e938c69ba33870'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: e6f2d9d45bcc5ef12704328352b2b8626d3ce236
ViewMTN: http://monotone.openembedded.org/revision/info/e6f2d9d45bcc5ef12704328352b2b8626d3ce236
Files:
1
conf/distro/include/sane-srcrevs.inc
packages/alsa/alsa-state/fic-gta02/asound.state
packages/alsa/alsa-state/fic-gta02/gsmhandset.state
packages/alsa/alsa-state/fic-gta02/stereoout.state
packages/alsa/alsa-state.bb
packages/freesmartphone/pyneog_svn.bb
packages/gcc/gcc-4.2.2/intermask-bigendian.patch
packages/klibc/files/fstype-sane-vfat-and-jffs2-for-1.5.patch
packages/gcc/gcc-cross_4.2.2.bb
packages/gcc/gcc_4.2.2.bb
Diffs:
#
# mt diff -r49d6fb299ea52b27b881053a089d50fa688a1582 -re6f2d9d45bcc5ef12704328352b2b8626d3ce236
#
#
#
# patch "conf/distro/include/sane-srcrevs.inc"
# from [1819e55c2030088e515aae4ce84d2cc2e97b12f2]
# to [c93d95925b43f437e02f491ade77d7eea716610f]
#
# patch "packages/alsa/alsa-state/fic-gta02/asound.state"
# from [3dc7b53f478ddd81f2c1e0f417de59d206eadf9b]
# to [9354a119e8ef00e14a2d0585a0477e3cd87717e3]
#
# patch "packages/alsa/alsa-state/fic-gta02/gsmhandset.state"
# from [160bb5fdcf8656f03ec120c677c29512983ef721]
# to [22f8a7307f48f6bc8245fd1f3a1b6aae87fe1117]
#
# patch "packages/alsa/alsa-state/fic-gta02/stereoout.state"
# from [3dc7b53f478ddd81f2c1e0f417de59d206eadf9b]
# to [9354a119e8ef00e14a2d0585a0477e3cd87717e3]
#
# patch "packages/alsa/alsa-state.bb"
# from [790f2ce45c0d7d9471cb29f1a157071adb29ea3b]
# to [1b4bdc4da7afc43826838ecc9cf8e5031d44ef83]
#
# patch "packages/freesmartphone/pyneog_svn.bb"
# from [fdb6814f6c9d0ec94518ea66cb9fe551615a2d62]
# to [4d72b89ba56a5345d16b5dd157d7972a4cbb4941]
#
============================================================
--- conf/distro/include/sane-srcrevs.inc 1819e55c2030088e515aae4ce84d2cc2e97b12f2
+++ conf/distro/include/sane-srcrevs.inc c93d95925b43f437e02f491ade77d7eea716610f
@@ -136,8 +136,8 @@ SRCREV_pn-psplash ?= "249"
SRCREV_pn-opkg-native ?= "4142"
SRCREV_pn-oprofileui ?= "160"
SRCREV_pn-psplash ?= "249"
-SRCREV_pn-pyneod ?= "86"
-SRCREV_pn-pyneog ?= "85"
+SRCREV_pn-pyneod ?= "88"
+SRCREV_pn-pyneog ?= "88"
SRCREV_pn-python-formencode = "3148"
SRCREV_pn-python-gsmd = "127"
SRCREV_pn-python-lightmediascanner = "68"
============================================================
--- packages/alsa/alsa-state/fic-gta02/asound.state 3dc7b53f478ddd81f2c1e0f417de59d206eadf9b
+++ packages/alsa/alsa-state/fic-gta02/asound.state 9354a119e8ef00e14a2d0585a0477e3cd87717e3
@@ -6,8 +6,8 @@ state.neo1973gta02 {
comment.range '0 - 255'
iface MIXER
name 'PCM Volume'
- value.0 255
- value.1 255
+ value.0 235
+ value.1 235
}
control.2 {
comment.access 'read write'
============================================================
--- packages/alsa/alsa-state/fic-gta02/gsmhandset.state 160bb5fdcf8656f03ec120c677c29512983ef721
+++ packages/alsa/alsa-state/fic-gta02/gsmhandset.state 22f8a7307f48f6bc8245fd1f3a1b6aae87fe1117
@@ -6,8 +6,8 @@ state.neo1973gta02 {
comment.range '0 - 255'
iface MIXER
name 'PCM Volume'
- value.0 255
- value.1 255
+ value.0 235
+ value.1 235
}
control.2 {
comment.access 'read write'
============================================================
--- packages/alsa/alsa-state/fic-gta02/stereoout.state 3dc7b53f478ddd81f2c1e0f417de59d206eadf9b
+++ packages/alsa/alsa-state/fic-gta02/stereoout.state 9354a119e8ef00e14a2d0585a0477e3cd87717e3
@@ -6,8 +6,8 @@ state.neo1973gta02 {
comment.range '0 - 255'
iface MIXER
name 'PCM Volume'
- value.0 255
- value.1 255
+ value.0 235
+ value.1 235
}
control.2 {
comment.access 'read write'
============================================================
--- packages/alsa/alsa-state.bb 790f2ce45c0d7d9471cb29f1a157071adb29ea3b
+++ packages/alsa/alsa-state.bb 1b4bdc4da7afc43826838ecc9cf8e5031d44ef83
@@ -8,7 +8,7 @@ PV = "0.1.0"
LICENSE = "GPL"
RRECOMMENDS_alsa-state = "alsa-states"
PV = "0.1.0"
-PR = "r9"
+PR = "r10"
SRC_URI = " \
file://asoundrc \
@@ -28,6 +28,7 @@ SRC_URI_append_fic-gta02 = "\
SRC_URI_append_fic-gta02 = "\
file://stereoout.state \
+ file://gsmhandset.state \
"
inherit update-rc.d
============================================================
--- packages/freesmartphone/pyneog_svn.bb fdb6814f6c9d0ec94518ea66cb9fe551615a2d62
+++ packages/freesmartphone/pyneog_svn.bb 4d72b89ba56a5345d16b5dd157d7972a4cbb4941
@@ -15,12 +15,12 @@ do_install() {
do_install() {
find . -name ".svn"|xargs rm -rf
install -d ${D}${datadir}/pyneog
- for i in media *.py Xsession.d.zadje; do
+ for i in media *.py; do
cp -a $i ${D}${datadir}/pyneog/
done
install -d ${D}${sysconfdir}/X11/Xsession.d/
- ln -sf ${datadir}/pyneog/Xsession.d.zadje ${D}${sysconfdir}/X11/Xsession.d/80zadje
+ install -m 0755 80pyneog ${D}${sysconfdir}/X11/Xsession.d/
}
FILES_${PN} = "${datadir} ${bindir} ${sysconfdir}"
#
# mt diff -r89bcc665b5e831cc60b3aaef92e938c69ba33870 -re6f2d9d45bcc5ef12704328352b2b8626d3ce236
#
#
#
# add_file "packages/gcc/gcc-4.2.2/intermask-bigendian.patch"
# content [ad15bc87222a9c4ea8cca2b19046728b65bfda5e]
#
# add_file "packages/klibc/files/fstype-sane-vfat-and-jffs2-for-1.5.patch"
# content [89bfe802816f7fdaf10df01ec23cd9b28f9380dc]
#
# 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/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},
============================================================
--- 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 = " \
More information about the Openembedded-commits
mailing list