diff options
64 files changed, 3979 insertions, 761 deletions
diff --git a/classes/rm_work.bbclass b/classes/rm_work.bbclass index 45812bbb81..2ec7d305f2 100644 --- a/classes/rm_work.bbclass +++ b/classes/rm_work.bbclass @@ -14,7 +14,7 @@ do_rm_work () { for dir in * do if [ `basename ${S}` = $dir ]; then - rm -rf $dir/* + rm -rf $dir elif [ $dir != 'temp' ]; then rm -rf $dir fi diff --git a/conf/bitbake.conf b/conf/bitbake.conf index d642998e8d..de5266f855 100644 --- a/conf/bitbake.conf +++ b/conf/bitbake.conf @@ -108,6 +108,8 @@ PROVIDES = "" PROVIDES_prepend = "${P} ${PF} ${PN} " RPROVIDES = "" +MULTI_PROVIDER_WHITELIST = "virtual/libintl" + PACKAGES = "${PN}-dbg ${PN} ${PN}-doc ${PN}-dev ${PN}-locale" FILES = "" diff --git a/conf/distro/include/angstrom-eglibc.inc b/conf/distro/include/angstrom-eglibc.inc index dc3929c3a7..91afb658e3 100644 --- a/conf/distro/include/angstrom-eglibc.inc +++ b/conf/distro/include/angstrom-eglibc.inc @@ -2,6 +2,7 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "eglibc" PREFERRED_PROVIDER_virtual/libintl ?= "eglibc" PREFERRED_PROVIDER_virtual/libc ?= "eglibc" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "eglibc-initial" PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-for-gcc = "eglibc-intermediate" PREFERRED_PROVIDER_virtual/arm-angstrom-linux-gnueabi-libc-for-gcc = "eglibc-intermediate" diff --git a/conf/distro/include/angstrom-glibc.inc b/conf/distro/include/angstrom-glibc.inc index 1eabe6b868..1502833389 100644 --- a/conf/distro/include/angstrom-glibc.inc +++ b/conf/distro/include/angstrom-glibc.inc @@ -2,7 +2,7 @@ PREFERRED_PROVIDER_virtual/libiconv ?= "glibc" PREFERRED_PROVIDER_virtual/libintl ?= "glibc" PREFERRED_PROVIDER_virtual/libc ?= "glibc" -PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial = "glibc-initial" +PREFERRED_PROVIDER_virtual/${TARGET_PREFIX}libc-initial ?= "glibc-initial" TARGET_OS = "linux${@['','-gnueabi'][bb.data.getVar('TARGET_ARCH',d,1) in ['arm', 'armeb'] and bb.data.getVar('MACHINE',d) not in ['collie','h3600', 'h3800', 'simpad', 'htcwallaby']]}" diff --git a/conf/distro/include/openmoko.inc b/conf/distro/include/openmoko.inc index 7c3c4a8f41..80c861b95c 100644 --- a/conf/distro/include/openmoko.inc +++ b/conf/distro/include/openmoko.inc @@ -119,7 +119,7 @@ PREFERRED_VERSION_dates = "0.1" # Development # PREFERRED_PROVIDER_qemu-native = "qemu-native" -PREFERRED_VERSION_qemu-native = "0.8.2+cvs${SRCDATE}" +PREFERRED_VERSION_qemu-native = "0.9.0+cvs${SRCDATE}" # # Opie diff --git a/conf/machine/omap1710h3.conf b/conf/machine/omap1710h3.conf index 0b26436bf5..73dced352e 100644 --- a/conf/machine/omap1710h3.conf +++ b/conf/machine/omap1710h3.conf @@ -1,12 +1,12 @@ #@TYPE: Machine -#@NAME: OMAP1610 cpu on an H2 board -#@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor +#@NAME: OMAP1710 cpu on an H2 board +#@DESCRIPTION: Machine configuration for the OMAP H3 development board with a 1710 processor TARGET_ARCH = "arm" PACKAGE_EXTRA_ARCHS = "armv5te" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6" +PREFERRED_PROVIDER_virtual/kernel = "linux-omap1" PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" diff --git a/conf/machine/omap2420h4.conf b/conf/machine/omap2420h4.conf index a9e1a00cc5..fb9f4669da 100644 --- a/conf/machine/omap2420h4.conf +++ b/conf/machine/omap2420h4.conf @@ -1,17 +1,16 @@ #@TYPE: Machine -#@NAME: OMAP1610 cpu on an H2 board -#@DESCRIPTION: Machine configuration for the OMAP H2 development board with a 1610 processor +#@NAME: OMAP2420 cpu on an H4 board +#@DESCRIPTION: Machine configuration for the OMAP H4 development board with a 2420 processor TARGET_ARCH = "arm" -PACKAGE_EXTRA_ARCHS = "armv5te armv6te" - +PACKAGE_EXTRA_ARCHS = "armv4t armv5te armv6" PREFERRED_PROVIDER_xserver = "xserver-kdrive" -PREFERRED_PROVIDER_virtual/kernel = "linux-omap-2.6" -PREFERRED_PROVIDERS += "virtual/${TARGET_PREFIX}depmod:module-init-tools-cross" - -BOOTSTRAP_EXTRA_RDEPENDS += "modutils-collateral" +PREFERRED_PROVIDER_virtual/kernel = "linux-omap2" +PREFERRED_VERSION_u-boot = "1.1.4" SERIAL_CONSOLE ?= "115200 ttyS0" EXTRA_IMAGECMD_jffs2 = "--pad --little-endian --eraseblock=0x40000" -require conf/machine/include/tune-arm926ejs.conf +MACHINE_FEATURES = "kernel26" + +require conf/machine/include/tune-arm1136jf-s.conf diff --git a/packages/automake/automake-native_1.10.bb b/packages/automake/automake-native_1.10.bb index 92c861f49c..a7857c562d 100644 --- a/packages/automake/automake-native_1.10.bb +++ b/packages/automake/automake-native_1.10.bb @@ -1,3 +1,5 @@ PV := "${PV}" require automake-native.inc + +DEFAULT_PREFERENCE = "-1" diff --git a/packages/glibc/glibc-package.bbclass b/packages/glibc/glibc-package.bbclass index ae6a085e74..e8e755d139 100644 --- a/packages/glibc/glibc-package.bbclass +++ b/packages/glibc/glibc-package.bbclass @@ -27,7 +27,7 @@ ENABLE_BINARY_LOCALE_GENERATION ?= "0" BINARY_LOCALE_ARCHES ?= "arm.*" PACKAGES = "glibc-dbg glibc catchsegv sln nscd ldd localedef glibc-utils glibc-dev glibc-doc glibc-locale libsegfault glibc-extra-nss glibc-thread-db glibc-pcprofile" -PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-*" +PACKAGES_DYNAMIC = "glibc-gconv-* glibc-charmap-* glibc-localedata-* locale-base-*" libc_baselibs = "/lib/libc* /lib/libm* /lib/ld* /lib/libpthread* /lib/libresolv* /lib/librt* /lib/libutil* /lib/libnsl* /lib/libnss_files* /lib/libnss_compat* /lib/libnss_dns* /lib/libdl* /lib/libanl* /lib/libBrokenLocale*" diff --git a/packages/gnuplot/gnuplot_4.2.0.bb b/packages/gnuplot/gnuplot_4.2.0.bb index c6f51c4f15..d750aac66a 100644 --- a/packages/gnuplot/gnuplot_4.2.0.bb +++ b/packages/gnuplot/gnuplot_4.2.0.bb @@ -8,7 +8,6 @@ PR = "r0" SRC_URI = "${SOURCEFORGE_MIRROR}/gnuplot/${PN}-${PV}.tar.gz \ file://subdirs.patch;patch=1 \ - file://matrix.patch;patch=1 \ file://gnuplot.desktop \ file://gnuplot.png" diff --git a/packages/grub/grub_0.97.bb b/packages/grub/grub_0.97.bb index 044ecba577..028a1a1a06 100644 --- a/packages/grub/grub_0.97.bb +++ b/packages/grub/grub_0.97.bb @@ -2,7 +2,8 @@ DESCRIPTION = "GRUB is the GRand Unified Bootloader" HOMEPAGE = "http://www.gnu.org/software/grub" SECTION = "bootloaders" PRIORITY = "optional" -PR = "r1" +RDEPENDS = "diffutils" +PR = "r2" SRC_URI = "ftp://alpha.gnu.org/gnu/grub/grub-${PV}.tar.gz" diff --git a/packages/gsm/files/default b/packages/gsm/files/default index 43f4a2db0d..4b582dd5ac 100644 --- a/packages/gsm/files/default +++ b/packages/gsm/files/default @@ -3,12 +3,12 @@ . /etc/init.d/functions case `cpuinfo_id` in - "GTA01", "GTA02") + "GTA01"|"GTA02") GSMD_OPTS="-s 115200 -F" GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" GSM_DEV="/dev/ttySAC0" ;; - "HTC Apache", "HTC Blueangel") + "HTC Apache"|"HTC Blueangel") GSMD_OPTS="-s 115200 -F" GSM_DEV="/dev/ttyS0" ;; diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index b815a227b6..7eee675047 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -4,7 +4,7 @@ LICENSE = "GPL LGPL" SECTION = "libs/gsm" PROVIDES += "gsmd" PV = "0.1+svn${SRCDATE}" -PR = "r20" +PR = "r21" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ file://gsmd \ diff --git a/packages/gstreamer/gst-plugins-bad/gst-plugins-directfb-fix.patch b/packages/gstreamer/gst-plugins-bad/gst-plugins-directfb-fix.patch new file mode 100644 index 0000000000..f8f516bc44 --- /dev/null +++ b/packages/gstreamer/gst-plugins-bad/gst-plugins-directfb-fix.patch @@ -0,0 +1,32 @@ +--- gst-plugins-bad-0.10.5-r1.orig/gst-plugins-bad-0.10.5/examples/directfb/gstdfb.c 2007-08-24 08:23:23.000000000 +0100 ++++ gst-plugins-bad-0.10.5-r1/gst-plugins-bad-0.10.5/examples/directfb/gstdfb.c 2007-08-24 08:24:28.000000000 +0100 +@@ -35,7 +35,7 @@ + #include <math.h> + #include <time.h> + +-#include <directfb.h> ++#include <directfb/directfb.h> + #include <gst/gst.h> + #include <string.h> + +--- gst-plugins-bad-0.10.5-r1.orig/gst-plugins-bad-0.10.5/ext/directfb/dfb-example.c 2007-08-24 08:23:24.000000000 +0100 ++++ gst-plugins-bad-0.10.5-r1/gst-plugins-bad-0.10.5/ext/directfb/dfb-example.c 2007-08-24 08:24:41.000000000 +0100 +@@ -1,5 +1,5 @@ + +-#include <directfb.h> ++#include <directfb/directfb.h> + #include <gst/gst.h> + + static IDirectFB *dfb = NULL; + +--- gst-plugins-bad-0.10.5-r1.orig/gst-plugins-bad-0.10.5/ext/directfb/dfbvideosink.h 2007-08-24 08:23:24.000000000 +0100 ++++ gst-plugins-bad-0.10.5-r1/gst-plugins-bad-0.10.5/ext/directfb/dfbvideosink.h 2007-08-24 08:24:56.000000000 +0100 +@@ -22,7 +22,7 @@ + + #include <gst/video/gstvideosink.h> + +-#include <directfb.h> ++#include <directfb/directfb.h> + + G_BEGIN_DECLS + diff --git a/packages/gstreamer/gst-plugins-bad_0.10.5.bb b/packages/gstreamer/gst-plugins-bad_0.10.5.bb index 9c7d94117c..ce61d10010 100644 --- a/packages/gstreamer/gst-plugins-bad_0.10.5.bb +++ b/packages/gstreamer/gst-plugins-bad_0.10.5.bb @@ -1,8 +1,8 @@ require gst-plugins.inc -SRC_URI += "file://vorbisenc.h file://vorbisdec.h" -DEPENDS += "gst-plugins-base" -EXTRA_OECONF += " --disable-directfb " +SRC_URI += "file://vorbisenc.h file://vorbisdec.h \ + file://gst-plugins-directfb-fix.patch;patch=1;pnum=2" +DEPENDS += "gst-plugins-base directfb" do_compile_prepend() { # work around missing files in upstream tarball (upstream bug #454078) diff --git a/packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch b/packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch index d44c454ce3..ec408a5f28 100644 --- a/packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch +++ b/packages/gtk+/gtk+-2.10.14/combo-arrow-size.patch @@ -1,11 +1,8 @@ Index: gtk/gtkcombobox.c =================================================================== -RCS file: /cvs/gnome/gtk+/gtk/gtkcombobox.c,v -retrieving revision 1.185 -diff -u -p -r1.185 gtkcombobox.c ---- gtk/gtkcombobox.c 12 Oct 2006 13:48:07 -0000 1.185 -+++ gtk/gtkcombobox.c 1 Nov 2006 19:01:09 -0000 -@@ -756,6 +756,25 @@ gtk_combo_box_class_init (GtkComboBoxCla +--- gtk/gtkcombobox.c.orig 2007-08-21 11:10:15.000000000 +0000 ++++ gtk/gtkcombobox.c 2007-08-21 11:13:00.000000000 +0000 +@@ -692,6 +692,25 @@ FALSE, GTK_PARAM_READABLE)); @@ -31,26 +28,27 @@ diff -u -p -r1.185 gtkcombobox.c g_type_class_add_private (object_class, sizeof (GtkComboBoxPrivate)); } -@@ -1897,7 +1916,12 @@ gtk_combo_box_size_request (GtkWidget +@@ -1926,8 +1945,13 @@ { - gint width, height; + GtkComboBox *combo_box = GTK_COMBO_BOX (widget); gint focus_width, focus_pad; + gint font_size; + gint arrow_size; - GtkRequisition bin_req; + GtkAllocation child; + GtkRequisition req; + PangoContext *context; + PangoFontMetrics *metrics; + PangoFontDescription *font_desc; + gboolean is_rtl = gtk_widget_get_direction (widget) == GTK_TEXT_DIR_RTL; - GtkComboBox *combo_box = GTK_COMBO_BOX (widget); - -@@ -1910,7 +1934,20 @@ gtk_combo_box_size_request (GtkWidget + widget->allocation = *allocation; +@@ -1935,8 +1959,21 @@ gtk_widget_style_get (GTK_WIDGET (widget), "focus-line-width", &focus_width, "focus-padding", &focus_pad, + "arrow-size", &arrow_size, NULL); -+ + + font_desc = GTK_BIN (widget)->child->style->font_desc; + context = gtk_widget_get_pango_context (widget); + metrics = pango_context_get_metrics (context, font_desc, @@ -62,6 +60,7 @@ diff -u -p -r1.185 gtkcombobox.c + arrow_size = MAX (arrow_size, font_size); + + gtk_widget_set_size_request (combo_box->priv->arrow, arrow_size, arrow_size); - ++ if (!combo_box->priv->tree_view) { + if (combo_box->priv->cell_view) diff --git a/packages/gtk+/gtk+_2.10.14.bb b/packages/gtk+/gtk+_2.10.14.bb index 947cf19077..ef783b01f0 100644 --- a/packages/gtk+/gtk+_2.10.14.bb +++ b/packages/gtk+/gtk+_2.10.14.bb @@ -1,6 +1,6 @@ require gtk-2.10.inc -PR = "r6" +PR = "r7" SRC_URI = "ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-${PV}.tar.bz2 \ file://no-xwc.patch;patch=1 \ diff --git a/packages/less/less-381/configure.patch b/packages/less/less-381/configure.patch deleted file mode 100644 index 2f054ba639..0000000000 --- a/packages/less/less-381/configure.patch +++ /dev/null @@ -1,243 +0,0 @@ - -# -# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher -# - ---- less-381/./configure.ac~configure -+++ less-381/./configure.ac -@@ -9,7 +9,7 @@ - # contact the author, see the README file. - - # Autoconf initialization. --AC_INIT(less, 1) -+AC_INIT([less],[1]) - AC_CONFIG_SRCDIR([forwback.c]) - AC_CONFIG_HEADER([defines.h]) - -@@ -56,8 +56,7 @@ - TERMLIBS="-lxcurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -69,8 +68,7 @@ - TERMLIBS="-lncurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -82,8 +80,7 @@ - TERMLIBS="-lcurses" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -96,8 +93,7 @@ - TERMLIBS="-lcurses -ltermcap" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -111,8 +107,7 @@ - TERMLIBS="-ltermcap" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -124,8 +119,7 @@ - TERMLIBS="-lcurses -ltermlib" - SAVE_LIBS=$LIBS - LIBS="$LIBS $TERMLIBS" -- AC_TRY_LINK(, [tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);], -- [termok=yes], [termok=no]) -+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[tgetent(0,0); tgetflag(0); tgetnum(0); tgetstr(0,0);]])],[termok=yes],[termok=no]) - LIBS=$SAVE_LIBS - if test $termok = no; then TERMLIBS=""; fi - fi -@@ -200,14 +194,11 @@ - # Checks for identifiers. - AC_TYPE_OFF_T - AC_MSG_CHECKING(for void) --AC_TRY_COMPILE(, [void *foo = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_VOID)], [AC_MSG_RESULT(no)]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[void *foo = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_VOID)],[AC_MSG_RESULT(no)]) - AC_MSG_CHECKING(for const) --AC_TRY_COMPILE(, [const int foo = 0;], -- [AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CONST)], [AC_MSG_RESULT(no)]) -+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[const int foo = 0;]])],[AC_MSG_RESULT(yes); AC_DEFINE(HAVE_CONST)],[AC_MSG_RESULT(no)]) - AC_MSG_CHECKING(for time_t) --AC_TRY_COMPILE([#include <time.h>], [time_t t = 0;], -- [AC_MSG_RESULT(yes); A |