[oe-commits] org.oe.dev merge of '7eb72993f7971af5ed6ca074f12728e72fab4af9'
mickeyl commit
openembedded-commits at lists.openembedded.org
Mon Sep 3 20:04:59 UTC 2007
merge of '7eb72993f7971af5ed6ca074f12728e72fab4af9'
and 'b04a5865f2f7f8e22f7323e2a3e613909162c33f'
Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 0854d0ad4a8b3ab099cfa6a24ec74b412716128e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0854d0ad4a8b3ab099cfa6a24ec74b412716128e
Files:
1
packages/binutils/binutils-2.18
packages/pxaregs
packages/pxaregs/pxaregs-1.14
classes/qmake2.bbclass
packages/binutils/binutils-2.18/110-arm-eabi-conf.patch
packages/binutils/binutils-2.18/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch
packages/binutils/binutils-2.18/binutils-uclibc-100-uclibc-conf.patch
packages/binutils/binutils-2.18/binutils-uclibc-300-001_ld_makefile_patch.patch
packages/binutils/binutils-2.18/binutils-uclibc-300-006_better_file_error.patch
packages/binutils/binutils-2.18/binutils-uclibc-300-012_check_ldrunpath_length.patch
packages/binutils/binutils-cross-sdk_2.18.bb
packages/binutils/binutils-cross_2.18.bb
packages/binutils/binutils_2.18.bb
packages/pxaregs/pxaregs-1.14/Makefile
packages/pxaregs/pxaregs-1.14/i2c.patch
packages/pxaregs/pxaregs-1.14/munmap.patch
packages/pxaregs/pxaregs-1.14/serial.patch
packages/pxaregs/pxaregs-1.14/usb.patch
packages/pxaregs/pxaregs_1.14.bb
packages/qte/qtopia-core_4.3.1.bb
packages/xournal/xournal_0.4.bb
MAINTAINERS
classes/qmake-base.bbclass
classes/qmake.bbclass
classes/qt4x11.bbclass
packages/makedevs/makedevs-1.0.0/makedevs.c
packages/makedevs/makedevs_1.0.0.bb
packages/meta/package-index.bb
packages/misc-binary-only/prism-firmware/prism-fw.sh
packages/misc-binary-only/prism-firmware.bb
packages/python/python-pygobject_2.12.3.bb
packages/python/python-pygtk_2.10.4.bb
packages/scummvm/scummvm.inc
packages/tasks/task-openmoko-feed.bb
packages/webkit/webkit-gtk_svn.bb
site/common-glibc
conf/machine/rokr-e2.conf
conf/machine/rokre2.conf
packages/openmoko2/openmoko-mediaplayer2_svn.bb
packages/tasks/task-openmoko.bb
Diffs:
#
# mt diff -r7eb72993f7971af5ed6ca074f12728e72fab4af9 -r0854d0ad4a8b3ab099cfa6a24ec74b412716128e
#
#
#
# add_dir "packages/binutils/binutils-2.18"
#
# add_dir "packages/pxaregs"
#
# add_dir "packages/pxaregs/pxaregs-1.14"
#
# add_file "classes/qmake2.bbclass"
# content [a1af56cd2193e33f5e44f6c7781760386a74d850]
#
# add_file "packages/binutils/binutils-2.18/110-arm-eabi-conf.patch"
# content [f3bbf6a8a2347f3ecedb82d4c41cf8a14d6516d3]
#
# add_file "packages/binutils/binutils-2.18/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch"
# content [e0a30885b4d82cb2b512d4a9241044cc8cdc768b]
#
# add_file "packages/binutils/binutils-2.18/binutils-uclibc-100-uclibc-conf.patch"
# content [7e350d4762e855d69582fee76ef5289cfe1e726b]
#
# add_file "packages/binutils/binutils-2.18/binutils-uclibc-300-001_ld_makefile_patch.patch"
# content [412df6ebe7f2dadc38a3d68b9a74accd998e927b]
#
# add_file "packages/binutils/binutils-2.18/binutils-uclibc-300-006_better_file_error.patch"
# content [74aba67bda3813664cc7fa3182d68e8561ba8515]
#
# add_file "packages/binutils/binutils-2.18/binutils-uclibc-300-012_check_ldrunpath_length.patch"
# content [9fb1224ed588f35fac30d5fdb0a69713e51c3fa9]
#
# add_file "packages/binutils/binutils-cross-sdk_2.18.bb"
# content [9276912dab9aa784046d22334d366a5bb9ff6f0b]
#
# add_file "packages/binutils/binutils-cross_2.18.bb"
# content [ede72c3f24f80082b3381b9d98618d3e8d01b1fe]
#
# add_file "packages/binutils/binutils_2.18.bb"
# content [2457fcc4615a92236de679835b678cbb4dbdf4e7]
#
# add_file "packages/pxaregs/pxaregs-1.14/Makefile"
# content [665be7d272953c9040a2148787ad7654261754ba]
#
# add_file "packages/pxaregs/pxaregs-1.14/i2c.patch"
# content [e28594ed5f3c65f2d13c7533a23cf24dd8cf5cf0]
#
# add_file "packages/pxaregs/pxaregs-1.14/munmap.patch"
# content [9ed9de59f4e53c3a9c4d3e0e1f6497418782d771]
#
# add_file "packages/pxaregs/pxaregs-1.14/serial.patch"
# content [0bd36aba6e537b8eb82e5ceea251a4cb263eebb1]
#
# add_file "packages/pxaregs/pxaregs-1.14/usb.patch"
# content [7c49bc8a8195510d8ce722e0f1a3e00b46127f8a]
#
# add_file "packages/pxaregs/pxaregs_1.14.bb"
# content [dd0eaa82a0a9c70ee31530e6f75bf50003334da2]
#
# add_file "packages/qte/qtopia-core_4.3.1.bb"
# content [318931809588acb33cdc77b0acb027a9d326485c]
#
# add_file "packages/xournal/xournal_0.4.bb"
# content [bb264ca441e1eee49615587408d6caebdce1b0e0]
#
# patch "MAINTAINERS"
# from [252ff8e6c48e3f59ae9a3cd0c57251b4d2a3e532]
# to [6ee469099979d98a605357577f83edaf55f669fd]
#
# patch "classes/qmake-base.bbclass"
# from [a489a220fe2b3f37bb01107cc1365e48bea86430]
# to [ad812ccb8f270d4c422cc80258d173e249f04f12]
#
# patch "classes/qmake.bbclass"
# from [17ebd03d219366c0e1c20d75ad8cb8d3274b99e4]
# to [3ef973d2c334ac644e2f124902ea399136985ee5]
#
# patch "classes/qt4x11.bbclass"
# from [c1c773af617672d8ff38e8bd5f5d04d6773ae67c]
# to [dadca92eaa92ca965bfe00bf480dffb806e1d45c]
#
# patch "packages/makedevs/makedevs-1.0.0/makedevs.c"
# from [d8baece6be2666c9a9d240fe16d7577ec42225c5]
# to [f89f9b5686ca9c46e0056a49cab5b9ccd8f63f00]
#
# patch "packages/makedevs/makedevs_1.0.0.bb"
# from [15bdc36f225d6d9098ea881e5a562ec59f1ab3db]
# to [559c6f3caaae0d1bf229e678571ffc998cba407e]
#
# patch "packages/meta/package-index.bb"
# from [4f33564e2d11f46b7975676e5901b225190d4920]
# to [913b2200fb1f3c012233ec7cb2c160ecfdc3ef15]
#
# patch "packages/misc-binary-only/prism-firmware/prism-fw.sh"
# from [01e11a8fd115fe200d3ca578cffcccf33adc81ec]
# to [c3edfabe4b87f2b640d2d15ae6c4532f95994de5]
#
# patch "packages/misc-binary-only/prism-firmware.bb"
# from [bbfdfcf3d5affba9aa4c8e106eb545485f9069b6]
# to [c6119706ca5818c93a5cd774212d8f6c9c8b0d4b]
#
# patch "packages/python/python-pygobject_2.12.3.bb"
# from [d82d06b42f0be7a50536c35b4ced3f100e9deb12]
# to [9117719b159b006a9b5f6038dead055ba4eade2b]
#
# patch "packages/python/python-pygtk_2.10.4.bb"
# from [a0fdcb6d5f12db89559881a6377fb0668bae3917]
# to [ef1d51e1a9e98c27de9b343b2d5ff39e8776c388]
#
# patch "packages/scummvm/scummvm.inc"
# from [195a28283db02d87e7361fce8f6cda1776848c24]
# to [fe0de533e25b32bbf637b2b36b05a3712b82f4c1]
#
# patch "packages/tasks/task-openmoko-feed.bb"
# from [556642537d4bd3763b3a455f2bd4eb77bd92deca]
# to [b505cfd8ec607353fb6dccf8b9bbc25aea3887a8]
#
# patch "packages/webkit/webkit-gtk_svn.bb"
# from [cb5b674496bc18948802b1c9b8f634d574e64268]
# to [d4502d16a5835c6b6f743bd4033bb0c4d66e43de]
#
# patch "site/common-glibc"
# from [dcdbc1de2506454c1ddcb1b471c5c26218ca28fc]
# to [a32962de9da8f5299190c1286e3fdaea85c95d93]
#
============================================================
--- classes/qmake2.bbclass a1af56cd2193e33f5e44f6c7781760386a74d850
+++ classes/qmake2.bbclass a1af56cd2193e33f5e44f6c7781760386a74d850
@@ -0,0 +1,20 @@
+#
+# QMake variables for Qt4
+#
+inherit qmake-base
+
+DEPENDS_prepend = "qmake2-native uicmoc4-native "
+
+export QTDIR = "${STAGING_DIR}/${HOST_SYS}/qt4"
+export QMAKESPEC = "${QTDIR}/mkspecs/${TARGET_OS}-oe-g++"
+export OE_QMAKE_UIC = "${STAGING_BINDIR_NATIVE}/uic4"
+export OE_QMAKE_UIC3 = "${STAGING_BINDIR_NATIVE}/uic34"
+export OE_QMAKE_MOC = "${STAGING_BINDIR_NATIVE}/moc4"
+export OE_QMAKE_RCC = "${STAGING_BINDIR_NATIVE}/rcc4"
+export OE_QMAKE_QMAKE = "${STAGING_BINDIR_NATIVE}/qmake2"
+export OE_QMAKE_LINK = "${CXX}"
+export OE_QMAKE_CXXFLAGS = "${CXXFLAGS}"
+export OE_QMAKE_INCDIR_QT = "${QTDIR}/include"
+export OE_QMAKE_LIBDIR_QT = "${QTDIR}/lib"
+export OE_QMAKE_LIBS_QT = "qt"
+export OE_QMAKE_LIBS_X11 = "-lXext -lX11 -lm"
============================================================
--- packages/binutils/binutils-2.18/110-arm-eabi-conf.patch f3bbf6a8a2347f3ecedb82d4c41cf8a14d6516d3
+++ packages/binutils/binutils-2.18/110-arm-eabi-conf.patch f3bbf6a8a2347f3ecedb82d4c41cf8a14d6516d3
@@ -0,0 +1,24 @@
+diff -urN binutils-2.16.91.0.7.orig/configure binutils-2.16.91.0.7/configure
+--- binutils-2.16.91.0.7.orig/configure 2006-05-31 14:54:24.000000000 +0300
++++ binutils-2.16.91.0.7/configure 2006-05-31 14:55:53.000000000 +0300
+@@ -1299,7 +1299,7 @@
+ arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
+ noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+ ;;
+- arm*-*-linux-gnueabi)
++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
+ noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+ noconfigdirs="$noconfigdirs target-libjava target-libobjc"
+ ;;
+diff -urN binutils-2.16.91.0.7.orig/configure.in binutils-2.16.91.0.7/configure.in
+--- binutils-2.16.91.0.7.orig/configure.ac 2006-05-31 14:54:24.000000000 +0300
++++ binutils-2.16.91.0.7/configure.ac 2006-05-31 14:55:53.000000000 +0300
+@@ -497,7 +497,7 @@
+ arm-*-elf* | strongarm-*-elf* | xscale-*-elf* | arm*-*-eabi* )
+ noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+ ;;
+- arm*-*-linux-gnueabi)
++ arm*-*-linux-gnueabi | arm*-*-linux-uclibcgnueabi)
+ noconfigdirs="$noconfigdirs target-libffi target-qthreads"
+ noconfigdirs="$noconfigdirs target-libjava target-libobjc"
+ ;;
============================================================
--- packages/binutils/binutils-2.18/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch e0a30885b4d82cb2b512d4a9241044cc8cdc768b
+++ packages/binutils/binutils-2.18/binutils-2.16.91.0.6-objcopy-rename-errorcode.patch e0a30885b4d82cb2b512d4a9241044cc8cdc768b
@@ -0,0 +1,39 @@
+# strip (and objcopy) fail to set the error code if there is no
+# output file name and the rename of the stripped (or copied) file
+# fails, yet the command fails to do anything. This fixes both
+# objcopy and strip.
+#
+# modification by bero: Ported to 2.16.91.0.6
+#
+#Signed-off-by: John Bowler <jbowler at acm.org>
+#Signed-off-by: Bernhard Rosenkraenzer <bero at arklinux.org>
+---
+# binutils/objcopy.c | 8 +++++---
+# 1 file changed, 5 insertions(+), 3 deletions(-)
+#
+Index: src/binutils/objcopy.c
+===================================================================
+--- src.orig/binutils/objcopy.c 2007-08-09 13:26:03.000000000 +0100
++++ src/binutils/objcopy.c 2007-08-09 16:36:12.000000000 +0100
+@@ -2787,8 +2787,9 @@ strip_main (int argc, char *argv[])
+ if (preserve_dates)
+ set_times (tmpname, &statbuf);
+ if (output_file != tmpname)
+- smart_rename (tmpname, output_file ? output_file : argv[i],
+- preserve_dates);
++ if (smart_rename (tmpname, output_file ? output_file : argv[i],
++ preserve_dates))
++ hold_status = 1;
+ status = hold_status;
+ }
+ else
+@@ -3411,7 +3412,8 @@ copy_main (int argc, char *argv[])
+ if (preserve_dates)
+ set_times (tmpname, &statbuf);
+ if (tmpname != output_filename)
+- smart_rename (tmpname, input_filename, preserve_dates);
++ if (smart_rename (tmpname, input_filename, preserve_dates))
++ status = 1;
+ }
+ else
+ unlink_if_ordinary (tmpname);
============================================================
--- packages/binutils/binutils-2.18/binutils-uclibc-100-uclibc-conf.patch 7e350d4762e855d69582fee76ef5289cfe1e726b
+++ packages/binutils/binutils-2.18/binutils-uclibc-100-uclibc-conf.patch 7e350d4762e855d69582fee76ef5289cfe1e726b
@@ -0,0 +1,34 @@
+--- binutils-2.18.orig/configure
++++ binutils-2.18/configure
+@@ -2206,7 +2206,7 @@
+ am33_2.0-*-linux*)
+ noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+ ;;
+- sh-*-linux*)
++ sh*-*-linux*)
+ noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+ ;;
+ sh*-*-pe|mips*-*-pe|*arm-wince-pe)
+@@ -2504,7 +2504,7 @@
+ romp-*-*)
+ noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
+ ;;
+- sh-*-* | sh64-*-*)
++ sh*-*-* | sh64-*-*)
+ case "${host}" in
+ i[3456789]86-*-vsta) ;; # don't add gprof back in
+ i[3456789]86-*-go32*) ;; # don't add gprof back in
+--- binutils-2.18.orig/gprof/configure
++++ binutils-2.18/gprof/configure
+@@ -4124,6 +4124,11 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
++linux-uclibc*)
++ lt_cv_deplibs_check_method=pass_all
++ lt_cv_file_magic_test_file=`echo /lib/libuClibc-*.so`
++ ;;
++
+ netbsd*)
+ if echo __ELF__ | $CC -E - | $GREP __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[^/]+(\.so\.[0-9]+\.[0-9]+|_pic\.a)$'
============================================================
--- packages/binutils/binutils-2.18/binutils-uclibc-300-001_ld_makefile_patch.patch 412df6ebe7f2dadc38a3d68b9a74accd998e927b
+++ packages/binutils/binutils-2.18/binutils-uclibc-300-001_ld_makefile_patch.patch 412df6ebe7f2dadc38a3d68b9a74accd998e927b
@@ -0,0 +1,50 @@
+#!/bin/sh -e
+## 001_ld_makefile_patch.dpatch
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: correct where ld scripts are installed
+## DP: Author: Chris Chimelis <chris at debian.org>
+## DP: Upstream status: N/A
+## DP: Date: ??
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+--- binutils-2.16.91.0.1/ld/Makefile.am
++++ binutils-2.16.91.0.1/ld/Makefile.am
+@@ -20,7 +20,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+
+ EMUL = @EMUL@
+ EMULATION_OFILES = @EMULATION_OFILES@
+--- binutils-2.16.91.0.1/ld/Makefile.in
++++ binutils-2.16.91.0.1/ld/Makefile.in
+@@ -268,7 +268,7 @@
+ # We put the scripts in the directory $(scriptdir)/ldscripts.
+ # We can't put the scripts in $(datadir) because the SEARCH_DIR
+ # directives need to be different for native and cross linkers.
+-scriptdir = $(tooldir)/lib
++scriptdir = $(libdir)
+ BASEDIR = $(srcdir)/..
+ BFDDIR = $(BASEDIR)/bfd
+ INCDIR = $(BASEDIR)/include
============================================================
--- packages/binutils/binutils-2.18/binutils-uclibc-300-006_better_file_error.patch 74aba67bda3813664cc7fa3182d68e8561ba8515
+++ packages/binutils/binutils-2.18/binutils-uclibc-300-006_better_file_error.patch 74aba67bda3813664cc7fa3182d68e8561ba8515
@@ -0,0 +1,43 @@
+#!/bin/sh -e
+## 006_better_file_error.dpatch by David Kimdon <dwhedon at gordian.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Specify which filename is causing an error if the filename is a
+## DP: directory. (#45832)
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+diff -urNad /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c binutils-2.14.90.0.6/bfd/opncls.c
+--- /home/james/debian/packages/binutils/binutils-2.14.90.0.6/bfd/opncls.c 2003-07-23 16:08:09.000000000 +0100
++++ binutils-2.14.90.0.6/bfd/opncls.c 2003-09-10 22:35:00.000000000 +0100
+@@ -150,6 +150,13 @@
+ {
+ bfd *nbfd;
+ const bfd_target *target_vec;
++ struct stat s;
++
++ if (stat (filename, &s) == 0)
++ if (S_ISDIR(s.st_mode)) {
++ bfd_set_error (bfd_error_file_not_recognized);
++ return NULL;
++ }
+
+ nbfd = _bfd_new_bfd ();
+ if (nbfd == NULL)
============================================================
--- packages/binutils/binutils-2.18/binutils-uclibc-300-012_check_ldrunpath_length.patch 9fb1224ed588f35fac30d5fdb0a69713e51c3fa9
+++ packages/binutils/binutils-2.18/binutils-uclibc-300-012_check_ldrunpath_length.patch 9fb1224ed588f35fac30d5fdb0a69713e51c3fa9
@@ -0,0 +1,47 @@
+#!/bin/sh -e
+## 012_check_ldrunpath_length.dpatch by Chris Chimelis <chris at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Only generate an RPATH entry if LD_RUN_PATH is not empty, for
+## DP: cases where -rpath isn't specified. (#151024)
+
+if [ $# -ne 1 ]; then
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1
+fi
+
+[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
+patch_opts="${patch_opts:--f --no-backup-if-mismatch}"
+
+case "$1" in
+ -patch) patch $patch_opts -p1 < $0;;
+ -unpatch) patch $patch_opts -p1 -R < $0;;
+ *)
+ echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
+ exit 1;;
+esac
+
+exit 0
+
+ at DPATCH@
+diff -urNad /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em binutils-2.15/ld/emultempl/elf32.em
+--- /home/james/debian/packages/binutils/new/binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:58.000000000 +0100
++++ binutils-2.15/ld/emultempl/elf32.em 2004-05-21 23:12:59.000000000 +0100
+@@ -692,6 +692,8 @@
+ && command_line.rpath == NULL)
+ {
+ lib_path = (const char *) getenv ("LD_RUN_PATH");
++ if ((lib_path) && (strlen (lib_path) == 0))
++ lib_path = NULL;
+ if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
+ force))
+ break;
+@@ -871,6 +873,8 @@
+ rpath = command_line.rpath;
+ if (rpath == NULL)
+ rpath = (const char *) getenv ("LD_RUN_PATH");
++ if ((rpath) && (strlen (rpath) == 0))
++ rpath = NULL;
+ if (! (bfd_elf_size_dynamic_sections
+ (output_bfd, command_line.soname, rpath,
+ command_line.filter_shlib,
============================================================
--- packages/binutils/binutils-cross-sdk_2.18.bb 9276912dab9aa784046d22334d366a5bb9ff6f0b
+++ packages/binutils/binutils-cross-sdk_2.18.bb 9276912dab9aa784046d22334d366a5bb9ff6f0b
@@ -0,0 +1,21 @@
+SECTION = "devel"
+require binutils_${PV}.bb
+inherit sdk
+DEPENDS += "flex-native bison-native"
+FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/binutils-${PV}"
+EXTRA_OECONF = "--with-sysr%s
>>> DIFF TRUNCATED @ 16K
#
# mt diff -rb04a5865f2f7f8e22f7323e2a3e613909162c33f -r0854d0ad4a8b3ab099cfa6a24ec74b412716128e
#
#
#
# rename "conf/machine/rokr-e2.conf"
# to "conf/machine/rokre2.conf"
#
# patch "conf/machine/rokre2.conf"
# from [0d6bee13f804137fbb6e3564ed46b0422b8dc682]
# to [88c317268af239bc9fcc109e27a2f5803fa232a0]
#
# patch "packages/openmoko2/openmoko-mediaplayer2_svn.bb"
# from [9fdc610b49803ad469053fbf419cba76dd170430]
# to [29fd85f99770056b454fc50a90c40754d1527c46]
#
# patch "packages/tasks/task-openmoko.bb"
# from [42cdffc8a3ad775182f6a319ca88cd8a0230c625]
# to [8f483a0572038a79f60bddab9863f323e93bbef2]
#
============================================================
--- conf/machine/rokr-e2.conf 0d6bee13f804137fbb6e3564ed46b0422b8dc682
+++ conf/machine/rokre2.conf 88c317268af239bc9fcc109e27a2f5803fa232a0
@@ -1,9 +1,8 @@
#@TYPE: Machine
-#@NAME: Motorola EZX rokr e2
-#@DESCRIPTION: Machine configuration for the Motorola GSM phones rokr e2
+#@NAME: Motorola EZX ROKR E2
+#@DESCRIPTION: Machine configuration for the Motorola GSM Phone ROKR E2
require conf/machine/include/motorola-ezx-base.inc
+# there is no touchscreen
+MACHINE_FEATURES = "kernel26 apm alsa bluetooth usbgadget usbhost keyboard screen"
-#no touchscreen
-MACHINE_FEATURES = "kernel26 touchscreen apm alsa bluetooth usbgadget usbhost keyboard screen"
-
============================================================
--- packages/openmoko2/openmoko-mediaplayer2_svn.bb 9fdc610b49803ad469053fbf419cba76dd170430
+++ packages/openmoko2/openmoko-mediaplayer2_svn.bb 29fd85f99770056b454fc50a90c40754d1527c46
@@ -1,10 +1,10 @@ DEPENDS = "libmokoui2 expat gstreamer li
DESCRIPTION = "A media player for OpenMoko"
SECTION = "openmoko/tools"
DEPENDS = "libmokoui2 expat gstreamer libspiff"
+RDEPENDS = "gst-meta-audio"
PV = "0.1.0+svn${SVNREV}"
-PR = "r0"
+PR = "r1"
inherit openmoko2
FILES_${PN} += "${datadir}/openmoko-mediaplayer"
-
============================================================
--- packages/tasks/task-openmoko.bb 42cdffc8a3ad775182f6a319ca88cd8a0230c625
+++ packages/tasks/task-openmoko.bb 8f483a0572038a79f60bddab9863f323e93bbef2
@@ -77,13 +77,13 @@ RDEPENDS_task-openmoko-ui = "\
# handle theming. FIXME: properly use machine database in a smart way,
# taking into account not only size but also PPI! Ultimately this might
# need recomputing some theme files and images on-the-fly :/ SVG and logical
-# theme description anyone?
-THEMES = "openmoko-icon-theme-standard2 openmoko-theme-standard2"
-THEMES_a780 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_e680 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_a1200 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_rokr2 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
-THEMES_rokr6 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+# theme description anyone? Or simply Edje to the rescue! :D
+THEMES = "openmoko-icon-theme-standard2 openmoko-theme-standard2"
+THEMES_a780 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+THEMES_e680 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+THEMES_a1200 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+THEMES_rokre2 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
+THEMES_rokre6 = "openmoko-icon-theme-standard2 openmoko-theme-standard2-qvga"
RDEPENDS_task-openmoko-ui += "${THEMES}"
More information about the Openembedded-commits
mailing list