Scooping up Patches

new file mode 100644
index 0000000..e4951a8
@@ -0,0 +1,14 @@
+DESCRIPTION = "JSON-C - A JSON implementation in C"
+HOMEPAGE = "http://oss.metaparadigm.com/json-c/"
+
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://COPYING;md5=30a276a476b02c2dcd0849bde417fb17"
+
+SRC_URI = "http://oss.metaparadigm.com/json-c/json-c-${PV}.tar.gz"
+SRC_URI[md5sum] = "3a13d264528dcbaf3931b0cede24abae"
+SRC_URI[sha256sum] = "702a486c9bf8e19137d484ab5c49b4ad314eb5e1fe37062a72c0a0fa39439475"
+
+S = "${WORKDIR}/json-c-${PV}"
+
+
+inherit autotools

index 79c6e14..6f5f1c0 100644
@@ -46,4 +46,5 @@ NO32LIBS ??= "1"
 
 # Default to emitting logfiles if a build fails.
 BBINCLUDELOGS ??= "yes"
-
+SDK_VERSION ??= "oe-core.0"
+DISTRO_VERSION ??= "oe-core.0"

index c936a27..5fb6cd3 100644
@@ -104,7 +104,7 @@ toolchain_create_sdk_env_script_for_installer () {
 #we get the cached site config in the runtime
 TOOLCHAIN_CONFIGSITE_NOCACHE := "${@siteinfo_get_files(d, True)}"
 TOOLCHAIN_CONFIGSITE_SYSROOTCACHE := "${STAGING_DATADIR}/${TARGET_SYS}_config_site.d"
-TOOLCHAIN_NEED_CONFIGSITE_CACHE = "eglibc ncurses"
+TOOLCHAIN_NEED_CONFIGSITE_CACHE = "ncurses"
 
 #This function create a site config file
 toolchain_create_sdk_siteconfig () {

@@ -112,7 +112,9 @@ toolchain_create_sdk_siteconfig () {
 
 	rm -f $siteconfig
 	touch $siteconfig
-
+	if [ "${LIBC}" = "eglibc" ]; then
+		TOOLCHAIN_NEED_CONFIGSITE_CACHE = "${TOOLCHAIN_NEED_CONFIGSITE_CACHE} eglibc"
+	fi
 	for sitefile in ${TOOLCHAIN_CONFIGSITE_NOCACHE} ; do
 		cat $sitefile >> $siteconfig
 	done

@@ -140,5 +142,7 @@ python __anonymous () {
     deps = d.getVarFlag('do_configure', 'depends') or ""
     for dep in (d.getVar('TOOLCHAIN_NEED_CONFIGSITE_CACHE', True) or "").split():
         deps += " %s:do_populate_sysroot" % dep
+    if d.getVar('TCLIBC', True) is "uclibc":
+	deps += "uclibc:do_populate_sysroot"
     d.setVarFlag('do_configure', 'depends', deps)
 }

new file mode 100644
index 0000000..435e74e
@@ -0,0 +1,27 @@
+From: Scott Anderson <[email protected]>
+Subject: ipkg-utils: Make arfile.py handle six digit UIDs
+    
+    Essentially, the problem is that arfile.py is splitting the ar header with
+    white-space instead of fixed-width fields, so two fields would get treated
+    as a single field.  This makes things better than before as it now honors
+    the fixed field widths.
+    
+Upsteam-status: Pending (there is no upstream after openmoko imploded)
+
+--- ipkg-utils/arfile.py.orig	2010-09-29 13:38:15.000000000 -0700
++++ ipkg-utils/arfile.py	2010-10-01 16:06:00.000000000 -0700
+@@ -74,7 +74,12 @@
+             if l == "\n":
+                 l = self.f.readline()
+                 if not l: break
+             l = l.replace('`', '')
+-            descriptor = l.split()
++            # Field lengths from /usr/include/ar.h:
++            ar_field_lens = [ 16, 12, 6, 6, 8, 10, 2 ]
++            descriptor = []
++            for field_len in ar_field_lens:
++                descriptor.append(l[:field_len].strip())
++                l = l[field_len:]
+ #            print descriptor
+             size = int(descriptor[5])
+             memberName = descriptor[0][:-1]

index e04b74a..9b94aff 100644
@@ -8,12 +8,13 @@ RDEPENDS_${PN} = "python"
 RDEPENDS_${PN}_virtclass-native = ""
 SRCREV = "4747"
 PV = "0.1.8+svnr${SRCPV}"
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/host/;module=opkg-utils;proto=http \
            file://index-ignore-filenotfound.patch \
            file://mtime-int.patch \
            file://add-license-field.patch \
+           file://arfile_header_split.patch \
            "
 
 S = "${WORKDIR}/opkg-utils"

index 90ff005..a86bc0c 100644
@@ -1,7 +1,6 @@
 #
 # Default preferred versions
 #
-PREFERRED_VERSION_pulseaudio ?= "0.9.23"
 
 # Force the python versions in one place
 PYTHON_BASEVERSION ?= "2.7"

61 lines not on this page · raw message

deleted file mode 100644
index 86e3972..0000000
@@ -1,17 +0,0 @@
-Derived from OE by Dongxiao Xu <[email protected]>
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: pulseaudio-0.9.15/configure.ac
-===================================================================
---- pulseaudio-0.9.15.orig/configure.ac	2009-04-14 00:09:53.000000000 +0100
-+++ pulseaudio-0.9.15/configure.ac	2009-05-22 11:32:50.000000000 +0100
-@@ -20,7 +20,7 @@
- # along with PulseAudio; if not, write to the Free Software Foundation,
- # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- 
--AC_PREREQ(2.63)
-+AC_PREREQ(2.61)
- 
- m4_define(pa_major, [0])
- m4_define(pa_minor, [9])

deleted file mode 100644
index 99ceff8..0000000
@@ -1,17 +0,0 @@
-Derived from OE by Dongxiao Xu <[email protected]>
-
-Upstream-Status: Pending
-
-Index: pulseaudio-0.9.11/src/pulsecore/atomic.h
-===================================================================
---- pulseaudio-0.9.11.orig/src/pulsecore/atomic.h
-+++ pulseaudio-0.9.11/src/pulsecore/atomic.h
-@@ -40,6 +40,8 @@
- #error "Please include config.h before including this file!"
- #endif
- 
-+#include "macro.h"
-+
- #ifdef HAVE_ATOMIC_BUILTINS
- 
- /* __sync based implementation */

deleted file mode 100644
index d4a247a..0000000
@@ -1,33 +0,0 @@
-Derived from OE by Dongxiao Xu <[email protected]>
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: pulseaudio-0.9.19/configure.ac
-===================================================================
---- pulseaudio-0.9.19.orig/configure.ac	2009-10-31 11:40:00.000000000 +0000
-+++ pulseaudio-0.9.19/configure.ac	2009-10-31 11:50:35.000000000 +0000
-@@ -27,12 +27,13 @@
- AC_CONFIG_SRCDIR([src/daemon/main.c])
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_HEADERS([config.h])
--AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax])
-+AM_INIT_AUTOMAKE([foreign 1.10 -Wall -Wno-portability tar-pax])
- 
- m4_define(pa_major, `echo $VERSION | cut -d. -f1 | cut -d- -f1`)
- m4_define(pa_minor, `echo $VERSION | cut -d. -f2 | cut -d- -f1`)
- m4_define(pa_micro, `echo $VERSION | cut -d. -f3 | cut -d- -f1`)
- 
-+
- AC_SUBST(PA_MAJOR, pa_major)
- AC_SUBST(PA_MINOR, pa_minor)
- AC_SUBST(PA_MICRO, pa_micro)
-@@ -80,7 +81,8 @@
-       ;;
- esac
- 
--AM_SILENT_RULES([yes])
-+# only use if available
-+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- 
- #### Checks for programs. ####
- 

deleted file mode 100644
index f8b07ea..0000000
@@ -1,22 +0,0 @@
-| fix for more strict syntax compliance in gcc4.x
-| pulsecore/core-util.c: In function 'pa_raise_priority':
-| pulsecore/core-util.c:547: error: label at end of compound statement
-| Signed off: [email protected]
-|
-Derived from OE by Dongxiao Xu <[email protected]>
-
-Upstream-Status: Pending
-
-Index: pulseaudio-0.9.6/src/pulsecore/core-util.c
-===================================================================
---- pulseaudio-0.9.6.orig/src/pulsecore/core-util.c
-+++ pulseaudio-0.9.6/src/pulsecore/core-util.c
-@@ -535,7 +535,7 @@ void pa_raise_priority(void) {
-         pa_log_info("Successfully gained high priority class.");
- #endif
- 
--fail:
-+fail:;
- 
- #if defined(HAVE_SYS_CAPABILITY_H)
-     if (caps) {

deleted file mode 100644
index bae0a25..0000000
@@ -1,34 +0,0 @@
-Derived from OE by Dongxiao Xu <[email protected]>
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: pulseaudio-0.9.15/m4/tls.m4
-===================================================================
---- pulseaudio-0.9.15.orig/m4/tls.m4	2008-08-19 23:25:02.000000000 +0200
-+++ pulseaudio-0.9.15/m4/tls.m4	2009-07-10 09:55:25.266365511 +0200
-@@ -1,12 +1,19 @@
- AC_DEFUN([CC_CHECK_TLS], [
-   AC_CACHE_CHECK([whether $CC knows __thread for Thread-Local Storage],
-     cc_cv_tls___thread,
--    [AC_COMPILE_IFELSE(
--      AC_LANG_PROGRAM(
--        [[static __thread int a = 6;]],
--        [[a = 5;]]),
--      [cc_cv_tls___thread=yes],
--      [cc_cv_tls___thread=no])
-+    [AC_LINK_IFELSE([__thread int a; int b; int main() { return a = b; }],
-+	 [chktls_save_LDFLAGS="$LDFLAGS"
-+	  LDFLAGS="-shared -Wl,--no-undefined $LDFLAGS"
-+	  chktls_save_CFLAGS="$CFLAGS"
-+	  CFLAGS="-fPIC $CFLAGS"
-+	  dnl If -shared works, test if TLS works in a shared library.
-+	  AC_LINK_IFELSE([int f() { return 0; }],
-+	    AC_LINK_IFELSE([__thread int a; int b; int f() { return a = b; }],
-+	      [cc_cv_tls___thread=yes],
-+	      [cc_cv_tls___thread=no]),
-+	    [cc_cv_tls___thread=yes])
-+	  CFLAGS="$chktls_save_CFLAGS"
-+	  LDFLAGS="$chktls_save_LDFLAGS"], [cc_cv_tls___thread=no])
-     ])
-   
-   AS_IF([test "x$cc_cv_tls___thread" = "xyes"],

deleted file mode 100644
index 86e3972..0000000
@@ -1,17 +0,0 @@
-Derived from OE by Dongxiao Xu <[email protected]>
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: pulseaudio-0.9.15/configure.ac
-===================================================================
---- pulseaudio-0.9.15.orig/configure.ac	2009-04-14 00:09:53.000000000 +0100
-+++ pulseaudio-0.9.15/configure.ac	2009-05-22 11:32:50.000000000 +0100
-@@ -20,7 +20,7 @@
- # along with PulseAudio; if not, write to the Free Software Foundation,
- # Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- 
--AC_PREREQ(2.63)
-+AC_PREREQ(2.61)
- 
- m4_define(pa_major, [0])
- m4_define(pa_minor, [9])

deleted file mode 100644
index 99ceff8..0000000
@@ -1,17 +0,0 @@
-Derived from OE by Dongxiao Xu <[email protected]>
-
-Upstream-Status: Pending
-
-Index: pulseaudio-0.9.11/src/pulsecore/atomic.h
-===================================================================
---- pulseaudio-0.9.11.orig/src/pulsecore/atomic.h
-+++ pulseaudio-0.9.11/src/pulsecore/atomic.h
-@@ -40,6 +40,8 @@
- #error "Please include config.h before including this file!"
- #endif
- 
-+#include "macro.h"
-+
- #ifdef HAVE_ATOMIC_BUILTINS
- 
- /* __sync based implementation */

deleted file mode 100644
index d4a247a..0000000
@@ -1,33 +0,0 @@
-Derived from OE by Dongxiao Xu <[email protected]>
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: pulseaudio-0.9.19/configure.ac
-===================================================================
---- pulseaudio-0.9.19.orig/configure.ac	2009-10-31 11:40:00.000000000 +0000
-+++ pulseaudio-0.9.19/configure.ac	2009-10-31 11:50:35.000000000 +0000
-@@ -27,12 +27,13 @@
- AC_CONFIG_SRCDIR([src/daemon/main.c])
- AC_CONFIG_MACRO_DIR([m4])
- AC_CONFIG_HEADERS([config.h])
--AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability silent-rules tar-pax])
-+AM_INIT_AUTOMAKE([foreign 1.10 -Wall -Wno-portability tar-pax])
- 
- m4_define(pa_major, `echo $VERSION | cut -d. -f1 | cut -d- -f1`)
- m4_define(pa_minor, `echo $VERSION | cut -d. -f2 | cut -d- -f1`)
- m4_define(pa_micro, `echo $VERSION | cut -d. -f3 | cut -d- -f1`)
- 
-+
- AC_SUBST(PA_MAJOR, pa_major)
- AC_SUBST(PA_MINOR, pa_minor)
- AC_SUBST(PA_MICRO, pa_micro)
-@@ -80,7 +81,8 @@
-       ;;
- esac
- 
--AM_SILENT_RULES([yes])
-+# only use if available
-+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
- 
- #### Checks for programs. ####
- 

deleted file mode 100644
index fbb22d7..0000000
@@ -1,26 +0,0 @@
-using uClibc $(INTLLIBS) is not empty but set to -lintl
-this means that AM_LIBADD wont be empty as well and hence
-a missing space which otherwise works starts to show up as error
-
-| make[4]: *** No rule to make target `-lintl', needed by `libbluetooth-ipc.la'.  Stop.
-| make[4]: Leaving directory `/home/kraj/work/angstrom/sources/openembedded-core/build/tmp-uclibc/work/armv5te-oe-linux-uclibceabi/pulseaudio-0.9.23-r7/pulseaudio-0.9.23/src'
-| make[3]: *** [all-recursive] Error 1
-
-We add missing space
-
-Signed-off-by: Khem Raj <[email protected]>
-
-Upstream-Status: Pending
-Index: pulseaudio-0.9.23/src/Makefile.am
-===================================================================
---- pulseaudio-0.9.23.orig/src/Makefile.am	2011-06-23 13:18:54.000000000 -0700
-+++ pulseaudio-0.9.23/src/Makefile.am	2011-11-20 09:04:00.986917207 -0800
-@@ -1701,7 +1701,7 @@
- 
- libbluetooth_ipc_la_SOURCES = modules/bluetooth/ipc.c modules/bluetooth/ipc.h
- libbluetooth_ipc_la_LDFLAGS = -avoid-version
--libbluetooth_ipc_la_LIBADD = $(AM_LIBADD)libpulsecore-@[email protected] libpulsecommon-@[email protected] libpulse.la
-+libbluetooth_ipc_la_LIBADD = $(AM_LIBADD) libpulsecore-@[email protected] libpulsecommon-@[email protected] libpulse.la
- libbluetooth_ipc_la_CFLAGS = $(AM_CFLAGS)
- BLUETOOTH_IPC_FILES = $(subst modules/bluetooth/,,$(libbluetooth_ipc_la_SOURCES)) rtp.h
- 

deleted file mode 100644
index f8b07ea..0000000
@@ -1,22 +0,0 @@
-| fix for more strict syntax compliance in gcc4.x
-| pulsecore/core-util.c: In function 'pa_raise_priority':
-| pulsecore/core-util.c:547: error: label at end of compound statement
-| Signed off: [email protected]
-|
-Derived from OE by Dongxiao Xu <[email protected]>
-
-Upstream-Status: Pending
-
-Index: pulseaudio-0.9.6/src/pulsecore/core-util.c
-===================================================================
---- pulseaudio-0.9.6.orig/src/pulsecore/core-util.c
-+++ pulseaudio-0.9.6/src/pulsecore/core-util.c
-@@ -535,7 +535,7 @@ void pa_raise_priority(void) {
-         pa_log_info("Successfully gained high priority class.");
- #endif
- 
--fail:
-+fail:;
- 
- #if defined(HAVE_SYS_CAPABILITY_H)
-     if (caps) {

deleted file mode 100644
index bae0a25..0000000
@@ -1,34 +0,0 @@
-Derived from OE by Dongxiao Xu <[email protected]>
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: pulseaudio-0.9.15/m4/tls.m4
-===================================================================
---- pulseaudio-0.9.15.orig/m4/tls.m4	2008-08-19 23:25:02.000000000 +0200
-+++ pulseaudio-0.9.15/m4/tls.m4	2009-07-10 09:55:25.266365511 +0200
-@@ -1,12 +1,19 @@
- AC_DEFUN([CC_CHECK_TLS], [
-   AC_CACHE_CHECK([whether $CC knows __thread for Thread-Local Storage],
-     cc_cv_tls___thread,
--    [AC_COMPILE_IFELSE(
--      AC_LANG_PROGRAM(
--        [[static __thread int a = 6;]],
--        [[a = 5;]]),
--      [cc_cv_tls___thread=yes],
--      [cc_cv_tls___thread=no])
-+    [AC_LINK_IFELSE([__thread int a; int b; int main() { return a = b; }],
-+	 [chktls_save_LDFLAGS="$LDFLAGS"
-+	  LDFLAGS="-shared -Wl,--no-undefined $LDFLAGS"
-+	  chktls_save_CFLAGS="$CFLAGS"
-+	  CFLAGS="-fPIC $CFLAGS"
-+	  dnl If -shared works, test if TLS works in a shared library.
-+	  AC_LINK_IFELSE([int f() { return 0; }],
-+	    AC_LINK_IFELSE([__thread int a; int b; int f() { return a = b; }],
-+	      [cc_cv_tls___thread=yes],
-+	      [cc_cv_tls___thread=no]),
-+	    [cc_cv_tls___thread=yes])
-+	  CFLAGS="$chktls_save_CFLAGS"
-+	  LDFLAGS="$chktls_save_LDFLAGS"], [cc_cv_tls___thread=no])
-     ])
-   
-   AS_IF([test "x$cc_cv_tls___thread" = "xyes"],

deleted file mode 100644
index 5b19980..0000000
@@ -1,2 +0,0 @@
-# <type> <owner> <group> <mode> <path> <linksource>
-d pulse pulse 0755 /var/run/pulse none

index 747b650..a94c398 100644
@@ -68,7 +68,7 @@ FILES_libpulse-mainloop-glib = "${libdir}/libpulse-mainloop-glib.so.*"
 				   	 
 FILES_${PN}-dbg += "${libexecdir}/pulse/.debug \
                     ${libdir}/pulse-${PV}/modules/.debug"
-FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala"		    
+FILES_${PN}-dev += "${libdir}/pulse-${PV}/modules/*.la ${datadir}/vala ${libdir}/cmake"		    
 FILES_${PN}-conf = "${sysconfdir}"
 FILES_${PN}-bin = "${bindir}/* \
                    ${sysconfdir}/default/volatiles/volatiles.04_pulse"

similarity index 100%
rename from meta/recipes-multimedia/pulseaudio/pulseaudio-0.9.22/volatiles.04_pulse
rename to meta/recipes-multimedia/pulseaudio/pulseaudio/volatiles.04_pulse

deleted file mode 100644
index 3067365..0000000
@@ -1,24 +0,0 @@
-require pulseaudio.inc
-
-PR = "r7"
-
-DEPENDS += "gdbm speex"
-
-inherit gettext
-
-SRC_URI += "\
-  file://buildfix.patch \
-  file://autoconf_version.patch \
-  file://tls_m4.patch \
-  file://configure_silent_rules.patch \
-  file://armv4+v5asm.patch \
-"
-
-do_compile_prepend() {
-    cd ${S}
-    mkdir -p ${S}/libltdl
-    cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl
-}
-
-SRC_URI[md5sum] = "ca85ab470669b05e100861654cf5eb3c"
-SRC_URI[sha256sum] = "c6019324395117a258c048a6db5e9734551cc2c61dc35b46403ff00d64be55f0"

deleted file mode 100644
index e712cab..0000000
@@ -1,27 +0,0 @@
-require pulseaudio.inc
-
-PR = "r8"
-
-DEPENDS += "gdbm speex libxml-parser-perl-native"
-
-inherit gettext perlnative
-
-SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.gz \
-  file://buildfix.patch \
-  file://autoconf_version.patch \
-  file://tls_m4.patch \
-  file://configure_silent_rules.patch \
-  file://volatiles.04_pulse \
-  file://fix_bluez_build.patch \
-"
-
-SRC_URI[md5sum] = "7391205a337d1e04a9ff38025f684034"
-SRC_URI[sha256sum] = "af3e84c614cb632fd1f57105489fcd5f93f906da1ce5aa9019492212031fba4e"
-
-do_compile_prepend() {
-    cd ${S}
-    mkdir -p ${S}/libltdl
-    cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl
-}
-
-ARM_INSTRUCTION_SET = "arm"

new file mode 100644
index 0000000..d97c932
@@ -0,0 +1,19 @@
+require pulseaudio.inc
+
+DEPENDS += "libjson gdbm speex libxml-parser-perl-native"
+
+inherit gettext perlnative
+
+SRC_URI = "http://freedesktop.org/software/pulseaudio/releases/pulseaudio-${PV}.tar.xz \
+  file://volatiles.04_pulse \
+"
+
+SRC_URI[md5sum] = "17d21df798cee407b769c6355fae397a"
+SRC_URI[sha256sum] = "6fe531136f6ebce2d35872a2d2c914278cdc5dcdd5eea516dc52c81f9001f5ee"
+
+do_compile_prepend() {
+    cd ${S}
+    mkdir -p ${S}/libltdl
+    cp ${STAGING_LIBDIR}/libltdl* ${S}/libltdl
+}
+

index d14bce4..7795914 100644
@@ -45,7 +45,7 @@ LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=2d5025d4aa3495befef8f17206a5b0a1"
 DEPENDS = "bzip2 zlib db openssl elfutils expat libpcre attr acl popt ${extrarpmdeps}"
 extrarpmdeps = "python perl"
 extrarpmdeps_virtclass-native = "file-native"
-PR = "r24"
+PR = "r25"
 
 # rpm2cpio is a shell script, which is part of the rpm src.rpm.  It is needed
 # in order to extract the distribution SRPM into a format we can extract...

@@ -157,6 +157,7 @@ EXTRA_OECONF = "--verbose \
 		--with-build-extlibdep \
 		--with-build-maxextlibdep \
 		--without-valgrind \
+                --without-xz \
 		--disable-openmp \
 		--enable-build-pic \
 		--enable-build-versionscript \

index 982224f..f07907e 100644
@@ -10,7 +10,8 @@ EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \
                 --disable-werror \
                 --disable-nls \
                 --enable-poison-system-directories \
-		${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default', '', d)}"
+                ${@base_contains('DISTRO_FEATURES', 'ld-is-gold', '--enable-gold=default', '', d)} \
+                ${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}"
 
 do_install () {
 	oe_runmake 'DESTDIR=${D}' install

index 58fee85..51e4257 100644
@@ -49,7 +49,8 @@ B = "${S}/build.${HOST_SYS}.${TARGET_SYS}"
 
 EXTRA_OECONF = "--program-prefix=${TARGET_PREFIX} \
                 --enable-install-libbfd \
-                --enable-shared"
+                --enable-shared \
+                ${@base_contains('DISTRO_FEATURES', 'multiarch', '--enable-64-bit-bfd', '', d)}"
 
 EXTRA_OECONF_virtclass-native = "--enable-target=all --enable-64-bit-bfd --enable-install-libbfd"
 

index 69e0213..7ec2f7e 100644
@@ -21,6 +21,16 @@ def get_gcc_mips_plt_setting(bb, d):
         return "--with-mips-plt"
     return ""
 
+def get_gcc_multiarch_setting(bb, d):
+    if 'multiarch' in bb.data.getVar('DISTRO_FEATURES',d,1).split() :
+        if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'i586', 'i686' ] :
+            return "--enable-targets=all"
+        if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'powerpc' ] :
+            return "--enable-targets=powerpc64"
+        if bb.data.getVar('TARGET_ARCH', d, 1) in [ 'sparc' ] :
+            return "--enable-targets=all"
+    return ""
+
 # We really need HOST_SYS here for some packages and TARGET_SYS for others.
 # For now, libgcc is most important so we fix for that - RP.
 SHLIBSDIR = "${STAGING_DIR_TARGET}/shlibs"

index ae23e8e..d014980 100644
@@ -42,7 +42,8 @@ EXTRA_OECONF = "${@['--enable-clocale=generic', ''][d.getVar('USE_NLS', 1) != 'n
                 ${EXTRA_OECONF_BASE} \
                 ${EXTRA_OECONF_FPU} \
                 ${EXTRA_OECONF_PATHS} \
-                ${@get_gcc_mips_plt_setting(bb, d)}"
+                ${@get_gcc_mips_plt_setting(bb, d)} \
+                ${@get_gcc_multiarch_setting(bb, d)}"
 
 # Build uclibc compilers without cxa_atexit support
 EXTRA_OECONF_append_linux               = " --enable-__cxa_atexit"

index 10a9baf..4502829 100644
@@ -1,20 +1,20 @@
-Upstream-Status: Inappropriate [embedded specific]
+Upstream-Status: Pending
 
-# The CC variable,sometimes like:"x86_64-poky-linux-gcc   -m64 --sysroot=/${TMPDIR}/sysroots/qemux86-64", contains option information. 
-# This will lead to wrong compiler name "qemux86-64" rather than "x86_64-poky-linux-gcc" when python finding the compiler name.
+The CC variable,sometimes like:"x86_64-poky-linux-gcc   -m64 --sysroot=/${TMPDIR}/sysroots/qemux86-64", contains option information. 
+This will lead to wrong compiler name "qemux86-64" rather than "x86_64-poky-linux-gcc" when python finding the compiler name.
 
-#Signed-off-by: Mei Lei <[email protected]>
-
-diff --git Python-2.6.6/Lib/distutils/unixccompiler.py Python-2.6.6/Lib/distutils/unixccompiler.py
-index 6d0b84d..aaf49cb 100644
---- Python-2.6.6/Lib/distutils/unixccompiler.py
-+++ Python-2.6.6/Lib/distutils/unixccompiler.py
-@@ -282,7 +282,7 @@ class UnixCCompiler(CCompiler):
+Signed-off-by: Mei Lei <[email protected]>
+Signed-off-by: Khem Raj <[email protected]>
+Index: Python-2.7.2/Lib/distutils/unixccompiler.py
+===================================================================
+--- Python-2.7.2.orig/Lib/distutils/unixccompiler.py	2011-11-24 13:51:10.539998722 -0800
++++ Python-2.7.2/Lib/distutils/unixccompiler.py	2011-11-24 15:54:36.872137766 -0800
+@@ -282,7 +282,7 @@
          # this time, there's no way to determine this information from
          # the configuration data stored in the Python installation, so
          # we use this hack.
 -        compiler = os.path.basename(sysconfig.get_config_var("CC"))
-+        compiler = os.path.basename(sysconfig.get_config_var("CC").split()[0])
++        compiler = sysconfig.get_config_var("CC")
          if sys.platform[:6] == "darwin":
              # MacOSX's linker doesn't understand the -R flag at all
              return "-L" + dir

index 6b90d5b..d036eca 100644
@@ -1,6 +1,6 @@
 require python.inc
 DEPENDS = "openssl-native bzip2-full-native zlib-native readline-native sqlite3-native"
-PR = "${INC_PR}.0"
+PR = "${INC_PR}.1"
 
 SRC_URI += "file://04-default-is-optimized.patch \
            file://05-enable-ctypes-cross-build.patch \

index 84a986e..b95578c 100644
@@ -4657,9 +4657,15 @@ RECIPE_MAINTAINER_pn-libx11 = "Dexuan Cui <[email protected]>"
 
 RECIPE_STATUS_pn-libx11-diet = "green"
 DISTRO_PN_ALIAS_pn-libx11-diet = "Debian=libx11-6 Fedora=libX11 Ubuntu=libx11-6 OpenSuSE=xorg-x11-libX11"
+RECIPE_LATEST_VERSION_pn-libx11-diet = "1.4.4"
+RECIPE_LATEST_RELEASE_DATE_pn-libx11-diet = "Jul 28,2011"
+RECIPE_LAST_UPDATE_pn-libx11-diet = " Nov 22, 2011"
 RECIPE_MAINTAINER_pn-libx11-diet = "Xiaofeng Yan <[email protected]>"
 
-RECIPE_STATUS_pn-directfb = "red"
+RECIPE_STATUS_pn-directfb = "green"
+RECIPE_LATEST_VERSION_pn-directfb = "1.5.3"
+RECIPE_LATEST_RELEASE_DATE_pn-direcfb = "Aug 9,2011"
+RECIPE_LAST_UPDATE_pn-directfb = "Nov 7, 2011"
 RECIPE_MAINTAINER_pn-directfb = "Xiaofeng Yan <[email protected]>"
 
 RECIPE_STATUS_pn-libarchive  = "green"

@@ -4671,8 +4677,11 @@ RECIPE_MAINTAINER_pn-libarchive  = "Xiaofeng Yan <[email protected]>"
 RECIPE_STATUS_pn-xserver-kdrive  = "red"
 RECIPE_MAINTAINER_pn-xserver-kdrive  = "Xiaofeng Yan <[email protected]>"
 
-RECIPE_STATUS_pn-xserver-xf86-lite  = "red"
-RECIPE_MAINTAINER_pn-xserver-xf86-lite  = "Xiaofeng Yan <[email protected]>"
+RECIPE_STATUS_pn-xserver-xorg-lite  = "green"
+RECIPE_LATEST_VERSION_pn-xserver-xorg-lite = "1.11.1"
+RECIPE_LATEST_RELEASE_DATE_pn-xserver-xorg-lite = "Sept 24, 2011"
+RECIPE_LAST_UPDATE_pn-xserver-xorg-lite = " Sep 30,2011"
+RECIPE_MAINTAINER_pn-xserver-xorg-lite  = "Xiaofeng Yan <[email protected]>"
 
 RECIPE_STATUS_pn-libx11-trim = "green"
 DISTRO_PN_ALIAS_pn-libx11-trim = "Debian=libx11-6 Fedora=libX11 Ubuntu=libx11-6 OpenSuSE=xorg-x11-libX11"

index d84b1b3..84a986e 100644
@@ -425,7 +425,7 @@ RECIPE_INTEL_SECTION_pn-readline = "base libs"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-readline = "11 months"
 RECIPE_LATEST_RELEASE_DATE_pn-readline = "Feb 13, 2011"
 RECIPE_COMMENTS_pn-readline = ""
-RECIPE_MANUAL_CHECK_DATE_pn-readline = "Sep 27, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-readline = "Nov 23, 2011"
 
 RECIPE_STATUS_pn-libgcrypt = "green"
 RECIPE_LATEST_VERSION_pn-libgcrypt = "1.5.0"

@@ -437,6 +437,7 @@ RECIPE_PATCH_pn-libgcrypt+add-pkgconfig-support = "add .pc file"
 RECIPE_INTEL_SECTION_pn-libgcrypt = "base libs"
 RECIPE_TIME_BETWEEN_LAST_TWO_RELEASES_pn-libgcrypt = "11 months"
 RECIPE_COMMENTS_pn-libgcrypt = ""
+RECIPE_MANUAL_CHECK_DATE_pn-libgcrypt = "Nov 23, 2011"
 
 RECIPE_STATUS_pn-gnutls = "yellow"   # need explict pre configure
 RECIPE_LATEST_VERSION_pn-gnutls = "2.12.11"

new file mode 100644
index 0000000..d1bdab9
@@ -0,0 +1,23 @@
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Martin Jansa <[email protected]>
+
+diff -uNr libX11-1.3.6.orig//configure.ac libX11-1.3.6/configure.ac
+--- libX11-1.3.6.orig//configure.ac	2010-09-20 08:04:16.000000000 +0200
++++ libX11-1.3.6/configure.ac	2010-09-28 16:29:26.000000000 +0200
+@@ -355,7 +355,14 @@
+ # Find keysymdef.h
+ #
+ AC_MSG_CHECKING([keysym definitions])
+-KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
++AC_ARG_WITH(keysymdefdir,
++        AC_HELP_STRING([--with-keysymdefdir=DIR], [The location of keysymdef.h]),
++        KEYSYMDEFDIR=$withval, KEYSYMDEFDIR="")
++
++if test x$KEYSYMDEFDIR = x; then
++	KEYSYMDEFDIR=`$PKG_CONFIG --variable=includedir xproto`/X11
++fi
++
+ FILES="keysymdef.h XF86keysym.h Sunkeysym.h DECkeysym.h HPkeysym.h"
+ for i in $FILES; do
+     if test -f "$KEYSYMDEFDIR/$i"; then

45 lines not on this page · raw message

new file mode 100644
index 0000000..9763313
@@ -0,0 +1,29 @@
+Index: libX11-1.3.4/src/util/Makefile.am
+===================================================================
+--- libX11-1.3.4.orig/src/util/Makefile.am
++++ libX11-1.3.4/src/util/Makefile.am
+@@ -1,24 +1 @@
+-
+-noinst_PROGRAMS=makekeys
+-
+-makekeys_CFLAGS = \
+-	$(X11_CFLAGS) \
+-	$(CWARNFLAGS)
+-
+-CC = @CC_FOR_BUILD@
+-CPPFLAGS = @CPPFLAGS_FOR_BUILD@
+-CFLAGS = @CFLAGS_FOR_BUILD@
+-LDFLAGS = @LDFLAGS_FOR_BUILD@
+-
+ EXTRA_DIST = mkks.sh
+-
+-if LINT
+-# Check source code with tools like lint & sparse
+-
+-ALL_LINT_FLAGS=$(LINT_FLAGS) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-		$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS)
+-
+-lint:
+-	$(LINT) $(ALL_LINT_FLAGS) makekeys.c
+-
+-endif LINT

new file mode 100644
index 0000000..7aed308
@@ -0,0 +1,20 @@
+require libx11.inc
+
+DESCRIPTION += " Support for XCMS is disabled in this version."
+
+LICENSE = "MIT & MIT-style & BSD"
+LIC_FILES_CHKSUM = "file://COPYING;md5=172255dee66bb0151435b2d5d709fcf7"
+
+PR = "r0"
+
+DEPENDS += "libxcb xproto xextproto xtrans libxau kbproto inputproto xf86bigfontproto xproto-native"
+
+SRC_URI += "file://x11_disable_makekeys.patch \
+            file://keysymdef_include.patch \
+            file://makekeys_crosscompile.patch"
+
+
+SRC_URI[md5sum] = "f65c9c7ecbfb64c19dbd7927160d63fd"
+SRC_URI[sha256sum] = "88d7238ce5f7cd123450567de7a3b56a43556e4ccc45df38b8324147c889a844"
+
+EXTRA_OECONF += "--with-keysymdef=${STAGING_INCDIR}/X11/ --disable-xcms "

index 31e9822..4adeace 100755
@@ -114,7 +114,7 @@ while [ $i -le $# ]; do
                 usage
             fi
             ;;
-        *-image-*)
+        *-image*)
             if [ -z "$ROOTFS" ]; then
                 if [ -f "$arg" ]; then
                     process_filename $arg

@@ -307,7 +307,7 @@ findimage() {
 
     # Sort rootfs candidates by modification time - the most
     # recently created one is the one we most likely want to boot.
-    filenames=`ls -t $where/*core-image*$machine.$extension 2>/dev/null | xargs`
+    filenames=`ls -t $where/*-image*$machine.$extension 2>/dev/null | xargs`
     for name in $filenames; do
         if [[ "$name" =~ core-image-sato-sdk ||
               "$name" =~ core-image-sato     ||

index 2c5bb0a..8b0808d 100644
@@ -3,7 +3,7 @@ SRC_URI += "file://crosscompile.patch"
 # Misc build failure for master HEAD
 SRC_URI += "file://fix_open_max_preprocessor_error.patch"
 
-PR = "r1"
+PR = "r2"
 
 SRC_URI[md5sum] = "4cdf54dc569b6a5548257c93a45dcd3d"
 SRC_URI[sha256sum] = "c069c177d9a80bca2ee1d49aa1af6d9f996c83e4ff12393cab2ca3f8817276f6"

index 2559397..c1a552e 100644
@@ -100,7 +100,6 @@ EXTRA_OECONF += "--with-fop=no \
                  --disable-acfb \
                  --disable-ccfb \
                  --disable-mcfb \
-                 --disable-dga \
                  --disable-xinerama \
                  --disable-xf86misc \
                  --disable-xorgcfg \

index be84e9e..57615f5 100644
@@ -3,4 +3,5 @@ require xserver-xorg-common.inc
 EXTRA_OECONF += "\
                  --disable-dri \
                  --disable-glx \
+                 --disable-dga \
 "

index 7d729b4..3a90121 100644
@@ -51,3 +51,8 @@ FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
 
 FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
 FILES_libegl-dbg += "${libdir}/egl/.debug/*"
+
+do_install_append () {
+    install -d ${D}/${includedir}/GL
+    cp -pPr ${S}/include/GL/internal* ${D}/${includedir}/GL
+}

index 1d9c894..7d729b4 100644
@@ -38,7 +38,16 @@ EXTRA_OECONF = "--enable-glu \
 # Multiple virtual/gl providers being built breaks staging
 EXCLUDE_FROM_WORLD = "1"
 
-PACKAGES =+ "libglu libglu-dev"
-
+PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
+FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
+FILES_libgl = "${libdir}/libGL.so.*"
 FILES_libglu = "${libdir}/libGLU.so.*"
+FILES_libosmesa = "${libdir}/libOSMesa.so.*"
+
+FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
+FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL"
 FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h"
+FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
+
+FILES_${PN}-dbg += "${libdir}/dri/.debug/*"
+FILES_libegl-dbg += "${libdir}/egl/.debug/*"

index b8ccff0..a23a5d5 100644
@@ -1,16 +1,17 @@
 DESCRIPTION = "tzcode, timezone zoneinfo utils -- zic, zdump, tzselect"
 LICENSE = "PD"
-PR = "r0"
+PR = "r1"
 
 LIC_FILES_CHKSUM = "file://${WORKDIR}/README;md5=3ae8198f82258417ce29066d3b034035"
 
-SRC_URI =" http://www.iana.org/time-zones/repository/releases/tzcode${PV}.tar.gz;name=tzcode \
-           http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata"
+SRC_URI =" ftp://ftp.iana.org/tz/releases/tzcode${PV}.tar.gz;name=tzcode \
+           ftp://ftp.iana.org/tz/releases/tzdata2011n.tar.gz;name=tzdata"
 
 SRC_URI[tzcode.md5sum] = "cf7f4335b7c8682899fa2814e711c1b2"
 SRC_URI[tzcode.sha256sum] = "f0dd991de3f8d6c599c104e294377c9befa1ef40aa5a1d09e2e295a453f3c1ec"
-SRC_URI[tzdata.md5sum] = "c7a86ec34f30f8d6aa77ef94902a3047"
-SRC_URI[tzdata.sha256sum] = "f8dde7ca5e61f21ac34c8cdbef5568d00c829981211098f059d8104964c81ffa"
+SRC_URI[tzdata.md5sum] = "20dbfb28efa008ddbf6dd34601ea40fa"
+SRC_URI[tzdata.sha256sum] = "a343e542486b2b8ebdeca474eed79f1c04f69420ca943c2b9bdea1d2385e38cd"
+
 
 S = "${WORKDIR}"
 

similarity index 96%
rename from meta/recipes-extended/tzdata/tzdata_2011l.bb
rename to meta/recipes-extended/tzdata/tzdata_2011n.bb
index 140f8ed..de9281a 100644
@@ -12,10 +12,10 @@ RCONFLICTS= "timezones timezone-africa timezone-america timezone-antarctica \
              timezone-australia timezone-europe timezone-indian \
              timezone-iso3166.tab timezone-pacific timezone-zone.tab"
 
-SRC_URI = "http://www.iana.org/time-zones/repository/releases/tzdata${PV}.tar.gz;name=tzdata"
+SRC_URI = "ftp://ftp.iana.org/tz/releases/tzdata${PV}.tar.gz;name=tzdata"
 
-SRC_URI[tzdata.md5sum] = "bae1b93673e1aef80186c90dfd493f1c"
-SRC_URI[tzdata.sha256sum] = "cb9fec68a19c9c3b900bb71f3ca20d0051a863f765387b52fc2d144a5bbb0c7d"
+SRC_URI[tzdata.md5sum] = "20dbfb28efa008ddbf6dd34601ea40fa"
+SRC_URI[tzdata.sha256sum] = "a343e542486b2b8ebdeca474eed79f1c04f69420ca943c2b9bdea1d2385e38cd"
 
 S = "${WORKDIR}"
 

new file mode 100644
index 0000000..476d091
@@ -0,0 +1,29 @@
+Index: intltool-0.40.6/intltool.m4
+===================================================================
+--- intltool-0.40.6.orig/intltool.m4	2009-02-14 14:12:28.000000000 -0800
++++ intltool-0.40.6/intltool.m4	2011-11-23 15:39:34.689561872 -0800
+@@ -122,14 +122,16 @@
+    IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+    AC_MSG_RESULT([$IT_PERL_VERSION])
+ fi
+-if test "x$2" != "xno-xml"; then
+-   AC_MSG_CHECKING([for XML::Parser])
+-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+-       AC_MSG_RESULT([ok])
+-   else
+-       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+-   fi
+-fi
++
++# Disable this check since we know XML::Parser is installed
++#if test "x$2" != "xno-xml"; then
++#   AC_MSG_CHECKING([for XML::Parser])
++#   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
++#       AC_MSG_RESULT([ok])
++#   else
++#       AC_MSG_ERROR([XML::Parser perl module is required for intltool])
++#   fi
++#fi
+ 
+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
+ AC_SUBST(ALL_LINGUAS)

index e9871fc..c820f11 100644
@@ -1,14 +1,19 @@
 require intltool.inc
 LICENSE="GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r5"
+PR = "r6"
 
 SRC_URI_append = " file://intltool-nowarn-0.40.0.patch \
                    ${NATIVEPATCHES} \
                  "
 
-NATIVEPATCHES = "file://noperlcheck.patch"
-NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch"
+#
+# All of the intltool scripts have the correct paths to perl already
+# embedded into them and can find perl fine, so we add the remove xml-check
+# in the intltool.m4 via the remove-xml-check.patch
+NATIVEPATCHES = "file://noperlcheck.patch \
+                 file://remove-xml-check.patch"
+NATIVEPATCHES_virtclass-native = "file://use-nativeperl.patch" 
 
 SRC_URI[md5sum] = "69bc0353323112f42ad4f9cf351bc3e5"
 SRC_URI[sha256sum] = "4d1e5f8561f09c958e303d4faa885079a5e173a61d28437d0013ff5efc9e3b64"

new file mode 100644
index 0000000..c9dc92c
@@ -0,0 +1,36 @@
+Upstream-Status: Inappropriate [embedded specific]
+
+We don't really need to build the doc and manual.
+
+Morever, we get this failure in do_compile:
+help2man: can't get `--help' info from hostname.td/hostname
+
+This is because help2man tries to invoke "hostname --help", but in the
+cross-compile case, the target binary may not be execuable on the host.
+
+Signed-off-by: Dexuan Cui <[email protected]>
+
+diff -Nru coreutils-8.14/Makefile.am coreutils-8.14/Makefile.am
+--- coreutils-8.14.orig/Makefile.am	2011-10-10 15:30:55.000000000 +0800
++++ coreutils-8.14/Makefile.am	2011-11-24 17:29:26.398593744 +0800
+@@ -17,7 +17,7 @@
+ 
+ ALL_RECURSIVE_TARGETS =
+ 
+-SUBDIRS = lib src doc man po tests gnulib-tests
++SUBDIRS = lib src po tests gnulib-tests
+ 
+ changelog_etc =				\
+   ChangeLog-2005			\
+diff -Nru coreutils-8.14.orig/Makefile.in coreutils-8.14/Makefile.in
+--- coreutils-8.14.orig/Makefile.in	2011-10-12 17:21:46.000000000 +0800
++++ coreutils-8.14/Makefile.in	2011-11-24 17:29:14.868593748 +0800
+@@ -1453,7 +1453,7 @@
+ 
+ # Some tests always need root privileges, others need them only sometimes.
+ ALL_RECURSIVE_TARGETS = install-root check-root distcheck-hook
+-SUBDIRS = lib src doc man po tests gnulib-tests
++SUBDIRS = lib src po tests gnulib-tests
+ changelog_etc = \
+   ChangeLog-2005			\
+   ChangeLog-2006			\

index 01face0..ec41fe2 100644
@@ -7,7 +7,7 @@ BUGTRACKER = "http://debbugs.gnu.org/coreutils"
 LICENSE = "GPLv3+"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504\
                     file://src/ls.c;startline=5;endline=16;md5=e1a509558876db58fb6667ba140137ad"
-PR = "r1"
+PR = "r2"
 DEPENDS = "gmp"
 DEPENDS_virtclass-native = ""
 

@@ -15,10 +15,13 @@ inherit autotools gettext
 
 SRC_URI = "${GNU_MIRROR}/coreutils/${BP}.tar.xz \
            file://remove-usr-local-lib-from-m4.patch \
+           file://disable_doc_man.patch \
           "
 SRC_URI[md5sum] = "bcb135ce553493a45aba01b39eb3920a"
 SRC_URI[sha256sum] = "0d120817c19292edb19e92ae6b8eac9020e03d51e0af9cb116cf82b65d18b02d"
 
+EXTRA_OECONF += "--enable-install-program=hostname"
+
 EXTRA_OECONF_virtclass-native = "--without-gmp"
 
 # [ gets a special treatment and is not included in this

@@ -29,9 +32,8 @@ bindir_progs = "base64 basename chcon cksum comm csplit cut dir dircolors dirnam
                 sha384sum sha512sum shred shuf sort split stat stdbuf sum tac tail tee test timeout\
                 tr truncate tsort tty unexpand uniq unlink uptime users vdir wc who whoami yes df"
 
-# hostname gets a special treatment and is not included in this
 base_bindir_progs = "cat chgrp chmod chown cp date dd echo false kill ln ls mkdir \
-                     mknod mv pwd rm rmdir sleep stty sync touch true uname"
+                     mknod mv pwd rm rmdir sleep stty sync touch true uname hostname"
 
 sbindir_progs= "chroot"
 

@@ -71,7 +73,6 @@ pkg_prerm_${PN} () {
 	for i in ${sbindir_progs}; do update-alternatives --remove $i $i.${PN}; done
 
 	# The special cases
-	update-alternatives --remove hostname hostname.${PN}
 	update-alternatives --remove uptime uptime.${PN}
 	update-alternatives --remove '[' 'lbracket.${PN}'
 }

new file mode 100644
index 0000000..7ddba9c
@@ -0,0 +1,11 @@
+IMAGE_INSTALL = "task-core-boot task-core-apps-console task-core-ssh-openssh task-self-hosted"
+
+POKY_EXTRA_INSTALL = "\
+    task-self-hosted \
+    "
+
+IMAGE_ROOTFS_EXTRA_SPACE = "1048576"
+
+inherit core-image
+
+PR = "r0"

174 lines not on this page · raw message

index df776c9..c07341e 100644
@@ -2944,9 +2944,9 @@ RECIPE_LAST_UPDATE_pn-sysprof = "Dec 8, 2010"
 RECIPE_MAINTAINER_pn-sysprof = "Tom Zanussi <[email protected]>"
 
 RECIPE_STATUS_pn-binutils="green"
-RECIPE_LATEST_VERSION_pn-binutils="2.21.1a"
-RECIPE_LAST_UPDATE_pn-binutils = "Aug 29, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-binutils = "Aug 29, 2011"
+RECIPE_LATEST_VERSION_pn-binutils="2.22"
+RECIPE_LAST_UPDATE_pn-binutils = "Nov 23, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-binutils = "Nov 23, 2011"
 RECIPE_MAINTAINER_pn-binutils = "Nitin A Kamble <[email protected]>"
 
 RECIPE_STATUS_pn-ldconfig-native = "red"

@@ -3015,8 +3015,8 @@ RECIPE_MAINTAINER_pn-intltool = "Nitin A Kamble <[email protected]>"
 
 RECIPE_STATUS_pn-libtool="green" 
 RECIPE_LATEST_VERSION_pn-libtool="2.4.2"
-RECIPE_LAST_UPDATE_pn-libtool = "Nov 16, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-libtool = "Nov 16, 2011" 
+RECIPE_LAST_UPDATE_pn-libtool = "Nov 28, 2011"
+RECIPE_MANUAL_CHECK_DATE_pn-libtool = "Nov 28, 2011" 
 RECIPE_MAINTAINER_pn-libtool = "Nitin A Kamble <[email protected]>"
 
 RECIPE_STATUS_pn-linux-libc-headers="green" 

index b95578c..df776c9 100644
@@ -5707,10 +5707,10 @@ DISTRO_PN_ALIAS_pn-table = "Intel"
 
 RECIPE_STATUS_pn-eds-tools = "red"
 DISTRO_PN_ALIAS_pn-eds-tools = "OpenedHand"
-RECIPE_LATEST_VERSION_pn-eds-tools = "bzr"
+RECIPE_LATEST_VERSION_pn-eds-tools = "git"
 RECIPE_LAST_UPDATE_pn-eds-tools = "Sep 12, 2007"
-RECIPE_MANUAL_CHECK_DATE_pn-eds-tools = "Nov 08, 2011"
-RECIPE_NO_UPDATE_REASON_pn-eds-tools = "Possibly convert to GIT based fetch"
+RECIPE_MANUAL_CHECK_DATE_pn-eds-tools = "Nov 25, 2011"
+RECIPE_MAINTAINER_pn-eds-tools = "Wenzong Fan <[email protected]>"
 
 RECIPE_STATUS_pn-abiword-embedded = "red"
 DISTRO_PN_ALIAS_pn-abiword-embedded = "Fedora=abiword Ubuntu=abiword"

@@ -6017,11 +6017,12 @@ RECIPE_LATEST_VERSION_pn-mesa-demos = "8.0.1"
 RECIPE_LAST_UPDATE_pn-mesa-demos = "Jul 13, 2010"
 RECIPE_MANUAL_CHECK_DATE_pn-mesa-demos = "Jun 7, 2011" 
 
-RECIPE_STATUS_pn-gettext = "red"
+RECIPE_STATUS_pn-gettext = "green"
 RECIPE_LATEST_VERSION_pn-gettext = "0.18.1.1"
 RECIPE_LATEST_RELEASE_DATE_pn-gettext = "Jun 06, 2010"
 RECIPE_LAST_UPDATE_pn-gettext = "May 24, 2011"
-RECIPE_MANUAL_CHECK_DATE_pn-gettext = "Sep 29, 2011" 
+RECIPE_MANUAL_CHECK_DATE_pn-gettext = "Nov 25, 2011"
+RECIPE_MAINTAINER_pn-gettext = "Wenzong Fan <[email protected]>"
 
 RECIPE_STATUS_pn-pseudo = "green"
 RECIPE_LATEST_VERSION_pn-pseudo = "1.2"

index 4fa6488..6a93968 100644
@@ -3,7 +3,7 @@ DESCRIPTION = "Embedded GLIBC (EGLIBC) is a variant of the GNU C Library (GLIBC)
 HOMEPAGE = "http://www.eglibc.org/home"
 SECTION = "libs"
 LICENSE = "GPLv2 & LGPLv2.1"
-INC_PR = "r11"
+INC_PR = "r12"
 LIC_FILES_CHKSUM ?= "file://LICENSES;md5=07a394b26e0902b9ffdec03765209770 \
       file://COPYING;md5=393a5ca445f6965873eca0259a17f833 \
       file://posix/rxspencer/COPYRIGHT;md5=dc5485bb394a13b2332ec1c785f5d83a \

index 448f73a..f154d64 100644
@@ -48,7 +48,7 @@ do_install () {
 
 	# add links to linux-libc-headers: gcc-{cross,crossdk}-intermediate need this.
 	for t in linux asm asm-generic; do
-		ln -s ${STAGING_DIR_TARGET}${includedir}/$t ${D}${includedir}/
+		cp -ar ${STAGING_DIR_TARGET}${includedir}/$t ${D}${includedir}/
 	done
 }
 

index ed722be..c22e7dc 100644
@@ -18,7 +18,7 @@ PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
 
 GCCVERSION ?= "4.6%"
 SDKGCCVERSION ?= "4.6%"
-BINUVERSION ?= "2.21.1a"
+BINUVERSION ?= "2.22"
 EGLIBCVERSION ?= "2.13"
 UCLIBCVERSION ?= "0.9.32"
 LINUXLIBCVERSION ?= "3.1"

similarity index 86%
rename from meta/recipes-devtools/binutils/binutils-cross-canadian_2.21.1a.bb
rename to meta/recipes-devtools/binutils/binutils-cross-canadian_2.22.bb
index a49aded..7dad2a6 100644
@@ -1,3 +1,3 @@
 require binutils_${PV}.bb
 require binutils-cross-canadian.inc
-PR = "r2"
+PR = "r0"

similarity index 100%
rename from meta/recipes-devtools/binutils/binutils-cross_2.21.1a.bb
rename to meta/recipes-devtools/binutils/binutils-cross_2.22.bb

similarity index 96%
rename from meta/recipes-devtools/binutils/binutils-crosssdk_2.21.1a.bb
rename to meta/recipes-devtools/binutils/binutils-crosssdk_2.22.bb
index 21289cd..0d6efff 100644
@@ -4,7 +4,7 @@ inherit crosssdk
 
 PROVIDES = "virtual/${TARGET_PREFIX}binutils-crosssdk"
 
-PR = "r1"
+PR = "r0"
 
 do_configure_prepend () {
 	sed -i 's#/usr/local/lib /lib /usr/lib#${SDKPATHNATIVE}/lib ${SDKPATHNATIVE}/usr/lib /usr/local/lib /lib /usr/lib#' ${S}/ld/configure.tgt

deleted file mode 100644
index dc49613..0000000
@@ -1,24 +0,0 @@
-Upstream-Status: Pending
-
---- /tmp/configure.ac	2008-06-22 14:14:59.000000000 +0200
-+++ binutils-2.18.50.0.7/configure.ac	2008-06-22 14:15:30.000000000 +0200
-@@ -561,7 +561,7 @@
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-gnueabi | arm*-*-linux-uclibceabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in
---- /tmp/configure	2008-06-22 14:17:11.000000000 +0200
-+++ binutils-2.18.50.0.7/configure	2008-06-22 14:17:56.000000000 +0200
-@@ -2307,7 +2307,7 @@
-     noconfigdirs="$noconfigdirs target-libffi target-qthreads"
-     libgloss_dir=arm
-     ;;
--  arm*-*-linux-gnueabi)
-+  arm*-*-linux-gnueabi | arm*-*-linux-uclibceabi)
-     noconfigdirs="$noconfigdirs target-qthreads"
-     noconfigdirs="$noconfigdirs target-libobjc"
-     case ${with_newlib} in

index 1a640ea..5e6be3a 100644
@@ -6,13 +6,13 @@ Signed-off-by: Sven Rebhan <[email protected]>
 
 Always try to prepend the sysroot prefix to absolute filenames first.
 
-Index: binutils-2.21/ld/ldfile.c
+Index: binutils-2.22/ld/ldfile.c
 ===================================================================
---- binutils-2.21.orig/ld/ldfile.c
-+++ binutils-2.21/ld/ldfile.c
-@@ -372,18 +372,24 @@ ldfile_open_file_search (const char *arc
+--- binutils-2.22.orig/ld/ldfile.c
++++ binutils-2.22/ld/ldfile.c
+@@ -351,18 +351,24 @@ ldfile_open_file_search (const char *arc
       directory first.  */
-   if (! entry->is_archive)
+   if (! entry->maybe_archive)
      {
 -      if (entry->sysrooted && IS_ABSOLUTE_PATH (entry->filename))
 +      /* For absolute pathnames, try to always open the file in the

157 lines not on this page · raw message

101 lines not on this page · raw message

index 3f627c6..b5a25c2 100644
@@ -1,28 +1,32 @@
 Upstream-Status: Pending
 
---- binutils-2.18.orig/configure
-+++ binutils-2.18/configure
-@@ -2206,7 +2206,7 @@
-   am33_2.0-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+Index: binutils-2.22/configure
+===================================================================
+--- binutils-2.22.orig/configure
++++ binutils-2.22/configure
+@@ -3130,7 +3130,7 @@ case "${target}" in
      ;;
--  sh-*-linux*)
-+  sh*-*-linux*)
-     noconfigdirs="$noconfigdirs ${libgcj} target-newlib target-libgloss"
+   s390-*-* | s390x-*-*)
      ;;
-   sh*-*-pe|mips*-*-pe|*arm-wince-pe)
-@@ -2504,7 +2504,7 @@
-   romp-*-*)
-     noconfigdirs="$noconfigdirs bfd binutils ld gas opcodes target-libgloss ${libgcj}"
+-  sh-*-* | sh[34]*-*-*)
++  sh*-*-* | sh[34]*-*-*)
+     ;;
+   sh64-*-* | sh5*-*-*)
+     ;;
+@@ -3570,7 +3570,7 @@ case "${target}" in
+   mips*-*-*)
+     noconfigdirs="$noconfigdirs gprof"
      ;;
 -  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 @@
+     case "${target}" in
+       sh*-*-elf)
+          ;;
+Index: binutils-2.22/gprof/configure
+===================================================================
+--- binutils-2.22.orig/gprof/configure
++++ binutils-2.22/gprof/configure
+@@ -6103,6 +6103,11 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
    lt_cv_deplibs_check_method=pass_all
    ;;
  

index 07312d7..c6e1efc 100644
@@ -27,9 +27,11 @@ exit 0
 Upstream-Status: Inappropriate [debian patch]
 
 @DPATCH@
---- binutils-2.16.91.0.1/ld/Makefile.am
-+++ binutils-2.16.91.0.1/ld/Makefile.am
-@@ -20,7 +20,7 @@
+Index: binutils-2.22/ld/Makefile.am
+===================================================================
+--- binutils-2.22.orig/ld/Makefile.am
++++ binutils-2.22/ld/Makefile.am
+@@ -37,7 +37,7 @@ endif
  # 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.

@@ -38,9 +40,11 @@ Upstream-Status: Inappropriate [debian patch]
  
  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 @@
+Index: binutils-2.22/ld/Makefile.in
+===================================================================
+--- binutils-2.22.orig/ld/Makefile.in
++++ binutils-2.22/ld/Makefile.in
+@@ -366,7 +366,7 @@ AM_CFLAGS = $(WARN_CFLAGS)
  # 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.

index 35835b3..47bd8ff 100644
@@ -25,10 +25,11 @@ exit 0
 Upstream-Status: Inappropriate [debian patch]
 
 @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 @@
+Index: binutils-2.22/bfd/opncls.c
+===================================================================
+--- binutils-2.22.orig/bfd/opncls.c
++++ binutils-2.22/bfd/opncls.c
+@@ -197,6 +197,13 @@ bfd_fopen (const char *filename, const c
  {
    bfd *nbfd;
    const bfd_target *target_vec;

index 3944f2e..d31f80c 100644
@@ -25,11 +25,11 @@ exit 0
 Upstream-Status: Inappropriate [debian patch]
 
 @DPATCH@
-Index: src/ld/emultempl/elf32.em
+Index: binutils-2.22/ld/emultempl/elf32.em
 ===================================================================
---- src.orig/ld/emultempl/elf32.em	2009-09-23 06:54:28.000000000 -0700
-+++ src/ld/emultempl/elf32.em	2009-10-06 10:58:16.883414592 -0700
-@@ -1237,6 +1237,8 @@ fragment <<EOF
+--- binutils-2.22.orig/ld/emultempl/elf32.em
++++ binutils-2.22/ld/emultempl/elf32.em
+@@ -1273,6 +1273,8 @@ fragment <<EOF
  	      && command_line.rpath == NULL)
  	    {
  	      lib_path = (const char *) getenv ("LD_RUN_PATH");

@@ -38,7 +38,7 @@ Index: src/ld/emultempl/elf32.em
  	      if (gld${EMULATION_NAME}_search_needed (lib_path, &n,
  						      force))
  		break;
-@@ -1463,6 +1465,8 @@ gld${EMULATION_NAME}_before_allocation (
+@@ -1500,6 +1502,8 @@ gld${EMULATION_NAME}_before_allocation (
    rpath = command_line.rpath;
    if (rpath == NULL)
      rpath = (const char *) getenv ("LD_RUN_PATH");

@@ -46,4 +46,4 @@ Index: src/ld/emultempl/elf32.em
 +    rpath = NULL;
  
    for (abfd = link_info.input_bfds; abfd; abfd = abfd->link_next)
-     {
+     if (bfd_get_flavour (abfd) == bfd_target_elf_flavour)

index 5831579..3869faf 100644
@@ -19,11 +19,11 @@ floatformat.c:(.text+0x43e): undefined reference to `ldexp'
 collect2: ld returned 1 exit status
 make[4]: *** [as-new] Error 1
 
-Index: binutils-2.17.50/gas/configure.tgt
+Index: binutils-2.22/gas/configure.tgt
 ===================================================================
---- binutils-2.17.50.orig/gas/configure.tgt
-+++ binutils-2.17.50/gas/configure.tgt
-@@ -408,6 +408,12 @@ case ${generic_target} in
+--- binutils-2.22.orig/gas/configure.tgt
++++ binutils-2.22/gas/configure.tgt
+@@ -428,6 +428,12 @@ case ${generic_target} in
    *-*-netware)				fmt=elf em=netware ;;
  esac
  

@@ -34,6 +34,5 @@ Index: binutils-2.17.50/gas/configure.tgt
 +esac
 +
  case ${cpu_type} in
-   alpha | arm | i386 | ia64 | mips | ns32k | pdp11 | ppc | sparc | z80 | z8k)
+   alpha | arm | i386 | ia64 | microblaze | mips | ns32k | pdp11 | ppc | sparc | z80 | z8k)
      bfd_gas=yes
-

index 16c775c..c09578a 100644
@@ -9,11 +9,13 @@
 # Adapted to binutils 2.18.50.0.7
 Upstream-Status: Inappropriate [embedded specific]
 
---- binutils/ld/emulparams/elf_i386.sh
-+++ binutils/ld/emulparams/elf_i386.sh
-@@ -12,3 +12,13 @@
+Index: binutils-2.22/ld/emulparams/elf_i386.sh
+===================================================================
+--- binutils-2.22.orig/ld/emulparams/elf_i386.sh
++++ binutils-2.22/ld/emulparams/elf_i386.sh
+@@ -14,3 +14,13 @@ GENERATE_PIE_SCRIPT=yes
+ NO_SMALL_DATA=yes
  SEPARATE_GOTPLT=12
- SHARABLE_SECTIONS=yes
  IREL_IN_PLT=
 +
 +# Linux modify the default library search path to first include

index 2939011..73d9db2 100644
@@ -11,11 +11,11 @@ binutils.
 Upstream-Status: Pending
 
 Signed-off-by: Khem Raj <[email protected]>
-Index: binutils-2.21.1/gas/config/obj-elf.c
+Index: binutils-2.22/gas/config/obj-elf.c
 ===================================================================
---- binutils-2.21.1.orig/gas/config/obj-elf.c	2011-03-23 07:14:03.000000000 -0700
-+++ binutils-2.21.1/gas/config/obj-elf.c	2011-07-16 19:05:57.003831035 -0700
-@@ -741,10 +741,10 @@
+--- binutils-2.22.orig/gas/config/obj-elf.c
++++ binutils-2.22/gas/config/obj-elf.c
+@@ -741,10 +741,10 @@ obj_elf_change_section (const char *name
  }
  
  static bfd_vma

@@ -28,7 +28,7 @@ Index: binutils-2.21.1/gas/config/obj-elf.c
  
    while (len > 0)
      {
-@@ -775,7 +775,7 @@
+@@ -775,7 +775,7 @@ obj_elf_parse_section_letters (char *str
  	  attr |= SHF_TLS;
  	  break;
  	case '?':

@@ -37,7 +37,7 @@ Index: binutils-2.21.1/gas/config/obj-elf.c
  	  break;
  	/* Compatibility.  */
  	case 'm':
-@@ -978,7 +978,7 @@
+@@ -978,7 +978,7 @@ obj_elf_section (int push)
  
        if (*input_line_pointer == '"')
  	{

@@ -46,7 +46,7 @@ Index: binutils-2.21.1/gas/config/obj-elf.c
  
  	  beg = demand_copy_C_string (&dummy);
  	  if (beg == NULL)
-@@ -986,7 +986,7 @@
+@@ -986,7 +986,7 @@ obj_elf_section (int push)
  	      ignore_rest_of_line ();
  	      return;
  	    }

@@ -55,7 +55,7 @@ Index: binutils-2.21.1/gas/config/obj-elf.c
  
  	  SKIP_WHITESPACE ();
  	  if (*input_line_pointer == ',')
-@@ -1038,10 +1038,10 @@
+@@ -1038,10 +1038,10 @@ obj_elf_section (int push)
  	      attr &= ~SHF_MERGE;
  	    }
  

@@ -68,7 +68,7 @@ Index: binutils-2.21.1/gas/config/obj-elf.c
  	    }
  	  if ((attr & SHF_GROUP) != 0 && *input_line_pointer == ',')
  	    {
-@@ -1063,7 +1063,7 @@
+@@ -1063,7 +1063,7 @@ obj_elf_section (int push)
  	      attr &= ~SHF_GROUP;
  	    }
  

index 3772dfb..6e732fb 100644
@@ -6,11 +6,11 @@ Thanks to RP for helping find the source code causing the issue.
 
 2010/08/13
 Nitin A Kamble <[email protected]>
-Index: binutils-2.20.1/libiberty/Makefile.in
+Index: binutils-2.22/libiberty/Makefile.in
 ===================================================================
---- binutils-2.20.1.orig/libiberty/Makefile.in
-+++ binutils-2.20.1/libiberty/Makefile.in
-@@ -327,7 +327,8 @@ install: install_to_$(INSTALL_DEST) inst
+--- binutils-2.22.orig/libiberty/Makefile.in
++++ binutils-2.22/libiberty/Makefile.in
+@@ -350,7 +350,8 @@ install-strip: install
  # multilib-specific flags, it's overridden by FLAGS_TO_PASS from the
  # default multilib, so we have to take CFLAGS into account as well,
  # since it will be passed the multilib flags.

2,450 lines not on this page · raw message

index 2666d31..4fcffa4 100644

Lines of this file are not shown. View the raw message.

similarity index 84%
rename from meta/recipes-devtools/binutils/binutils_2.21.1a.bb
rename to meta/recipes-devtools/binutils/binutils_2.22.bb
index 2d4ed27..f0ed5e8 100644

Lines of this file are not shown. View the raw message.

index 7d729b4..df035e6 100644
@@ -38,6 +38,9 @@ EXTRA_OECONF = "--enable-glu \
 # Multiple virtual/gl providers being built breaks staging
 EXCLUDE_FROM_WORLD = "1"
 
+# ie mesa-dri could be empty and mesa-dri-dev RDEPENDS on it
+ALLOW_EMPTY_${PN} = "1"
+
 PACKAGES =+ "libegl libegl-dev libegl-dbg libglu libglu-dev libosmesa libosmesa-dev libgl libgl-dev"
 FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
 FILES_libgl = "${libdir}/libGL.so.*"