[OE-core] [PATCH] grub-efi-native: Update to version 2.00
Added -Wno-unused-result because of a read() with no result, and causing
error due to -Werror
Updated grub recipe because of a patch name change 1.99 -> 2.00
Signed-off-by: Radu Moisan
---
...2man.patch => grub-2.00-disable-help2man.patch} | 117 +++-
...grub-2.00-fix-enable_execute_stack-check.patch} |8 +-
...ix.patch => grub-2.00-fpmath-sse-387-fix.patch} |0
.../grub/files/grub-no-unused-result.patch | 13 +++
...-efi-native_1.99.bb => grub-efi-native_2.00.bb} | 18 ++-
meta/recipes-bsp/grub/grub_2.00.bb |2 +-
6 files changed, 42 insertions(+), 116 deletions(-)
rename meta/recipes-bsp/grub/files/{grub-1.99-disable-help2man.patch =>
grub-2.00-disable-help2man.patch} (54%)
rename
meta/recipes-bsp/grub/files/{grub-1.99-fix-enable_execute_stack-check.patch =>
grub-2.00-fix-enable_execute_stack-check.patch} (92%)
rename meta/recipes-bsp/grub/files/{grub-1.99-fpmath-sse-387-fix.patch =>
grub-2.00-fpmath-sse-387-fix.patch} (100%)
create mode 100644 meta/recipes-bsp/grub/files/grub-no-unused-result.patch
rename meta/recipes-bsp/grub/{grub-efi-native_1.99.bb =>
grub-efi-native_2.00.bb} (80%)
diff --git a/meta/recipes-bsp/grub/files/grub-1.99-disable-help2man.patch
b/meta/recipes-bsp/grub/files/grub-2.00-disable-help2man.patch
similarity index 54%
rename from meta/recipes-bsp/grub/files/grub-1.99-disable-help2man.patch
rename to meta/recipes-bsp/grub/files/grub-2.00-disable-help2man.patch
index 3ffefdc..a2e42c2 100644
--- a/meta/recipes-bsp/grub/files/grub-1.99-disable-help2man.patch
+++ b/meta/recipes-bsp/grub/files/grub-2.00-disable-help2man.patch
@@ -10,14 +10,14 @@ unnecessarily.
Signed-off-by: Darren Hart
-Index: grub-1.99/configure.ac
+Index: grub-2.00/configure.ac
===
grub-1.99.orig/configure.ac
-+++ grub-1.99/configure.ac
-@@ -275,11 +275,12 @@ if test x$grub_cv_apple_cc = xyes ; then
- HOST_CFLAGS="$HOST_CFLAGS -fnested-functions"
+--- grub-2.00.orig/configure.ac
grub-2.00/configure.ac
+@@ -310,11 +310,12 @@ if test x$USE_NLS = xno; then
+ HOST_CFLAGS="$HOST_CFLAGS -fno-builtin-gettext"
fi
-
+
-if test "x$cross_compiling" = xyes; then
- AC_MSG_WARN([cannot generate manual pages while cross compiling])
-else
@@ -32,11 +32,11 @@ Index: grub-1.99/configure.ac
# Check for functions and headers.
AC_CHECK_FUNCS(posix_memalign memalign asprintf vasprintf getextmntent)
-Index: grub-1.99/configure
+Index: grub-2.00/configure
===
grub-1.99.orig/configure
-+++ grub-1.99/configure
-@@ -1172,7 +1172,6 @@ GL_COND_LIBTOOL_FALSE
+--- grub-2.00.orig/configure
grub-2.00/configure
+@@ -1215,7 +1215,6 @@ GL_COND_LIBTOOL_FALSE
GL_COND_LIBTOOL_TRUE
BUILD_CC
LIBUTIL
@@ -44,15 +44,7 @@ Index: grub-1.99/configure
POSUB
LTLIBINTL
LIBINTL
-@@ -1204,6 +1203,7 @@ LEXLIB
- am__fastdepCC_FALSE
- am__fastdepCC_TRUE
- CCDEPMODE
-+am__nodep
- AMDEPBACKSLASH
- AMDEP_FALSE
- AMDEP_TRUE
-@@ -3011,7 +3011,6 @@ _ACEOF
+@@ -3069,7 +3068,6 @@ _ACEOF
# Let the site file select an alternate cache file if it wants to.
# Prefer an explicitly selected file to automatically selected ones.
ac_site_file1=NONE
@@ -60,7 +52,7 @@ Index: grub-1.99/configure
if test -n "$CONFIG_SITE"; then
# We do not want a PATH search for config.site.
case $CONFIG_SITE in #((
-@@ -3019,14 +3018,8 @@ if test -n "$CONFIG_SITE"; then
+@@ -3077,14 +3075,8 @@ if test -n "$CONFIG_SITE"; then
*/*) ac_site_file1=$CONFIG_SITE;;
*) ac_site_file1=./$CONFIG_SITE;;
esac
@@ -76,7 +68,7 @@ Index: grub-1.99/configure
do
test "x$ac_site_file" = xNONE && continue
if test /dev/null != "$ac_site_file" && test -r "$ac_site_file"; then
-@@ -3313,8 +3306,9 @@ case $target_os in *\ *) target_os=`echo
+@@ -3371,8 +3363,9 @@ case $target_os in *\ *) target_os=`echo
# The aliases save the names the user supplied, while $host etc.
# will get canonicalized.
test -n "$target_alias" &&
@@ -88,83 +80,8 @@ Index: grub-1.99/configure
program_prefix=${target_alias}-
am__api_version='1.11'
-@@ -3786,11 +3780,11 @@ MAKEINFO=${MAKEINFO-"${am_missing_run}ma
-
- # We need awk for the "check" target. The system "awk" is bad on
- # some platforms.
--# Always define AMTAR for backward compatibility.
--
--AMTAR=${AMTAR-"${am_missing_run}tar"}
-+# Always define AMTAR for backward compatibility. Yes, it's still used
-+# in the wild :-( We should find a proper way to deprecate it ...
-+AMTAR='$${TAR-tar}'
-
--am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
-+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
-
-
-
-@@ -4256,6 +4250,7 @@ fi
- if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-+ am__nodep='_no'
- fi
- if test "x$enable_dependency_tracking" != xno; then
- AMDEP_TRUE=
-@@ -5069,6 +5064,
[OE-core] [PATCH] subversion: two small fixes
From: Roy.Li
Add missing build dependency on sqlite3
Disable Ruby checking. we do not have Ruby, and subversion always
checks ruby on host which leads to build error when ruby-dev is
installed on host.
Signed-off-by: Roy.Li
---
.../subversion/subversion_1.6.15.bb|7 ---
.../subversion/subversion_1.7.2.bb |5 +++--
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-devtools/subversion/subversion_1.6.15.bb
b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
index 29029ce..244d7ea 100644
--- a/meta/recipes-devtools/subversion/subversion_1.6.15.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.6.15.bb
@@ -1,13 +1,13 @@
DESCRIPTION = "The Subversion (svn) client"
SECTION = "console/network"
-DEPENDS = "apr-util neon"
+DEPENDS = "apr-util neon sqlite3"
RDEPENDS_${PN} = "neon"
LICENSE = "Apache-2"
HOMEPAGE = "http://subversion.tigris.org";
BBCLASSEXTEND = "native"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://subversion.tigris.org/downloads/${BPN}-${PV}.tar.bz2 \
file://disable-revision-install.patch \
@@ -23,7 +23,8 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=2a69fef414e2cb907b4544298569300b"
EXTRA_OECONF = " \
--without-berkeley-db --without-apxs --without-apache \
--without-swig --with-apr=${STAGING_BINDIR_CROSS} \
---with-apr-util=${STAGING_BINDIR_CROSS}"
+--with-apr-util=${STAGING_BINDIR_CROSS} \
+ac_cv_path_RUBY=none"
inherit autotools
diff --git a/meta/recipes-devtools/subversion/subversion_1.7.2.bb
b/meta/recipes-devtools/subversion/subversion_1.7.2.bb
index 4f71de5..1d36b63 100644
--- a/meta/recipes-devtools/subversion/subversion_1.7.2.bb
+++ b/meta/recipes-devtools/subversion/subversion_1.7.2.bb
@@ -7,7 +7,7 @@ HOMEPAGE = "http://subversion.tigris.org";
BBCLASSEXTEND = "native"
-PR = "r3"
+PR = "r4"
SRC_URI = "${APACHE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \
file://libtool2.patch \
@@ -21,7 +21,8 @@ LIC_FILES_CHKSUM =
"file://LICENSE;md5=4a14fd2da3134e40a087eb4326a4ecd4"
EXTRA_OECONF = " \
--without-berkeley-db --without-apxs --without-apache \
--without-swig --with-apr=${STAGING_BINDIR_CROSS} \
---with-apr-util=${STAGING_BINDIR_CROSS}"
+--with-apr-util=${STAGING_BINDIR_CROSS} \
+ac_cv_path_RUBY=none"
inherit autotools
--
1.7.4.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [discussion] perf: specify SLANG_INC dir for perf
Hi Richard,
Ping ...
Hopefully you could recall sufficient context from this thread about
the 'include path for slang.h' cause compile error issue that we are
trying to fix here.
I saw your three commits in oecore like below:
commit b033000
Author: Richard Purdie
Date: Tue Aug 7 22:21:38 2012 +
linux-yocto-3.2: Apply slang workaround fixing perf builds to 3.2 kernels
too
Signed-off-by: Richard Purdie
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.2.bb
b/meta/recipes-kernel/linux/linux-yocto_3.2.bb
index de716da..b254251 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.2.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.2.bb
@@ -24,6 +24,8 @@ KMETA = "meta"
SRC_URI =
"git://git.yoctoproject.org/linux-yocto-3.2;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
+SRC_URI += "file://noslang.patch"
+
COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)"
# Functionality flags
commit 6b4ed64
Author: Richard Purdie
Date: Tue Aug 7 22:21:22 2012 +
linux-yocto-3.0: Apply slang workaround fixing perf builds to 3.0 kernels
too
Signed-off-by: Richard Purdie
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
index 2adbc46..3022f21 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.0.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.0.bb
@@ -24,6 +24,8 @@ PV = "${LINUX_VERSION}+git${SRCPV}"
SRC_URI =
"git://git.yoctoproject.org/linux-yocto-3.0;protocol=git;bareclone=1;branch=${KBRANCH},meta;name=machine,meta"
+SRC_URI += "file://noslang.patch"
+
COMPATIBLE_MACHINE = "(qemuarm|qemux86|qemuppc|qemumips|qemux86-64)"
# Functionality flags
commit 4fd4b2e
Author: Richard Purdie
Date: Tue Aug 7 12:17:16 2012 +0100
linux-yocto-3.4: Disable extra slang header search path
Add in a workaround to avoid host infection detection build failures
from the slang include directory in perf. I'll defer to Bruce to
fix this properly but we need a workaround now as this is breaking
builds.
Signed-off-by: Richard Purdie
diff --git a/meta/recipes-kernel/linux/linux-yocto/noslang.patch
b/meta/recipes-kernel/linux/linux-yocto/noslang.patch
new file mode 100644
index 000..9cada34
--- /dev/null
+++ b/meta/recipes-kernel/linux/linux-yocto/noslang.patch
@@ -0,0 +1,20 @@
+We (OE) install slang into /usr/include so we never need to look into
+/usr/include/slang/. We never want to look into a hardcoded path like this
+since it triggers host infection issues. For now, simply remove this
+since it causes us problems.
+
+Upstream-Status: Pending (would need rework)
+
+Index: tools/perf/Makefile
+===
+--- linux.orig/tools/perf/Makefile 2012-08-07 10:29:43.020149620 +
linux/tools/perf/Makefile 2012-08-07 10:30:08.128148098 +
+@@ -504,7 +504,7 @@
+ BASIC_CFLAGS += -DNO_NEWT_SUPPORT
+ else
+ # Fedora has /usr/include/slang/slang.h, but ubuntu
/usr/include/slang.h
+- BASIC_CFLAGS += -I/usr/include/slang
++ # BASIC_CFLAGS += -I/usr/include/slang
+ EXTLIBS += -lnewt -lslang
+ LIB_OBJS += $(OUTPUT)util/ui/setup.o
+ LIB_OBJS += $(OUTPUT)util/ui/browser.o
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 48333b3..5ab46b7 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -20,6 +20,8 @@ SRCREV_meta ?= "7ff48aa47c50b6455d60ca93bc81260ce8fe1a1b"
SRC_URI =
"git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
+SRC_URI += "file://noslang.patch"
+
LINUX_VERSION ?= "3.4.6"
PR = "${INC_PR}.0"
---
Since you mentioned 'workaround' in commit log, I would like to submit
another solution:
#1. Merge below kernel patch to kernel tree:
>From 7708f74d98e7233c7257b055eea0ffb914f4ce2c Mon Sep 17 00:00:00 2001
From: Liang Li
Date: Wed, 1 Aug 2012 14:31:24 +0800
Subject: [PATCH] perf: add SLANG_INC for slang.h
Previously we hard code '-I/usr/include/slang' to CFLAGS to works with
some hosts that has /usr/include/slang/slang.h other than
/usr/include/slang.h like Fedora. This will cause compiling warnings
in some cases.
We'd better to provide user a chance to specify correct location of
slang.h then user could specify SLANG_INC to avoid compile warnings.
Signed-off-by: Liang Li
---
tools/perf/Makefile | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/tools/perf/Makefile b/tools/perf/Makefile
index b7a7a87..067f2df 100644
--- a/tools/perf/Makefile
+++ b/tools/perf/Makefile
@@ -496,8 +496,10 @@ else
msg := $(warning newt not found, disables TUI support. Please
install newt-devel or libnewt-dev);
BASIC_CFLAGS += -DNO_NEWT_SUPPORT
el
[OE-core] [PATCH] libatomics-ops: update to the latest version 7.2
All old patches are droped because:
Merged into 7.2 by upstream:
* fedora/libatomic_ops-1.2-ppclwzfix.patch
* gentoo/libatomic_ops-1.2-mips.patch
* gentoo/sh4-atomic-ops.patch
* libatomics-ops_fix_for_x32.patch
Obsolete:
* doublefix.patch
Signed-off-by: Xin Ouyang
---
.../pulseaudio/libatomics-ops/doublefix.patch | 27
.../fedora/libatomic_ops-1.2-ppclwzfix.patch | 20 ---
.../gentoo/libatomic_ops-1.2-mips.patch| 129
.../libatomics-ops/gentoo/sh4-atomic-ops.patch | 70 ---
.../libatomics-ops_fix_for_x32.patch | 41 ---
...libatomics-ops_1.2.bb => libatomics-ops_7.2.bb} | 11 +-
6 files changed, 3 insertions(+), 295 deletions(-)
delete mode 100644
meta/recipes-multimedia/pulseaudio/libatomics-ops/doublefix.patch
delete mode 100644
meta/recipes-multimedia/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch
delete mode 100644
meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/libatomic_ops-1.2-mips.patch
delete mode 100644
meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/sh4-atomic-ops.patch
delete mode 100644
meta/recipes-multimedia/pulseaudio/libatomics-ops/libatomics-ops_fix_for_x32.patch
rename meta/recipes-multimedia/pulseaudio/{libatomics-ops_1.2.bb =>
libatomics-ops_7.2.bb} (65%)
diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops/doublefix.patch
b/meta/recipes-multimedia/pulseaudio/libatomics-ops/doublefix.patch
deleted file mode 100644
index 0d3b718..000
--- a/meta/recipes-multimedia/pulseaudio/libatomics-ops/doublefix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Double path references breaks recent autoconf+automake
-
-RP 2/1/10
-
-Index: libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am
-===
libatomic_ops-1.2.orig/src/atomic_ops/sysdeps/Makefile.am 2005-09-28
00:53:16.0 +0100
-+++ libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am 2010-02-01
14:28:46.397820574 +
-@@ -25,7 +25,6 @@
- README \
- \
- gcc/alpha.h gcc/arm.h gcc/x86.h \
--gcc/hppa.h gcc/ia64.h \
- gcc/powerpc.h gcc/sparc.h \
- gcc/hppa.h gcc/m68k.h gcc/s390.h \
- gcc/ia64.h gcc/x86_64.h gcc/cris.h \
-Index: libatomic_ops-1.2/doc/Makefile.am
-===
libatomic_ops-1.2.orig/doc/Makefile.am 2010-02-01 15:20:09.20774
+
-+++ libatomic_ops-1.2/doc/Makefile.am 2010-02-01 15:20:20.909049794 +
-@@ -1,3 +1,3 @@
- # installed documentation
- #
--dist_pkgdata_DATA=COPYING LICENSING.txt README.txt COPYING README_stack.txt
README_malloc.txt README_win32.txt
-+dist_pkgdata_DATA=LICENSING.txt README.txt COPYING README_stack.txt
README_malloc.txt README_win32.txt
diff --git
a/meta/recipes-multimedia/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch
b/meta/recipes-multimedia/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch
deleted file mode 100644
index 315ae91..000
---
a/meta/recipes-multimedia/pulseaudio/libatomics-ops/fedora/libatomic_ops-1.2-ppclwzfix.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Upstream-Status: Inappropriate [others]
-
-The patch is imported from fedora project, and is not appropriate for us
-to upstream it.
-
-http://cvs.fedoraproject.org/viewcvs/devel/libatomic_ops/libatomic_ops-1.2-ppclwzfix.patch
-
-* add fix for bad variable handling on PPC
-
libatomic_ops-1.2.orig/src/atomic_ops/sysdeps/gcc/powerpc.h
2007-05-29 19:29:52.0 +0200
-+++ libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/powerpc.h 2007-05-29
19:30:48.0 +0200
-@@ -72,7 +72,7 @@
- /* registers. I always got "impossible constraint" when I */
- /* tried the "y" constraint.*/
- __asm__ __volatile__ (
--"lwz %0,%1\n"
-+"lwz%U1%X1 %0,%1\n"
- "cmpw cr7,%0,%0\n"
- "bne- cr7,1f\n"
- "1: isync\n"
diff --git
a/meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/libatomic_ops-1.2-mips.patch
b/meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/libatomic_ops-1.2-mips.patch
deleted file mode 100644
index 971379d..000
---
a/meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/libatomic_ops-1.2-mips.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-Upstream-Status: Inappropriate [others]
-
-Patch from gentoo which is not appropriate for us to upstream.
-
-# Patch copied from the OpenEmbedded libatomics-ops recipe. Original
-# source was from Gentoo.
-#
-# Signed-off-by: Scott Garman
-diff --git a/src/atomic_ops.h b/src/atomic_ops.h
-index c23f30b..791b360 100755
a/src/atomic_ops.h
-+++ b/src/atomic_ops.h
-@@ -220,6 +220,9 @@
- # if defined(__cris__) || defined(CRIS)
- # include "atomic_ops/sysdeps/gcc/cris.h"
- # endif
-+# if defined(__mips__)
-+# include "atomic_ops/sysdeps/gcc/mips.h"
-+# endif
- #endif /*
[OE-core] [PATCH] libproxy: add dependency on glib-2.0
Without this, you will get occasional build failures if libproxy tries to build before the glib headers are placed in the sysroot. Signed-off-by: Paul Gortmaker diff --git a/meta/recipes-support/libproxy/libproxy_0.4.7.bb b/meta/recipes-support/libproxy/libproxy_0.4.7.bb index 7e3cf27..a39e3a8 100644 --- a/meta/recipes-support/libproxy/libproxy_0.4.7.bb +++ b/meta/recipes-support/libproxy/libproxy_0.4.7.bb @@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=7d704a7b1b116e8783edcdb44ff4 \ file://utils/proxy.c;beginline=1;endline=18;md5=55152a1006d7dafbef32baf9c30a99c0" -DEPENDS = "gconf" +DEPENDS = "gconf glib-2.0" PR = "r4" -- 1.7.12.rc1.1.gbce1580 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 32/32] classes/license: fix manifest to work with deb
From: Paul Eggleton
Prepend the license manifest creation call to ROOTFS_POSTPROCESS_COMMAND
instead of appending to ROOTFS_POSTINSTALL_COMMAND. The latter is not
implemented for the deb backend (and probably ought to just be removed
completely), and by using _prepend we can still ensure it occurs before
package info is removed (and before buildhistory in case it is needed
there in future).
Signed-off-by: Paul Eggleton
---
meta/classes/license.bbclass |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass
index 6c4a673..cd4512e 100644
--- a/meta/classes/license.bbclass
+++ b/meta/classes/license.bbclass
@@ -382,7 +382,7 @@ do_populate_lic[sstate-name] = "populate-lic"
do_populate_lic[sstate-inputdirs] = "${LICSSTATEDIR}"
do_populate_lic[sstate-outputdirs] = "${LICENSE_DIRECTORY}/"
-ROOTFS_POSTINSTALL_COMMAND += "license_create_manifest; "
+ROOTFS_POSTPROCESS_COMMAND_prepend = "license_create_manifest; "
python do_populate_lic_setscene () {
sstate_setscene(d)
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 31/32] scripts/buildhistory-diff: add GitPython version check
From: Paul Eggleton
Display an error if the user does not have at least version 0.3.1 of
GitPython installed.
Signed-off-by: Paul Eggleton
Signed-off-by: Richard Purdie
---
scripts/buildhistory-diff |8 ++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/scripts/buildhistory-diff b/scripts/buildhistory-diff
index 9936a4b..3f27eab 100755
--- a/scripts/buildhistory-diff
+++ b/scripts/buildhistory-diff
@@ -7,16 +7,20 @@
import sys
import os
+from distutils.version import LooseVersion
# Ensure PythonGit is installed (buildhistory_analysis needs it)
try:
import git
except ImportError:
-print("Please install PythonGit 0.3.1 or later in order to use this
script")
+print("Please install GitPython (python-git) 0.3.1 or later in order to
use this script")
sys.exit(1)
-
def main():
+if LooseVersion(git.__version__) < '0.3.1':
+print("Version of GitPython is too old, please install GitPython
(python-git) 0.3.1 or later in order to use this script")
+sys.exit(1)
+
if (len(sys.argv) < 3):
print("Report significant differences in the buildhistory repository")
print("Syntax: %s [to-revision]"
% os.path.basename(sys.argv[0]))
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 30/32] buildhistory_analysis: fix error when version specifier missing
From: Paul Eggleton Passing None to split_versions() will raise an exception, so check that the version is specified before passing it in. Signed-off-by: Paul Eggleton Signed-off-by: Richard Purdie --- meta/lib/oe/buildhistory_analysis.py |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oe/buildhistory_analysis.py b/meta/lib/oe/buildhistory_analysis.py index 313416c..29dc4a9 100644 --- a/meta/lib/oe/buildhistory_analysis.py +++ b/meta/lib/oe/buildhistory_analysis.py @@ -272,7 +272,7 @@ def compare_pkg_lists(astr, bstr): if k in depverb: dva = depvera[k] dvb = depverb[k] -if dva != dvb: +if dva and dvb and dva != dvb: if bb.utils.vercmp(split_version(dva), split_version(dvb)) < 0: remove.append(k) -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 28/32] foomatic: fix perl path for target
From: Saul Wold
This problem appears on F17 when configure finds /bin/perl, since the beh
script is a target side script, we need to set PERL in the do_configure_prepend
in order for the correct perl to be used
Signed-off-by: Saul Wold
Signed-off-by: Richard Purdie
Reworked commit to fix merge conflicts with denzil branch.
Signed-off-by: Scott Garman
---
.../foomatic/foomatic-filters_4.0.7.bb |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb
b/meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb
index 223bb02..8626d38 100644
--- a/meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb
+++ b/meta/recipes-extended/foomatic/foomatic-filters_4.0.7.bb
@@ -10,7 +10,7 @@ format using a printer-specific, but spooler-independent PPD
file. \
"
DEPENDS += "cups perl libxml2"
-PR = "r3"
+PR = "r4"
LICENSE = "GPLv2+"
LIC_FILES_CHKSUM =
"file://${WORKDIR}/foomatic-filters-${PV}/COPYING;md5=393a5ca445f6965873eca0259a17f833"
@@ -25,6 +25,7 @@ inherit autotools
EXTRA_OECONF += "--disable-file-converter-check --with-file-converter=texttops"
do_configure_prepend() {
+export PERL="${bindir}/env perl"
export LIB_CUPS=${exec_prefix}/lib/cups # /usr/lib NOT libdir
export CUPS_BACKENDS=${exec_prefix}/lib/cups/backend # /usr/lib NOT libdir
export CUPS_FILTERS=${exec_prefix}/lib/cups/filter# /usr/lib NOT libdir
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 29/32] classes/rootfs_*: fix splitting package dependency strings
From: Paul Eggleton
If a + character appears in a version specification within the list of
package dependencies, the version will not be removed from the list in
list_package_depends/recommends leading to garbage appearing in the
dependency graphs generated by buildhistory. To avoid any future
problems due to unusual characters appearing in versions, change the
regex to match almost any character.
Fixes [YOCTO #2451].
Signed-off-by: Paul Eggleton
Signed-off-by: Richard Purdie
---
meta/classes/rootfs_deb.bbclass |4 ++--
meta/classes/rootfs_ipk.bbclass |4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/meta/classes/rootfs_deb.bbclass b/meta/classes/rootfs_deb.bbclass
index b6c706c..6c9767f 100644
--- a/meta/classes/rootfs_deb.bbclass
+++ b/meta/classes/rootfs_deb.bbclass
@@ -101,11 +101,11 @@ get_package_filename() {
}
list_package_depends() {
- ${DPKG_QUERY_COMMAND} -s $1 | grep ^Depends | sed -e 's/^Depends: //'
-e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g'
+ ${DPKG_QUERY_COMMAND} -s $1 | grep ^Depends | sed -e 's/^Depends: //'
-e 's/,//g' -e 's:([=<>]* [^ )]*)::g'
}
list_package_recommends() {
- ${DPKG_QUERY_COMMAND} -s $1 | grep ^Recommends | sed -e 's/^Recommends:
//' -e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g'
+ ${DPKG_QUERY_COMMAND} -s $1 | grep ^Recommends | sed -e 's/^Recommends:
//' -e 's/,//g' -e 's:([=<>]* [^ )]*)::g'
}
rootfs_check_package_exists() {
diff --git a/meta/classes/rootfs_ipk.bbclass b/meta/classes/rootfs_ipk.bbclass
index cbc63f0..1580086 100644
--- a/meta/classes/rootfs_ipk.bbclass
+++ b/meta/classes/rootfs_ipk.bbclass
@@ -143,11 +143,11 @@ get_package_filename() {
}
list_package_depends() {
- opkg-cl ${IPKG_ARGS} info $1 | grep ^Depends | sed -e 's/^Depends: //'
-e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g'
+ opkg-cl ${IPKG_ARGS} info $1 | grep ^Depends | sed -e 's/^Depends: //'
-e 's/,//g' -e 's:([=<>]* [^ )]*)::g'
}
list_package_recommends() {
- opkg-cl ${IPKG_ARGS} info $1 | grep ^Recommends | sed -e
's/^Recommends: //' -e 's/,//g' -e 's:([=<>]* [0-9a-zA-Z.~\-]*)::g'
+ opkg-cl ${IPKG_ARGS} info $1 | grep ^Recommends | sed -e
's/^Recommends: //' -e 's/,//g' -e 's:([=<>]* [^ )]*)::g'
}
rootfs_check_package_exists() {
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 27/32] shadow: use 'users' group by default
From: Otavio Salvador
The rootfs has 'users' group at number 100 and without this fix it
would assign to a non-existent group and if a group with gid as 1000
is created later it would own all files for users created.
Signed-off-by: Otavio Salvador
Signed-off-by: Saul Wold
Reworked commit to fix merge conflicts with denzil branch.
Signed-off-by: Scott Garman
---
meta/recipes-extended/shadow/shadow_4.1.4.3.bb |5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
index f892eb9..38cc005 100644
--- a/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow_4.1.4.3.bb
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
DEPENDS = "${@base_contains('DISTRO_FEATURES', 'pam', 'libpam', '', d)}"
RDEPENDS_${PN} = "shadow-securetty ${@base_contains('DISTRO_FEATURES', 'pam',
'${PAM_PLUGINS}', '', d)}"
-PR = "r8"
+PR = "r9"
SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
file://login_defs_pam.sed \
@@ -83,6 +83,9 @@ do_install_append() {
sed -i 's:/bin/bash:/bin/sh:g' ${D}${sysconfdir}/default/useradd
sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd
+ # Use users group by default
+ sed -i 's,^GROUP=1000,GROUP=100,g' ${D}${sysconfdir}/default/useradd
+
install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir}
for i in passwd chfn newgrp chsh groups ; do
mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 26/32] shadow-native: use 'users' group by default
From: Otavio Salvador
The rootfs has 'users' group at number 100 and without this fix it
would assign to a non-existent group and if a group with gid as 1000
is created later it would own all files for users created.
Signed-off-by: Otavio Salvador
Signed-off-by: Saul Wold
Reworked commit to fix merge conflicts with denzil branch.
Signed-off-by: Scott Garman
---
.../shadow/shadow-native_4.1.4.3.bb|5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
index 38bb922..529f90a 100644
--- a/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
+++ b/meta/recipes-extended/shadow/shadow-native_4.1.4.3.bb
@@ -7,7 +7,7 @@ LICENSE = "BSD | Artistic-1.0"
LIC_FILES_CHKSUM = "file://COPYING;md5=08c553a87d4e51bbed50b20e0adcaede \
file://src/passwd.c;firstline=8;endline=30;md5=2899a045e90511d0e043b85a7db7e2fe"
-PR = "r4"
+PR = "r5"
SRC_URI = "http://pkg-shadow.alioth.debian.org/releases/${BPN}-${PV}.tar.bz2 \
file://shadow.automake-1.11.patch \
@@ -44,6 +44,9 @@ do_install_append() {
sed -i 's:/bin/bash:/bin/sh:g' ${D}${sysconfdir}/default/useradd
sed -i '/^CREATE_MAIL_SPOOL/ s:^:#:' ${D}${sysconfdir}/default/useradd
+ # Use users group by default
+ sed -i 's,^GROUP=1000,GROUP=100,g' ${D}${sysconfdir}/default/useradd
+
install -d ${D}${sbindir} ${D}${base_sbindir} ${D}${base_bindir}
for i in passwd chfn newgrp chsh ; do
mv ${D}${bindir}/$i ${D}${bindir}/$i.${PN}
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 25/32] u-boot.inc: update linker arguments to pass --sysroot arg
From: Matthew McClintock
If we are building from sstate-cache it's possible to be building
from another folder on another machine, therefore the linker requires
that a proper --sysroot is passed too it so it can find things like
libgcc.a and avoid errors such as:
| arm-poky-linux-gnueabi-gcc -g -O2 -fno-common -ffixed-r8 -msoft-float
-D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=0x80008000
-I/local/yocto/upstream/label/ubuntu1204-64b/machine/beagleboard/poky/edison/tmp/work/beagleboard-poky-linux-gnueabi/u-boot-v2011.06+git5+b1af6f532e0d348b153d5c148369229d24af361a-r0/git/include
-fno-builtin -ffreestanding -nostdinc -isystem
/local/yocto/upstream/label/ubuntu1204-64b/machine/beagleboard/poky/edison/tmp/sysroots/x86_64-linux/usr/bin/armv7a-vfp-neon-poky-linux-gnueabi/../../lib/armv7a-vfp-neon-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/4.6.3/include
-pipe -DCONFIG_ARM -D__ARM__ -marm -mabi=aapcs-linux -mno-thumb-interwork
-march=armv5 -Wall -Wstrict-prototypes -fno-stack-protector
-fno-toplevel-reorder -o hello_world.o hello_world.c -c
| arm-poky-linux-gnueabi-gcc -g -O2 -fno-common -ffixed-r8 -msoft-float
-D__KERNEL__ -DCONFIG_SYS_TEXT_BASE=0x80008000
-I/local/yocto/upstream/label/ubuntu1204-64b/machine/beagleboard/poky/edison/tmp/work/beagleboard-poky-linux-gnueabi/u-boot-v2011.06+git5+b1af6f532e0d348b153d5c148369229d24af361a-r0/git/include
-fno-builtin -ffreestanding -nostdinc -isystem
/local/yocto/upstream/label/ubuntu1204-64b/machine/beagleboard/poky/edison/tmp/sysroots/x86_64-linux/usr/bin/armv7a-vfp-neon-poky-linux-gnueabi/../../lib/armv7a-vfp-neon-poky-linux-gnueabi/gcc/arm-poky-linux-gnueabi/4.6.3/include
-pipe -DCONFIG_ARM -D__ARM__ -marm -mabi=aapcs-linux -mno-thumb-interwork
-march=armv5 -Wall -Wstrict-prototypes -fno-stack-protector
-fno-toplevel-reorder -o stubs.o stubs.c -c
| arm-poky-linux-gnueabi-ld -r -o libstubs.o stubs.o
| arm-poky-linux-gnueabi-ld -g -Ttext 0x8030 \
| -o hello_world -e hello_world hello_world.o libstubs.o \
| -L. -lgcc
| arm-poky-linux-gnueabi-ld: cannot find -lgcc
| make[1]: *** [hello_world] Error 1
Signed-off-by: Matthew McClintock
Signed-off-by: Saul Wold
Signed-off-by: Richard Purdie
---
meta/recipes-bsp/u-boot/u-boot.inc|2 +-
meta/recipes-bsp/u-boot/u-boot_2011.03.bb |2 +-
meta/recipes-bsp/u-boot/u-boot_2011.06.bb |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-bsp/u-boot/u-boot.inc
b/meta/recipes-bsp/u-boot/u-boot.inc
index 0445c34..e627e97 100644
--- a/meta/recipes-bsp/u-boot/u-boot.inc
+++ b/meta/recipes-bsp/u-boot/u-boot.inc
@@ -8,7 +8,7 @@ inherit deploy
PARALLEL_MAKE=""
# GCC 4.5.1 builds unusable binaries using -Os, remove it from OPTFLAGS
-EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} OPTFLAGS='-O2'"
+EXTRA_OEMAKE = "CROSS_COMPILE=${TARGET_PREFIX} OPTFLAGS='-O2'
CC='${TARGET_PREFIX}gcc ${TOOLCHAIN_OPTIONS}'"
python () {
if not d.getVar("UBOOT_MACHINE", True):
diff --git a/meta/recipes-bsp/u-boot/u-boot_2011.03.bb
b/meta/recipes-bsp/u-boot/u-boot_2011.03.bb
index e99bc2c..5d79e1a 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2011.03.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2011.03.bb
@@ -17,7 +17,7 @@ FILESDIR =
"${@os.path.dirname(d.getVar('FILE',1))}/u-boot-git/${MACHINE}"
SRCREV = "19b54a701811220221fc4d5089a2bb18892018ca"
PV = "v2011.03+git${SRCPV}"
-PR = "r6"
+PR = "r7"
SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
diff --git a/meta/recipes-bsp/u-boot/u-boot_2011.06.bb
b/meta/recipes-bsp/u-boot/u-boot_2011.06.bb
index 680401f..43f2c06 100644
--- a/meta/recipes-bsp/u-boot/u-boot_2011.06.bb
+++ b/meta/recipes-bsp/u-boot/u-boot_2011.06.bb
@@ -17,7 +17,7 @@ FILESDIR =
"${@os.path.dirname(d.getVar('FILE',1))}/u-boot-git/${MACHINE}"
SRCREV = "b1af6f532e0d348b153d5c148369229d24af361a"
PV = "v2011.06+git${SRCPV}"
-PR = "r1"
+PR = "r2"
SRC_URI = "git://git.denx.de/u-boot.git;branch=master;protocol=git"
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 24/32] tcl: fix target recipe build issue on older distros
From: Nitin A Kamble
the builddir is put in front of the LD_LIBRARY_PATH, causing dynamically
linking of target library with native tclsh.
Fix this behavior to cross build tcl correctly.
This issue got exposed when eglibc-2.15 was configured for the target.
Signed-off-by: Nitin A Kamble
Signed-off-by: Richard Purdie
---
.../tcl/fix_issue_with_old_distro_glibc.patch | 109
meta/recipes-devtools/tcltk/tcl_8.5.11.bb |5 +-
2 files changed, 112 insertions(+), 2 deletions(-)
create mode 100644
meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
diff --git
a/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
b/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
new file mode 100644
index 000..9c295a6
--- /dev/null
+++ b/meta/recipes-devtools/tcltk/tcl/fix_issue_with_old_distro_glibc.patch
@@ -0,0 +1,109 @@
+Upstream-Status: inappropriate [embedded specific]
+
+Fixes tcl target recipe build on old distros which have glibc older than 2.14
+
+| + echo 'NOTE: make
DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image
install'
+| NOTE: make
DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image
install
+| + make
DESTDIR=/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image
install
+| Making directory
/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/lib
+| Installing message catalogs
+| Making directory
/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/share/man
+| tclsh: /lib64/libc.so.6: version `GLIBC_2.14' not found (required by
/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/tcl8.5.11/unix/libtcl8.5.so)
+| Making directory
/srv/home/nitin/builds/build-gcc47/tmp/work/x86_64-poky-linux/tcl-8.5.11-r5/image/usr/bin
+| make: *** [install-msgs] Error 1
+
+Signed-Off-By: Nitin A Kamble
+2012/04/26
+
+Index: unix/Makefile.in
+===
+--- unix.orig/Makefile.in
unix/Makefile.in
+@@ -592,12 +592,12 @@ tcltest-real:
+ # % make test TESTFLAGS="-verbose bps -file fileName.test"
+
+ test: tcltest@EXEEXT@
+- @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export
@LD_LIBRARY_PATH_VAR@; \
++ @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export
@LD_LIBRARY_PATH_VAR@; \
+ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
+ ./tcltest@EXEEXT@ $(TOP_DIR)/tests/all.tcl $(TESTFLAGS)
+
+ gdb-test: tcltest@EXEEXT@
+- @echo "set env
@LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run
++ @echo "set env @LD_LIBRARY_PATH_VAR@=\"$${@LD_LIBRARY_PATH_VAR@}\"" >
gdb.run
+ @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run
+ @echo "set args $(TOP_DIR)/tests/all.tcl $(TESTFLAGS) -singleproc 1" >>
gdb.run
+ $(GDB) ./tcltest@EXEEXT@ --command=gdb.run
+@@ -605,27 +605,27 @@ gdb-test: tcltest@EXEEXT@
+
+ # Useful target to launch a built tcltest with the proper path,...
+ runtest: tcltest@EXEEXT@
+- @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export
@LD_LIBRARY_PATH_VAR@; \
++ @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export
@LD_LIBRARY_PATH_VAR@; \
+ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
+ ./tcltest@EXEEXT@
+
+ # Useful target for running the test suite with an unwritable current
+ # directory...
+ ro-test: tcltest@EXEEXT@
+- @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export
@LD_LIBRARY_PATH_VAR@; \
++ @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export
@LD_LIBRARY_PATH_VAR@; \
+ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
+ echo 'exec chmod -w .;package require
tcltest;tcltest::temporaryDirectory /tmp;source ../tests/all.tcl;exec chmod +w
.' | ./tcltest@EXEEXT@
+
+ # This target can be used to run tclsh from the build directory
+ # via `make shell SCRIPT=/tmp/foo.tcl`
+ shell: ${TCL_EXE}
+- @LD_LIBRARY_PATH_VAR@="`pwd`:$${@LD_LIBRARY_PATH_VAR@}"; export
@LD_LIBRARY_PATH_VAR@; \
++ @LD_LIBRARY_PATH_VAR@="$${@LD_LIBRARY_PATH_VAR@}"; export
@LD_LIBRARY_PATH_VAR@; \
+ TCL_LIBRARY="${TCL_BUILDTIME_LIBRARY}"; export TCL_LIBRARY; \
+ ${TCL_EXE} $(SCRIPT)
+
+ # This target can be used to run tclsh inside either gdb or insight
+ gdb: ${TCL_EXE}
+- @echo "set env
@LD_LIBRARY_PATH_VAR@=\"`pwd`:$${@LD_LIBRARY_PATH_VAR@}\"" > gdb.run
++ @echo "set env @LD_LIBRARY_PATH_VAR@=\"$${@LD_LIBRARY_PATH_VAR@}\"" >
gdb.run
+ @echo "set env TCL_LIBRARY=${TCL_BUILDTIME_LIBRARY}" >> gdb.run
+ $(GDB) ${TCL_EXE} --command=gdb.run
+ rm gdb.run
+@@ -633,12 +633,12 @@ gdb: ${TCL_EXE}
+ VALGRINDARGS=--tool=memcheck --num-callers=8 --leak-resolution=high
--leak-check=yes --show-reachable=yes -v
[OE-core] [PATCH 23/32] utils.bbclass: add helper function to add all multilib variants of a specific package
From: Richard Purdie
This is useful for the scenario where we want to add 'gcc' to
the root file system for all multilib variants
Signed-off-by: Matthew McClintock
Signed-off-by: Richard Purdie
---
meta/classes/utils.bbclass |9 +
1 file changed, 9 insertions(+)
diff --git a/meta/classes/utils.bbclass b/meta/classes/utils.bbclass
index fde8f44..cc3acfa 100644
--- a/meta/classes/utils.bbclass
+++ b/meta/classes/utils.bbclass
@@ -351,6 +351,15 @@ def extend_variants(d, var, extend, delim=':'):
variants.append(eext[1])
return " ".join(variants)
+def multilib_pkg_extend(d, pkg):
+ variants = (d.getVar("MULTILIB_VARIANTS", True) or "").split()
+ if not variants:
+ return pkg
+ pkgs = pkg
+ for v in variants:
+ pkgs = pkgs + " " + v + "-" + pkg
+ return pkgs
+
def all_multilib_tune_values(d, var, unique = True, need_split = True, delim =
' '):
"""Return a string of all ${var} in all multilib tune configuration"""
values = []
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 21/32] image_types.bbclass: redefine EXTRA_IMAGECMD_jffs2 to leverage siteinfo
From: Ting Liu
Signed-off-by: Ting Liu
Signed-off-by: Richard Purdie
---
meta/classes/image_types.bbclass |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass
index b590ae1..55f122e 100644
--- a/meta/classes/image_types.bbclass
+++ b/meta/classes/image_types.bbclass
@@ -188,7 +188,12 @@ IMAGE_CMD_ubi () {
IMAGE_CMD_ubifs = "mkfs.ubifs -r ${IMAGE_ROOTFS} -o
${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ubifs ${MKUBIFS_ARGS}"
EXTRA_IMAGECMD = ""
-EXTRA_IMAGECMD_jffs2 ?= "--pad --little-endian --eraseblock=0x4"
+
+inherit siteinfo
+JFFS2_ENDIANNESS ?= "${@base_conditional('SITEINFO_ENDIANNESS', 'le',
'--little-endian', '--big-endian', d)}"
+JFFS2_ERASEBLOCK ?= "0x4"
+EXTRA_IMAGECMD_jffs2 ?= "--pad ${JFFS2_ENDIANNESS}
--eraseblock=${JFFS2_ERASEBLOCK} --no-cleanmarkers"
+
# Change these if you want default genext2fs behavior (i.e. create minimal
inode number)
EXTRA_IMAGECMD_ext2 ?= "-i 8192"
EXTRA_IMAGECMD_ext3 ?= "-i 8192"
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 22/32] libtool: fixed parallel build related race
From: Enrico Scholz
While building libtool, the libtool script itself will be regenerated
because OE modifies a dependency[1]. With -jX, this operation (-->
removal, creation of non-x file, 'chmod a+x') can happen at a time when
the script is going to be executed. This can cause errors like:
| arm-linux-gnueabi-libtool: compile: ccache arm-linux-gnueabi-gcc ...
| ...
| /bin/sh ./config.status libtool
| ...
| arm-linux-gnueabi-libtool: compile: ccache arm-linux-gnueabi-gcc ...
| /bin/sh: ./arm-linux-gnueabi-libtool: Permission denied
| make[2]: *** [libltdl/libltdl_libltdl_la-lt__alloc.lo] Error 126
I am not sure whether the custom do_compile_prepend() is still needed.
For now only the issue above will be fixed by executing ./config.status
yet again.
[1] see 648290d5bf4d6ff50d3643bb7ad902dfc23aa702
Signed-off-by: Enrico Scholz
Signed-off-by: Richard Purdie
---
meta/recipes-devtools/libtool/libtool-2.4.2.inc |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/libtool/libtool-2.4.2.inc
b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
index 084062a..c1ef7c4 100644
--- a/meta/recipes-devtools/libtool/libtool-2.4.2.inc
+++ b/meta/recipes-devtools/libtool/libtool-2.4.2.inc
@@ -8,7 +8,7 @@ LICENSE = "GPLv2 & LGPLv2.1"
LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
file://libltdl/COPYING.LIB;md5=e3eda01d9815f8d24aae2dbd89b68b06"
-INC_PR = "r2"
+INC_PR = "r3"
SRC_URI = "${GNU_MIRROR}/libtool/libtool-${PV}.tar.gz \
file://trailingslash.patch \
@@ -27,6 +27,7 @@ do_compile_prepend () {
# Sometimes this file doesn't get rebuilt, force the issue
rm -f ${S}/libltdl/config/ltmain.sh
make libltdl/config/ltmain.sh
+ ./config.status
}
inherit autotools
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 20/32] task-core-tools-testapps.bb: kexec-tools does not work on e5500-64b parts
From: Matthew McClintock
This prevents kexec from building for this part since it does not work
Signed-off-by: Matthew McClintock
Signed-off-by: Saul Wold
Signed-off-by: Richard Purdie
---
.../recipes-core/tasks/task-core-tools-testapps.bb |1 +
1 file changed, 1 insertion(+)
diff --git a/meta/recipes-core/tasks/task-core-tools-testapps.bb
b/meta/recipes-core/tasks/task-core-tools-testapps.bb
index b5847f8..bdd0d05 100644
--- a/meta/recipes-core/tasks/task-core-tools-testapps.bb
+++ b/meta/recipes-core/tasks/task-core-tools-testapps.bb
@@ -22,6 +22,7 @@ KEXECTOOLS ?= "kexec"
KEXECTOOLS_mips ?= ""
KEXECTOOLS_mipsel ?= ""
KEXECTOOLS_powerpc ?= ""
+KEXECTOOLS_e5500-64b ?= ""
RDEPENDS_${PN} = "\
blktool \
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 19/32] gcc-package-runtime.inc: Fix QA warning
From: Matthew McClintock
> ERROR: QA Issue: gcc-runtime: Files/directories were installed but not shipped
> /usr/lib/libgomp.so.1.0.0
> /usr/lib/libgomp.so.1
Signed-off-by: Matthew McClintock
Signed-off-by: Saul Wold
Signed-off-by: Richard Purdie
---
meta/recipes-devtools/gcc/gcc-package-runtime.inc |3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/gcc/gcc-package-runtime.inc
b/meta/recipes-devtools/gcc/gcc-package-runtime.inc
index 9962615..eeec957 100644
--- a/meta/recipes-devtools/gcc/gcc-package-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-runtime.inc
@@ -64,8 +64,9 @@ FILES_libmudflap-dev = "\
${libdir}/libmudflap*.a \
${libdir}/libmudflap*.la"
+FILES_libgomp = "${libdir}/libgomp*${SOLIBS}"
FILES_libgomp-dev = "\
- ${libdir}/libgomp*.so \
+ ${libdir}/libgomp*${SOLIBSDEV} \
${libdir}/libgomp*.la \
${libdir}/libgomp.spec \
${libdir}/gcc/${TARGET_SYS}/${BINV}/include/omp.h \
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 17/32] xserver-xorg: Fix build on powerpc
From: Khem Raj
Signed-off-by: Khem Raj
Signed-off-by: Richard Purdie
---
.../xorg-xserver/xserver-xorg-1.11.2.inc |9 +++---
.../xserver-xorg-1.11.2/gcc-47-warning.patch | 33
2 files changed, 38 insertions(+), 4 deletions(-)
create mode 100644
meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
index f5fa629..6a86af4 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2.inc
@@ -1,10 +1,11 @@
-SRC_URI += "file://crosscompile.patch"
-
# Misc build failure for master HEAD
-SRC_URI += "file://fix_open_max_preprocessor_error.patch"
+SRC_URI += "file://crosscompile.patch \
+file://fix_open_max_preprocessor_error.patch \
+file://gcc-47-warning.patch \
+ "
SRC_URI[md5sum] = "8796fff441e5435ee36a72579008af24"
SRC_URI[sha256sum] =
"fa415decf02027ca278b06254ccfbcceba2a83c2741405257ebf749da4a73cf2"
-PR = "r1"
+PR = "r2"
diff --git
a/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch
new file mode 100644
index 000..ed4eaac
--- /dev/null
+++
b/meta/recipes-graphics/xorg-xserver/xserver-xorg-1.11.2/gcc-47-warning.patch
@@ -0,0 +1,33 @@
+This patch fixes errors on powerpc like below
+
+| lnx_video.c: In function 'unmapVidMem':
+| lnx_video.c:472:24: error: cast from pointer to integer of different size
[-Werror=pointer-to-int-cast]
+
+Its in 1.12 branch
+
+http://cgit.freedesktop.org/xorg/xserver/commit/?h=server-1.12-branch&id=eb3377ffb8a7baa26c9831e56ed782d48b28fa71
+
+Upstream-Status: Backport
+
+Signed-off-by: Khem Raj
+
+Index: xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c
+===
+--- xorg-server-1.11.2.orig/hw/xfree86/os-support/linux/lnx_video.c
2012-05-01 06:32:34.186489019 -0700
xorg-server-1.11.2/hw/xfree86/os-support/linux/lnx_video.c 2012-05-01
06:49:14.926537452 -0700
+@@ -469,11 +469,11 @@
+ static void
+ unmapVidMem(int ScreenNum, pointer Base, unsigned long Size)
+ {
+-memType alignOff = (memType)Base
+- - ((memType)Base & ~(getpagesize() - 1));
++uintptr_t alignOff = (uintptr_t)Base
++ - ((uintptr_t)Base & ~(getpagesize() - 1));
+
+-DebugF("alignment offset: %lx\n",alignOff);
+-munmap((caddr_t)((memType)Base - alignOff), (Size + alignOff));
++DebugF("alignment offset: %lx\n",(unsigned long)alignOff);
++munmap((void*)((uintptr_t)Base - alignOff), (Size + alignOff));
+ }
+
+
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 18/32] kernel.bbclass: Copy bounds.h only if it exists, needed for 2.6.x.
From: Leon Woestenberg
Linux 2.6.x kernels did not (all) have the bounds.h file, so copy
only iff exists.
(See OE-Core 02ac0d1b65389e1779d5f95047f761d7a82ef7a4)
Signed-off-by: Leon Woestenberg
Signed-off-by: Scott Garman
---
meta/classes/kernel.bbclass |5 +
1 file changed, 5 insertions(+)
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index c21ab96..5f6ff66 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -183,6 +183,11 @@ kernel_do_install() {
cp arch/powerpc/lib/crtsavres.o
$kerneldir/arch/powerpc/lib/crtsavres.o
fi
+ # Necessary for building modules like compat-wireless.
+ if [ -f include/generated/bounds.h ]; then
+ cp include/generated/bounds.h
$kerneldir/include/generated/bounds.h
+ fi
+
# Remove the following binaries which cause strip errors
# during do_package for cross-compiled platforms
bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 14/32] augeas: Add libxml2 dependency
From: Martin Donnelly
This patch fixes the following Augeas configure error.
| checking for LIBXML... no
| configure: error: Package requirements (libxml-2.0) were not met:
|
| No package 'libxml-2.0' found
|
| Consider adjusting the PKG_CONFIG_PATH environment variable if you
| installed software in a non-standard prefix.
|
| Alternatively, you may set the environment variables LIBXML_CFLAGS
| and LIBXML_LIBS to avoid the need to call pkg-config.
| See the pkg-config man page for more details.
| ERROR: oe_runconf failed
Signed-off-by: Martin Donnelly
Signed-off-by: Richard Purdie
---
meta/recipes-extended/augeas/augeas.inc |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-extended/augeas/augeas.inc
b/meta/recipes-extended/augeas/augeas.inc
index 40be762..9fe864d 100644
--- a/meta/recipes-extended/augeas/augeas.inc
+++ b/meta/recipes-extended/augeas/augeas.inc
@@ -7,7 +7,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=bbb461211a33b134d42ed5ee802b37ff"
SRC_URI = "http://augeas.net/download/${BP}.tar.gz";
-DEPENDS = "readline"
+DEPENDS = "readline libxml2"
inherit autotools
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 15/32] curl: enable ssl support
From: Saul Wold
This patch enables ssl support for curl to allow git to clone from
https / ssl sites. We do not want to enable gnutls for native or
nativesdk, as it adds additional dependency and increase build time
[YOCTO #2532]
Signed-off-by: Saul Wold
---
meta/recipes-support/curl/curl_7.24.0.bb | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-support/curl/curl_7.24.0.bb
b/meta/recipes-support/curl/curl_7.24.0.bb
index 12e95c9..f9dce7d 100644
--- a/meta/recipes-support/curl/curl_7.24.0.bb
+++ b/meta/recipes-support/curl/curl_7.24.0.bb
@@ -5,10 +5,10 @@ SECTION = "console/network"
LICENSE = "MIT"
LIC_FILES_CHKSUM =
"file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac"
-DEPENDS = "zlib gnutls"
-DEPENDS_virtclass-native = "zlib-native"
-DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
-PR = "r0"
+DEPENDS = "zlib gnutls openssl"
+DEPENDS_virtclass-native = "zlib-native openssl-native"
+DEPENDS_virtclass-nativesdk = "zlib-nativesdk openssl-nativesdk"
+PR = "r1"
SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
file://noldlibpath.patch \
@@ -20,7 +20,7 @@ SRC_URI[sha256sum] =
"ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01
inherit autotools pkgconfig binconfig
EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
---without-ssl \
+ --with-ssl \
--without-libssh2 \
--with-random=/dev/urandom \
--without-libidn \
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 16/32] curl: Use gnutls for target and openssl for native
From: Saul Wold
Since gnutls is available on the target use it, but we do not build gnutls for
the native side as it adds too many dependecies, so use openssl.
Signed-off-by: Saul Wold
---
meta/recipes-support/curl/curl_7.24.0.bb | 13 ++---
1 file changed, 6 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-support/curl/curl_7.24.0.bb
b/meta/recipes-support/curl/curl_7.24.0.bb
index f9dce7d..2c5369c 100644
--- a/meta/recipes-support/curl/curl_7.24.0.bb
+++ b/meta/recipes-support/curl/curl_7.24.0.bb
@@ -5,10 +5,10 @@ SECTION = "console/network"
LICENSE = "MIT"
LIC_FILES_CHKSUM =
"file://COPYING;beginline=7;md5=3a34942f4ae3fbf1a303160714e664ac"
-DEPENDS = "zlib gnutls openssl"
+DEPENDS = "zlib gnutls"
DEPENDS_virtclass-native = "zlib-native openssl-native"
-DEPENDS_virtclass-nativesdk = "zlib-nativesdk openssl-nativesdk"
-PR = "r1"
+DEPENDS_virtclass-nativesdk = "zlib-nativesdk"
+PR = "r2"
SRC_URI = "http://curl.haxx.se/download/curl-${PV}.tar.bz2 \
file://noldlibpath.patch \
@@ -20,7 +20,6 @@ SRC_URI[sha256sum] =
"ebdb111088ff8b0e05b1d1b075e9f1608285e8105cc51e21caacf33d01
inherit autotools pkgconfig binconfig
EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
- --with-ssl \
--without-libssh2 \
--with-random=/dev/urandom \
--without-libidn \
@@ -28,9 +27,9 @@ EXTRA_OECONF = "--with-zlib=${STAGING_LIBDIR}/../ \
${CURLGNUTLS} \
"
-CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../"
-CURLGNUTLS_virtclass-native = "--without-gnutls"
-CURLGNUTLS_virtclass-nativesdk = "--without-gnutls"
+CURLGNUTLS = " --with-gnutls=${STAGING_LIBDIR}/../ --without-ssl"
+CURLGNUTLS_virtclass-native = "--without-gnutls --with-ssl"
+CURLGNUTLS_virtclass-nativesdk = "--without-gnutls --without-ssl"
do_configure_prepend() {
sed -i s:OPT_GNUTLS/bin:OPT_GNUTLS:g configure.ac
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 13/32] task-core-sdk.bb: add libgomp and libgomp-dev by RECOMMENDS
From: Zhenhua Luo
Signed-off-by: Zhenhua Luo
Signed-off-by: Saul Wold
Signed-off-by: Richard Purdie
---
meta/recipes-core/tasks/task-core-sdk.bb |6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-core/tasks/task-core-sdk.bb
b/meta/recipes-core/tasks/task-core-sdk.bb
index ec6cdcc..fe95236 100644
--- a/meta/recipes-core/tasks/task-core-sdk.bb
+++ b/meta/recipes-core/tasks/task-core-sdk.bb
@@ -7,7 +7,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM =
"file://${COREBASE}/LICENSE;md5=3f40d7994397109285ec7b81fdeb3b58 \
file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
DEPENDS = "task-core-console"
-PR = "r7"
+PR = "r8"
ALLOW_EMPTY = "1"
#PACKAGEFUNCS =+ 'generate_sdk_pkgs'
@@ -48,6 +48,10 @@ RDEPENDS_task-core-sdk = "\
file \
tcl"
+RRECOMMENDS_task-core-sdk = "\
+libgomp \
+libgomp-dev"
+
#python generate_sdk_pkgs () {
#poky_pkgs = read_pkgdata('task-core', d)['PACKAGES']
#pkgs = d.getVar('PACKAGES', True).split()
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 12/32] lsof: define linux C library type when using eglibc
From: Ting Liu
lsof tries to compile a temp c source file and execute the binary to
determine linux C library type (file Configure, line 2689-2717).
It is inpracticable for cross-compilation and may have build issue on
some distros since it depends on host settings.
Fix below error when building for 64bit target on 64bit host:
[...]
| dsock.c:481:44: error: 'TCP_LISTEN' undeclared (first use in this function)
| dsock.c:482:45: error: 'TCP_CLOSING' undeclared (first use in this function)
[...]
| make: *** [dsock.o] Error 1
The actual issue exists in do_configure:
[...]
Testing C library type with cc ... done
Cannot determine C library type; assuming it is not glibc.
Which is in turn caused by missing 'gnu/stubs-32.h" when compiling
the temp c source file on host:
[...]
fatal error: gnu/stubs-32.h: No such file or directory compilation terminated.
file gnu/stubs-32.h is provided by 32bit glibc.
Signed-off-by: Ting Liu
Signed-off-by: Saul Wold
Signed-off-by: Richard Purdie
---
meta/recipes-extended/lsof/lsof_4.85.bb |7 ++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-extended/lsof/lsof_4.85.bb
b/meta/recipes-extended/lsof/lsof_4.85.bb
index 8f25e24..d4091d1 100644
--- a/meta/recipes-extended/lsof/lsof_4.85.bb
+++ b/meta/recipes-extended/lsof/lsof_4.85.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "Lsof is a Unix-specific diagnostic tool. \
Its name stands for LiSt Open Files, and it does just that."
SECTION = "devel"
LICENSE = "BSD"
-PR = "r0"
+PR = "r1"
SRC_URI = "ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/lsof_${PV}.tar.bz2";
@@ -29,6 +29,11 @@ LSOF_OS_libc-glibc = "linux"
export LSOF_INCLUDE = "${STAGING_INCDIR}"
do_configure () {
+if [ "x${EGLIBCVERSION}" != "x" ];then
+LINUX_CLIB=`echo ${EGLIBCVERSION} |sed -e 's,\.,,g'`
+LINUX_CLIB="-DGLIBCV=${LINUX_CLIB}"
+export LINUX_CLIB
+fi
yes | ./Configure ${LSOF_OS}
}
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/32] gcc: gcc-cross-canadian: use correct location for libraries for powerpc64
From: Matthew McClintock
This fixes the issue where gcc invokes the linker with an incorrect -L
library location and gives up because it can't find libraries. It was
looking in a /lib folder instead of /lib64
Signed-off-by: Matthew McClintock
Signed-off-by: Richard Purdie
---
meta/recipes-devtools/gcc/gcc-4.6.inc |2 +-
.../recipes-devtools/gcc/gcc-cross-canadian_4.6.bb |4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc
b/meta/recipes-devtools/gcc/gcc-4.6.inc
index 32545eb..c71312e 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = "r26"
+PR = "r27"
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.6.0
diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb
b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb
index da3210f..74f983d 100644
--- a/meta/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb
+++ b/meta/recipes-devtools/gcc/gcc-cross-canadian_4.6.bb
@@ -9,8 +9,8 @@ DEPENDS += "gmp-nativesdk mpfr-nativesdk libmpc-nativesdk
elfutils-nativesdk"
RDEPENDS_${PN} += "mpfr-nativesdk libmpc-nativesdk elfutils-nativesdk"
SYSTEMHEADERS = "/usr/include"
-SYSTEMLIBS = "/lib/"
-SYSTEMLIBS1 = "/usr/lib/"
+SYSTEMLIBS = "${target_base_libdir}/"
+SYSTEMLIBS1 = "${target_libdir}/"
EXTRA_OECONF += "--disable-libunwind-exceptions --disable-libssp \
--disable-libgomp --disable-libmudflap \
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 10/32] libgomp: add libgomp (openmp) library, and build for powerpc targets by default
From: Matthew McClintock
Signed-off-by: Matthew McClintock
Signed-off-by: Richard Purdie
---
meta/recipes-devtools/gcc/gcc-4.6.inc |2 +-
.../recipes-devtools/gcc/gcc-configure-runtime.inc |7 +++
meta/recipes-devtools/gcc/gcc-package-runtime.inc | 12
3 files changed, 20 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc
b/meta/recipes-devtools/gcc/gcc-4.6.inc
index c71312e..4c6fe28 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = "r27"
+PR = "r28"
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.6.0
diff --git a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
index 34bfaeb..c9e8dd6 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-runtime.inc
@@ -9,6 +9,8 @@ EXTRA_OECONF_PATHS = " \
--with-build-sysroot=${STAGING_DIR_TARGET}"
RUNTIMETARGET = "libssp libstdc++-v3"
+RUNTIMETARGET_append_powerpc = " libgomp"
+RUNTIMETARGET_append_powerpc64 = " libgomp"
# ?
# libiberty
# libmudflap
@@ -36,6 +38,11 @@ do_install () {
for d in ${RUNTIMETARGET}; do
cd ${B}/$d/
oe_runmake 'DESTDIR=${D}' install
+ if [ "$d" = "libgomp" ]; then
+ rm -rf ${D}${datadir}/info/libgomp.info
${D}${datadir}/info/dir
+ rmdir --ignore-fail-on-non-empty -p
${D}${libdir}/gcc/${TARGET_SYS}/${BINV}/finclude
+ rmdir --ignore-fail-on-non-empty -p ${D}${datadir}/info
+ fi
done
chown -R root:root ${D}
}
diff --git a/meta/recipes-devtools/gcc/gcc-package-runtime.inc
b/meta/recipes-devtools/gcc/gcc-package-runtime.inc
index feb8735..9962615 100644
--- a/meta/recipes-devtools/gcc/gcc-package-runtime.inc
+++ b/meta/recipes-devtools/gcc/gcc-package-runtime.inc
@@ -13,6 +13,9 @@ PACKAGES = "\
libgfortran-dev \
libmudflap \
libmudflap-dev \
+ libgomp \
+ libgomp-dev \
+ libgomp-staticdev \
"
# The base package doesn't exist, so we clear the recommends.
RRECOMMENDS_${PN}-dbg = ""
@@ -61,3 +64,12 @@ FILES_libmudflap-dev = "\
${libdir}/libmudflap*.a \
${libdir}/libmudflap*.la"
+FILES_libgomp-dev = "\
+ ${libdir}/libgomp*.so \
+ ${libdir}/libgomp*.la \
+ ${libdir}/libgomp.spec \
+ ${libdir}/gcc/${TARGET_SYS}/${BINV}/include/omp.h \
+ "
+FILES_libgomp-staticdev = "\
+ ${libdir}/libgomp*.a \
+ "
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/32] sysvinit-inittab_2.88dsf.bb: Allow multiple serial port consoles to be defined
From: Matthew McClintock
Set SERIAL_CONSOLES if you want to define multiple serial consoles, also if
you need to check for the presence of the serial consoles you can also define
SERIAL_CONSOLES_CHECK to determine if these are present when you boot. This
will prevent error message that pop up when the serial port is not present.
SERIAL_CONSOLES = "115200;ttyS0 115200;ttyS1 115200;ttyEHV0"
SERIAL_CONSOLES_CHECK = "${SERIAL_CONSOLES}"
The above lines in machine.conf or elsewhere will have the effect of having
two serial consoles and removing any that are not present at boot
Signed-off-by: Saul Wold
Signed-off-by: Richard Purdie
---
.../sysvinit/sysvinit-inittab_2.88dsf.bb | 22 ++--
1 file changed, 20 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
index 9bd087c..1089edb 100644
--- a/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
+++ b/meta/recipes-core/sysvinit/sysvinit-inittab_2.88dsf.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Inittab for sysvinit"
LICENSE = "GPLv2"
LIC_FILES_CHKSUM =
"file://${COREBASE}/meta/files/common-licenses/GPL-2.0;md5=801f80980d171dd6425610833a22dbe6"
-PR = "r6"
+PR = "r7"
SRC_URI = "file://inittab"
@@ -26,7 +26,8 @@ do_install() {
for i in $tmp
do
j=`echo ${i} | sed s/\;/\ /g`
-echo "${idx}:2345:respawn:${base_sbindir}/getty ${j}" >>
${D}${sysconfdir}/inittab
+ echo "${idx}:12345:respawn:${base_sbindir}/getty ${j}" >>
${D}${sysconfdir}/inittab
+
idx=`expr $idx + 1`
done
@@ -51,6 +52,23 @@ EOF
fi
}
+pkg_postinst_${PN} () {
+# run this on the target
+if [ "x$D" == "x" ]; then
+ tmp="${SERIAL_CONSOLES_CHECK}"
+ for i in $tmp
+ do
+ j=`echo ${i} | sed s/^.*\;//g`
+ if [ -z "`cat /proc/consoles | grep ${j}`" ]; then
+ sed -i /^.*${j}$/d /etc/inittab
+ fi
+ done
+ kill -HUP 1
+else
+ exit 1
+fi
+}
+
# USE_VT and SERIAL_CONSOLE are generally defined by the MACHINE .conf.
# Set PACKAGE_ARCH appropriately.
PACKAGE_ARCH = "${MACHINE_ARCH}"
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/32] gcc-configure-common.inc: use --with-long-double-128 on powerpc to comply with ABI
From: Matthew McClintock
Signed-off-by: Matthew McClintock
Signed-off-by: Richard Purdie
---
meta/recipes-devtools/gcc/gcc-4.6.inc |2 +-
meta/recipes-devtools/gcc/gcc-configure-common.inc |4
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/gcc/gcc-4.6.inc
b/meta/recipes-devtools/gcc/gcc-4.6.inc
index 020e21b..32545eb 100644
--- a/meta/recipes-devtools/gcc/gcc-4.6.inc
+++ b/meta/recipes-devtools/gcc/gcc-4.6.inc
@@ -1,6 +1,6 @@
require gcc-common.inc
-PR = "r25"
+PR = "r26"
# Third digit in PV should be incremented after a minor release
# happens from this branch on gcc e.g. currently its 4.6.0
diff --git a/meta/recipes-devtools/gcc/gcc-configure-common.inc
b/meta/recipes-devtools/gcc/gcc-configure-common.inc
index 9542dc9..0f91ed3 100644
--- a/meta/recipes-devtools/gcc/gcc-configure-common.inc
+++ b/meta/recipes-devtools/gcc/gcc-configure-common.inc
@@ -53,6 +53,10 @@ EXTRA_OECONF_append_linux-uclibceabi = "
--disable-__cxa_atexit"
EXTRA_OECONF_FPU = "${@get_gcc_fpu_setting(bb, d)}"
CPPFLAGS = ""
+# powerpc needs this to comply with the ABI
+EXTRA_OECONF_append_powerpc = " --with-long-double-128"
+EXTRA_OECONF_append_powerpc64 = " --with-long-double-128"
+
# Used by configure to define additional values for FLAGS_FOR_TARGET -
# passed to all the compilers.
ARCH_FLAGS_FOR_TARGET = "${TARGET_CC_ARCH}"
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/32] openjade-native_1.3.2.bb: fix typo and change the deps exclusion to correct var
From: Matthew McClintock
Signed-off-by: Matthew McClintock
Signed-off-by: Richard Purdie
---
.../openjade/openjade-native_1.3.2.bb |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
index 5b29c1f..cd6a5aa 100644
--- a/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
+++ b/meta/recipes-devtools/openjade/openjade-native_1.3.2.bb
@@ -32,7 +32,7 @@ CONFIGUREOPTS := "${@d.getVar('CONFIGUREOPTS',
True).replace('--datadir=${datadi
# CONFIGUREOPTS has hard coded paths so we need to ignore it's vardeps
# there are other bits in there too but they are picked up by other variable
# dependencies so it all works out
-do_configure[vardepsexclude] += "CONNFIGUREOPTS"
+oe_runconf[vardepsexclude] += "CONFIGUREOPTS"
CFLAGS =+ "-I${S}/include"
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/32] dtc.inc: fix for libdir == /usr/lib64
From: Matthew McClintock
On 64bit systems dtc will still install libaries in /usr/lib
unless we havet this override
Signed-off-by: Matthew McClintock
Signed-off-by: Richard Purdie
---
meta/recipes-kernel/dtc/dtc.inc |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-kernel/dtc/dtc.inc b/meta/recipes-kernel/dtc/dtc.inc
index fab91dc..18847c6 100644
--- a/meta/recipes-kernel/dtc/dtc.inc
+++ b/meta/recipes-kernel/dtc/dtc.inc
@@ -10,8 +10,8 @@ SRC_URI = "git://www.jdl.com/software/dtc.git;protocol=git \
file://make_install.patch \
"
-EXTRA_OEMAKE='PREFIX="${prefix}"'
-INC_PR = "r2"
+EXTRA_OEMAKE='PREFIX="${prefix}" LIBDIR="${libdir}"'
+INC_PR = "r3"
S = "${WORKDIR}/git"
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/32] packagedata.py: Fix get_subpkgedata_fn for multilib
From: Matthew McClintock
This happens when tryng to add libgcc-dev to as a multilib package
(e.g. IMAGE_INSTALL_append = " lib32-libgcc-dev")
| Processing task-core-boot...
| Processing fman-ucode...
| Processing dosfstools...
| Processing lib32-libgcc-dev...
| Unable to find package lib32-libgcc-dev (libgcc-dev)!
NOTE: package fsl-image-full-1.0-r1.1.3.6: task do_rootfs: Failed
RPM (or bitbake?) is looking in the tmp/pkgdata, however some of these file
paths are mungned for the multilib scenario:
$ find tmp/pkgdata/ | grep libgcc-dev$
tmp/pkgdata/ppce5500-fsl-linux/runtime/lib32-libgcc-dev
tmp/pkgdata/ppc64e5500-fsl-linux/runtime/libgcc-dev
This patch fixes where we look for these files so they can be found and
properly installed for the multilib root file system
Signed-off-by: Matthew McClintock
Signed-off-by: Richard Purdie
---
meta/lib/oe/packagedata.py |8
1 file changed, 8 insertions(+)
diff --git a/meta/lib/oe/packagedata.py b/meta/lib/oe/packagedata.py
index a7a40f0..9a28e6b 100644
--- a/meta/lib/oe/packagedata.py
+++ b/meta/lib/oe/packagedata.py
@@ -27,6 +27,14 @@ def read_pkgdatafile(fn):
def get_subpkgedata_fn(pkg, d):
archs = d.expand("${PACKAGE_ARCHS}").split(" ")
+mlarchs = d.getVar("MULTILIB_PACKAGE_ARCHS", d) or None
+
+if mlarchs:
+for mlarch in mlarchs.split(" "):
+if "_" in mlarch:
+prefix, split, new_arch = mlarch.partition("_")
+archs.append(new_arch)
+
archs.reverse()
pkgdata = d.expand('${TMPDIR}/pkgdata/')
targetdir = d.expand('${TARGET_VENDOR}-${TARGET_OS}/runtime/')
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/32] xinetd: Update to 2.3.15
From: Saul Wold
Signed-off-by: Saul Wold
---
.../xinetd/{xinetd_2.3.14.bb => xinetd_2.3.15.bb} |6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
rename meta/recipes-extended/xinetd/{xinetd_2.3.14.bb => xinetd_2.3.15.bb}
(90%)
diff --git a/meta/recipes-extended/xinetd/xinetd_2.3.14.bb
b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
similarity index 90%
rename from meta/recipes-extended/xinetd/xinetd_2.3.14.bb
rename to meta/recipes-extended/xinetd/xinetd_2.3.15.bb
index 26ba78f..3d55e99 100644
--- a/meta/recipes-extended/xinetd/xinetd_2.3.14.bb
+++ b/meta/recipes-extended/xinetd/xinetd_2.3.15.bb
@@ -7,7 +7,7 @@ LICENSE = "BSD"
LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=8ad8615198542444f84d28a6cf226dd8"
DEPENDS = ""
-PR ="r1"
+PR = "r0"
SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \
file://xinetd.init \
@@ -17,8 +17,8 @@ SRC_URI = "http://www.xinetd.org/xinetd-${PV}.tar.gz \
file://xinetd-should-be-able-to-listen-on-IPv6-even-in-ine.patch \
"
-SRC_URI[md5sum] = "567382d7972613090215c6c54f9b82d9"
-SRC_URI[sha256sum] =
"760e0e617c609a0509ef63fc7e9580d2f1d88c6113bb6d63273de7de7cd0bc1f"
+SRC_URI[md5sum] = "77358478fd58efa6366accae99b8b04c"
+SRC_URI[sha256sum] =
"bf4e060411c75605e4dcbdf2ac57c6bd9e1904470a2f91e01ba31b50a80a5be3"
inherit autotools update-rc.d
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/32] qemu-0.15.1: add patch to fix compilatation problems on powerpc
From: Matthew McClintock
ERROR: Function failed: do_compile (see
/opt/yocto/cache-build/p5020ds-64b/build_p5020ds-64b_release/tmp/work/ppc64e5500-fsl-linux/qemu-0.15.1-r6/temp/log.do_compile.28447
for further information)
ERROR: Logfile of failure stored in:
/opt/yocto/cache-build/p5020ds-64b/build_p5020ds-64b_release/tmp/work/ppc64e5500-fsl-linux/qemu-0.15.1-r6/temp/log.do_compile.28447
Log data follows:
| DEBUG: SITE files ['endian-big', 'bit-64', 'powerpc-common', 'common-linux',
'common-glibc', 'powerpc-linux', 'powerpc64-linux', 'common']
| ERROR: Function failed: do_compile (see
/opt/yocto/cache-build/p5020ds-64b/build_p5020ds-64b_release/tmp/work/ppc64e5500-fsl-linux/qemu-0.15.1-r6/temp/log.do_compile.28447
for further information)
| NOTE: make -j 24
| LINK ppc-linux-user/qemu-ppc
|
/opt/yocto/cache-build/p5020ds-64b/build_p5020ds-64b_release/tmp/sysroots/x86_64-linux/usr/libexec/ppc64e5500-fsl-linux/gcc/powerpc64-fsl-linux/4.6.4/ld:/opt/yocto/cache-build/p5020ds-64b/build_p5020ds-64b_release/tmp/work/ppc64e5500-fsl-linux/qemu-0.15.1-r6/qemu-0.15.1/ppc64.ld:84:
syntax error
| collect2: ld returned 1 exit status
| make[1]: *** [qemu-ppc] Error 1
| make: *** [subdir-ppc-linux-user] Error 2
| make: *** Waiting for unfinished jobs
| ERROR: oe_runmake failed
Signed-off-by: Matthew McClintock
Signed-off-by: Richard Purdie
---
.../qemu-0.15.1/0001-ppc64-Fix-linker-script.patch | 46
meta/recipes-devtools/qemu/qemu_0.15.1.bb |3 +-
2 files changed, 48 insertions(+), 1 deletion(-)
create mode 100644
meta/recipes-devtools/qemu/qemu-0.15.1/0001-ppc64-Fix-linker-script.patch
diff --git
a/meta/recipes-devtools/qemu/qemu-0.15.1/0001-ppc64-Fix-linker-script.patch
b/meta/recipes-devtools/qemu/qemu-0.15.1/0001-ppc64-Fix-linker-script.patch
new file mode 100644
index 000..d64d76f
--- /dev/null
+++ b/meta/recipes-devtools/qemu/qemu-0.15.1/0001-ppc64-Fix-linker-script.patch
@@ -0,0 +1,46 @@
+Upstream-Status: Backport
+
+From 7c0a3409627604c111d5c5e1ce4e0224c2b56315 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Andreas=20F=C3=A4rber?=
+Date: Tue, 4 Oct 2011 05:14:52 +
+Subject: [PATCH] ppc64: Fix linker script
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Since commit 8733f609 (Fix linker scripts) linking on Linux/ppc64 fails:
+
+ LINK ppc64-linux-user/qemu-ppc64
+/usr/lib64/gcc/powerpc64-suse-linux/4.3/../../../../powerpc64-suse-linux/bin/ld:/home/afaerber/qemu/ppc64.ld:84:
syntax error
+collect2: ld gab 1 als Ende-Status zurück
+make[1]: *** [qemu-ppc64] Fehler 1
+make: *** [subdir-ppc64-linux-user] Fehler 2
+
+Fix by removing a leftover line in the ppc64 linker script.
+
+Cc: Gerd Hoffmann
+Cc: Blue Swirl
+Signed-off-by: Andreas Färber
+Signed-off-by: Alexander Graf
+---
+ ppc64.ld |4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/ppc64.ld b/ppc64.ld
+index 0059ee5..0a7c0dd 100644
+--- a/ppc64.ld
b/ppc64.ld
+@@ -81,8 +81,8 @@ SECTIONS
+ .sdata2 : { *(.sdata2 .sdata2.* .gnu.linkonce.s2.*) }
+ .sbss2 : { *(.sbss2 .sbss2.* .gnu.linkonce.sb2.*) }
+ .eh_frame_hdr : { *(.eh_frame_hdr) }
+-*(.gcc_except_table.*) } /* Adjust the address for the data segment. We want
to
+-adjust up to + the same address within the page on the next page up. */
++ /* Adjust the address for the data segment. We want to adjust up to
++ the same address within the page on the next page up. */
+ . = ALIGN (0x1) - ((0x1 - .) & (0x1 - 1)); . =
DATA_SEGMENT_ALIGN
+ (0x1, 0x1000); /* Exception handling */
+ .eh_frame : { KEEP (*(.eh_frame)) }
+--
+1.7.10
+
diff --git a/meta/recipes-devtools/qemu/qemu_0.15.1.bb
b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
index e90f339..54f746b 100644
--- a/meta/recipes-devtools/qemu/qemu_0.15.1.bb
+++ b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
@@ -3,7 +3,7 @@ require qemu.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
-PR = "r6"
+PR = "r7"
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
FILESDIR = "${WORKDIR}"
@@ -19,6 +19,7 @@ SRC_URI = "\
file://larger_default_ram_size.patch \
file://arm-bgr.patch \
file://a4d1f142542935b90d2eb30f3aead4edcf455fe6.patch \
+file://0001-ppc64-Fix-linker-script.patch \
"
# Only use the GL passthrough patches for native/nativesdk versions
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/32] libxml-parser-perl_2.41.bb: fix MakeMaker issues with using wrong CC/LD/etc
From: Matthew McClintock
MakeMaker has a bug where it does not propagate CC/LD/etc information
down to subproject it generates Makefiles for... this recipe has has an
Expat subproject which has issues building if we are using sstate-cache
and it will reference the old sysroots and be unable to build properly.
There is an upstream MakeMaker bug for this issue but we can work around
it by fixing up the Makefiles for now
See:
https://rt.cpan.org/Public/Bug/Display.html?id=28632
Signed-off-by: Matthew McClintock
Signed-off-by: Richard Purdie
---
.../perl/libxml-parser-perl_2.41.bb| 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
b/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
index be41578..33b4d83 100644
--- a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
+++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM =
"file://README;beginline=2;endline=6;md5=c8767d7516229f07b26e
DEPENDS += "expat expat-native"
-PR = "r2"
+PR = "r3"
SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz";
SRC_URI[md5sum] = "c320d2ffa459e6cdc6f9f59c1185855e"
@@ -13,10 +13,17 @@ SRC_URI[sha256sum] =
"b48197cd2265a26c5f016489f11a7b450d8833cb8b3d6a46ee15975740
S = "${WORKDIR}/XML-Parser-${PV}"
-EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR}
EXPATINCPATH=${STAGING_INCDIR}"
+EXTRA_CPANFLAGS = "EXPATLIBPATH=${STAGING_LIBDIR}
EXPATINCPATH=${STAGING_INCDIR} CC=${CC} LD=${LD} FULL_AR=${AR}"
inherit cpan
+# fix up sub MakeMaker project as arguments don't get propagated though
+# see https://rt.cpan.org/Public/Bug/Display.html?id=28632
+do_configure_append() {
+ sed 's:--sysroot=.*\(\s\|$\):--sysroot=${STAGING_DIR_TARGET} :g' -i
Makefile Expat/Makefile
+ sed 's:^FULL_AR = .*:FULL_AR = ${AR}:g' -i Expat/Makefile
+}
+
do_compile() {
export LIBC="$(find ${STAGING_DIR_TARGET}/${base_libdir}/ -name
'libc-*.so')"
cpan_do_compile
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/32] linux-dtb: add multi-dtb build support
From: Zhenhua Luo
including following enhancement:
* support multi-dtb build
* skip dtb build and install when KERNEL_DEVICETREE is empty
* print a warning message when specified dts file is not available
Signed-off-by: Zhenhua Luo
---
meta/recipes-kernel/linux/linux-dtb.inc | 36 +--
1 file changed, 29 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-dtb.inc
b/meta/recipes-kernel/linux/linux-dtb.inc
index 9188cee..8aa1458 100644
--- a/meta/recipes-kernel/linux/linux-dtb.inc
+++ b/meta/recipes-kernel/linux/linux-dtb.inc
@@ -15,13 +15,35 @@ python __anonymous () {
do_install_append() {
if test -n "${KERNEL_DEVICETREE}"; then
- dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o devicetree
${KERNEL_DEVICETREE}
- install -m 0644 devicetree ${D}/boot/devicetree-${KERNEL_VERSION}
- install -d ${DEPLOYDIR}
- install -m 0644 devicetree ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.dtb
- cd ${DEPLOYDIR}
- rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
- ln -sf ${KERNEL_IMAGE_BASE_NAME}.dtb ${KERNEL_IMAGE_SYMLINK_NAME}.dtb
+for DTS_FILE in ${KERNEL_DEVICETREE}; do
+if [ ! -f ${DTS_FILE} ]; then
+echo "Warning: ${DTS_FILE} is not available!"
+continue
+fi
+DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
+DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed
"s/${MACHINE}/${DTS_BASE_NAME}/g"`
+DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed
"s/${MACHINE}/${DTS_BASE_NAME}/g"`
+dtc -I dts -O dtb ${KERNEL_DEVICETREE_FLAGS} -o ${DTS_BASE_NAME}
${DTS_FILE}
+install -m 0644 ${DTS_BASE_NAME}
${D}/boot/devicetree-${DTB_SYMLINK_NAME}.dtb
+done
fi
}
+do_deploy_append() {
+if test -n "${KERNEL_DEVICETREE}"; then
+for DTS_FILE in ${KERNEL_DEVICETREE}; do
+if [ ! -f ${DTS_FILE} ]; then
+echo "Warning: ${DTS_FILE} is not available!"
+continue
+fi
+DTS_BASE_NAME=`basename ${DTS_FILE} | awk -F "." '{print $1}'`
+DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed
"s/${MACHINE}/${DTS_BASE_NAME}/g"`
+DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed
"s/${MACHINE}/${DTS_BASE_NAME}/g"`
+install -d ${DEPLOYDIR}
+install -m 0644 ${B}/${DTS_BASE_NAME} ${DEPLOYDIR}/${DTB_NAME}.dtb
+cd ${DEPLOYDIR}
+ln -sf ${DTB_NAME}.dtb ${DTB_SYMLINK_NAME}.dtb
+cd -
+done
+fi
+}
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/32] denzil pull request1
Hello, This is my first pull request for denzil since the 1.2.1 release was made. It has been run through the autobuilder, which is having some issues with running sanity tests and buildhistory, so if the build succeeded for everything except for those steps, I note it as "Green with known AB issues" below. Note that these tests were run with a poky-based branch. Autobuilder Test Report: sgarman/denzil-next-pull1 eclipse-plugin: Green http://autobuilder.yoctoproject.org:8010/builders/eclipse-plugin/builds/491 nightly-x86: Green with known AB issues http://autobuilder.yoctoproject.org:8010/builders/nightly-x86/builds/633 nightly-x86-64: Green with known AB issues http://autobuilder.yoctoproject.org:8010/builders/nightly-x86-64/builds/572 nightly-arm: Red: see below http://autobuilder.yoctoproject.org:8010/builders/nightly-arm/builds/571 connman-gnome do_configure failed configure: error: dbus-glib > = 0.73 is required nightly-mips: Green with known AB issues http://autobuilder.yoctoproject.org:8010/builders/nightly-mips nightly-ppc: Green with known AB issues http://autobuilder.yoctoproject.org:8010/builders/nightly-ppc/builds/527 nightly-world: Green http://autobuilder.yoctoproject.org:8010/builders/nightly-world/builds/221 nightly-non-gpl3: Green http://autobuilder.yoctoproject.org:8010/builders/nightly-non-gpl3/builds/204 nightly-multilib: Green http://autobuilder.yoctoproject.org:8010/builders/nightly-multilib/builds/205 nightly-tiny: Green http://autobuilder.yoctoproject.org:8010/builders/nightly-tiny/builds/185 Scott The following changes since commit 741146fa90f28f7ce8d82ee7f7e254872d519724: gconf.bbclass: don't register schemas in the install stage (2012-06-29 15:03:01 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib sgarman/denzil-next-pull1 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgarman/denzil-next-pull1 Enrico Scholz (1): libtool: fixed parallel build related race Khem Raj (1): xserver-xorg: Fix build on powerpc Martin Donnelly (1): augeas: Add libxml2 dependency Matthew McClintock (12): libxml-parser-perl_2.41.bb: fix MakeMaker issues with using wrong CC/LD/etc qemu-0.15.1: add patch to fix compilatation problems on powerpc packagedata.py: Fix get_subpkgedata_fn for multilib dtc.inc: fix for libdir == /usr/lib64 openjade-native_1.3.2.bb: fix typo and change the deps exclusion to correct var gcc-configure-common.inc: use --with-long-double-128 on powerpc to comply with ABI gcc: gcc-cross-canadian: use correct location for libraries for powerpc64 libgomp: add libgomp (openmp) library, and build for powerpc targets by default sysvinit-inittab_2.88dsf.bb: Allow multiple serial port consoles to be defined gcc-package-runtime.inc: Fix QA warning task-core-tools-testapps.bb: kexec-tools does not work on e5500-64b parts u-boot.inc: update linker arguments to pass --sysroot arg Nitin A Kamble (1): tcl: fix target recipe build issue on older distros Otavio Salvador (2): shadow-native: use 'users' group by default shadow: use 'users' group by default Paul Eggleton (4): classes/rootfs_*: fix splitting package dependency strings buildhistory_analysis: fix error when version specifier missing scripts/buildhistory-diff: add GitPython version check classes/license: fix manifest to work with deb Richard Purdie (1): utils.bbclass: add helper function to add all multilib variants of a specific package Saul Wold (4): xinetd: Update to 2.3.15 curl: enable ssl support curl: Use gnutls for target and openssl for native foomatic: fix perl path for target Scott Garman (1): kernel.bbclass: Copy bounds.h only if it exists, needed for 2.6.x. Ting Liu (2): lsof: define linux C library type when using eglibc image_types.bbclass: redefine EXTRA_IMAGECMD_jffs2 to leverage siteinfo Zhenhua Luo (2): linux-dtb: add multi-dtb build support task-core-sdk.bb: add libgomp and libgomp-dev by RECOMMENDS meta/classes/image_types.bbclass |7 +- meta/classes/kernel.bbclass|5 + meta/classes/license.bbclass |2 +- meta/classes/rootfs_deb.bbclass|4 +- meta/classes/rootfs_ipk.bbclass|4 +- meta/classes/utils.bbclass |9 ++ meta/lib/oe/buildhistory_analysis.py |2 +- meta/lib/oe/packagedata.py |8 ++ meta/recipes-bsp/u-boot/u-boot.inc |2 +- meta/recipes-bsp/u-boot/u-boot_2011.03.bb |2 +- meta/recipes-bsp/u-boot/u-boot_2011.06.bb |2 +- .../sysvinit/sysvinit-inittab_2.88dsf.bb | 22 +++- meta/recipes-core/tasks/task-core-sdk.bb |6 +- .../recipes-core/tasks/task-core-tools-testapps.bb |1 + meta/recipes-devtools/gcc/gcc-4.6.inc |
[OE-core] [PATCH 1/1] runqemu: support booting ramfs-based images
Added support for booting ramfs-based images (e.g, poky-tiny) which
do not have block device support.
This fixes [YOCTO #2612].
Signed-off-by: Scott Garman
---
scripts/runqemu |6 ++
scripts/runqemu-internal |5 +
2 files changed, 11 insertions(+)
diff --git a/scripts/runqemu b/scripts/runqemu
index 7454dd4..7e4bcc4 100755
--- a/scripts/runqemu
+++ b/scripts/runqemu
@@ -26,6 +26,7 @@ usage() {
echo " KERNEL - the kernel image file to use"
echo " ROOTFS - the rootfs image file or nfsroot directory to use"
echo " MACHINE - the machine name (optional, autodetected from KERNEL
filename if unspecified)"
+echo " RAMFS - boot a ramfs-based image"
echo " Simplified QEMU command-line options can be passed with:"
echo "nographic - disables video console"
echo "serial - enables a serial console on /dev/ttyS0"
@@ -37,6 +38,7 @@ usage() {
echo " $MYNAME qemuarm"
echo " $MYNAME qemux86-64 core-image-sato ext3"
echo " $MYNAME path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial"
+echo " $MYNAME qemux86 ramfs"
echo " $MYNAME qemux86 qemuparams=\"-m 256\""
echo " $MYNAME qemux86 bootparams=\"psplash=false\""
exit 1
@@ -118,6 +120,10 @@ while true; do
LAZY_ROOTFS="true"
fi
;;
+"ramfs")
+FSTYPE=cpio.gz
+RAMFS=true
+;;
"nographic")
SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -nographic"
SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT console=ttyS0"
diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal
index eeadb24..0d4f4a1 100755
--- a/scripts/runqemu-internal
+++ b/scripts/runqemu-internal
@@ -453,6 +453,11 @@ if [ "$MACHINE" = "akita" ]; then
fi
fi
+if [ "x$RAMFS" = "xtrue" ]; then
+QEMUOPTIONS="-initrd $ROOTFS -nographic"
+KERNCMDLINE="root=/dev/ram0"
+fi
+
if [ "x$QEMUOPTIONS" = "x" ]; then
echo "Error: Unable to support this combination of options"
cleanup
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] runqemu ramfs support
Added support for booting ramfs-based images (e.g, poky-tiny) which do not have block device support. This fixes [YOCTO #2612]. Scott The following changes since commit 5290e82ecef08b5e573d7442627276d7b42c6b93: foomatic: fix perl path for target (2012-08-08 10:05:52 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib sgarman/runqemu-ramfs-oe http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=sgarman/runqemu-ramfs-oe Scott Garman (1): runqemu: support booting ramfs-based images scripts/runqemu |6 ++ scripts/runqemu-internal |5 + 2 files changed, 11 insertions(+) -- 1.7.9.5 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Update prelink to latest version
The following changes since commit b5028cc84ad7c40c51cadbdf7fdc892cde4462cb: createrepo: add wrapper script to fix paths (2012-08-13 20:09:22 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib mhatle/prelink http://git.yoctoproject.org/cgit.cgi//log/?h=mhatle/prelink Mark Hatle (1): prelink: Update to latest upstream prelink meta/recipes-devtools/prelink/prelink_git.bb |4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) -- 1.7.3.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] prelink: Update to latest upstream prelink
The latest fixes an obscure problem with prelinking on PowerPC, as well
as general updated.
Signed-off-by: Mark Hatle
---
meta/recipes-devtools/prelink/prelink_git.bb |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-devtools/prelink/prelink_git.bb
b/meta/recipes-devtools/prelink/prelink_git.bb
index c94bdf5..610302e 100644
--- a/meta/recipes-devtools/prelink/prelink_git.bb
+++ b/meta/recipes-devtools/prelink/prelink_git.bb
@@ -8,9 +8,9 @@ and executables, so that far fewer relocations need to be
resolved at \
runtime and thus programs come up faster."
LICENSE = "GPLv2"
LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
-SRCREV = "7b47f2f8a15ed13b7905bc120bb2586f3e164f7d"
+SRCREV = "a2d8e30942bd4bc0a5c852b9d9d12f8684c4bb8d"
PV = "1.0+git${SRCPV}"
-PR = "r9"
+PR = "r10"
#
# The cron script attempts to re-prelink the system daily -- on
--
1.7.3.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] distutils.bbclass: fix libdir for 64-bit python modules built with distutils
Without this some modules will be intalled in /usr/lib/python2.6/
instead of /usr/${libdir}/python2.6
Signed-off-by: Matthew McClintock
---
meta/classes/distutils.bbclass |1 +
1 file changed, 1 insertion(+)
diff --git a/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass
index 690df73..7588b81 100644
--- a/meta/classes/distutils.bbclass
+++ b/meta/classes/distutils.bbclass
@@ -39,6 +39,7 @@ distutils_do_install() {
PYTHONPATH=${D}/${PYTHON_SITEPACKAGES_DIR} \
BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \
${STAGING_BINDIR_NATIVE}/python-native/python setup.py install
${DISTUTILS_INSTALL_ARGS} || \
+${STAGING_BINDIR_NATIVE}/python-native/python setup.py install
${DISTUTILS_INSTALL_ARGS} --install-lib=${D}${libdir}/${PYTHON_DIR} || \
bbfatal "python setup.py install execution failed."
for i in `find ${D} -name "*.py"` ; do \
--
1.7.9.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] linux-yocto/3.4: BSP, uprobes, config and cleanups
Updating the linux-yocto 3.4 recipe with consolidated fixes, BSPs
and cleanups.
>From the kernel meta branch:
28bcd46 meta: move emgd features to staging
6c01949 meta: Crystal Forest Machine Created.
3c19c4d meta/qemuppc: remove redundant profiling options
a5da4d5 meta: kgdb: update configuration for out of box functionality
1d13e00 meta: update status/series and patches for v3.4
b96c408 fsl-mpc8315e-rdb: replace leading dot with hash in cfg file
7c9a3b0 usb: fix scc and cfg filename collision with ktypes/base/
aa0e1f6 kconfig: make CONFIG_BLOCK=y part of base config
3d1a2f2 kconfig: add tty/serial file to hardware listing
60b600f routerstationpro: specify chosen filesystems in audit input.
8b5c8c7 routerstationpro: add config data for audit purposes
d7ae8fa meta: add ath79 Kconfig to hardware listing.
And from the standard branch:
c77666c powerpc: uprobes: removed external declaration of
uprobe_get_swbp_addr.
c262f3e powerpc: Uprobes port to powerpc
d40e73d powerpc: Add trap_nr to thread_struct
6a64190 Revert "This is the port of uprobes to powerpc. Usage is similar to
x86."
e422119 Revert "powerpc: uprobes: removed external declaration of
uprobe_get_swbp_addr."
d4ef82f keys: kill task_struct->replacement_session_keyring
1cc141e keys: kill the dummy key_replace_session_keyring()
090ca45 keys: change keyctl_session_to_parent() to use task_work_add()
61bc7a8 genirq: reimplement exit_irq_thread() hook via task_work_add()
5ee34dd task_work_add: generic process-context callbacks
70754de move key_repace_session_keyring() into tracehook_notify_resume()
6f70bc1 powerpc: uprobes: removed external declaration of
uprobe_get_swbp_addr.
e5f6a4c This is the port of uprobes to powerpc. Usage is similar to x86.
2bc4597 On RISC architectures like powerpc, instructions are fixed size.
Instruction analysis on such pl
8893371 perf probe: Detect probe target when m/x options are absent
544d531a perf probe: Provide perf interface for uprobes
103b503 tracing: Fix kconfig warning due to a typo
9bb012e tracing: Provide trace events interface for uprobes
b9b7281 tracing: Extract out common code for kprobes/uprobes trace events
91f0360 tracing: Modify is_delete, is_return from int to bool
a8600f2 uprobes/core: Decrement uprobe count before the pages are unmapped
a252056 uprobes/core: Make background page replacement logic account for
rss_stat counters
3efc15b uprobes/core: Optimize probe hits with the help of a counter
20f3d76 uprobes/core: Allocate XOL slots for uprobes use
77bfad8 uprobes/core: Handle breakpoint and singlestep exceptions
7196d9a uprobes/core: Rename bkpt to swbp
c99bc18 uprobes/core: Make order of function parameters consistent across
functions
7e9be99 uprobes/core: Make macro names consistent
c4247f2 uprobes: Update copyright notices
f066ff9 uprobes/core: Move insn to arch specific structure
e91cf65 uprobes/core: Remove uprobe_opcode_sz
942b91c uprobes/core: Make instruction tables volatile
56c1e99 uprobes: Move to kernel/events/
0a7ad1c uprobes/core: Clean up, refactor and improve the code
3760d62 uprobes, mm, x86: Add the ability to install and remove uprobes
breakpoints
Two BSP updates:
- Crystal Forest Machine has been added
- routerstationpro configuration updates for 3.4
Signed-off-by: Bruce Ashfield
---
meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb |6 +++---
meta/recipes-kernel/linux/linux-yocto_3.4.bb| 14 +++---
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
index b995a42..1c4d2fd 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
@@ -8,9 +8,9 @@ LINUX_KERNEL_TYPE = "preempt-rt"
KMETA = "meta"
-SRCREV_machine ?= "50cc910aeb0571921b7ad86091ec2dc621adf67f"
-SRCREV_machine_qemuppc ?= "713b13fa93d4d0b1780b31ed9bbb7a5527447886"
-SRCREV_meta ?= "8d2012649516f3c489295a31fb9ea7afd1b464e4"
+SRCREV_machine ?= "7c172e3f3d3109b23a1107f512f9463d3108f5b2"
+SRCREV_machine_qemuppc ?= "ee88dfc005ec2cdbfe5fda3c27e5f8a175991948"
+SRCREV_meta ?= "28bcd46af1d592dab39bd8a0891c872454fde8bc"
PR = "${INC_PR}.0"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 9f1e550..64a19a1 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -10,13 +10,13 @@ KBRANCH_qemumips64 = "standard/mti-malta64"
KBRANCH_qemumips64el = "standard/mti-malta64"
KBRANCH_qemuarm = "standard/arm-versatile-926ejs"
-SRCREV_machine_qemuarm ?= "469cf6a66c720944adeaf8e43c044dfcb8d90599"
-SRCREV_machine_qemumips ?= "0985f3076c1a5a2cc3a01054e8a0411ffe440395"
-SRCREV_machine_qemuppc ?= "e662bb66d9114c05919cd57ee4d620f4e67d2123"
-SRCREV_machine_qemux86 ?= "f01bddc9534f31b27b475b68d13b589
[OE-core] [PATCH 0/2] linux-yocto: 3.4.7 & BSP updates
Richard/Saul, Here's a set of updates for the 3.4 kernel that I've had under test for a week or so. We have a bump to 3.4.7 and some updates to prep for systemtap updates, update BSPs and cleanup configuration. Cheers, Bruce The following changes since commit 2dec760b79bb7e2e79c33c5127fa64685bd86a18: foomatic: fix perl path for target (2012-08-08 10:06:00 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib zedd/kernel http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel Bruce Ashfield (2): linux-yocto: bump version to 3.4.7 linux-yocto/3.4: BSP, uprobes, config and cleanups meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb |8 meta/recipes-kernel/linux/linux-yocto_3.4.bb| 16 2 files changed, 12 insertions(+), 12 deletions(-) -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] linux-yocto: bump version to 3.4.7
The v3.4.7 -stable update has been released, updating all in-tree
BSPs to this new baseline.
Signed-off-by: Bruce Ashfield
---
meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb |8
meta/recipes-kernel/linux/linux-yocto_3.4.bb| 16
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
index ea2ce02..b995a42 100644
--- a/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto-rt_3.4.bb
@@ -3,14 +3,14 @@ require recipes-kernel/linux/linux-yocto.inc
KBRANCH = "standard/preempt-rt/base"
KBRANCH_qemuppc = "standard/preempt-rt/qemuppc"
-LINUX_VERSION ?= "3.4.6"
+LINUX_VERSION ?= "3.4.7"
LINUX_KERNEL_TYPE = "preempt-rt"
KMETA = "meta"
-SRCREV_machine ?= "2d008a6dcbf565878cee14c5f050eca53897316f"
-SRCREV_machine_qemuppc ?= "94d25f958b6dfb1e8009a0feea7ab4c9a8f54a99"
-SRCREV_meta ?= "7ff48aa47c50b6455d60ca93bc81260ce8fe1a1b"
+SRCREV_machine ?= "50cc910aeb0571921b7ad86091ec2dc621adf67f"
+SRCREV_machine_qemuppc ?= "713b13fa93d4d0b1780b31ed9bbb7a5527447886"
+SRCREV_meta ?= "8d2012649516f3c489295a31fb9ea7afd1b464e4"
PR = "${INC_PR}.0"
PV = "${LINUX_VERSION}+git${SRCPV}"
diff --git a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
index 5ab46b7..9f1e550 100644
--- a/meta/recipes-kernel/linux/linux-yocto_3.4.bb
+++ b/meta/recipes-kernel/linux/linux-yocto_3.4.bb
@@ -10,19 +10,19 @@ KBRANCH_qemumips64 = "standard/mti-malta64"
KBRANCH_qemumips64el = "standard/mti-malta64"
KBRANCH_qemuarm = "standard/arm-versatile-926ejs"
-SRCREV_machine_qemuarm ?= "b57548a29e44655e27cfbdf3a0642d682401b835"
-SRCREV_machine_qemumips ?= "633d487b0f6e5d328400b47f0d69d9dac7354c84"
-SRCREV_machine_qemuppc ?= "6229fc0f62283e0dc9f8b5d2be01b048a92867f3"
-SRCREV_machine_qemux86 ?= "19f7e43b54aef08d58135ed2a897d77b624b320a"
-SRCREV_machine_qemux86-64 ?= "19f7e43b54aef08d58135ed2a897d77b624b320a"
-SRCREV_machine ?= "19f7e43b54aef08d58135ed2a897d77b624b320a"
-SRCREV_meta ?= "7ff48aa47c50b6455d60ca93bc81260ce8fe1a1b"
+SRCREV_machine_qemuarm ?= "469cf6a66c720944adeaf8e43c044dfcb8d90599"
+SRCREV_machine_qemumips ?= "0985f3076c1a5a2cc3a01054e8a0411ffe440395"
+SRCREV_machine_qemuppc ?= "e662bb66d9114c05919cd57ee4d620f4e67d2123"
+SRCREV_machine_qemux86 ?= "f01bddc9534f31b27b475b68d13b5897533a6fca"
+SRCREV_machine_qemux86-64 ?= "f01bddc9534f31b27b475b68d13b5897533a6fca"
+SRCREV_machine ?= "f01bddc9534f31b27b475b68d13b5897533a6fca"
+SRCREV_meta ?= "8d2012649516f3c489295a31fb9ea7afd1b464e4"
SRC_URI =
"git://git.yoctoproject.org/linux-yocto-3.4.git;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
SRC_URI += "file://noslang.patch"
-LINUX_VERSION ?= "3.4.6"
+LINUX_VERSION ?= "3.4.7"
PR = "${INC_PR}.0"
PV = "${LINUX_VERSION}+git${SRCPV}"
--
1.7.5.4
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] libowl-av: patches merged upstream, bump srcrev
Signed-off-by: Ross Burton
---
.../libowl-av/gst_change_state.patch | 42
.../owl-video-widget/libowl-av/make-382.patch | 13 --
.../recipes-sato/owl-video-widget/libowl-av_git.bb |8 ++--
3 files changed, 3 insertions(+), 60 deletions(-)
delete mode 100644
meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
delete mode 100644 meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
diff --git
a/meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
b/meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
deleted file mode 100644
index 5bc279a..000
--- a/meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Fix music player crash if adding unknown type files.
-
-Using bus message to call function flush_head/feed_head in main thread
-to protect private data operation.
-
-A better fix may be to listen to bus message "CODEC_NOT_FOUND" and
-"MISSING_PLUGIN" directly to avoid hooking into "unknown-type" signal.
-We will revisit it in next period.
-
-Signed-off-by: Dongxiao Xu
-
-Upstream-Status: Pending
-
-diff -ruN libowl-av-orig/libowl-av/owl-tag-reader.c
libowl-av/libowl-av/owl-tag-reader.c
libowl-av-orig/libowl-av/owl-tag-reader.c 2010-10-12 14:30:26.0
+0800
-+++ libowl-av/libowl-av/owl-tag-reader.c 2010-10-12 14:32:39.0
+0800
-@@ -300,13 +300,23 @@
-GstCaps *caps,
-OwlTagReader *tag_reader)
- {
-+GstMessage *message;
-+GstBus *bus;
-+
- tag_reader->priv->current_error =
- g_error_new (OWL_TAG_READER_ERROR,
- OWL_TAG_READER_ERROR_UNKNOWN_TYPE,
- "Unknown type");
-
--flush_head (tag_reader);
--feed_head (tag_reader);
-+/**
-+ * Post a message to the bus, as we are in another thread here.
-+ **/
-+message = gst_message_new_error(GST_OBJECT (decodebin),
-+tag_reader->priv->current_error,
NULL);
-+
-+bus = gst_pipeline_get_bus (GST_PIPELINE
(tag_reader->priv->pipeline));
-+gst_bus_post (bus, message);
-+gst_object_unref (GST_OBJECT (bus));
- }
-
- /**
diff --git a/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
b/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
deleted file mode 100644
index a8be781..000
--- a/meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Upstream-Status: Inappropriate [configuration]
-
-Index: libowl-av/Makefile.am
-===
libowl-av.orig/Makefile.am
-+++ libowl-av/Makefile.am
-@@ -14,5 +14,5 @@ EXTRA_DIST = libowl-av.pc.in libowl-av.v
- MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure
depcomp intltool-extract intltool-merge intltool-update install-sh ltmain.sh
Makefile.in missing
-
- snapshot:
--$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
-+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
-
diff --git a/meta/recipes-sato/owl-video-widget/libowl-av_git.bb
b/meta/recipes-sato/owl-video-widget/libowl-av_git.bb
index 4413d38..62a4a7d 100644
--- a/meta/recipes-sato/owl-video-widget/libowl-av_git.bb
+++ b/meta/recipes-sato/owl-video-widget/libowl-av_git.bb
@@ -12,14 +12,12 @@ DEPENDS = "gtk+ gstreamer gst-plugins-base"
RDEPENDS_${PN} = "gst-meta-base"
RRECOMMENDS_${PN} = "gst-meta-audio gst-meta-video"
-SRCREV = "1379fd230a32509e94971961183f1031f469737a"
+SRCREV = "03030c41ea578cfa74a2ffceb875675b248318ae"
PV = "0.1+git${SRCPV}"
-PR = "r2"
+PR = "r3"
-SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
- file://gst_change_state.patch \
- file://make-382.patch"
+SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git"
S = "${WORKDIR}/git"
--
1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] libowl updates
Patches were merged upstream, so drop them and bump srcrev. The following changes since commit 2dec760b79bb7e2e79c33c5127fa64685bd86a18: foomatic: fix perl path for target (2012-08-08 10:06:00 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ross/owl for you to fetch changes up to d3e664ba768f4485f8d7984a86c571cf43815497: libowl-av: patches merged upstream, bump srcrev (2012-08-10 15:47:00 +0300) Ross Burton (2): owl-video: patches pushed upstream, so bump srcrev libowl-av: patches merged upstream, bump srcrev .../libowl-av/gst_change_state.patch | 42 .../owl-video-widget/libowl-av/make-382.patch | 13 -- .../recipes-sato/owl-video-widget/libowl-av_git.bb |8 ++-- .../owl-video/gtk_multithread_safe.patch | 40 --- .../owl-video-widget/owl-video/make-382.patch | 17 .../recipes-sato/owl-video-widget/owl-video_git.bb |8 ++-- 6 files changed, 6 insertions(+), 122 deletions(-) delete mode 100644 meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch delete mode 100644 meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch delete mode 100644 meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch delete mode 100644 meta/recipes-sato/owl-video-widget/owl-video/make-382.patch Ross Burton (2): owl-video: patches pushed upstream, so bump srcrev libowl-av: patches merged upstream, bump srcrev .../libowl-av/gst_change_state.patch | 42 .../owl-video-widget/libowl-av/make-382.patch | 13 -- .../recipes-sato/owl-video-widget/libowl-av_git.bb |8 ++-- .../owl-video/gtk_multithread_safe.patch | 40 --- .../owl-video-widget/owl-video/make-382.patch | 17 .../recipes-sato/owl-video-widget/owl-video_git.bb |8 ++-- 6 files changed, 6 insertions(+), 122 deletions(-) delete mode 100644 meta/recipes-sato/owl-video-widget/libowl-av/gst_change_state.patch delete mode 100644 meta/recipes-sato/owl-video-widget/libowl-av/make-382.patch delete mode 100644 meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch delete mode 100644 meta/recipes-sato/owl-video-widget/owl-video/make-382.patch -- 1.7.10 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] owl-video: patches pushed upstream, so bump srcrev
Signed-off-by: Ross Burton
---
.../owl-video/gtk_multithread_safe.patch | 40
.../owl-video-widget/owl-video/make-382.patch | 17 -
.../recipes-sato/owl-video-widget/owl-video_git.bb |8 ++--
3 files changed, 3 insertions(+), 62 deletions(-)
delete mode 100644
meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
delete mode 100644 meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
diff --git
a/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
b/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
deleted file mode 100644
index 437f72b..000
--- a/meta/recipes-sato/owl-video-widget/owl-video/gtk_multithread_safe.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-Use gdk_threads_enter/gdk_threads_leave to ensure gtk multithread safe
-
-If the video player tries to play an unknown type file, it will enter
-the error_cb() function, which is called in another thread.
-Use gdk_threads_enter/gdk_threads_leave to ensure the safe of gtk
-multi-thread operation.
-
-Signed-off-by: Dongxiao Xu
-
-Upstream-Status: Pending
-
-diff -ruN video-orig/src/video.c video/src/video.c
video-orig/src/video.c 2010-10-15 16:07:26.522346398 +0800
-+++ video/src/video.c 2010-10-15 16:25:51.780296717 +0800
-@@ -96,6 +96,7 @@
- {
- GtkWidget *dialog;
-
-+gdk_threads_enter();
- dialog = gtk_message_dialog_new (data->window,
- GTK_DIALOG_NO_SEPARATOR,
- GTK_MESSAGE_ERROR,
-@@ -103,6 +104,7 @@
- error->message);
- gtk_dialog_run (GTK_DIALOG (dialog));
- gtk_widget_destroy (dialog);
-+gdk_threads_leave();
- }
-
- /**
-@@ -606,7 +608,9 @@
-
- gtk_widget_show_all (GTK_WIDGET (data->window));
-
-+gdk_threads_enter();
- gtk_main ();
-+gdk_threads_leave();
-
- /**
- * Cleanup.
diff --git a/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
b/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
deleted file mode 100644
index d219c31..000
--- a/meta/recipes-sato/owl-video-widget/owl-video/make-382.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Make 3.82 is much stricter and demands tabs. Obey.
-
-JL - 15/12/10
-
-Upstream-Status: Inappropriate [configuration]
-
-Index: video/Makefile.am
-===
video.orig/Makefile.am
-+++ video/Makefile.am
-@@ -4,5 +4,5 @@ SUBDIRS = src
- MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure
depcomp intltool-extract intltool-merge intltool-update install-sh ltmain.sh
Makefile.in missing
-
- snapshot:
--$(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
-+ $(MAKE) dist distdir=$(PACKAGE)-snap`date +"%Y%m%d"`
-
diff --git a/meta/recipes-sato/owl-video-widget/owl-video_git.bb
b/meta/recipes-sato/owl-video-widget/owl-video_git.bb
index bc63273..ae08383 100644
--- a/meta/recipes-sato/owl-video-widget/owl-video_git.bb
+++ b/meta/recipes-sato/owl-video-widget/owl-video_git.bb
@@ -8,22 +8,20 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=ac14b7ca45afea5af040da54db270eb0 \
SECTION = "x11"
DEPENDS = "libowl-av"
-SRCREV = "f133472318970796fae1ea3e98ac062156768baf"
+SRCREV = "07ab48f331a5e6e0d169e4892c7eb1fc22dc0b9d"
PV = "0.1+git${SRCPV}"
-PR = "r1"
+PR = "r2"
S = "${WORKDIR}/git"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
- file://gtk_multithread_safe.patch \
file://owl-video-widget.png \
file://stock_media-play.png \
file://stock_volume-0.png \
file://stock_volume-min.png \
file://stock_volume-med.png \
file://stock_volume-max.png \
- file://owl-video-widget.desktop \
- file://make-382.patch"
+ file://owl-video-widget.desktop"
inherit autotools pkgconfig
--
1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 8/8] mesa: enable EGL, with DRM and X11 platforms
Patch originally by Damien Lespiau .
Signed-off-by: Ross Burton
---
meta/recipes-graphics/mesa/mesa-common.inc |5 +++--
meta/recipes-graphics/mesa/mesa-dri.inc|6 +-
2 files changed, 8 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc
b/meta/recipes-graphics/mesa/mesa-common.inc
index feb152b..de171f0 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -17,7 +17,7 @@ PE = "2"
DEPENDS = "libxml2-native makedepend-native flex-native bison-native"
-PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2"
+PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl"
# for mesa-dri and mesa-xlib
FILESEXTRAPATHS_append := "${THISDIR}/mesa:"
@@ -30,6 +30,7 @@ EXTRA_OECONF = "--enable-glu \
--enable-shared-glapi"
PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)}
\
+ ${@base_contains('MACHINE_FEATURES', 'x86', 'egl', '', d)} \
${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage
libxfixes"
@@ -60,7 +61,7 @@ FILES_libglapi = "${libdir}/libglapi.so.*"
FILES_libglu = "${libdir}/libGLU.so.*"
FILES_libosmesa = "${libdir}/libOSMesa.so.*"
-FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
+FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR
${libdir}/pkgconfig/egl.pc"
FILES_libgbm-dev = "${libdir}/libgbm* ${libdir}/pkgconfig/gbm.pc
${includedir}/gbm.h"
FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL
${libdir}/pkgconfig/gl.pc"
FILES_libglapi-dev = "${libdir}/libglapi.*"
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc
b/meta/recipes-graphics/mesa/mesa-dri.inc
index 32ca4b2..8b04e5b 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -10,10 +10,14 @@ DRIDRIVERS_append_x86-64 = ",i915,i965"
EXTRA_OECONF += "--disable-gallium --without-gallium-drivers"
EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}"
-EXTRA_OECONF += "--disable-egl --enable-gbm"
+EXTRA_OECONF += "--enable-gbm"
PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1
--disable-gles2"
+EGL_PLATFORMS = "drm"
+EGL_PLATFORMS .="${@base_contains('DISTRO_FEATURES', 'x11', ',x11', '', d)}"
+PACKAGECONFIG[egl] = "--enable-egl --with-egl-platforms=${EGL_PLATFORMS},
--disable-egl"
+
python populate_packages_prepend() {
dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
--
1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/8] clutter: DOLT isn't used anymore
Signed-off-by: Ross Burton
---
meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb |7 +--
meta/recipes-graphics/clutter/clutter-1.8_git.bb |7 +--
meta/recipes-graphics/clutter/cogl_git.bb |7 +--
3 files changed, 3 insertions(+), 18 deletions(-)
diff --git a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
b/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
index a370568..aceef96 100644
--- a/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb
@@ -1,7 +1,7 @@
require recipes-graphics/clutter/clutter.inc
require recipes-graphics/clutter/clutter-package.inc
-PR = "r1"
+PR = "r2"
# We're API/ABI compatible and this may make things easier for layers
PROVIDES += "clutter-1.6"
@@ -19,10 +19,5 @@ S = "${WORKDIR}/clutter-${PV}"
BASE_CONF += "--disable-introspection"
-do_configure_prepend () {
- # Disable DOLT
- sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
-
SRC_URI[md5sum] = "487f70f9b59e1328b47f1db4094ab662"
SRC_URI[sha256sum] =
"0d567177facd6913ac9c894e230ae48933125f02354ef965bbbf0586f1f0df91"
diff --git a/meta/recipes-graphics/clutter/clutter-1.8_git.bb
b/meta/recipes-graphics/clutter/clutter-1.8_git.bb
index 7d8bcb3..89d8026 100644
--- a/meta/recipes-graphics/clutter/clutter-1.8_git.bb
+++ b/meta/recipes-graphics/clutter/clutter-1.8_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=4fbd65380cdd255951079008b364516c"
# the 1.8.4 tag
SRCREV = "f2183fa8df3d173afbee09cc4230ab8f4e03f459"
PV = "1.8.4+git${SRCPV}"
-PR = "r1"
+PR = "r2"
DEFAULT_PREFERENCE = "-1"
@@ -18,8 +18,3 @@ S = "${WORKDIR}/git"
BASE_CONF += "--disable-introspection"
AUTOTOOLS_AUXDIR = "${S}/build"
-
-do_configure_prepend () {
- # Disable DOLT
- sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
diff --git a/meta/recipes-graphics/clutter/cogl_git.bb
b/meta/recipes-graphics/clutter/cogl_git.bb
index 682f931..a3e1903 100644
--- a/meta/recipes-graphics/clutter/cogl_git.bb
+++ b/meta/recipes-graphics/clutter/cogl_git.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=4fbd65380cdd255951079008b364516c"
# the 1.8.2 tag
SRCREV = "e398e374e2ff0e88bc1d63577a192f8ca04a1cb5"
PV = "1.8.2+git${SRCPV}"
-PR = "r2"
+PR = "r3"
DEFAULT_PREFERENCE = "-1"
@@ -14,8 +14,3 @@ SRC_URI =
"git://git.gnome.org/cogl;protocol=git;branch=master \
S = "${WORKDIR}/git"
AUTOTOOLS_AUXDIR = "${S}/build"
-
-do_configure_prepend () {
- # Disable DOLT
- sed -i -e 's/^DOLT//' ${S}/configure.ac
-}
--
1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/8] mesa: enable GLES v1 and v2
Patch originally by Damien Lespiau .
Signed-off-by: Ross Burton
---
meta/recipes-graphics/mesa/mesa-common.inc | 12 ++--
meta/recipes-graphics/mesa/mesa-dri.inc|2 ++
2 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc
b/meta/recipes-graphics/mesa/mesa-common.inc
index aac3bbe..24cc3d0 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -12,7 +12,7 @@ SECTION = "x11"
LICENSE = "MIT"
LIC_FILES_CHKSUM =
"file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
-INC_PR = "r0"
+INC_PR = "r1"
PE = "2"
@@ -21,7 +21,7 @@ LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage
libxfixes libxml2-nativ
DEPENDS = "makedepend-native flex-native bison-native ${PROTO_DEPS}
${LIB_DEPS}"
-PROVIDES = "virtual/libgl"
+PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2"
# for mesa-dri and mesa-xlib
FILESEXTRAPATHS_append := "${THISDIR}/mesa:"
@@ -34,6 +34,8 @@ EXTRA_OECONF = "--enable-glu \
--enable-glx-tls \
--enable-shared-glapi"
+PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)}"
+
# Multiple virtual/gl providers being built breaks staging
EXCLUDE_FROM_WORLD = "1"
@@ -46,10 +48,14 @@ PACKAGES =+ "libegl libegl-dev libegl-dbg \
libgl libgl-dev \
libglapi libglapi-dev \
libgbm libgbm-dev \
+ libgles1 libgles1-dev \
+ libgles2 libgles2-dev \
"
FILES_libegl = "${libdir}/libEGL.so.* ${libdir}/egl/*.so"
FILES_libgbm = "${libdir}/libgbm.so.*"
+FILES_libgles1 = "${libdir}/libGLESv1*.so.*"
+FILES_libgles2 = "${libdir}/libGLESv2.so.*"
FILES_libgl = "${libdir}/libGL.so.*"
FILES_libglapi = "${libdir}/libglapi.so.*"
FILES_libglu = "${libdir}/libGLU.so.*"
@@ -59,6 +65,8 @@ FILES_libegl-dev = "${libdir}/libEGL.* ${includedir}/EGL"
FILES_libgbm-dev = "${libdir}/libgbm* ${libdir}/pkgconfig/gbm.pc
${includedir}/gbm.h"
FILES_libgl-dev = "${libdir}/libGL.* ${includedir}/GL
${libdir}/pkgconfig/gl.pc"
FILES_libglapi-dev = "${libdir}/libglapi.*"
+FILES_libgles1-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES
${libdir}/pkgconfig/glesv1*.pc"
+FILES_libgles2-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2
${libdir}/pkgconfig/glesv2.pc"
FILES_libglu-dev = "${libdir}/libGLU.* ${includedir}/GL/glu*.h
${libdir}/pkgconfig/glu.pc"
FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/osmesa.h"
diff --git a/meta/recipes-graphics/mesa/mesa-dri.inc
b/meta/recipes-graphics/mesa/mesa-dri.inc
index f8f1fff..32ca4b2 100644
--- a/meta/recipes-graphics/mesa/mesa-dri.inc
+++ b/meta/recipes-graphics/mesa/mesa-dri.inc
@@ -12,6 +12,8 @@ EXTRA_OECONF += "--disable-gallium --without-gallium-drivers"
EXTRA_OECONF += "--enable-dri --with-dri-drivers=${DRIDRIVERS}"
EXTRA_OECONF += "--disable-egl --enable-gbm"
+PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1
--disable-gles2"
+
python populate_packages_prepend() {
dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri")
--
1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/8] mesa: Add a mesa-dri-glsl-native_git recipe
From: Damien Lespiau
If you have both a fixed version of mesa and a git version of mesa, you
also need the mesa-dri-glsl-native recipe for each versions. The code
generation that happens natively has to be done with the tool extracted
from the version you are compiling.
Signed-off-by: Damien Lespiau
Signed-off-by: Ross Burton
---
.../recipes-graphics/mesa/mesa-dri-glsl-native.inc |7 ++
.../mesa/mesa-dri-glsl-native_8.0.4.bb |9 ++--
.../mesa/mesa-dri-glsl-native_git.bb | 23
3 files changed, 32 insertions(+), 7 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native.inc
create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native.inc
b/meta/recipes-graphics/mesa/mesa-dri-glsl-native.inc
new file mode 100644
index 000..c8b80e8
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-dri-glsl-native.inc
@@ -0,0 +1,7 @@
+DESCRIPTION = "gl shader language specific build from mesa-dri"
+HOMEPAGE = "http://mesa3d.org";
+BUGTRACKER = "https://bugs.freedesktop.org";
+SECTION = "x11"
+LICENSE = "GPLv3+"
+
+DEPENDS = "makedepend-native"
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb
b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb
index a81fb6d..d551598 100644
--- a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb
+++ b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_8.0.4.bb
@@ -1,11 +1,6 @@
-DESCRIPTION = "gl shader language specific build from mesa-dri"
-HOMEPAGE = "http://mesa3d.org";
-BUGTRACKER = "https://bugs.freedesktop.org";
-SECTION = "x11"
-LICENSE = "GPLv3+"
-LIC_FILES_CHKSUM =
"file://glsl_parser.cpp;beginline=3;endline=33;md5=d078f1cddc2fc355719c090482254bd9"
+require mesa-dri-glsl-native.inc
-DEPENDS = "makedepend-native"
+LIC_FILES_CHKSUM =
"file://glsl_parser.cpp;beginline=3;endline=33;md5=d078f1cddc2fc355719c090482254bd9"
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2";
SRC_URI[md5sum] = "d546f988adfdf986cff45b1efa2d8a46"
diff --git a/meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb
b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb
new file mode 100644
index 000..4611f80
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb
@@ -0,0 +1,23 @@
+require mesa-dri-glsl-native.inc
+
+LIC_FILES_CHKSUM =
"file://../../docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
+
+SRCREV = "c1f4867c89adb1a6b19d66ec8ad146115909f0a7"
+PV = "8.0.4+git${SRCPV}"
+DEFAULT_PREFERENCE = "-1"
+
+SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;protocol=git"
+S = "${WORKDIR}/git/src/glsl"
+
+inherit native
+
+# use default config for native build
+do_configure_prepend() {
+ ln -sf ${S}/../../configs/default ${S}/../../configs/current
+}
+
+do_install() {
+ install -d ${D}/${bindir}/glsl
+ install -m 755 ${S}/builtin_compiler
${D}/${bindir}/glsl/builtin_compiler
+ install -m 755 ${S}/glsl_compiler ${D}/${bindir}/glsl/glsl_compiler
+}
--
1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/8] mesa: respect x11 DISTRO_FEATURE
Patch originally by Damien Lespiau .
Signed-off-by: Ross Burton
---
meta/recipes-graphics/mesa/mesa-8.0.4.inc |1 +
meta/recipes-graphics/mesa/mesa-common.inc | 15 +-
meta/recipes-graphics/mesa/mesa-git.inc|2 ++
...-gross-hack-to-prevent-from-install-libgl.patch | 29
4 files changed, 39 insertions(+), 8 deletions(-)
create mode 100644
meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch
diff --git a/meta/recipes-graphics/mesa/mesa-8.0.4.inc
b/meta/recipes-graphics/mesa/mesa-8.0.4.inc
index d9d17bb..9afb35d 100644
--- a/meta/recipes-graphics/mesa/mesa-8.0.4.inc
+++ b/meta/recipes-graphics/mesa/mesa-8.0.4.inc
@@ -5,6 +5,7 @@ SRC_URI =
"ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
file://0002-cross-compile.patch \
file://0003-fix-for-x32.patch \
"
+SRC_URI += "${@base_contains('DISTRO_FEATURES', 'x11', '',
'file://0004-gross-hack-to-prevent-from-install-libgl.patch', d)}"
S = "${WORKDIR}/Mesa-${PV}"
diff --git a/meta/recipes-graphics/mesa/mesa-common.inc
b/meta/recipes-graphics/mesa/mesa-common.inc
index 24cc3d0..feb152b 100644
--- a/meta/recipes-graphics/mesa/mesa-common.inc
+++ b/meta/recipes-graphics/mesa/mesa-common.inc
@@ -12,14 +12,10 @@ SECTION = "x11"
LICENSE = "MIT"
LIC_FILES_CHKSUM =
"file://docs/license.html;md5=03ccdc4c379c4289aecfb8892c546f67"
-INC_PR = "r1"
+INC_PR = "r2"
PE = "2"
-
-PROTO_DEPS = "xf86driproto glproto"
-LIB_DEPS = "virtual/libx11 libxext libxxf86vm libxdamage libxfixes
libxml2-native"
-
-DEPENDS = "makedepend-native flex-native bison-native ${PROTO_DEPS}
${LIB_DEPS}"
+DEPENDS = "libxml2-native makedepend-native flex-native bison-native"
PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2"
@@ -31,10 +27,13 @@ inherit autotools pkgconfig pythonnative
EXTRA_OECONF = "--enable-glu \
--disable-glw \
--disable-glut \
---enable-glx-tls \
--enable-shared-glapi"
-PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)}"
+PACKAGECONFIG ??= "${@base_contains('MACHINE_FEATURES', 'x86', 'gles', '', d)}
\
+ ${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+
+X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage
libxfixes"
+PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}"
# Multiple virtual/gl providers being built breaks staging
EXCLUDE_FROM_WORLD = "1"
diff --git a/meta/recipes-graphics/mesa/mesa-git.inc
b/meta/recipes-graphics/mesa/mesa-git.inc
index 32b1d96..7910eb6 100644
--- a/meta/recipes-graphics/mesa/mesa-git.inc
+++ b/meta/recipes-graphics/mesa/mesa-git.inc
@@ -11,6 +11,8 @@ SRC_URI =
"git://anongit.freedesktop.org/git/mesa/mesa;protocol=git \
file://0002-cross-compile.patch \
file://0003-fix-for-x32.patch \
"
+SRC_URI += "${@base_contains('DISTRO_FEATURES', 'x11', '',
'file://0004-gross-hack-to-prevent-from-install-libgl.patch', d)}"
+
S = "${WORKDIR}/git"
do_configure_prepend() {
diff --git
a/meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch
b/meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch
new file mode 100644
index 000..cf9dee2
--- /dev/null
+++
b/meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch
@@ -0,0 +1,29 @@
+gross hack to prevent from install libgl
+
+This patch is not suitable for upstream. This is only needed for the 8.0.x
+branch, master (8.1.x) has a largely different build system (using automake)
+and does not need it. It is fully expected to drop the patch with the next bump
+to a stable version based on 8.1.x.
+
+Upstream-Status: Inappropriate
+
+---
+ src/mesa/Makefile |2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/mesa/Makefile b/src/mesa/Makefile
+index 0e15d61..a0a2cb5 100644
+--- a/src/mesa/Makefile
b/src/mesa/Makefile
+@@ -166,7 +166,7 @@ install: default $(DRICORE_INSTALL_TARGET)
+ else \
+ $(MAKE) install-osmesa || exit 1 ; \
+ fi ;; \
+- dri)$(MAKE) install-libgl install-dri || exit 1 ;; \
++ dri)$(MAKE) install-dri || exit 1 ;; \
+ *) $(MAKE) install-libgl || exit 1 ;; \
+ esac ; \
+ done
+--
+1.7.10.4
+
--
1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/8] core: Prefer mesa-dri as virtual/libopengles1/2 provider
From: Damien Lespiau
Wihtout it, you have both mesa-dri and mesa-xlib as providers. Let's
prefer the accelerated version.
Signed-off-by: Ross Burton
---
meta/conf/distro/include/default-providers.inc |2 ++
meta/conf/machine/qemux86-64.conf|2 ++
meta/conf/machine/qemux86.conf |2 ++
.../bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf|2 ++
4 files changed, 8 insertions(+)
diff --git a/meta/conf/distro/include/default-providers.inc
b/meta/conf/distro/include/default-providers.inc
index 54c90d3..28d2f8e 100644
--- a/meta/conf/distro/include/default-providers.inc
+++ b/meta/conf/distro/include/default-providers.inc
@@ -6,6 +6,8 @@ PREFERRED_PROVIDER_virtual/db-native ?= "db-native"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri"
PREFERRED_PROVIDER_virtual/update-alternatives ?= "update-alternatives-cworth"
PREFERRED_PROVIDER_virtual/update-alternatives-native ?= "opkg-native"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
diff --git a/meta/conf/machine/qemux86-64.conf
b/meta/conf/machine/qemux86-64.conf
index 998ef60..285054a 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -4,6 +4,8 @@
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri"
require conf/machine/include/tune-x86_64.inc
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 57e480c..c81afe5 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -4,6 +4,8 @@
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri"
require conf/machine/include/tune-i586.inc
diff --git
a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf
b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf
index 1ab6e58..d1f50c1 100644
--- a/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf
+++ b/scripts/lib/bsp/substrate/target/arch/qemu/conf/machine/{{=machine}}.conf
@@ -11,6 +11,8 @@ PREFERRED_VERSION_{{=preferred_kernel}} ?=
"{{=preferred_kernel_version}}%"
{{ if qemuarch == "i386" or qemuarch == "x86_64": }}
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri"
+PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri"
{{ input type:"choicelist" name:"qemuarch" prio:"5" msg:"Which qemu
architecture would you like to use?" default:"i386" }}
{{ input type:"choice" val:"i386" msg:"i386(32-bit)" }}
--
1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/8] mesa-demos: fix GLES2 build
Signed-off-by: Ross Burton
---
meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch | 15 +++
meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb |5 +++--
2 files changed, 18 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch
diff --git a/meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch
b/meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch
new file mode 100644
index 000..84a6fd6
--- /dev/null
+++ b/meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch
@@ -0,0 +1,15 @@
+Index: mesa-demos-8.0.1/src/egl/opengles2/es2_info.c
+===
+--- mesa-demos-8.0.1.orig/src/egl/opengles2/es2_info.c 2010-07-07
18:57:15.0 +0100
mesa-demos-8.0.1/src/egl/opengles2/es2_info.c 2012-08-01
13:14:59.000104115 +0100
+@@ -18,8 +18,8 @@
+ #include
+ #include
+ #include
+-#include
+-#include
++#include
++#include
+ #include
+
+
diff --git a/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
b/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
index bfc62c5..1d16bfc 100644
--- a/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
+++ b/meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb
@@ -11,10 +11,11 @@ LIC_FILES_CHKSUM =
"file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=9142
DEPENDS = "virtual/libx11 virtual/libgl glew"
-PR = "r2"
+PR = "r3"
SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2
\
- file://dso_linking_change_build_fix.patch"
+ file://dso_linking_change_build_fix.patch \
+ file://gles2-info.patch"
inherit autotools pkgconfig
--
1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/8] Enable EGL and GLES in x86 Mesa
Hopefully the final Mesa patch set. First pulls in an essential fix to
PACKAGECONFIG, and then enables GLES and EGL using PACKAGECONFIG, based on
whether the MACHINE_FEATURES contains x86.
Ross
The following changes since commit 2dec760b79bb7e2e79c33c5127fa64685bd86a18:
foomatic: fix perl path for target (2012-08-08 10:06:00 +0100)
are available in the git repository at:
git://git.yoctoproject.org/poky-contrib ross/mesa
for you to fetch changes up to 938675e4208fd34908653e1a7565c58f53067d77:
mesa: enable EGL, with DRM and X11 platforms (2012-08-13 12:53:45 +0100)
Damien Lespiau (2):
mesa: Add a mesa-dri-glsl-native_git recipe
core: Prefer mesa-dri as virtual/libopengles1/2 provider
Ross Burton (5):
clutter: DOLT isn't used anymore
mesa: enable GLES v1 and v2
mesa-demos: fix GLES2 build
mesa: respect x11 DISTRO_FEATURE
mesa: enable EGL, with DRM and X11 platforms
Yao Zhao (1):
base.bbclass: fix PACKAGECONFIG handling code
meta/classes/base.bbclass | 25 -
meta/conf/distro/include/default-providers.inc |2 ++
meta/conf/machine/qemux86-64.conf |2 ++
meta/conf/machine/qemux86.conf |2 ++
meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb |7 +
meta/recipes-graphics/clutter/clutter-1.8_git.bb |7 +
meta/recipes-graphics/clutter/cogl_git.bb |7 +
meta/recipes-graphics/mesa/mesa-8.0.4.inc |1 +
meta/recipes-graphics/mesa/mesa-common.inc | 26 --
.../mesa/mesa-demos/gles2-info.patch | 15 ++
meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb |5 ++--
.../recipes-graphics/mesa/mesa-dri-glsl-native.inc |7 +
.../mesa/mesa-dri-glsl-native_8.0.4.bb |9 ++
.../mesa/mesa-dri-glsl-native_git.bb | 23
meta/recipes-graphics/mesa/mesa-dri.inc|8 +-
meta/recipes-graphics/mesa/mesa-git.inc|2 ++
...-gross-hack-to-prevent-from-install-libgl.patch | 29
.../arch/qemu/conf/machine/{{=machine}}.conf |2 ++
18 files changed, 129 insertions(+), 50 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch
create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native.inc
create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb
create mode 100644
meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch
Damien Lespiau (2):
mesa: Add a mesa-dri-glsl-native_git recipe
core: Prefer mesa-dri as virtual/libopengles1/2 provider
Ross Burton (5):
clutter: DOLT isn't used anymore
mesa: enable GLES v1 and v2
mesa-demos: fix GLES2 build
mesa: respect x11 DISTRO_FEATURE
mesa: enable EGL, with DRM and X11 platforms
Yao Zhao (1):
base.bbclass: fix PACKAGECONFIG handling code
meta/classes/base.bbclass | 25 -
meta/conf/distro/include/default-providers.inc |2 ++
meta/conf/machine/qemux86-64.conf |2 ++
meta/conf/machine/qemux86.conf |2 ++
meta/recipes-graphics/clutter/clutter-1.8_1.8.4.bb |7 +
meta/recipes-graphics/clutter/clutter-1.8_git.bb |7 +
meta/recipes-graphics/clutter/cogl_git.bb |7 +
meta/recipes-graphics/mesa/mesa-8.0.4.inc |1 +
meta/recipes-graphics/mesa/mesa-common.inc | 26 --
.../mesa/mesa-demos/gles2-info.patch | 15 ++
meta/recipes-graphics/mesa/mesa-demos_8.0.1.bb |5 ++--
.../recipes-graphics/mesa/mesa-dri-glsl-native.inc |7 +
.../mesa/mesa-dri-glsl-native_8.0.4.bb |9 ++
.../mesa/mesa-dri-glsl-native_git.bb | 23
meta/recipes-graphics/mesa/mesa-dri.inc|8 +-
meta/recipes-graphics/mesa/mesa-git.inc|2 ++
...-gross-hack-to-prevent-from-install-libgl.patch | 29
.../arch/qemu/conf/machine/{{=machine}}.conf |2 ++
18 files changed, 129 insertions(+), 50 deletions(-)
create mode 100644 meta/recipes-graphics/mesa/mesa-demos/gles2-info.patch
create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native.inc
create mode 100644 meta/recipes-graphics/mesa/mesa-dri-glsl-native_git.bb
create mode 100644
meta/recipes-graphics/mesa/mesa/0004-gross-hack-to-prevent-from-install-libgl.patch
--
1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/8] base.bbclass: fix PACKAGECONFIG handling code
From: Yao Zhao
PACKAGECONFIG flag code only handles that when it has 3 or 4 items in flag,
it may have a stale data if some flags doesn't need DEPENDS and RDEPENDS.
Signed-off-by: Yao Zhao
Signed-off-by: Ross Burton
---
meta/classes/base.bbclass | 25 -
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass
index e15fa26..3e6a7de 100644
--- a/meta/classes/base.bbclass
+++ b/meta/classes/base.bbclass
@@ -364,20 +364,19 @@ python () {
if flag == "defaultval":
continue
items = flagval.split(",")
-if len(items) == 3:
-enable, disable, depend = items
-rdepend = ""
-elif len(items) == 4:
-enable, disable, depend, rdepend = items
+num = len(items)
+if num > 4:
+bb.error("Only enable,disable,depend,rdepend can be
specified!")
+
if flag in pkgconfig:
-if depend:
-extradeps.append(depend)
-if rdepend:
-extrardeps.append(rdepend)
-if enable:
-extraconf.append(enable)
-elif disable:
-extraconf.append(disable)
+if num >= 3 and items[2]:
+extradeps.append(items[2])
+if num >= 4 and items[3]:
+extrardeps.append(items[3])
+if num >= 1 and items[0]:
+extraconf.append(items[0])
+elif num >= 2 and items[1]:
+extraconf.append(items[1])
appendVar('DEPENDS', extradeps)
appendVar('RDEPENDS_${PN}', extrardeps)
appendVar('EXTRA_OECONF', extraconf)
--
1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] owl-video_git.bb: fix compilation on Fedora 13 machine
On 13 August 2012 19:06, McClintock Matthew-B29882 wrote: > On Fri, Aug 10, 2012 at 7:54 AM, Burton, Ross wrote: >> On 8 August 2012 17:07, McClintock Matthew-B29882 >> wrote: >>> Any comments on this? >> >> owl-video isn't pulling in Xrandr directly, so something is wrong with >> the linker flags produced by GTK+. I wonder if -Wl,--as-needed is >> breaking this... Can you replicate and provide the full build log? > > Err, I went back and now I can't even reproduce this issue... I guess > we can ignore it for the time being. Oh good. :) Thanks for attempting to replicate. Ross ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] owl-video_git.bb: fix compilation on Fedora 13 machine
On Fri, Aug 10, 2012 at 7:54 AM, Burton, Ross wrote: > On 8 August 2012 17:07, McClintock Matthew-B29882 > wrote: >> Any comments on this? > > owl-video isn't pulling in Xrandr directly, so something is wrong with > the linker flags produced by GTK+. I wonder if -Wl,--as-needed is > breaking this... Can you replicate and provide the full build log? Err, I went back and now I can't even reproduce this issue... I guess we can ignore it for the time being. -M > Ross > > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [oe-core][branch: denzil][PATCH] psplash: LIC_CHKSUM Tweak
* Change the license checksum to use the lines in the psplash.h that contains
license information instead of doing a checksum on the entire file.
Signed-off-by: Franklin S Cooper Jr
---
meta/recipes-core/psplash/psplash_git.bb |4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/psplash/psplash_git.bb
b/meta/recipes-core/psplash/psplash_git.bb
index bd405f9..f93afea 100644
--- a/meta/recipes-core/psplash/psplash_git.bb
+++ b/meta/recipes-core/psplash/psplash_git.bb
@@ -3,11 +3,11 @@ DESCRIPTION = "PSplash is a userspace graphical boot splash
screen for mainly em
HOMEPAGE = "http://git.yoctoproject.org/cgit/cgit.cgi/psplash";
SECTION = "base"
LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://psplash.h;md5=a87c39812c1e37f3451567cc29a29c8f"
+LIC_FILES_CHKSUM =
"file://psplash.h;beginline=1;endline=16;md5=840fb2356b10a85bed78dd09dc7745c6"
SRCREV = "e05374aae945bcfc6d962ed0d7b2774b77987e1d"
PV = "0.1+git${SRCPV}"
-PR = "r1"
+PR = "r2"
SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=git \
file://psplash-init \
--
1.7.7
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] linux-yocto: allow do_validate_branches to handle all branches
Branch validation will not restrict a branch that doesn't exist
in the tree at the time of validation (since you can't reset a
SRCREV on a non-existent branch). This restriction can be removed
by looking for all branches that contain the specified SRCREV
and forcing them to that value.
Signed-off-by: Bruce Ashfield
---
meta/classes/kernel-yocto.bbclass | 119 +
1 files changed, 80 insertions(+), 39 deletions(-)
diff --git a/meta/classes/kernel-yocto.bbclass
b/meta/classes/kernel-yocto.bbclass
index c995a2e..d859d76 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -214,63 +214,104 @@ python do_kernel_configcheck() {
bb.plain( "%s" % result )
}
-
-# Ensure that the branches (BSP and meta) are on the locatios specified by
+# Ensure that the branches (BSP and meta) are on the locations specified by
# their SRCREV values. If they are NOT on the right commits, the branches
-# are reset to the correct commit.
+# are corrected to the proper commit.
do_validate_branches() {
cd ${S}
+ export KMETA=${KMETA}
- # nothing to do if bootstrapping
- if [ -n "${YOCTO_KERNEL_EXTERNAL_BRANCH}" ]; then
- return
- fi
-
- # nothing to do if SRCREV is AUTOREV
+ set +e
+ # if SRCREV is AUTOREV it shows up as AUTOINC there's nothing to
+ # check and we can exit early
if [ "${SRCREV_machine}" = "AUTOINC" ]; then
- # restore the branch for builds
- git checkout -f ${KBRANCH}
return
fi
- branch_head=`git show-ref -s --heads ${KBRANCH}`
+ # If something other than the default branch was requested, it must
+ # exist in the tree, and it's a hard error if it wasn't
+ git show-ref --quiet --verify -- "refs/heads/${KBRANCH}"
+ if [ $? -eq 1 ]; then
+ if [ -n "${KBRANCH_DEFAULT}" ] &&
+ [ "${KBRANCH}" != "${KBRANCH_DEFAULT}" ]; then
+ echo "ERROR: branch ${KBRANCH} was set for kernel
compilation, "
+ echo " but it does not exist in the kernel
repository."
+ echo " Check the value of KBRANCH and ensure that
it describes"
+ echo " a valid banch in the source kernel
repository"
+ exit 1
+ fi
+ fi
+
+ if [ -z "${SRCREV_machine}" ]; then
+ target_branch_head="${SRCREV}"
+ else
+ target_branch_head="${SRCREV_machine}"
+ fi
+
+ # $SRCREV could have also been AUTOINC, so check again
+ if [ "${target_branch_head}" = "AUTOINC" ]; then
+ return
+ fi
+
+ containing_branches=`git branch --contains $target_branch_head | sed
's/^..//'`
+ if [ -z "$containing_branches" ]; then
+ echo "ERROR: SRCREV was set to \"$target_branch_head\", but no
branches"
+ echo " contain this commit"
+ exit 1
+ fi
+ ref=`git show ${target_branch_head} 2>&1 | head -n1 || true`
+ if [ "$ref" = "fatal: bad object ${target_meta_head}" ]; then
+ echo "ERROR ${target_branch_head} is not a valid commit ID."
+ echo "The kernel source tree may be out of sync"
+ exit 1
+ fi
+
+ # force the SRCREV in each branch that contains the specified
+ # SRCREV (if it isn't the current HEAD of that branch)
+ git checkout -q master
+ for b in $containing_branches; do
+ branch_head=`git show-ref -s --heads ${b}`
+ if [ "$branch_head" != "$target_branch_head" ]; then
+ echo "[INFO] Setting branch $b to
${target_branch_head}"
+ git branch -D $b > /dev/null
+ git branch $b $target_branch_head > /dev/null
+ fi
+ done
+
+ ## KMETA branch validation
meta_head=`git show-ref -s --heads ${KMETA}`
- target_branch_head="${SRCREV_machine}"
target_meta_head="${SRCREV_meta}"
+ git show-ref --quiet --verify -- "refs/heads/${KMETA}"
+ if [ $? -eq 1 ]; then
+ return
+ fi
- current=`git branch |grep \*|sed 's/^\* //'`
- if [ -n "$target_branch_head" ] && [ "$branch_head" !=
"$target_branch_head" ]; then
- if [ -n "${KERNEL_REVISION_CHECKING}" ]; then
- ref=`git show ${target_meta_head} 2>&1 | head -n1 ||
true`
- if [ "$ref" = "fatal: bad object ${target_meta_head}"
]; then
- echo "ERROR ${target_branch_head} is not a
valid commit ID."
- echo "The kernel source tree may be out of sync"
- exit 1
- else
- echo "Forcing branch $current to
${target_branch_head}"
-
[OE-core] [PATCH 0/1] [denzil] linux-yocto: make validate_branches handle non BSP branches
Scott, Here's a fix for validate_branches that comes from a pending master change that I've been running for 3 weeks, and one that TomZ has tested in his yocto BSP work on denzil. It fixes some BSP use cases that involve setting a specific SRCREV on a base branch, so that a BSP branch that doesn't yet exist can be created off of that known base. Previously only an existing BSP branch could have it's SRCREV restricted. cc: Tom Zanussi Cheers, Bruce The following changes since commit 73cdebf60df225ee10f2eb215935be3b61e1b831: documentation/dev-manual/dev-manual-kernel-appendix.xml: Add note about conflict (2012-06-29 15:54:26 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib zedd/kernel-denzil http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel-denzil Bruce Ashfield (1): linux-yocto: allow do_validate_branches to handle all branches meta/classes/kernel-yocto.bbclass | 119 + 1 files changed, 80 insertions(+), 39 deletions(-) -- 1.7.5.4 ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH] wpa-supplicant: fix paths in dbus/systemd *.service files
Signed-off-by: Andreas Müller
---
.../wpa-supplicant/wpa-supplicant-1.0.inc |2 ++
.../wpa-supplicant/wpa-supplicant_1.0.bb |2 +-
2 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
index 0c18b30..873e923 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant-1.0.inc
@@ -29,6 +29,8 @@ do_configure () {
}
export EXTRA_CFLAGS = "${CFLAGS}"
+export BINDIR = "${sbindir}"
+
do_compile () {
unset CFLAGS CPPFLAGS CXXFLAGS
oe_runmake
diff --git a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
index 8ede3e5..a60cd86 100644
--- a/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
+++ b/meta/recipes-connectivity/wpa-supplicant/wpa-supplicant_1.0.bb
@@ -1,6 +1,6 @@
require wpa-supplicant-1.0.inc
-PR = "r0"
+PR = "r1"
SRC_URI[md5sum] = "8650f6aa23646ef634402552d0669640"
SRC_URI[sha256sum] =
"91d41d473a5aafa2e25dd6577ebda975c4d4a3188850a53e31feaf7c04482b9c"
--
1.7.6.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] dri2proto: upgrade to 2.8
Signed-off-by: Constantin Musca
---
.../{dri2proto_2.6.bb => dri2proto_2.8.bb} |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-proto/{dri2proto_2.6.bb => dri2proto_2.8.bb}
(76%)
diff --git a/meta/recipes-graphics/xorg-proto/dri2proto_2.6.bb
b/meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb
similarity index 76%
rename from meta/recipes-graphics/xorg-proto/dri2proto_2.6.bb
rename to meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb
index 99c089a..fd27ed5 100644
--- a/meta/recipes-graphics/xorg-proto/dri2proto_2.6.bb
+++ b/meta/recipes-graphics/xorg-proto/dri2proto_2.8.bb
@@ -12,5 +12,5 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=2e396fa91834f8786032cad2da5638f3 \
PR = "r0"
-SRC_URI[md5sum] = "2eb74959684f47c862081099059a11ab"
-SRC_URI[sha256sum] =
"ad82c0b28c19fcd3f91ea1f93956cb666526b41b91f239773b5854b9b1a3b909"
+SRC_URI[md5sum] = "b2721d5d24c04d9980a0c6540cb5396a"
+SRC_URI[sha256sum] =
"f9b55476def44fc7c459b2537d17dbc731e36ed5d416af7ca0b1e2e676f8aa04"
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] glproto: upgrade to 1.4.16
Signed-off-by: Constantin Musca
---
.../{glproto_1.4.15.bb => glproto_1.4.16.bb} |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-proto/{glproto_1.4.15.bb =>
glproto_1.4.16.bb} (77%)
diff --git a/meta/recipes-graphics/xorg-proto/glproto_1.4.15.bb
b/meta/recipes-graphics/xorg-proto/glproto_1.4.16.bb
similarity index 77%
rename from meta/recipes-graphics/xorg-proto/glproto_1.4.15.bb
rename to meta/recipes-graphics/xorg-proto/glproto_1.4.16.bb
index 955f44b..e8ad93b 100644
--- a/meta/recipes-graphics/xorg-proto/glproto_1.4.15.bb
+++ b/meta/recipes-graphics/xorg-proto/glproto_1.4.16.bb
@@ -15,5 +15,5 @@ PE = "1"
BBCLASSEXTEND = "nativesdk"
-SRC_URI[md5sum] = "d1ff0c1acc605689919c1ee2fc9b5582"
-SRC_URI[sha256sum] =
"990356ebe2e8966aa643287c9a485777957a49299dfb211654df5ff212dec171"
+SRC_URI[md5sum] = "3847963c1b88fd04a030b932b0aece07"
+SRC_URI[sha256sum] =
"54dd663a7f5ed702f2ff035b79edf770c2f850867ac0d55742f696bfc8b2598d"
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] pixman: upgrade to 0.27.2
Signed-off-by: Constantin Musca
---
.../{pixman_0.26.2.bb => pixman_0.27.2.bb} |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/xorg-lib/{pixman_0.26.2.bb => pixman_0.27.2.bb}
(86%)
diff --git a/meta/recipes-graphics/xorg-lib/pixman_0.26.2.bb
b/meta/recipes-graphics/xorg-lib/pixman_0.27.2.bb
similarity index 86%
rename from meta/recipes-graphics/xorg-lib/pixman_0.26.2.bb
rename to meta/recipes-graphics/xorg-lib/pixman_0.27.2.bb
index 337ac2b..e55276e 100644
--- a/meta/recipes-graphics/xorg-lib/pixman_0.26.2.bb
+++ b/meta/recipes-graphics/xorg-lib/pixman_0.27.2.bb
@@ -24,5 +24,5 @@ LOONGSON_MMI = "--disable-loongson-mmi"
EXTRA_OECONF="--disable-gtk ${IWMMXT} ${LOONGSON_MMI}"
-SRC_URI[md5sum] = "6b3e4c5300adb893a2baa9631c23efb2"
-SRC_URI[sha256sum] =
"193b651c8ba89ecfacb8dc62a34d2bd305245163910cdbdf907e5d5ece92647c"
+SRC_URI[md5sum] = "dd67154b23d88e6a75ad3a83f3052198"
+SRC_URI[sha256sum] =
"cae9dc13727a84f11beb150c88d3a06ba114f82c52d68073c663c027e099123b"
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] Package upgrades
The set contains package upgrades compiled successfully on all architectures
and tested using the xorg-server.
Constantin Musca (3):
pixman: upgrade to 0.27.2
glproto: upgrade to 1.4.16
dri2proto: upgrade to 2.8
.../{pixman_0.26.2.bb => pixman_0.27.2.bb} |4 ++--
.../{dri2proto_2.6.bb => dri2proto_2.8.bb} |4 ++--
.../{glproto_1.4.15.bb => glproto_1.4.16.bb} |4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
rename meta/recipes-graphics/xorg-lib/{pixman_0.26.2.bb => pixman_0.27.2.bb}
(86%)
rename meta/recipes-graphics/xorg-proto/{dri2proto_2.6.bb => dri2proto_2.8.bb}
(76%)
rename meta/recipes-graphics/xorg-proto/{glproto_1.4.15.bb =>
glproto_1.4.16.bb} (77%)
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] qemu.inc: disable curl for qemu-nativesdk
The following changes since commit 2dec760b79bb7e2e79c33c5127fa64685bd86a18: foomatic: fix perl path for target (2012-08-08 10:06:00 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib robert/qemu http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/qemu Robert Yang (1): qemu.inc: disable curl for qemu-nativesdk meta/recipes-devtools/qemu/qemu.inc |4 +++- meta/recipes-devtools/qemu/qemu_0.15.1.bb |2 +- meta/recipes-devtools/qemu/qemu_git.bb|2 +- 3 files changed, 5 insertions(+), 3 deletions(-) ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] qemu.inc: disable curl for qemu-nativesdk
We had added the --disable-curl to EXTRA_OECONF, but there is an
EXTRA_OECONF_virtclass-nativesdk += "foo", the
"EXTRA_OECONF_virtclass-nativesdk +=" equals to
"EXTRA_OECONF_virtclass-nativesdk =" (the "+" has no effect here), so we
should add the "--disable-curl" to EXTRA_OECONF_virtclass-nativesdk.
And change the "+=" to "=" to not confuse people.
[YOCTO #2305]
Signed-off-by: Robert Yang
---
meta/recipes-devtools/qemu/qemu.inc |4 +++-
meta/recipes-devtools/qemu/qemu_0.15.1.bb |2 +-
meta/recipes-devtools/qemu/qemu_git.bb|2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-devtools/qemu/qemu.inc
b/meta/recipes-devtools/qemu/qemu.inc
index f9368f3..bf41b3b 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -45,7 +45,9 @@ DEPENDS_virtclass-native = "zlib-native alsa-lib-native
glib-2.0-native"
DEPENDS_virtclass-nativesdk = "zlib-nativesdk libsdl-nativesdk
glib-2.0-nativesdk \
${@base_contains('DISTRO_FEATURES', 'x11',
'qemugl-nativesdk', '', d)}"
RDEPENDS_virtclass-nativesdk = "libsdl-nativesdk"
-EXTRA_OECONF_virtclass-nativesdk += "--target-list=${@get_qemu_target_list(d)}
--disable-werror --disable-vnc-tls"
+EXTRA_OECONF_virtclass-nativesdk = "--target-list=${@get_qemu_target_list(d)}
--disable-werror --disable-vnc-tls \
+ --disable-curl \
+ "
BBCLASSEXTEND = "native nativesdk"
diff --git a/meta/recipes-devtools/qemu/qemu_0.15.1.bb
b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
index 983e831..7b862ed 100644
--- a/meta/recipes-devtools/qemu/qemu_0.15.1.bb
+++ b/meta/recipes-devtools/qemu/qemu_0.15.1.bb
@@ -3,7 +3,7 @@ require qemu.inc
LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
-PR = "r10"
+PR = "r11"
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}"
FILESDIR = "${WORKDIR}"
diff --git a/meta/recipes-devtools/qemu/qemu_git.bb
b/meta/recipes-devtools/qemu/qemu_git.bb
index bcec9bb..6d5e250 100644
--- a/meta/recipes-devtools/qemu/qemu_git.bb
+++ b/meta/recipes-devtools/qemu/qemu_git.bb
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
PV = "0.14.0"
-PR = "r3"
+PR = "r4"
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
FILESDIR = "${WORKDIR}"
--
1.7.1
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC 0/1] adt-installer: add support for relocatable SDK
Hi all,
This patch will add relocatable SDK support to adt installer. That is, the user
can provide an install folder, different than the default one (usually
/opt/${DISTRO}/${SDK_VERSION} and the binaries will be automatically relocated.
Why RFC? Well, adt_installer uses opkg in order to populate the SDK rootfs. If
the user wants to install, for example, x86_64 Poky SDK under, say,
/home/user/some/directory, he/she will end up with this directory structure:
/home/user/some/directory/opt/poky/1.2+snapshot/sysroots/x86_64-pokysdk-linux/...
The idea is to strip opt/poky/1.2+snapshot from this structure and end up with:
/home/user/some/directory/sysroots/x86_64-pokysdk-linux/...
With the meta-toolchain stuff it was easy because tar has the feature to strip
a number of components from file names on extraction and all was fine. But opkg,
doesn't... Not that I know of.
So, I had two options:
- hard way: patch opkg to be able to support this. Implementation could
take
some time and the feature will be rarely used in real-life;
- easy way: the solution I chose: after opkg finishes installation of
the
entire directory structure, move sysroots directory (together with the
setup scripts) to the location we want and then get rid of the
./opt/poky/1.2+snapshot/ tree, which is empty anyway.
Any comments?
Thanks,
Laurentiu
Laurentiu Palcu (1):
adt-installer: add support for relocatable SDK
.../installer/adt-installer/adt_installer | 11 ++
.../adt-installer/scripts/adt_installer_internal | 109
.../installer/adt-installer_1.0.bb | 37 +++
3 files changed, 121 insertions(+), 36 deletions(-)
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [RFC 1/1] adt-installer: add support for relocatable SDK
Since we made the SDK relocatable, we have to add this functionality to
adt-installer too.
Other:
- Changed tabs to spaces in the recipe file too.
Signed-off-by: Laurentiu Palcu
---
.../installer/adt-installer/adt_installer | 11 ++
.../adt-installer/scripts/adt_installer_internal | 109
.../installer/adt-installer_1.0.bb | 37 +++
3 files changed, 121 insertions(+), 36 deletions(-)
diff --git a/meta/recipes-devtools/installer/adt-installer/adt_installer
b/meta/recipes-devtools/installer/adt-installer/adt_installer
index 1a53eb9..1c70483 100755
--- a/meta/recipes-devtools/installer/adt-installer/adt_installer
+++ b/meta/recipes-devtools/installer/adt-installer/adt_installer
@@ -332,6 +332,17 @@ if [ -f "$YOCTOADT_INSTALL_LOG_FILE" ]; then
rm $YOCTOADT_INSTALL_LOG_FILE
fi
+echo -n "Please enter the install location (default: $DEFAULT_INSTALL_FOLDER):
"
+read INSTALL_FOLDER
+
+if [ "$INSTALL_FOLDER" = "" ]; then
+INSTALL_FOLDER = $DEFAULT_INSTALL_FOLDER
+fi
+
+eval INSTALL_FOLDER=$INSTALL_FOLDER
+export INSTALL_FOLDER=$(readlink -m $INSTALL_FOLDER)
+
+clear
usage
diff --git
a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
index 6201095..d524785 100755
---
a/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
+++
b/meta/recipes-devtools/installer/adt-installer/scripts/adt_installer_internal
@@ -50,8 +50,8 @@ install_native_sdk()
echo_info "\nStart installing selected native ADT for archs:
$YOCTOADT_TARGETS..."
-# where the packages are installed. Currently only / is supported
-NATIVE_INSTALL_DIR="/"
+# where the packages are installed.
+NATIVE_INSTALL_DIR=$INSTALL_FOLDER
if [ -d "$INSTALL_FOLDER" ]; then
echo_info "\nNative ADT installation directory \"$INSTALL_FOLDER\" already
exists! Continue installation will override its contents!"
@@ -59,28 +59,51 @@ if [ -d "$INSTALL_FOLDER" ]; then
fi
#Now begin to install native sdk and extract qemu rootfs which needs privilege
rights
-echo_info
"###"
-echo_info "Please note from this point on installation requires sudo password
..."
-echo_info
"###"
-username='id -nu'
+#depending on the install location
+username=$(id -nu)
+
+# find the owner of the parent
+dir=$NATIVE_INSTALL_DIR
+while [ 1 ]; do
+if [ -d $dir ]; then
+owner=$(stat -c %U $dir)
+break
+ else
+dir=$(dirname $dir)
+ fi
+done
+
+if [ "$owner" = "$username" ]; then
+SUDO=""
+else
+echo_info
"###"
+echo_info "Please note from this point on installation requires sudo
password ..."
+echo_info
"###"
+SUDO=sudo
+fi
+
#we need to make this directory firstly since opkg need to use it.
OPKG_LOCK_DIR="$NATIVE_INSTALL_DIR/$OPKG_LIBDIR/opkg"
if [ ! -d "$OPKG_LOCK_DIR" ]; then
- sudo mkdir -p $OPKG_LOCK_DIR
+ $SUDO mkdir -p $OPKG_LOCK_DIR
echo_info "Successfully create directory $OPKG_LOCK_DIR. "
#if user delete /opt/xxx, while dangling folders there, report error
elif [ ! -d "$INSTALL_FOLDER" ]; then
echo_info "\nDangling opkg cache folder $OPKG_LOCK_DIR detected. Continue
installation will remove the folder!"
confirm_install $1
- sudo rm -rf $OPKG_LOCK_DIR
- sudo mkdir -p $OPKG_LOCK_DIR
+ $SUDO rm -rf $OPKG_LOCK_DIR
+ $SUDO mkdir -p $OPKG_LOCK_DIR
#if user are updating installing, just let him/her go, give her/him prompt
else
echo_info "ADT has already been installed. Will update its contents..."
fi
#first update repository
-OPKG_CMD="sudo -E $LOCAL_OPKG_LOC/bin/opkg-cl"
+if [ "x$SUDO" = "x" ]; then
+OPKG_CMD="$LOCAL_OPKG_LOC/bin/opkg-cl"
+else
+OPKG_CMD="sudo -E $LOCAL_OPKG_LOC/bin/opkg-cl"
+fi
echo_info "Updating opkg..."
$OPKG_CMD -f $OPKG_CONFIG_FILE -o $NATIVE_INSTALL_DIR update &>>
$YOCTOADT_INSTALL_LOG_FILE
@@ -117,13 +140,6 @@ for native_target_type in $YOCTOADT_TARGETS; do
done
-# Link the ld.so.cache file into the hosts filesystem
-if [ ! -f "$OECORE_NATIVE_SYSROOT/etc/ld.so.cache" ]; then
-echo_info "Link the ld.so.cache file into the host filesystem"
-sudo ln -s /etc/ld.so.cache $OECORE_NATIVE_SYSROOT/etc/ld.so.cache
-check_result
-fi
-
if [ "$YOCTOADT_QEMU" == "Y" ] || [ "$YOCTOADT_QEMU" = "y" ]; then
echo_info "\nInstalling qemu native ..."
$OPKG_INSTALL_NATIVE_CMD qemu-nativesdk &>> $YOCTOADT_INSTALL_LOG_FILE
@@ -138,6 +154,63 @@ if [ "$YOCTOADT_NFS_UTIL" == "Y" ] || [
"$YOCTOADT_NFS_UTIL" == "y" ]; then
check_result
fi
+# Lose the ./opt/${DISTRO}/${SDK_VERSION} part, we don't really need to keep
+# the entire directory structure. We could patch opkg to do that but it's far
+# simpl
[OE-core] [PATCH] ethtool: package update 3.4.1 -> 3.5
Signed-off-by: Constantin Musca
---
.../ethtool/{ethtool_3.4.1.bb => ethtool_3.5.bb} |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-extended/ethtool/{ethtool_3.4.1.bb => ethtool_3.5.bb} (79%)
diff --git a/meta/recipes-extended/ethtool/ethtool_3.4.1.bb
b/meta/recipes-extended/ethtool/ethtool_3.5.bb
similarity index 79%
rename from meta/recipes-extended/ethtool/ethtool_3.4.1.bb
rename to meta/recipes-extended/ethtool/ethtool_3.5.bb
index 41ef330..b9caab6 100644
--- a/meta/recipes-extended/ethtool/ethtool_3.4.1.bb
+++ b/meta/recipes-extended/ethtool/ethtool_3.5.bb
@@ -9,7 +9,7 @@ PR = "r0"
SRC_URI = "${KERNELORG_MIRROR}/software/network/ethtool/ethtool-${PV}.tar.gz"
-SRC_URI[md5sum] = "25ccc0d717c37265042df4f7869485cb"
-SRC_URI[sha256sum] =
"3b67484b255996432854cb07de8f7e42ba555cf8efeb4a0134eb7575f9eef2a8"
+SRC_URI[md5sum] = "f2dd81ecc515f25372503501f9b7ea1b"
+SRC_URI[sha256sum] =
"e87e232ba927aecca5be565e7bea20c533ade97758b17e65b8941df35b3c6f59"
inherit autotools
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] man: fix RDEPENDS and reformat recipe
Signed-off-by: Koen Kooi
---
meta/recipes-extended/man/man_1.6f.bb |7 ---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/meta/recipes-extended/man/man_1.6f.bb
b/meta/recipes-extended/man/man_1.6f.bb
index 9f75307..3dce1ae 100644
--- a/meta/recipes-extended/man/man_1.6f.bb
+++ b/meta/recipes-extended/man/man_1.6f.bb
@@ -3,11 +3,11 @@ DESCRIPTION = "A set of documentation tools: man, apropos and
whatis"
SECTION = "console/utils"
HOMEPAGE = "http://primates.ximian.com/~flucifredi/man";
LICENSE = "GPLv2"
-PR = "r3"
+LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
-DEPENDS = "groff less"
+PR = "r4"
-LIC_FILES_CHKSUM = "file://COPYING;md5=8ca43cbc842c2336e835926c2166c28b"
+DEPENDS = "groff less"
SRC_URI = "http://primates.ximian.com/~flucifredi/${BPN}/${BPN}-${PV}.tar.gz \
file://man-1.5k-confpath.patch;striplevel=0 \
@@ -61,4 +61,5 @@ do_install_append(){
}
+RDEPENDS_${PN} = "less groff"
FILES_${PN} += "${datadir}/locale ${sysconfdir}/man.conf"
--
1.7.10
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] man: make man actually work by installing custom man.config
The default man.conf is named wrong and doesn't work. It references gtbl, while groff installs tbl and other things. This man.conf is imported from OE classic and runtime tested on angstrom. Before: root@beaglebone:~# man man sh: /usr/bin/gtbl: No such file or directory sh: line 0: echo: write error: Broken pipe gunzip: write: Broken pipe gunzip: error inflating sh: line 0: echo: write error: Broken pipe sh: line 0: echo: write error: Broken pipe After: root@beaglebone:~# man man MAN(1)Manual pager utilsMAN(1) NAME man - an interface to the on-line reference manuals SYNOPSIS man [-C file] [-d] [-D] [--warnings[=warnings]] [-R encoding] [-L locale] [-m system[,...]] [-M path] [-S list] [-e extension] [-i|-I] [--regex|--wildcard] [--names-only] [-a] [-u] [--no-subpages] [-P pager] [-r prompt] [-7] [-E encoding] [--no-hyphenation] [--no-justifi- cation] [-p string] [-t] [-T[device]] [-H[browser]] [-X[dpi]] [-Z] [[section] page ...] ... man -k [apropos options] regexp ... man -K [-w|-W] [-S list] [-i|-I] [--regex] [section] term ... man -f [whatis options] page ... man -l [-C file] [-d] [-D] [--warnings[=warnings]] [-R encoding] [-L locale] [-P pager] [-r prompt] [-7] [-E encoding] [-p string] [-t] [-T[device]] [-H[browser]] [-X[dpi]] [-Z] file ... man -w|-W [-C file] [-d] [-D] page ... man -c [-C file] [-d] [-D] page ... man [-hV] Check for config name: root@beaglebone:~# rm /etc/man.config root@beaglebone:~# man man Warning: cannot open configuration file /etc/man.config No manual entry for man As a bonus a bunch of references to the buildhost get removed from the config file. Signed-off-by: Koen Kooi --- meta/recipes-extended/man/man-1.6f/man.conf | 140 +++ meta/recipes-extended/man/man_1.6f.bb |6 +- 2 files changed, 143 insertions(+), 3 deletions(-) create mode 100644 meta/recipes-extended/man/man-1.6f/man.conf diff --git a/meta/recipes-extended/man/man-1.6f/man.conf b/meta/recipes-extended/man/man-1.6f/man.conf new file mode 100644 index 000..bb3c697 --- /dev/null +++ b/meta/recipes-extended/man/man-1.6f/man.conf @@ -0,0 +1,140 @@ +# +# Generated automatically from man.conf.in by the +# configure script. +# +# man.conf from man-1.5p +# +# For more information about this file, see the man pages man(1) +# and man.conf(5). +# +# This file is read by man to configure the default manpath (also used +# when MANPATH contains an empty substring), to find out where the cat +# pages corresponding to given man pages should be stored, +# and to map each PATH element to a manpath element. +# It may also record the pathname of the man binary. [This is unused.] +# The format is: +# +# MANBIN pathname +# MANPATH manpath_element [corresponding_catdir] +# MANPATH_MAP path_elementmanpath_element +# +# If no catdir is given, it is assumed to be equal to the mandir +# (so that this dir has both man1 etc. and cat1 etc. subdirs). +# This is the traditional Unix setup. +# Certain versions of the FSSTND recommend putting formatted versions +# of /usr/.../man/manx/page.x into /var/catman/.../catx/page.x. +# The keyword FSSTND will cause this behaviour. +# Certain versions of the FHS recommend putting formatted versions of +# /usr/.../share/man/[locale/]manx/page.x into +# /var/cache/man/.../[locale/]catx/page.x. +# The keyword FHS will cause this behaviour (and overrides FSSTND). +# Explicitly given catdirs override. +# +# FSSTND +FHS +# +# This file is also read by man in order to find how to call nroff, less, etc., +# and to determine the correspondence between extensions and decompressors. +# +# MANBIN /usr/local/bin/man +# +# Every automatically generated MANPATH includes these fields +# +MANPATH/usr/man +MANPATH/usr/share/man +MANPATH/usr/local/man +MANPATH/usr/local/share/man +MANPATH/usr/X11R6/man +# +# Uncomment if you want to include one of these by default +# +# MANPATH /opt/*/man +# MANPATH /usr/lib/*/man +# MANPATH /usr/share/*/man +# MANPATH /usr/kerberos/man +# +# Set up PATH to MANPATH mapping +# +# If people ask for "man foo" and have "/dir/bin/foo" in their PATH +# and the docs are found in "/dir/man", then no mapping is required. +# +# The below mappings are superfluous when the right hand side is +# in the mandatory manpath already, but will keep man from statting +# lots of other nearby files and directories. +# +MANPATH_MAP/bin/usr/share/man +MANPATH_MAP/sbin /usr/share/man +MANPATH_MAP/usr/bin/usr/share/man +MANPATH_MAP/usr/sbin /usr/share/man +MANPATH_MAP/usr/local/bin /usr/local/share/man +MANPATH_MAP/usr/local/sbin /usr/local/share/man +MANPATH_
[OE-core] [PATCH] libdrm: package update 2.4.35 -> 2.4.37
Signed-off-by: Constantin Musca
---
.../drm/{libdrm_2.4.35.bb => libdrm_2.4.37.bb} |4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
rename meta/recipes-graphics/drm/{libdrm_2.4.35.bb => libdrm_2.4.37.bb} (50%)
diff --git a/meta/recipes-graphics/drm/libdrm_2.4.35.bb
b/meta/recipes-graphics/drm/libdrm_2.4.37.bb
similarity index 50%
rename from meta/recipes-graphics/drm/libdrm_2.4.35.bb
rename to meta/recipes-graphics/drm/libdrm_2.4.37.bb
index 58ee449..d704b90 100644
--- a/meta/recipes-graphics/drm/libdrm_2.4.35.bb
+++ b/meta/recipes-graphics/drm/libdrm_2.4.37.bb
@@ -6,5 +6,5 @@ SRC_URI += "file://installtests.patch \
file://GNU_SOURCE_definition.patch \
"
-SRC_URI[md5sum] = "a40f5293dc0a7b49d2a1e959d7d60194"
-SRC_URI[sha256sum] =
"c390aee132f05910edb09398b70e108c6b53f9b69b21914a9ea3165eed6f1b21"
+SRC_URI[md5sum] = "9765919c28d4a54887576db3680137cc"
+SRC_URI[sha256sum] =
"e4ea39a901d4a8e59064f10f413bb037dad7790f7c16a5986e7cc1453b36488f"
--
1.7.9.5
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
