Skip to contentSkip to conversation

July 22, 2011

GIT PULL Applied Saul Wold 3 participants 19 messages Jul 22, 2011

lore
Share & tools
lore

Saul Wold

author
#0 lore raw

Richard,

This contains more uclibc updates from Khem along with Bruce's 3.0 Updates.

There are a couple of small updates for .gitignore and other recipes.

Thanks
Sau!

The following changes since commit f175e4f28aa835abef8c3d5e2065054416692418:

libiconv: Fix build failure on 1.13.1 (2011-07-21 22:50:06 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage

Bruce Ashfield (4):
linux-yocto: kernel-3.0 support recipe
kernel: copy defconfig to {B} vs {S}
linux-yocto: update LICENSE to GPLv2
kern-tools: update SRCREV

Khem Raj (6):
mesa-xlib, mesa-dri: Probe for newlocale() before using it. task-core-tools.bb: Exclude lttng-ust for x86_64/uclibc
uclibc: Add patch header for sync_file_range2.patch
strace: Define own sigmask macro if not defined already in signal.h
util-linux: Replace sigsetmask with posix compliant functions
tclibc-uclibc: Fix TARGET_OS for powerpc

Kumar Gala (1):
.gitignore: Update build ignores to have wildcard

Mei Lei (1):
dhcp: Fix libdir issue for multilib

Nitin A Kamble (3):
glib-2.0: fix a compilation issue due to dtrace
python: fix security vulnerability
fix Upstream-Status line for few patches

Saul Wold (1):
default-versions: Update pulseaudio as arm no longer needs a seperate
backport

 .gitignore                                         |   12 +-
 meta/classes/kernel-yocto.bbclass                  |    6 -
 meta/classes/kernel.bbclass                        |    4 +-
 meta/conf/distro/include/default-versions.inc      |    4 +-
 meta/conf/distro/include/tclibc-uclibc.inc         |    2 +-
 .../dhcp/dhcp-4.2.0/fix-external-bind.patch        |   14 +-
 meta/recipes-connectivity/dhcp/dhcp4.inc           |    2 +-
 meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb      |    2 +-
 meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb      |    3 +-
 meta/recipes-core/tasks/task-core-tools.bb         |   11 +-
 .../uclibc/uclibc-0.9.32/sync_file_range2.patch    |    7 +
 .../util-linux-2.19.1/remove_sigsetmark.patch      |   35 ++++
 meta/recipes-core/util-linux/util-linux_2.19.1.bb  |    3 +-
 .../btrfs-tools/btrfs-tools/fix_use_of_gcc.patch   |    2 +-
 .../dosfstools/dosfstools-2.10-kernel-2.6.patch    |    2 +-
 .../elfutils/elfutils/fix_for_gcc-4.7.patch        |    2 +-
 meta/recipes-devtools/python/python.inc            |    2 +-
 .../python/python/security_issue_2254_fix.patch    |  184 ++++++++++++++++++++
 meta/recipes-devtools/python/python_2.6.6.bb       |    1 +
 .../strace/strace-4.5.20/sigmask.patch             |   22 +++
 meta/recipes-devtools/strace/strace_4.5.20.bb      |    6 +-
 meta/recipes-graphics/mesa/mesa-dri/uclibc.patch   |   40 +++++
 meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb      |    6 +-
 meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb     |    5 +-
 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 meta/recipes-kernel/linux/linux-yocto.inc          |    2 +-
 meta/recipes-kernel/linux/linux-yocto_3.0.bb       |   47 +++++
 27 files changed, 387 insertions(+), 41 deletions(-)
 create mode 100644 meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch
 create mode 100644 meta/recipes-devtools/python/python/security_issue_2254_fix.patch
 create mode 100644 meta/recipes-devtools/strace/strace-4.5.20/sigmask.patch
 create mode 100644 meta/recipes-graphics/mesa/mesa-dri/uclibc.patch
 create mode 100644 meta/recipes-kernel/linux/linux-yocto_3.0.bb
Signature · 1 line
1.7.3.4
author
#1 lore raw

[CONSOLIDATED PULL 02/16] linux-yocto: kernel-3.0 support recipe

From: Bruce Ashfield <[email protected]>

Establish the infrastructure to start more comprehensive linux-3.0 testing. With this in place, the populated linux-yocto 3.0 can optionally be built for supported machines.

Note: this commit does not change the default for any targets and as such, it would need to be explicitly set as the preferred version to be built. The staged introduction allows some remaining issues to be solved, while making this available. Subsequent commits will be done to switch qemu machines ones they have been validated. If the default for a machine is not this kernel, consider it best effort.

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto_3.0.bb |   47 ++++++++++++++++++++++++++
 1 files changed, 47 insertions(+), 0 deletions(-)
 create mode 100644 meta/recipes-kernel/linux/linux-yocto_3.0.bb
meta/recipes-kernel/linux/linux-yocto_3.0.bb new file +47 -0
new file mode 100644
index 0000000..342993f
@@ -0,0 +1,47 @@
+inherit kernel
+require recipes-kernel/linux/linux-yocto.inc
+
+KMACHINE = "yocto/standard/base"
+KMACHINE_qemux86  = "yocto/standard/common-pc/base"
+KMACHINE_qemux86-64  = "yocto/standard/common-pc-64/base"
+KMACHINE_qemuppc  = "yocto/standard/qemu-ppc32"
+KMACHINE_qemumips = "yocto/standard/mti-malta32-be"
+KMACHINE_qemuarm  = "yocto/standard/arm-versatile-926ejs"
+
+KBRANCH = ${KMACHINE}
+KMETA = meta
+
+LINUX_VERSION ?= "3.0"
+LINUX_VERSION_EXTENSION ?= "-yocto-${LINUX_KERNEL_TYPE}"
+
+SRCREV_machine_qemuarm = "021129d0ad7dd63cbe68c9a1d369519a9e5e8440"
+SRCREV_machine_qemumips = "e86282b3085c5310d1c43af66242845ddadd49b6"
+SRCREV_machine_qemuppc = "f4ce805d0b74f9f32b6455730485120e27a4711e"
+SRCREV_machine_qemux86 = "3216e7d5c3cada16161481826cdb39c930457587"
+SRCREV_machine_qemux86-64 = "3216e7d5c3cada16161481826cdb39c930457587"
+SRCREV_machine = "3216e7d5c3cada16161481826cdb39c930457587"
+SRCREV_meta = "9010d1cbef2633dac7e559a7705c326b7601dd4c"
+
+PR = "r0"
+PV = "${LINUX_VERSION}+git${SRCPV}"
+SRCREV_FORMAT = "meta_machine"
+
+SRC_URI = "git://git.pokylinux.org/linux-yocto-3.0;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
+
+COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)"
+
+# Functionality flags
+KERNEL_REVISION_CHECKING ?= "t"
+KERNEL_FEATURES="features/netfilter"
+KERNEL_FEATURES_append=" features/taskstats"
+KERNEL_FEATURES_append_qemux86=" cfg/sound"
+KERNEL_FEATURES_append_qemux86-64=" cfg/sound"
+
+YOCTO_KERNEL_META_DATA=t
+
+# extra tasks
+addtask kernel_link_vmlinux after do_compile before do_install
+addtask validate_branches before do_patch after do_kernel_checkout
+addtask kernel_configcheck after do_configure before do_compile
+
+require linux-tools.inc
Signature · 1 line
1.7.3.4
author
#2 lore raw

[CONSOLIDATED PULL 01/16] dhcp: Fix libdir issue for multilib

In reply to Saul Wold

From: Mei Lei <[email protected]>

Signed-off-by Mei Lei <[email protected]>
---
 .../dhcp/dhcp-4.2.0/fix-external-bind.patch        |   14 +++++++-------
 meta/recipes-connectivity/dhcp/dhcp4.inc           |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)
meta/recipes-connectivity/dhcp/dhcp-4.2.0/fix-external-bind.patch +7 -7
index f03936d..4f11655 100644
@@ -28,7 +28,7 @@ index 77ed055..5a77f2d 100644
  		   scripts/solaris scripts/openwrt
  dhclient_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
 -		 ../bind/lib/libdns.a ../bind/lib/libisc.a
-+		 $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++		 $(libbind)/libdns.a $(libbind)/libisc.a
  man_MANS = dhclient.8 dhclient-script.8 dhclient.conf.5 dhclient.leases.5
  EXTRA_DIST = $(man_MANS)
  

@@ -53,7 +53,7 @@ index 61049be..85aefa3 100644
  omshell_SOURCES = omshell.c
  omshell_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
 -	        ../bind/lib/libdns.a ../bind/lib/libisc.a
-+	        $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++	        $(libbind)/libdns.a $(libbind)/libisc.a
  
  libdhcpctl_a_SOURCES = dhcpctl.c callback.c remote.c
  

@@ -61,7 +61,7 @@ index 61049be..85aefa3 100644
  cltest_LDADD = libdhcpctl.a ../common/libdhcp.a ../omapip/libomapi.a \
 -	       ../bind/lib/libdns.a ../bind/lib/libisc.a
 \ No newline at end of file
-+	       $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++	       $(libbind)/libdns.a $(libbind)/libisc.a
 diff --git a/omapip/Makefile.am b/omapip/Makefile.am
 index 595950a..17f2233 100644
 --- a/omapip/Makefile.am

@@ -71,7 +71,7 @@ index 595950a..17f2233 100644
  
  svtest_SOURCES = test.c
 -svtest_LDADD = libomapi.a ../bind/lib/libdns.a ../bind/lib/libisc.a
-+svtest_LDADD = libomapi.a $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++svtest_LDADD = libomapi.a $(libbind)/libdns.a $(libbind)/libisc.a
  
 diff --git a/relay/Makefile.am b/relay/Makefile.am
 index d8757ca..a7885da 100644

@@ -82,7 +82,7 @@ index d8757ca..a7885da 100644
  dhcrelay_SOURCES = dhcrelay.c
  dhcrelay_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
 -		 ../bind/lib/libdns.a ../bind/lib/libisc.a
-+		 $(libbind)/lib/libdns.a $(libbind)/lib/libisc.a
++		 $(libbind)/libdns.a $(libbind)/libisc.a
  man_MANS = dhcrelay.8
  EXTRA_DIST = $(man_MANS)
  

@@ -96,8 +96,8 @@ index cdfaf47..d2c254b 100644
  dhcpd_LDADD = ../common/libdhcp.a ../omapip/libomapi.a \
 -	      ../dhcpctl/libdhcpctl.a ../bind/lib/libdns.a \
 -	      ../bind/lib/libisc.a
-+	      ../dhcpctl/libdhcpctl.a $(libbind)/lib/libdns.a \
-+	      $(libbind)/lib/libisc.a
++	      ../dhcpctl/libdhcpctl.a $(libbind)/libdns.a \
++	      $(libbind)/libisc.a
  
  man_MANS = dhcpd.8 dhcpd.conf.5 dhcpd.leases.5
  EXTRA_DIST = $(man_MANS)
meta/recipes-connectivity/dhcp/dhcp4.inc +1 -1
index 885cc19..bdaa5e9 100644
@@ -25,7 +25,7 @@ EXTRA_OECONF = "--with-srv-lease-file=${localstatedir}/lib/dhcp/dhcpd.leases \
                 --with-srv6-lease-file=${localstatedir}/lib/dhcp/dhcpd6.leases \
                 --with-cli-lease-file=${localstatedir}/lib/dhcp/dhclient.leases \
                 --with-cli6-lease-file=${localstatedir}/lib/dhcp/dhclient6.leases \
-                --with-libbind=${STAGING_LIBDIR}/.. \
+                --with-libbind=${STAGING_LIBDIR}/ \
                "
 
 do_compile_prepend () {
Signature · 1 line
1.7.3.4
author
#3 lore raw

[CONSOLIDATED PULL 03/16] kernel: copy defconfig to {B} vs {S}

In reply to Saul Wold

From: Bruce Ashfield <[email protected]>

For kernel's that use a split source/object build the copy of defconfig to {S} in the base kernel class is problematic. The previous solution for this was to override the do_configure of the base kernel class in a subclass. While this is still a viable/valid option, it does mean that changes to the base do_configure will be missed.

The solution to this is to copy a defconfig to {B} which is typically the same as {S}, so most kernel recipes won't see or care about this change.

With this change in place, linux-yocto.bbclass can drop its override of do_configure.

Tested with linux-yocto and oe linux recipes.

Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/classes/kernel-yocto.bbclass |    6 ------
 meta/classes/kernel.bbclass       |    4 ++--
 2 files changed, 2 insertions(+), 8 deletions(-)
meta/classes/kernel-yocto.bbclass +0 -6
index 98272fc..a374df1 100644
@@ -118,12 +118,6 @@ python do_kernel_configcheck() {
     bb.plain( "%s" % result )
 }
 
-# overrides the base kernel_do_configure, since we don't want all the
-# defconfig processing in there
-kernel_do_configure() {
-        yes '' | oe_runmake oldconfig
-}
-
 
 # Ensure that the branches (BSP and meta) are on the locatios specified by
 # their SRCREV values. If they are NOT on the right commits, the branches
meta/classes/kernel.bbclass +2 -2
index 2e36e86..9c492a3 100644
@@ -181,8 +181,8 @@ sysroot_stage_all_append() {
 kernel_do_configure() {
 	# Copy defconfig to .config if .config does not exist. This allows
 	# recipes to manage the .config themselves in do_configure_prepend().
-	if [ -f "${WORKDIR}/defconfig" ] && [ ! -f "${S}/.config" ]; then
-		cp "${WORKDIR}/defconfig" "${S}/.config"
+	if [ -f "${WORKDIR}/defconfig" ] && [ ! -f "${B}/.config" ]; then
+		cp "${WORKDIR}/defconfig" "${B}/.config"
 	fi
 	yes '' | oe_runmake oldconfig
Signature · 1 line
1.7.3.4
author
#4 lore raw

[CONSOLIDATED PULL 05/16] kern-tools: update SRCREV

In reply to Saul Wold

From: Bruce Ashfield <[email protected]>

Fixes [YOCTO #1261]

Updating the SRCREV to pickup some branch creation fixes that were causing an invalid branch name to be used on a repository that couldn't support it (i.e. standard/base on a 2.6.34).

With this the 2.6.34 and 3.0 -rt branches will build.

Signed-off-by Bruce Ashfield <[email protected]>
---
 .../kern-tools/kern-tools-native_git.bb            |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-kernel/kern-tools/kern-tools-native_git.bb +1 -1
index f7600ca..1fbb1f7 100644
@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://git/tools/kgit;beginline=5;endline=9;md5=e2bf4415f3d8
 
 DEPENDS = "git-native guilt-native"
 
-SRCREV = "f8eb067b023d590b6cd8deddf6f96d6a820997af"
+SRCREV = "f5a915c277a37ba5949b4c0778356189e7dd9ec0"
 PR = r10
 PV = "0.1+git${SRCPV}"
Signature · 1 line
1.7.3.4
author
#5 lore raw

[CONSOLIDATED PULL 04/16] linux-yocto: update LICENSE to GPLv2

In reply to Saul Wold

From: Bruce Ashfield <[email protected]>

As reported by Koen Kooi, the LICENSE for linux-yocto can be tightened up to specifiy the particular version of the GPL.

cc Koen Kooi <[email protected]>
Signed-off-by Bruce Ashfield <[email protected]>
---
 meta/recipes-kernel/linux/linux-yocto.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/recipes-kernel/linux/linux-yocto.inc +1 -1
index c304d00..595795b 100644
@@ -1,6 +1,6 @@
 DESCRIPTION = "Yocto Kernel"
 SECTION = "kernel"
-LICENSE = "GPL"
+LICENSE = "GPLv2"
 
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
Signature · 1 line
1.7.3.4
author
#6 lore raw

[CONSOLIDATED PULL 06/16] default-versions: Update pulseaudio as arm no longer needs a seperate backport

In reply to Saul Wold
Signed-off-by Saul Wold <[email protected]>
---
 meta/conf/distro/include/default-versions.inc |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)
meta/conf/distro/include/default-versions.inc +1 -3
index 377aba5..e3ef1e6 100644
@@ -1,9 +1,7 @@
 #
 # Default preferred versions
 #
-PULSEAUDIOVERSION ?= "0.9.22"
-PULSEAUDIOVERSION_arm ?= "0.9.15"
-PREFERRED_VERSION_pulseaudio ?= "${PULSEAUDIOVERSION}"
+PREFERRED_VERSION_pulseaudio ?= "0.9.23"
 
 # Force the python versions in one place
 PYTHON_BASEVERSION ?= "2.6"
Signature · 1 line
1.7.3.4
author
#8 lore raw

[CONSOLIDATED PULL 08/16] task-core-tools.bb: Exclude lttng-ust for x86_64/uclibc

In reply to Saul Wold

From: Khem Raj <[email protected]>

Signed-off-by Khem Raj <[email protected]>
---
 meta/recipes-core/tasks/task-core-tools.bb |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)
meta/recipes-core/tasks/task-core-tools.bb +10 -1
index eed4afb..b0eb7d4 100644
@@ -58,6 +58,15 @@ RRECOMMENDS_task-core-tools-profile = "\
 SYSTEMTAP = "systemtap"
 SYSTEMTAP_libc-uclibc = ""
 
+# lttng-ust uses sched_getcpu() which is not there on uclibc
+# for some of the architectures it can be patched to call the
+# syscall directly but for x86_64 __NR_getcpu is a vsyscall
+# which means we can not use syscall() to call it. So we ignore
+# it for x86_64/uclibc
+
+LTTNGUST = "lttng-ust"
+LTTNGUST_libc-uclibc = ""
+
 #    exmap-console
 #    exmap-server
 

@@ -66,7 +75,7 @@ SYSTEMTAP_libc-uclibc = ""
 # (which is required by lttng-ust) may not build on other platforms, like
 # MIPS.
 RDEPENDS_task-core-tools-profile_append_qemux86 = " valgrind lttng-ust ${SYSTEMTAP}"
-RDEPENDS_task-core-tools-profile_append_qemux86-64 = " lttng-ust ${SYSTEMTAP}"
+RDEPENDS_task-core-tools-profile_append_qemux86-64 = " ${LTTNGUST} ${SYSTEMTAP}"
 RDEPENDS_task-core-tools-profile_append_qemuppc = " lttng-ust ${SYSTEMTAP}"
 RDEPENDS_task-core-tools-profile_append_qemuarm = " lttng-ust"
Signature · 1 line
1.7.3.4
author
#9 lore raw

[CONSOLIDATED PULL 07/16] mesa-xlib, mesa-dri: Probe for newlocale() before using it.

In reply to Saul Wold

From: Khem Raj <[email protected]>

Signed-off-by Khem Raj <[email protected]>
---
 meta/recipes-graphics/mesa/mesa-dri/uclibc.patch |   40 ++++++++++++++++++++++
 meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb    |    6 ++-
 meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb   |    5 ++-
 3 files changed, 48 insertions(+), 3 deletions(-)
 create mode 100644 meta/recipes-graphics/mesa/mesa-dri/uclibc.patch
meta/recipes-graphics/mesa/mesa-dri/uclibc.patch new file +40 -0
new file mode 100644
index 0000000..bb5af44
@@ -0,0 +1,40 @@
+Index: Mesa-7.10.2/src/mesa/main/imports.c
+===================================================================
+--- Mesa-7.10.2.orig/src/mesa/main/imports.c	2011-03-01 12:57:29.000000000 -0800
++++ Mesa-7.10.2/src/mesa/main/imports.c	2011-07-20 19:08:49.441785510 -0700
+@@ -757,7 +757,7 @@
+ float
+ _mesa_strtof( const char *s, char **end )
+ {
+-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
++#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined (HAVE_NEWLOCALE)
+    static locale_t loc = NULL;
+    if (!loc) {
+       loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+Index: Mesa-7.10.2/src/glsl/strtod.c
+===================================================================
+--- Mesa-7.10.2.orig/src/glsl/strtod.c	2011-01-03 16:45:51.000000000 -0800
++++ Mesa-7.10.2/src/glsl/strtod.c	2011-07-20 19:10:21.441785488 -0700
+@@ -44,7 +44,7 @@
+ double
+ glsl_strtod(const char *s, char **end)
+ {
+-#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
++#if defined(_GNU_SOURCE) && !defined(__CYGWIN__) && !defined(__FreeBSD__) && defined (HAVE_NEWLOCALE)
+    static locale_t loc = NULL;
+    if (!loc) {
+       loc = newlocale(LC_CTYPE_MASK, "C", NULL);
+Index: Mesa-7.10.2/configure.ac
+===================================================================
+--- Mesa-7.10.2.orig/configure.ac	2011-07-20 19:09:02.000000000 -0700
++++ Mesa-7.10.2/configure.ac	2011-07-20 19:09:57.121785492 -0700
+@@ -450,6 +450,9 @@
+ dnl See if posix_memalign is available
+ AC_CHECK_FUNC([posix_memalign], [DEFINES="$DEFINES -DHAVE_POSIX_MEMALIGN"])
+ 
++dnl See if newlocale is available
++AC_CHECK_FUNCS_ONCE(newlocale)
++
+ dnl SELinux awareness.
+ AC_ARG_ENABLE([selinux],
+     [AS_HELP_STRING([--enable-selinux],
meta/recipes-graphics/mesa/mesa-dri_7.10.2.bb +4 -2
index c7bd974..aac7a1c 100644
@@ -8,10 +8,12 @@ LIB_DEPS = "libdrm virtual/libx11 libxext libxxf86vm libxdamage libxfixes expat
 
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native python-native"
 
-PR = "r0"
+PR = "r1"
 
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
-           file://crossfix.patch"
+           file://crossfix.patch \
+           file://uclibc.patch \
+          "
 
 SRC_URI[md5sum] = "f5de82852f1243f42cc004039e10b771"
 SRC_URI[sha256sum] = "8ced2678ce11cf30804694a92ea3ca6b82f158ae8995bdc626c7e85aac71c7c1"
meta/recipes-graphics/mesa/mesa-xlib_7.10.2.bb +4 -1
index b77df2c..511103d 100644
@@ -1,6 +1,9 @@
 include mesa-common.inc
 
+FILESPATH =. "${FILE_DIRNAME}/mesa-dri:"
+
 SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
+           file://uclibc.patch \
            "
 
 SRC_URI[md5sum] = "f5de82852f1243f42cc004039e10b771"

@@ -14,6 +17,6 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes libxml2-nativ
 DEPENDS = "${PROTO_DEPS}  ${LIB_DEPS} makedepend-native"
 
 PE = "1"
-PR = "r0"
+PR = "r1"
 
 EXTRA_OECONF += "--with-driver=xlib"
Signature · 1 line
1.7.3.4
author
#10 lore raw

[CONSOLIDATED PULL 09/16] uclibc: Add patch header for sync_file_range2.patch

In reply to Saul Wold

From: Khem Raj <[email protected]>

Signed-off-by Khem Raj <[email protected]>
---
 .../uclibc/uclibc-0.9.32/sync_file_range2.patch    |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)
meta/recipes-core/uclibc/uclibc-0.9.32/sync_file_range2.patch +7 -0
index b5e972e..4b85a43 100644
@@ -1,3 +1,10 @@
+Some architectures like ppc, arm use aligned 64 bit inputs so a register is not wasted
+this then uses __NR_sync_file_range2 syscall. Implement is
+
+Singed-off-by: Khem Raj <[email protected]>
+
+Upstream-Status: Pending
+
 Index: git/libc/sysdeps/linux/common/sync_file_range.c
 ===================================================================
 --- git.orig/libc/sysdeps/linux/common/sync_file_range.c	2011-07-19 14:23:35.000000000 -0700
Signature · 1 line
1.7.3.4
author
#11 lore raw

[CONSOLIDATED PULL 11/16] util-linux: Replace sigsetmask with posix compliant functions

In reply to Saul Wold

From: Khem Raj <[email protected]>

This patch is not needed upstream since the code using sigsetmask has been deleted.

Signed-off-by Khem Raj <[email protected]>
---
 .../util-linux-2.19.1/remove_sigsetmark.patch      |   35 ++++++++++++++++++++
 meta/recipes-core/util-linux/util-linux_2.19.1.bb  |    3 +-
 2 files changed, 37 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch
meta/recipes-core/util-linux/util-linux-2.19.1/remove_sigsetmark.patch new file +35 -0
new file mode 100644
index 0000000..02e4d16
@@ -0,0 +1,35 @@
+simpleinit: remove deprecated sigsetmask()
+
+The sigsetmask() is deprecated in favor of sigprocmask().
+
+This is not needed upstream since simpleinit is removed from
+util-linux-ng master
+
+Signed-off-by: Khem Raj <[email protected]>
+
+Upstream-Status: Inappropriate
+
+Index: util-linux-2.19.1/simpleinit/shutdown.c
+===================================================================
+--- util-linux-2.19.1.orig/simpleinit/shutdown.c	2011-03-04 03:47:47.000000000 -0800
++++ util-linux-2.19.1/simpleinit/shutdown.c	2011-07-06 08:43:39.183849752 -0700
+@@ -145,7 +145,7 @@
+ {
+ 	int c, i, fd;
+ 	char *ptr;
+-
++	sigset_t sigmask;
+ 	i = getdtablesize ();
+ 	for (fd = 3; fd < i; fd++) close (fd);
+ 	if (getpid () == 1)
+@@ -153,7 +153,9 @@
+ 	    for (fd = 0; fd < 3; fd++) close (fd);
+ 	    while (1) wait (NULL);  /*  Grim reaper never stops  */
+ 	}
+-	sigsetmask (0); /*  simpleinit(8) blocks all signals: undo for ALRM  */
++	/*  simpleinit(8) blocks all signals: undo for ALRM  */
++	sigemptyset(&sigmask);
++	sigprocmask (SIG_SETMASK, &sigmask, NULL);
+ 	for (i = 1; i < NSIG; i++) signal (i, SIG_DFL);
+ 
+         setlocale(LC_ALL, "");
meta/recipes-core/util-linux/util-linux_2.19.1.bb +2 -1
index 0fd67d1..2ef95e6 100644
@@ -1,5 +1,5 @@
 MAJOR_VERSION = "2.19"
-PR = "r2"
+PR = "r3"
 require util-linux.inc
 
 # note that `lscpu' is under GPLv3+

@@ -8,6 +8,7 @@ LICENSE_util-linux-lscpu = "GPLv3+"
 SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \
             file://util-linux-ng-2.16-mount_lock_path.patch \
             file://uclibc-__progname-conflict.patch \      
+            file://remove_sigsetmark.patch \
 "
 
 SRC_URI[md5sum] = "3eab06f05163dfa65479c44e5231932c"
Signature · 1 line
1.7.3.4
author
#12 lore raw

[CONSOLIDATED PULL 10/16] strace: Define own sigmask macro if not defined already in signal.h

In reply to Saul Wold

From: Khem Raj <[email protected]>

This is required especially on uclibc systems where BSD compatible obsolete functions are disabled by kconfig. Therefore we check if the macro is undefined then we define it. Therefore eglibc/glibc builds should work as they use to.

Signed-off-by Khem Raj <[email protected]>
---
 .../strace/strace-4.5.20/sigmask.patch             |   22 ++++++++++++++++++++
 meta/recipes-devtools/strace/strace_4.5.20.bb      |    6 +++-
 2 files changed, 26 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-devtools/strace/strace-4.5.20/sigmask.patch
meta/recipes-devtools/strace/strace-4.5.20/sigmask.patch new file +22 -0
new file mode 100644
index 0000000..9bca528
@@ -0,0 +1,22 @@
+sigmask is a macro which is dropped if BSD compatibility is
+not enabled. So we check if the macro does not exist then
+we define it to __sigmask
+
+Signed-off-by: Khem Raj <[email protected]>
+
+Index: strace-4.5.20/signal.c
+===================================================================
+--- strace-4.5.20.orig/signal.c	2010-02-23 13:26:16.000000000 -0800
++++ strace-4.5.20/signal.c	2011-07-20 23:06:35.842339197 -0700
+@@ -140,6 +140,11 @@
+ #endif
+ #endif /* LINUX */
+ 
++#if !defined (sigmask) && defined (__sigmask)
++/* Compute mask for signal SIG.  */
++#define sigmask(sig)   __sigmask(sig)
++#endif /* sigmask */
++
+ const char *const signalent0[] = {
+ #include "signalent.h"
+ };
meta/recipes-devtools/strace/strace_4.5.20.bb +4 -2
index 3dba59f..391669f 100644
@@ -3,9 +3,11 @@ HOMEPAGE = "http://strace.sourceforge.net"
 SECTION = "console/utils"
 LICENSE = "BSD"
 LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=4535377ede62550fdeaf39f595fd550a"
-PR = "r1"
+PR = "r2"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2"
+SRC_URI = "${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.bz2 \
+           file://sigmask.patch \
+          "
 
 SRC_URI[md5sum] = "64dfe10d9db0c1e34030891695ffca4b"
 SRC_URI[sha256sum] = "ea8c059369eaa5ad90b246f34eab247d0ee48bfdee2670c7196320a4669ccabd"
Signature · 1 line
1.7.3.4
author
#13 lore raw

[CONSOLIDATED PULL 14/16] glib-2.0: fix a compilation issue due to dtrace

In reply to Saul Wold

From: Nitin A Kamble <[email protected]>

With multilib & x32 builds dtrace is getting turned-on by the glib-2.0 configure, which causes following compilation failure.

| x86_64-linux-libtool: link: ccache gcc -isystem/disk0/pokybuild/build-multilib/tmp/sysroots/x86_64-linux/usr/include -O2 -pipe -Wall -Wl,-rpath-link -Wl,/disk0/pokybuild/build-multilib/tmp/sysroots/x86_64-linux/usr/lib -Wl,-rpath -Wl,/disk0/pokybuild/build-multilib/tmp/sysroots/x86_64-linux/usr/lib -Wl,-O1 -o .libs/gtester gtester.o -L/disk0/pokybuild/build-multilib/tmp/sysroots/x86_64-linux/usr/lib ./.libs/libglib-2.0.so -lrt -Wl,-rpath -Wl,/disk0/pokybuild/build-multilib/tmp/sysroots/x86_64-linux/usr/lib

| ./.libs/libglib-2.0.so: undefined reference to `GLIB_SLICE_ALLOC'
| ./.libs/libglib-2.0.so: undefined reference to `GLIB_MEM_REALLOC'
| ./.libs/libglib-2.0.so: undefined reference to `GLIB_SLICE_FREE'
| ./.libs/libglib-2.0.so: undefined reference to `GLIB_MEM_ALLOC'
| ./.libs/libglib-2.0.so: undefined reference to `GLIB_MEM_FREE'
| ./.libs/libglib-2.0.so: undefined reference to `GLIB_QUARK_NEW'
| collect2: ld returned 1 exit status
| make[4]: *** [gtester] Error 1
Signed-off-by Nitin A Kamble <[email protected]>
---
 meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb |    2 +-
 meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
meta/recipes-core/glib-2.0/glib-2.0_2.27.5.bb +1 -1
index 0b30d17..26fc8fb 100644
@@ -1,6 +1,6 @@
 require glib.inc
 
-PR = "r5"
+PR = "r6"
 
 SRC_URI = "${GNOME_MIRROR}/glib/2.27/glib-${PV}.tar.bz2 \
            file://configure-libtool.patch \
meta/recipes-core/glib-2.0/glib-2.0_2.28.8.bb +2 -1
index a2e609f..dce6802 100644
@@ -1,6 +1,6 @@
 require glib.inc
 
-PR = "r2"
+PR = "r3"
 PE = "1"
 
 SRC_URI = "${GNOME_MIRROR}/glib/2.28/glib-${PV}.tar.bz2 \

@@ -20,3 +20,4 @@ SRC_URI[sha256sum] = "222f3055d6c413417b50901008c654865e5a311c73f0ae918b0a9978d1
 
 BBCLASSEXTEND = "native"
 
+EXTRA_OECONF_append = " --enable-dtrace=no"
Signature · 1 line
1.7.3.4
author
#14 lore raw

[CONSOLIDATED PULL 13/16] tclibc-uclibc: Fix TARGET_OS for powerpc

In reply to Saul Wold

From: Khem Raj <[email protected]>

1a9ae8ea8c0540d41b8ff4d95c0420d6df754634 removed -uclibc hence it got all wrong for powerpc. uclibc TARGET_OS for classic ppc is linux-uclibc and for ppc w/ SPE its linux-uclibcspe

Signed-off-by Khem Raj <[email protected]>
---
 meta/conf/distro/include/tclibc-uclibc.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
meta/conf/distro/include/tclibc-uclibc.inc +1 -1
index 2ccda5b..7c06654 100644
@@ -5,7 +5,7 @@
 TARGET_OS = "linux-uclibc"
 TARGET_OS_arm = "linux-uclibceabi"
 TARGET_OS_armeb = "linux-uclibceabi"
-TARGET_OS_powerpc = "linux${@['','-gnuspe'][bb.data.getVar('TARGET_FPU',d,1) in ['ppc-efd', 'ppc-efs']]}"
+TARGET_OS_powerpc = "linux-uclibc${@['','spe'][bb.data.getVar('TARGET_FPU',d,1) in ['ppc-efd', 'ppc-efs']]}"
 
 # Add uclibc overrides to the overrides.
 OVERRIDES =. "libc-uclibc:"
Signature · 1 line
1.7.3.4
author
#15 lore raw

[CONSOLIDATED PULL 12/16] .gitignore: Update build ignores to have wildcard

In reply to Saul Wold

From: Kumar Gala <[email protected]>

ignore not just build/* but any build*/* cases.

Signed-off-by Kumar Gala <[email protected]>
---
 .gitignore |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)
.gitignore +6 -6
index b13086d..d44e729 100644
@@ -1,11 +1,11 @@
 *.pyc
 *.pyo
-build/conf/local.conf
-build/conf/bblayers.conf
-build/downloads
-build/tmp/
-build/sstate-cache
-build/pyshtables.py
+build*/conf/local.conf
+build*/conf/bblayers.conf
+build*/downloads
+build*/tmp/
+build*/sstate-cache
+build*/pyshtables.py
 pstage/
 scripts/oe-git-proxy-socks
 sources/
Signature · 1 line
1.7.3.4
author
#16 lore raw

[CONSOLIDATED PULL 15/16] python: fix security vulnerability

In reply to Saul Wold

From: Nitin A Kamble <[email protected]>

This Fixes bug: [Yocto #1254]

http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2011-1015

Issue #2254: Fix CGIHTTPServer information disclosure. Relative paths are
now collapsed within the url properly before looking in cgi_directories.

Signed-off-by Nitin A Kamble <[email protected]>
---
 meta/recipes-devtools/python/python.inc            |    2 +-
 .../python/python/security_issue_2254_fix.patch    |  184 ++++++++++++++++++++
 meta/recipes-devtools/python/python_2.6.6.bb       |    1 +
 3 files changed, 186 insertions(+), 1 deletions(-)
 create mode 100644 meta/recipes-devtools/python/python/security_issue_2254_fix.patch
meta/recipes-devtools/python/python.inc +1 -1
index 25a458e..a6cc917 100644
@@ -3,7 +3,7 @@ HOMEPAGE = "http://www.python.org"
 LICENSE = "PSF"
 SECTION = "devel/python"
 # bump this on every change in contrib/python/generate-manifest-2.6.py
-INC_PR = "nk2"
+INC_PR = "r2"
 
 DEFAULT_PREFERENCE = "-26"
meta/recipes-devtools/python/python/security_issue_2254_fix.patch new file +184 -0

184 lines not on this page · raw message

meta/recipes-devtools/python/python_2.6.6.bb +1 -0
index 598fea8..f71440a 100644
@@ -19,6 +19,7 @@ SRC_URI = "\
   file://99-ignore-optimization-flag.patch \
   ${DISTRO_SRC_URI} \
   file://multilib.patch \
+  file://security_issue_2254_fix.patch \
 "
 
 SRC_URI[md5sum] = "cf4e6881bb84a7ce6089e4a307f71f14"
Signature · 1 line
1.7.3.4
author
#17 lore raw

[CONSOLIDATED PULL 16/16] fix Upstream-Status line for few patches

In reply to Saul Wold

From: Nitin A Kamble <[email protected]>

Signed-off-by Nitin A Kamble <[email protected]>
---
 .../btrfs-tools/btrfs-tools/fix_use_of_gcc.patch   |    2 +-
 .../dosfstools/dosfstools-2.10-kernel-2.6.patch    |    2 +-
 .../elfutils/elfutils/fix_for_gcc-4.7.patch        |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
meta/recipes-devtools/btrfs-tools/btrfs-tools/fix_use_of_gcc.patch +1 -1
index 0a5fb34..2d5315f 100644
@@ -1,5 +1,5 @@
 Nitin A Kamble <[email protected]> 2011/06/09
-UpstreamStatus: Pending
+Upstream-Status: Pending
 
 Avoid these kinds of errors while doing cross build:
meta/recipes-devtools/dosfstools/dosfstools/dosfstools-2.10-kernel-2.6.patch +1 -1
index 3ecafc3..0c9230f 100644
@@ -2,7 +2,7 @@ Submitted By: Jim Gifford (jim at linuxfromscratch dot org)
 Date: 2004-02-09
 Initial Package Version: 2.6
 Origin: Jim Gifford
-Upstream Status: Accepted
+Upstream-Status: Accepted
 Description: Fixes Compile Issues with the 2.6 Kernel
  
 --- dosfstools-2.10/dosfsck/common.h.orig	2004-02-09 18:37:59.056737458 +0000
meta/recipes-devtools/elfutils/elfutils/fix_for_gcc-4.7.patch +1 -1
index bd22eef..bd634b4 100644
@@ -1,4 +1,4 @@
-UpstreamStatus: pending
+Upstream-Status: pending
 gcc 4.7 does not like pointer conversion, so have a void * tmp var to work 
 around following compilation issue.
Signature · 1 line
1.7.3.4
#7 lore raw

Re: [CONSOLIDATED PULL 06/16] default-versions: Update pulseaudio as arm no longer needs a seperate backport

In reply to Saul Wold

Op 22 jul. 2011, om 09:25 heeft Saul Wold het volgende geschreven:

Quoted 10 lines
Signed-off-by Saul Wold <[email protected]>

---
meta/conf/distro/include/default-versions.inc | 4 +---

1 files changed, 1 insertions(+), 3 deletions(-)
meta/conf/distro/include/default-versions.inc +0 -0
index 377aba5..e3ef1e6 100644

meta/conf/distro/include/default-versions.inc line 4

Quoted 7 lines
meta/conf/distro/include/default-versions.inc +1 -3
@@ -1,9 +1,7 @@
 #
 # Default preferred versions
 #
-PULSEAUDIOVERSION ?= "0.9.22"
-PULSEAUDIOVERSION_arm ?= "0.9.15"
-PREFERRED_VERSION_pulseaudio ?= "${PULSEAUDIOVERSION}"
+PREFERRED_VERSION_pulseaudio ?= "0.9.23"

If you do that you need to rebuild things linking against pulse as well, e.g. gst-plugins-good. I haven't checked if gst actually depends on pull in oe-core though.

Applied
#18 lore raw
In reply to Saul Wold
Quoted 39 lines · Saul Wold

Richard,

This contains more uclibc updates from Khem along with Bruce's 3.0 Updates.

There are a couple of small updates for .gitignore and other recipes.

Thanks
Sau!

The following changes since commit f175e4f28aa835abef8c3d5e2065054416692418:

libiconv: Fix build failure on 1.13.1 (2011-07-21 22:50:06 +0100)

are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage

Bruce Ashfield (4):
linux-yocto: kernel-3.0 support recipe
kernel: copy defconfig to {B} vs {S}
linux-yocto: update LICENSE to GPLv2
kern-tools: update SRCREV

Khem Raj (6):
mesa-xlib, mesa-dri: Probe for newlocale() before using it. task-core-tools.bb: Exclude lttng-ust for x86_64/uclibc
uclibc: Add patch header for sync_file_range2.patch
strace: Define own sigmask macro if not defined already in signal.h
util-linux: Replace sigsetmask with posix compliant functions
tclibc-uclibc: Fix TARGET_OS for powerpc

Kumar Gala (1):
.gitignore: Update build ignores to have wildcard

Mei Lei (1):
dhcp: Fix libdir issue for multilib

Quoted 8 lines

Nitin A Kamble (3):
glib-2.0: fix a compilation issue due to dtrace
python: fix security vulnerability
fix Upstream-Status line for few patches

Saul Wold (1):
default-versions: Update pulseaudio as arm no longer needs a seperate
backport

Merged to master, thanks.

Richard