* [CONSOLIDATED PULL 00/12] Subset of Pending Changes
@ 2012-05-09 5:29 Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 01/12] libatomics-ops: Make it build for SH4 Saul Wold
` (11 more replies)
0 siblings, 12 replies; 13+ messages in thread
From: Saul Wold @ 2012-05-09 5:29 UTC (permalink / raw)
To: openembedded-core
Richard,
I have looked these over and there have been some comments on
past version of Seebs' Sanity.bbclass but nothing on the current
version, but please review it.
Other changes have been built and run.
Sau!
The following changes since commit 043871d7e5d2d19c2ff43e54d2ff180c09e8903e:
kern-tools: integrate minor fixes (2012-05-08 16:06:15 +0100)
are available in the git repository at:
git://git.openembedded.org/openembedded-core-contrib sgw/stage
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/stage
Eric Bénard (1):
zlib: upgrade to 1.2.7
Khem Raj (4):
libatomics-ops: Make it build for SH4
qemu-git: Move to tip of git
openssl: Fix build for mips64(el)
classes/mirrors.bbclass: Point snapshot.debian.org mirror to working
location
Nitin A Kamble (1):
guile: upgrade from 2.0.3 to 2.0.5
Otavio Salvador (1):
qt4-graphics-system: set graphic system in profile instead of X11
session
Peter Seebach (2):
sanity.bbclass: Implement initial toolchain sanity checks
sanity.bbclass: Check for bogus values in BBCLASSEXTEND
Saul Wold (2):
libpcap: Move pcap-config to -dev package
h264_qpel_mmx.patch: fix Upstream-Status tag
Ting Liu (1):
image_types.bbclass: redefine EXTRA_IMAGECMD_jffs2 to leverage
siteinfo
meta/classes/image_types.bbclass | 7 ++-
meta/classes/mirrors.bbclass | 2 +-
meta/classes/sanity.bbclass | 86 ++++++++++++++++++++
meta/conf/documentation.conf | 6 ++
meta/recipes-connectivity/libpcap/libpcap.inc | 7 ++-
.../openssl/openssl-1.0.0i/configure-targets.patch | 16 ++--
.../recipes-connectivity/openssl/openssl_1.0.0i.bb | 2 +-
.../remove.ldconfig.call.patch | 0
.../zlib/{zlib_1.2.6.bb => zlib_1.2.7.bb} | 6 +-
...01-Fix-the-SRFI-60-copy-bit-documentation.patch | 33 --------
..._GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch | 25 ------
...-modules-are-removed-gc-test-as-unresolve.patch | 38 +++++++++
...h-rather-than-gc-gc_version.h-in-pthread-.patch | 26 ------
...with-owner-not-retained-threads-test-as-u.patch | 33 ++++++++
.../guile/files/guile_2.0.5_fix_sed_error.patch | 24 ++++++
.../guile/files/opensuse/guile-64bit.patch | 3 +-
.../files/opensuse/guile-turn-off-gc-test.patch | 3 +-
.../guile/{guile_2.0.3.bb => guile_2.0.5.bb} | 16 ++--
.../recipes-devtools/qemu/qemu-git/powerpc_rom.bin | Bin 0 -> 4096 bytes
meta/recipes-devtools/qemu/qemu_git.bb | 18 +---
.../gst-ffmpeg-0.10.13/h264_qpel_mmx.patch | 2 +-
.../libatomics-ops/gentoo/sh4-atomic-ops.patch | 70 ++++++++++++++++
.../pulseaudio/libatomics-ops_1.2.bb | 6 +-
.../qt4-graphics-system/qt4-graphics-system_1.0.bb | 12 +--
24 files changed, 309 insertions(+), 132 deletions(-)
rename meta/recipes-core/zlib/{zlib-1.2.6 => zlib-1.2.7}/remove.ldconfig.call.patch (100%)
rename meta/recipes-core/zlib/{zlib_1.2.6.bb => zlib_1.2.7.bb} (80%)
delete mode 100644 meta/recipes-devtools/guile/files/debian/0001-Fix-the-SRFI-60-copy-bit-documentation.patch
delete mode 100644 meta/recipes-devtools/guile/files/debian/0002-Define-_GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch
create mode 100644 meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch
delete mode 100644 meta/recipes-devtools/guile/files/debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch
create mode 100644 meta/recipes-devtools/guile/files/debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
create mode 100644 meta/recipes-devtools/guile/files/guile_2.0.5_fix_sed_error.patch
rename meta/recipes-devtools/guile/{guile_2.0.3.bb => guile_2.0.5.bb} (84%)
create mode 100644 meta/recipes-devtools/qemu/qemu-git/powerpc_rom.bin
create mode 100644 meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/sh4-atomic-ops.patch
--
1.7.7.6
^ permalink raw reply [flat|nested] 13+ messages in thread
* [CONSOLIDATED PULL 01/12] libatomics-ops: Make it build for SH4
2012-05-09 5:29 [CONSOLIDATED PULL 00/12] Subset of Pending Changes Saul Wold
@ 2012-05-09 5:29 ` Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 02/12] qemu-git: Move to tip of git Saul Wold
` (10 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2012-05-09 5:29 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../libatomics-ops/gentoo/sh4-atomic-ops.patch | 70 ++++++++++++++++++++
.../pulseaudio/libatomics-ops_1.2.bb | 6 +-
2 files changed, 74 insertions(+), 2 deletions(-)
create mode 100644 meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/sh4-atomic-ops.patch
diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/sh4-atomic-ops.patch b/meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/sh4-atomic-ops.patch
new file mode 100644
index 0000000..dfdd29c
--- /dev/null
+++ b/meta/recipes-multimedia/pulseaudio/libatomics-ops/gentoo/sh4-atomic-ops.patch
@@ -0,0 +1,70 @@
+This patch is taken from Gentoo
+http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/dev-libs/libatomic_ops/files/libatomic_ops-1.2-sh4.patch?revision=1.1&view=markup
+
+Upstream-Status: Pending
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+
+Index: libatomic_ops-1.2/src/atomic_ops.h
+===================================================================
+--- libatomic_ops-1.2.orig/src/atomic_ops.h 2012-04-30 13:56:17.000000000 -0700
++++ libatomic_ops-1.2/src/atomic_ops.h 2012-04-30 13:58:28.747602349 -0700
+@@ -223,6 +223,10 @@
+ # if defined(__mips__)
+ # include "atomic_ops/sysdeps/gcc/mips.h"
+ # endif
++# if defined(__sh__) || defined(SH4)
++# include "atomic_ops/sysdeps/gcc/sh.h"
++# define AO_CAN_EMUL_CAS
++# endif /* __sh__ */
+ #endif /* __GNUC__ && !AO_USE_PTHREAD_DEFS */
+
+ #if defined(__INTEL_COMPILER) && !defined(AO_USE_PTHREAD_DEFS)
+Index: libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am
+===================================================================
+--- libatomic_ops-1.2.orig/src/atomic_ops/sysdeps/Makefile.am 2012-04-30 10:52:18.000000000 -0700
++++ libatomic_ops-1.2/src/atomic_ops/sysdeps/Makefile.am 2012-04-30 14:00:11.511609965 -0700
+@@ -28,7 +28,7 @@
+ 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 \
+- gcc/mips.h \
++ gcc/mips.h gcc/sh.h \
+ \
+ icc/ia64.h \
+ \
+Index: libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/sh.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ libatomic_ops-1.2/src/atomic_ops/sysdeps/gcc/sh.h 2012-04-30 13:58:28.755602350 -0700
+@@ -0,0 +1,31 @@
++/*
++ * Copyright (c) 2009 by Takashi YOSHII. All rights reserved.
++ *
++ * THIS MATERIAL IS PROVIDED AS IS, WITH ABSOLUTELY NO WARRANTY EXPRESSED
++ * OR IMPLIED. ANY USE IS AT YOUR OWN RISK.
++ *
++ * Permission is hereby granted to use or copy this program
++ * for any purpose, provided the above notices are retained on all copies.
++ * Permission to modify the code and to distribute modified code is granted,
++ * provided the above notices are retained, and a notice that the code was
++ * modified is included with the above copyright notice.
++ */
++
++#include "../all_atomic_load_store.h"
++#include "../ordered.h"
++
++/* sh has tas.b(byte) only */
++#include "../test_and_set_t_is_char.h"
++
++AO_INLINE AO_TS_VAL_t
++AO_test_and_set_full(volatile AO_TS_t *addr)
++{
++ int oldval;
++ __asm__ __volatile__(
++ "tas.b @%1; movt %0"
++ : "=r" (oldval)
++ : "r" (addr)
++ : "t", "memory");
++ return oldval? AO_TS_CLEAR : AO_TS_SET;
++}
++#define AO_HAVE_test_and_set_full
diff --git a/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb b/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
index d0162e6..eba43cd 100644
--- a/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
+++ b/meta/recipes-multimedia/pulseaudio/libatomics-ops_1.2.bb
@@ -6,13 +6,15 @@ LICENSE = "GPLv2 & MIT"
LIC_FILES_CHKSUM = "file://doc/COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
file://doc/LICENSING.txt;md5=607073e04548eac7d1f763e480477bab \
"
-PR = "r9"
+PR = "r10"
SRC_URI = "http://www.hpl.hp.com/research/linux/atomic_ops/download/libatomic_ops-${PV}.tar.gz \
file://fedora/libatomic_ops-1.2-ppclwzfix.patch \
file://gentoo/libatomic_ops-1.2-mips.patch \
file://doublefix.patch \
- file://libatomics-ops_fix_for_x32.patch"
+ file://libatomics-ops_fix_for_x32.patch \
+ file://gentoo/sh4-atomic-ops.patch \
+ "
SRC_URI[md5sum] = "1b65e48271c81e3fa2d7a9a69bab7504"
SRC_URI[sha256sum] = "a3d8768aa8fd2f6ae79be2d756b3a6b48816b3889ae906be3d5ffb2de5a5c781"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [CONSOLIDATED PULL 02/12] qemu-git: Move to tip of git
2012-05-09 5:29 [CONSOLIDATED PULL 00/12] Subset of Pending Changes Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 01/12] libatomics-ops: Make it build for SH4 Saul Wold
@ 2012-05-09 5:29 ` Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 03/12] qt4-graphics-system: set graphic system in profile instead of X11 session Saul Wold
` (9 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2012-05-09 5:29 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
There are a lot of armv7 and sh4 fixes that
its worth moving to latest version. The patch
forward porting can happen later.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../recipes-devtools/qemu/qemu-git/powerpc_rom.bin | Bin 0 -> 4096 bytes
meta/recipes-devtools/qemu/qemu_git.bb | 18 +++++-------------
2 files changed, 5 insertions(+), 13 deletions(-)
create mode 100644 meta/recipes-devtools/qemu/qemu-git/powerpc_rom.bin
diff --git a/meta/recipes-devtools/qemu/qemu-git/powerpc_rom.bin b/meta/recipes-devtools/qemu/qemu-git/powerpc_rom.bin
new file mode 100644
index 0000000000000000000000000000000000000000..c4044296c51529878f5d2a46230949d09ef1d4e2
GIT binary patch
literal 4096
zcmeHJQEMDk6h4#Pn8Z}5VUd7UHb$_7oo16ZWvl_Wq7bx}RV;`Ib~1CD44Ivo&djz(
z20DZ^Sm;B1^P!YL$|?xr50Dxx<W1-=Nb#jAB1A;VL+N<VoqKm?mo4n8m<wmm`OZ1_
zyXT&{cV+<&$6*H!JMdrW!2M?){{b*MgY{|vBVVIFj`A$ZQ4}1?4fK1d-SMjkR6spQ
z_GQ*+=6p}1edN8j-n~$%zt8GvfO5${M!BlzGeJ!LBFYOW#4B+{V8!s70opWVtXD3@
zDYsT7E6WA+<uUG+56Lw@`umUh__@Kqf6n8Nx^M%7WfVF8S{METF%22NokAEuO`<ed
z!}V9WmvV;4>hcYvi`OX{&F6WBRnw|kl?KhhA=dzmNj!qa7`0aw&RpKS@@VUVz<iB3
zMpQ$|xW4%zN%nJ?dQI!dwdlD}J%p)_T~Q;N05Shf4N8(@M;Ibka{YvEauGg?vIjtA
zbqtD8FaGQiqq(Cfl+!&ZM!lezVg)+I$)>XgU6}SL_e61d_GCWQDdT+4h>0J6J|vY6
z?n%vooL{&VPxp1(X12&CZmJJ@_@6`fnCE!)^YzN9>I}3^S{w(>9Y>+QAbsI`)YLe%
zhsb^kg>uN3pwJm3OoIDU=pIs8v?nECzNOo>lb47s&EaP<^|yU5q9tpZ%W9g#!{`Jv
zr|0H!wb2^S$51#BeALr<I95i*YdC^h)=oK8XTDy_e`39s6Efd#dZB8#PUySXQy=qb
zi2XtSc~LLG(q`vgB_qvg-;s)C8L6AkMN@f2<h+bp)Cgs?d9P4!Wp?qtu*JH{JmPj=
z9X5+MwRTe6R?5lm8zJYFbLBH3ET5Y^zkF@UH=8!Po3GplAFV<2I`~fY=BxF=C+}Vd
z-|60b7yIC&+PdqT)q3&`#C`C|bJS5^Z@xl5eDtl8^${oMHJ06gIf&9&36H?r)A;V4
z#+S@==jEcgSd;QG&rb6RyBX$`vA~Dw|Jwn1zD7)T#WL6@;i|`=;hOjXG2Diyht{Ia
zU{W_tp9O(xFxw7bGO#{l!uHt`7`AJysF!?pxyc-36&9O84uw{OE$RWwxh&Ptjb*0V
zmcvvc1M`U<9+ne0ptr1=y`Obs#c{9N%v@sN>&_Cx0<&mZafTbZr#AFp1v*?A3Nlm0
zZzgj>xMKNXQ@2&xYBnqPS-@>HKdpGnx?^IqQWS)y+YFH+ToxY7u|nTegHZRwP8V}b
zSae+sEb;%K*M1#ny}qNsYkLXA5B@1?u>#SJLhH*7Xlm<8f;#-X1y`fH6W_i8$-egB
zukYdwC~E6a_+TB*MCN`S^Bz_3)<>=KiD-M`L~SkEkMBZtb6dHCdSP>WD2n&sT(mn?
z+PpV(Q@b~GE4~eH#;xQaDju($jbT{3o+O+D*Tz`w>>7;I`r2-i+`I$ItrjS_{sHo6
zTN_Ym=RSmE(Ze$(%wLGV!aq8Lpw!l&igq#Dm@1(jj;@#MaSO(y^{Eo=O`A-R1mJvJ
aoLIp7h<sDgFE5ple~0izly{QHzx@jx&XA}8
literal 0
HcmV?d00001
diff --git a/meta/recipes-devtools/qemu/qemu_git.bb b/meta/recipes-devtools/qemu/qemu_git.bb
index bcec9bb..6d2011c 100644
--- a/meta/recipes-devtools/qemu/qemu_git.bb
+++ b/meta/recipes-devtools/qemu/qemu_git.bb
@@ -1,28 +1,20 @@
require qemu.inc
-SRCREV = "56a60dd6d619877e9957ba06b92d2f276e3c229d"
+SRCREV = "cf36b31db209a261ee3bc2737e788e1ced0a1bec"
LIC_FILES_CHKSUM = "file://COPYING;md5=441c28d2cf86e15a37fa47e15a72fbac \
file://COPYING.LIB;endline=24;md5=c04def7ae38850e7d3ef548588159913"
-PV = "0.14.0"
-PR = "r3"
+PV = "1.0+git"
+PR = "r0"
FILESPATH = "${FILE_DIRNAME}/qemu-${PV}/:${FILE_DIRNAME}/qemu-git/"
FILESDIR = "${WORKDIR}"
SRC_URI = "\
git://git.qemu.org/qemu.git;protocol=git \
- file://qemu-git-qemugl-host.patch \
- file://no-strip.patch \
- file://fix-nogl.patch \
- file://qemugl-allow-glxcontext-release.patch \
- file://linker-flags.patch \
- file://qemu-vmware-vga-depth.patch \
- file://enable-i386-linux-user.patch"
-
+ file://powerpc_rom.bin \
+ "
S = "${WORKDIR}/git"
DEFAULT_PREFERENCE = "-1"
-
-
--
1.7.7.6
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [CONSOLIDATED PULL 03/12] qt4-graphics-system: set graphic system in profile instead of X11 session
2012-05-09 5:29 [CONSOLIDATED PULL 00/12] Subset of Pending Changes Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 01/12] libatomics-ops: Make it build for SH4 Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 02/12] qemu-git: Move to tip of git Saul Wold
@ 2012-05-09 5:29 ` Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 04/12] sanity.bbclass: Implement initial toolchain sanity checks Saul Wold
` (8 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2012-05-09 5:29 UTC (permalink / raw)
To: openembedded-core
From: Otavio Salvador <otavio@ossystems.com.br>
To allow the use of Qt applications started manually to use the
configured graphics system the setting needs to be available in user
environment. This moves the setting to /etc/profile.d ensuring it is
set and available. This allow the removal of x11-common as dependency.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
.../qt4-graphics-system/qt4-graphics-system_1.0.bb | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb b/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb
index bae0340..e816a90 100644
--- a/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb
+++ b/meta/recipes-qt/qt4-graphics-system/qt4-graphics-system_1.0.bb
@@ -3,10 +3,9 @@ SECTION = "x11/base"
LICENSE = "MIT-X"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-QT_GRAPHICS_SYSTEM ?= "raster"
+PR = "r1"
-# xserver-common, x11-common
-VIRTUAL-RUNTIME_xserver_common ?= "x11-common"
+QT_GRAPHICS_SYSTEM ?= "raster"
def _get_extra_rdepends(d):
gs = d.getVar('QT_GRAPHICS_SYSTEM', True)
@@ -16,12 +15,11 @@ def _get_extra_rdepends(d):
return ""
do_install () {
- install -d ${D}/${sysconfdir}/X11/Xsession.d/
- cfg_file=${D}/${sysconfdir}/X11/Xsession.d/85xqt-graphicssystem
+ install -d ${D}/${sysconfdir}/profile.d/
+ cfg_file=${D}/${sysconfdir}/profile.d/qt-graphicssystem
echo "export QT_GRAPHICSSYSTEM=${QT_GRAPHICS_SYSTEM}" > $cfg_file
- chmod +x $cfg_file
}
-RDEPENDS_${PN} = "${VIRTUAL-RUNTIME_xserver_common} ${@_get_extra_rdepends(d)}"
+RDEPENDS_${PN} = "${@_get_extra_rdepends(d)}"
PACKAGE_ARCH = "${MACHINE_ARCH}"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [CONSOLIDATED PULL 04/12] sanity.bbclass: Implement initial toolchain sanity checks
2012-05-09 5:29 [CONSOLIDATED PULL 00/12] Subset of Pending Changes Saul Wold
` (2 preceding siblings ...)
2012-05-09 5:29 ` [CONSOLIDATED PULL 03/12] qt4-graphics-system: set graphic system in profile instead of X11 session Saul Wold
@ 2012-05-09 5:29 ` Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 05/12] sanity.bbclass: Check for bogus values in BBCLASSEXTEND Saul Wold
` (7 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2012-05-09 5:29 UTC (permalink / raw)
To: openembedded-core
From: Peter Seebach <peter.seebach@windriver.com>
This introduces a sanity check for the toolchain, which verifies
each tuning (including any multilibs), producing meaningful diagnostics
for problems, and also provides some higher-level tuning features.
The TUNEVALID and TUNECONFLICT/TUNECONFLICTS settings were not
implemented. Listed one or two missing features in TUNEVALID,
also (in a previous patch) fixed the references to
features which didn't exist.
This patch also provides a whitelisting mechanism (which is completely
unused) to allow vendors providing prebuilt toolchain components to
restrict tunings to those based on or compatible with a particular ABI.
Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
---
meta/classes/sanity.bbclass | 73 ++++++++++++++++++++++++++++++++++++++++++
meta/conf/documentation.conf | 6 +++
2 files changed, 79 insertions(+), 0 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 687ddeb..635049e 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -11,6 +11,76 @@ def raise_sanity_error(msg):
%s""" % msg)
+# Check a single tune for validity.
+def check_toolchain_tune(data, tune, multilib):
+ tune_errors = []
+ if not tune:
+ return "No tuning found for %s multilib." % multilib
+ bb.debug(2, "Sanity-checking tuning '%s' (%s) features:" % (tune, multilib))
+ features = (data.getVar("TUNE_FEATURES_tune-%s" % tune, True) or "").split()
+ if not features:
+ return "Tuning '%s' has no defined features, and cannot be used." % tune
+ valid_tunes = data.getVarFlags('TUNEVALID') or {}
+ conflicts = data.getVarFlags('TUNECONFLICTS') or {}
+ # [doc] is the documentation for the variable, not a real feature
+ if 'doc' in valid_tunes:
+ del valid_tunes['doc']
+ if 'doc' in conflicts:
+ del conflicts['doc']
+ for feature in features:
+ if feature in conflicts:
+ for conflict in conflicts[feature].split():
+ if conflict in features:
+ tune_errors.append("Feature '%s' conflicts with '%s'." %
+ (feature, conflict))
+ if feature in valid_tunes:
+ bb.debug(2, " %s: %s" % (feature, valid_tunes[feature]))
+ else:
+ tune_errors.append("Feature '%s' is not defined." % feature)
+ whitelist = data.getVar("TUNEABI_WHITELIST", True) or ''
+ override = data.getVar("TUNEABI_OVERRIDE", True) or ''
+ if whitelist:
+ tuneabi = data.getVar("TUNEABI_tune-%s" % tune, True) or ''
+ if not tuneabi:
+ tuneabi = tune
+ if True not in [x in whitelist.split() for x in tuneabi.split()]:
+ tune_errors.append("Tuning '%s' (%s) cannot be used with any supported tuning/ABI." %
+ (tune, tuneabi))
+ if tune_errors:
+ return "Tuning '%s' has the following errors:\n" + '\n'.join(tune_errors)
+
+def check_toolchain(data):
+ tune_error_set = []
+ deftune = data.getVar("DEFAULTTUNE", True)
+ tune_errors = check_toolchain_tune(data, deftune, 'default')
+ if tune_errors:
+ tune_error_set.append(tune_errors)
+
+ multilibs = (data.getVar("MULTILIB_VARIANTS", True) or "").split()
+ if multilibs:
+ seen_libs = []
+ seen_tunes = []
+ for lib in multilibs:
+ if lib in seen_libs:
+ tune_error_set.append("The multilib '%s' appears more than once." % lib)
+ else:
+ seen_libs.append(lib)
+ tune = data.getVar("DEFAULTTUNE_virtclass-multilib-%s" % lib, True)
+ if tune in seen_tunes:
+ tune_error_set.append("The tuning '%s' appears in more than one multilib." % tune)
+ else:
+ seen_libs.append(tune)
+ if tune == deftune:
+ tune_error_set.append("Multilib '%s' (%s) is also the default tuning." % (lib, deftune))
+ else:
+ tune_errors = check_toolchain_tune(data, tune, lib)
+ if tune_errors:
+ tune_error_set.append(tune_errors)
+ if tune_error_set:
+ return "Toolchain tunings invalid:\n" + '\n'.join(tune_error_set)
+
+ return ""
+
def check_conf_exists(fn, data):
bbpath = []
fn = data.expand(fn)
@@ -327,6 +397,9 @@ def check_sanity(e):
messages = messages + pseudo_msg + '\n'
check_supported_distro(e)
+ toolchain_msg = check_toolchain(e.data)
+ if toolchain_msg != "":
+ messages = messages + toolchain_msg + '\n'
# Check if DISPLAY is set if IMAGETEST is set
if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar( 'IMAGETEST', e.data, True ) == 'qemu':
diff --git a/meta/conf/documentation.conf b/meta/conf/documentation.conf
index 3e40a77..004a16c 100644
--- a/meta/conf/documentation.conf
+++ b/meta/conf/documentation.conf
@@ -36,6 +36,12 @@ for hardware floating point instructions."
TUNEVALID[doc] = "Descriptions of valid tuning features, stored as flags."
TUNECONFLICTS[doc] = "List of conflicting features for a given feature."
+TUNEABI[doc] = "An underlying ABI used by a particular tuning in a given \
+toolchain layer. This feature allows providers using prebuilt \
+libraries to check compatibility of a tuning against their selection \
+of libraries."
+TUNEABI_WHITELIST[doc] = "A whitelist of permissible TUNEABI values; if unset, all are allowed."
+TUNEABI_OVERRIDE[doc] = "If set, ignores TUNEABI_WHITELIST."
ASSUME_PROVIDED[doc] = "List of packages (recipes actually) which are assumed to be implicitly available.\
These packages won't be built by bitbake."
--
1.7.7.6
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [CONSOLIDATED PULL 05/12] sanity.bbclass: Check for bogus values in BBCLASSEXTEND
2012-05-09 5:29 [CONSOLIDATED PULL 00/12] Subset of Pending Changes Saul Wold
` (3 preceding siblings ...)
2012-05-09 5:29 ` [CONSOLIDATED PULL 04/12] sanity.bbclass: Implement initial toolchain sanity checks Saul Wold
@ 2012-05-09 5:29 ` Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 06/12] libpcap: Move pcap-config to -dev package Saul Wold
` (6 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2012-05-09 5:29 UTC (permalink / raw)
To: openembedded-core
From: Peter Seebach <peter.seebach@windriver.com>
Suggestion that came out of my sanity-checks of multilibs; verify
that stuff in BBCLASSEXTEND is valid.
Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
---
meta/classes/sanity.bbclass | 13 +++++++++++++
1 files changed, 13 insertions(+), 0 deletions(-)
diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 635049e..9f3f1d5 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -81,6 +81,15 @@ def check_toolchain(data):
return ""
+def check_bbclassextend(data):
+ allowed = ('native', 'nativesdk', 'multilib', 'cross')
+ extends = (data.getVar("BBCLASSEXTEND", True) or "").split()
+ errors = []
+ for pair in [x.split(':') for x in extends]:
+ if pair[0] not in allowed:
+ errors.append('BBCLASSEXTEND has invalid value: %s' % pair[0])
+ return '\n'.join(errors)
+
def check_conf_exists(fn, data):
bbpath = []
fn = data.expand(fn)
@@ -401,6 +410,10 @@ def check_sanity(e):
if toolchain_msg != "":
messages = messages + toolchain_msg + '\n'
+ bbclassextend_msg = check_bbclassextend(e.data)
+ if bbclassextend_msg != "":
+ messages = messages + bbclassextend_msg + '\n'
+
# Check if DISPLAY is set if IMAGETEST is set
if not data.getVar( 'DISPLAY', e.data, True ) and data.getVar( 'IMAGETEST', e.data, True ) == 'qemu':
messages = messages + 'qemuimagetest needs a X desktop to start qemu, please set DISPLAY correctly (e.g. DISPLAY=:1.0)\n'
--
1.7.7.6
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [CONSOLIDATED PULL 06/12] libpcap: Move pcap-config to -dev package
2012-05-09 5:29 [CONSOLIDATED PULL 00/12] Subset of Pending Changes Saul Wold
` (4 preceding siblings ...)
2012-05-09 5:29 ` [CONSOLIDATED PULL 05/12] sanity.bbclass: Check for bogus values in BBCLASSEXTEND Saul Wold
@ 2012-05-09 5:29 ` Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 07/12] openssl: Fix build for mips64(el) Saul Wold
` (5 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2012-05-09 5:29 UTC (permalink / raw)
To: openembedded-core
pcap-config is a tool used for getting the cflags and ln flags for development
[YOCTO #2367]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
meta/recipes-connectivity/libpcap/libpcap.inc | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc
index 427078f..945d4ca 100644
--- a/meta/recipes-connectivity/libpcap/libpcap.inc
+++ b/meta/recipes-connectivity/libpcap/libpcap.inc
@@ -13,7 +13,7 @@ DEPENDS = "flex-native bison-native"
PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'bluetooth', 'bluetooth', '', d)}"
PACKAGECONFIG[bluetooth] = "--enable-bluetooth,--disable-bluetooth,bluez4"
-INC_PR = "r1"
+INC_PR = "r2"
SRC_URI = "http://www.tcpdump.org/release/libpcap-${PV}.tar.gz"
@@ -30,3 +30,8 @@ do_configure_prepend () {
cat aclocal.m4 > acinclude.m4
fi
}
+
+# pcap-config is a dev tool and should not be packaged in the
+# core package.
+FILES_${PN} = "${libdir}/lib*${SOLIBS}"
+FILES_${PN}-dev += "${bindir}/pcap-config"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [CONSOLIDATED PULL 07/12] openssl: Fix build for mips64(el)
2012-05-09 5:29 [CONSOLIDATED PULL 00/12] Subset of Pending Changes Saul Wold
` (5 preceding siblings ...)
2012-05-09 5:29 ` [CONSOLIDATED PULL 06/12] libpcap: Move pcap-config to -dev package Saul Wold
@ 2012-05-09 5:29 ` Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 08/12] classes/mirrors.bbclass: Point snapshot.debian.org mirror to working location Saul Wold
` (4 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2012-05-09 5:29 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
.../openssl/openssl-1.0.0i/configure-targets.patch | 16 ++++++++--------
.../recipes-connectivity/openssl/openssl_1.0.0i.bb | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/meta/recipes-connectivity/openssl/openssl-1.0.0i/configure-targets.patch b/meta/recipes-connectivity/openssl/openssl-1.0.0i/configure-targets.patch
index 6d23771..3d253d8 100644
--- a/meta/recipes-connectivity/openssl/openssl-1.0.0i/configure-targets.patch
+++ b/meta/recipes-connectivity/openssl/openssl-1.0.0i/configure-targets.patch
@@ -3,11 +3,11 @@ Upstream-Status: Inappropriate [embedded specific]
The number of colons are important :)
-Index: openssl-1.0.0a/Configure
+Index: openssl-1.0.0h/Configure
===================================================================
---- openssl-1.0.0a.orig/Configure
-+++ openssl-1.0.0a/Configure
-@@ -380,6 +380,22 @@ my %table=(
+--- openssl-1.0.0h.orig/Configure 2012-04-23 09:16:09.521511921 -0700
++++ openssl-1.0.0h/Configure 2012-04-23 09:17:41.829516389 -0700
+@@ -380,6 +380,22 @@
"linux-alpha-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
"linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN -DTERMIO::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
@@ -22,10 +22,10 @@ Index: openssl-1.0.0a/Configure
+"linux-avr32","$ENV{'CC'}:-DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG DES_RISC1:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).",
+
+#### Linux on MIPS/MIPS64
-+"linux-mips","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-mips64","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -mabi=64 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-mips64el","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -mabi=64 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
-+"linux-mipsel","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2::::::::::::dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-mips","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-mips64","$ENV{'CC'}:-DB_ENDIAN -DTERMIO -mabi=64 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-mips64el","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -mabi=64 -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:SIXTY_FOUR_BIT_LONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"linux-mipsel","$ENV{'CC'}:-DL_ENDIAN -DTERMIO -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL DES_RISC2:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+
#### *BSD [do see comment about ${BSDthreads} above!]
"BSD-generic32","gcc:-DTERMIOS -O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.0i.bb b/meta/recipes-connectivity/openssl/openssl_1.0.0i.bb
index 68b092f..ca15a38 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.0i.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.0i.bb
@@ -6,7 +6,7 @@ DEPENDS += "ocf-linux"
CFLAG += "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS"
-PR = "${INC_PR}.1"
+PR = "${INC_PR}.2"
LIC_FILES_CHKSUM = "file://LICENSE;md5=f9a8f968107345e0b75aa8c2ecaa7ec8"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [CONSOLIDATED PULL 08/12] classes/mirrors.bbclass: Point snapshot.debian.org mirror to working location
2012-05-09 5:29 [CONSOLIDATED PULL 00/12] Subset of Pending Changes Saul Wold
` (6 preceding siblings ...)
2012-05-09 5:29 ` [CONSOLIDATED PULL 07/12] openssl: Fix build for mips64(el) Saul Wold
@ 2012-05-09 5:29 ` Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 09/12] guile: upgrade from 2.0.3 to 2.0.5 Saul Wold
` (3 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2012-05-09 5:29 UTC (permalink / raw)
To: openembedded-core
From: Khem Raj <raj.khem@gmail.com>
If you point to snapshot.debian.net/archive/pool then it will fetch
you a html page which will end up in corrupt download. The locations
have changed for archives and here we point the mirror to right
location.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
meta/classes/mirrors.bbclass | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/classes/mirrors.bbclass b/meta/classes/mirrors.bbclass
index bf23e05..86ccd7a 100644
--- a/meta/classes/mirrors.bbclass
+++ b/meta/classes/mirrors.bbclass
@@ -1,5 +1,5 @@
MIRRORS += "\
-${DEBIAN_MIRROR}/main http://snapshot.debian.net/archive/pool \n \
+${DEBIAN_MIRROR}/main http://snapshot.debian.org/archive/debian-archive/20120328T092752Z/debian/pool/ \n \
${DEBIAN_MIRROR} ftp://ftp.de.debian.org/debian/pool \n \
${DEBIAN_MIRROR} ftp://ftp.au.debian.org/debian/pool \n \
${DEBIAN_MIRROR} ftp://ftp.cl.debian.org/debian/pool \n \
--
1.7.7.6
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [CONSOLIDATED PULL 09/12] guile: upgrade from 2.0.3 to 2.0.5
2012-05-09 5:29 [CONSOLIDATED PULL 00/12] Subset of Pending Changes Saul Wold
` (7 preceding siblings ...)
2012-05-09 5:29 ` [CONSOLIDATED PULL 08/12] classes/mirrors.bbclass: Point snapshot.debian.org mirror to working location Saul Wold
@ 2012-05-09 5:29 ` Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 10/12] h264_qpel_mmx.patch: fix Upstream-Status tag Saul Wold
` (2 subsequent siblings)
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2012-05-09 5:29 UTC (permalink / raw)
To: openembedded-core
From: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
---
...01-Fix-the-SRFI-60-copy-bit-documentation.patch | 33 -----------------
..._GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch | 25 -------------
...-modules-are-removed-gc-test-as-unresolve.patch | 38 ++++++++++++++++++++
...h-rather-than-gc-gc_version.h-in-pthread-.patch | 26 -------------
...with-owner-not-retained-threads-test-as-u.patch | 33 +++++++++++++++++
.../guile/files/guile_2.0.5_fix_sed_error.patch | 24 ++++++++++++
.../guile/files/opensuse/guile-64bit.patch | 3 +-
.../files/opensuse/guile-turn-off-gc-test.patch | 3 +-
.../guile/{guile_2.0.3.bb => guile_2.0.5.bb} | 16 +++++----
9 files changed, 108 insertions(+), 93 deletions(-)
delete mode 100644 meta/recipes-devtools/guile/files/debian/0001-Fix-the-SRFI-60-copy-bit-documentation.patch
delete mode 100644 meta/recipes-devtools/guile/files/debian/0002-Define-_GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch
create mode 100644 meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch
delete mode 100644 meta/recipes-devtools/guile/files/debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch
create mode 100644 meta/recipes-devtools/guile/files/debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
create mode 100644 meta/recipes-devtools/guile/files/guile_2.0.5_fix_sed_error.patch
rename meta/recipes-devtools/guile/{guile_2.0.3.bb => guile_2.0.5.bb} (84%)
diff --git a/meta/recipes-devtools/guile/files/debian/0001-Fix-the-SRFI-60-copy-bit-documentation.patch b/meta/recipes-devtools/guile/files/debian/0001-Fix-the-SRFI-60-copy-bit-documentation.patch
deleted file mode 100644
index e6df9b9..0000000
--- a/meta/recipes-devtools/guile/files/debian/0001-Fix-the-SRFI-60-copy-bit-documentation.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Upstream-Status: Inappropriate [debian patch]
-
-From c53b49c63d7ed145fbaa3dde25063c407631f373 Mon Sep 17 00:00:00 2001
-From: Rob Browning <rlb@defaultvalue.org>
-Date: Sat, 23 Apr 2011 14:57:49 -0500
-Subject: Fix the SRFI 60 copy-bit documentation.
-
----
- libguile/srfi-60.c | 4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/libguile/srfi-60.c b/libguile/srfi-60.c
-index 264f4cb..1ed3c9e 100644
---- a/libguile/srfi-60.c
-+++ b/libguile/srfi-60.c
-@@ -70,7 +70,7 @@ SCM_DEFINE (scm_srfi60_log2_binary_factors, "log2-binary-factors", 1, 0, 0,
-
-
- SCM_DEFINE (scm_srfi60_copy_bit, "copy-bit", 3, 0, 0,
-- (SCM index, SCM n, SCM bit),
-+ (SCM index, SCM n, SCM newbit),
- "Return @var{n} with the bit at @var{index} set according to\n"
- "@var{newbit}. @var{newbit} should be @code{#t} to set the bit\n"
- "to 1, or @code{#f} to set it to 0. Bits other than at\n"
-@@ -86,7 +86,7 @@ SCM_DEFINE (scm_srfi60_copy_bit, "copy-bit", 3, 0, 0,
- int bb;
-
- ii = scm_to_ulong (index);
-- bb = scm_to_bool (bit);
-+ bb = scm_to_bool (newbit);
-
- if (SCM_I_INUMP (n))
- {
diff --git a/meta/recipes-devtools/guile/files/debian/0002-Define-_GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch b/meta/recipes-devtools/guile/files/debian/0002-Define-_GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch
deleted file mode 100644
index 7176c76..0000000
--- a/meta/recipes-devtools/guile/files/debian/0002-Define-_GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Upstream-Status: Inappropriate [debian patch]
-
-From 6614b8efc5a8d90a26a2b99308b909ac351b65e5 Mon Sep 17 00:00:00 2001
-From: Rob Browning <rlb@defaultvalue.org>
-Date: Sat, 23 Apr 2011 14:57:50 -0500
-Subject: Define _GNU_SOURCE to fix the GNU/kFreeBSD build.
-
-Author: Petr Salinger <Petr.Salinger@seznam.cz>
-Closes: #401168
----
- libguile/fports.c | 1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/libguile/fports.c b/libguile/fports.c
-index 1348b8b..3ac3ced 100644
---- a/libguile/fports.c
-+++ b/libguile/fports.c
-@@ -20,6 +20,7 @@
-
- \f
- #define _LARGEFILE64_SOURCE /* ask for stat64 etc */
-+#define _GNU_SOURCE /* ask for LONG_LONG_MAX/LONG_LONG_MIN */
-
- #ifdef HAVE_CONFIG_H
- # include <config.h>
diff --git a/meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch b/meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch
new file mode 100644
index 0000000..06c8494
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch
@@ -0,0 +1,38 @@
+Upstream-Status: Inappropriate [debian patch]
+
+Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
+
+From e52bfcdbaca5dce498678d8f512381e3e39a4066 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Sun, 18 Mar 2012 11:40:55 -0500
+Subject: Mark "Unused modules are removed" gc test as unresolved.
+
+As per discussion with upstream, mark this test as unresolved since it
+may produce false negatives, depending on the behavior/timing of the
+garbage collector.
+---
+ test-suite/tests/gc.test | 11 ++++++-----
+ 1 files changed, 6 insertions(+), 5 deletions(-)
+
+diff --git a/test-suite/tests/gc.test b/test-suite/tests/gc.test
+index 97eeb19..58e4936 100644
+--- a/test-suite/tests/gc.test
++++ b/test-suite/tests/gc.test
+@@ -80,11 +80,12 @@
+ (gc) ;; thrice: because the test doesn't succeed with only
+ ;; one gc round. not sure why.
+
+- (= (let lp ((i 0))
+- (if (guard)
+- (lp (1+ i))
+- i))
+- total)))
++ (or (= (let lp ((i 0))
++ (if (guard)
++ (lp (1+ i))
++ i))
++ total)
++ (throw 'unresolved))))
+
+ (pass-if "Lexical vars are collectable"
+ (let ((l (compile
diff --git a/meta/recipes-devtools/guile/files/debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch b/meta/recipes-devtools/guile/files/debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch
deleted file mode 100644
index aa64f58..0000000
--- a/meta/recipes-devtools/guile/files/debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-Upstream-Status: Inappropriate [debian patch]
-
-From 0c91fa9270e86b20bfb8e62db5ac84617b2567d9 Mon Sep 17 00:00:00 2001
-From: Rob Browning <rlb@defaultvalue.org>
-Date: Thu, 10 Nov 2011 02:23:04 -0600
-Subject: Include gc.h rather than gc/gc_version.h in pthread test.
-
-See comments in recent gc_version.h. It should never be included
-directly, and doing so was causing build failures.
----
- .../standalone/test-pthread-create-secondary.c | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/test-suite/standalone/test-pthread-create-secondary.c b/test-suite/standalone/test-pthread-create-secondary.c
-index fe39c2a..d87fb33 100644
---- a/test-suite/standalone/test-pthread-create-secondary.c
-+++ b/test-suite/standalone/test-pthread-create-secondary.c
-@@ -27,7 +27,7 @@
- #include <stdlib.h>
- #include <libguile.h>
-
--#include <gc/gc_version.h>
-+#include <gc.h>
-
-
- /* Up to GC 7.2alpha5, calling `GC_INIT' from a secondary thread would
diff --git a/meta/recipes-devtools/guile/files/debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch b/meta/recipes-devtools/guile/files/debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
new file mode 100644
index 0000000..34be3b9
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch
@@ -0,0 +1,33 @@
+Upstream-Status: Inappropriate [debian patch]
+
+Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
+
+From 848543091d55dddb54a85612155964506d712852 Mon Sep 17 00:00:00 2001
+From: Rob Browning <rlb@defaultvalue.org>
+Date: Sun, 18 Mar 2012 13:28:24 -0500
+Subject: Mark "mutex with owner not retained" threads test as unresolved.
+
+As per discussion with upstream, mark this test as unresolved since it
+may produce false negatives, depending on the behavior/timing of the
+garbage collector.
+---
+ test-suite/tests/threads.test | 6 ++++--
+ 1 files changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/test-suite/tests/threads.test b/test-suite/tests/threads.test
+index 85a7c38..50899cb 100644
+--- a/test-suite/tests/threads.test
++++ b/test-suite/tests/threads.test
+@@ -414,8 +414,10 @@
+
+ (gc) (gc)
+ (let ((m (g)))
+- (and (mutex? m)
+- (eq? (mutex-owner m) (current-thread)))))))
++ (or
++ (and (mutex? m)
++ (eq? (mutex-owner m) (current-thread)))
++ (throw 'unresolved))))))
+
+ ;;
+ ;; mutex lock levels
diff --git a/meta/recipes-devtools/guile/files/guile_2.0.5_fix_sed_error.patch b/meta/recipes-devtools/guile/files/guile_2.0.5_fix_sed_error.patch
new file mode 100644
index 0000000..e5dc226
--- /dev/null
+++ b/meta/recipes-devtools/guile/files/guile_2.0.5_fix_sed_error.patch
@@ -0,0 +1,24 @@
+Upstream-Status: Pending
+
+This fixes sed issue when prefix has / in it, like /usr/local
+
+autoreconf error avoided:
+| sed: -e expression #1, char 9: unknown option to `s'
+| configure.ac:39: error: AC_INIT should be called with package and version arguments
+
+Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
+2012/05/01
+
+Index: guile-2.0.5/build-aux/git-version-gen
+===================================================================
+--- guile-2.0.5.orig/build-aux/git-version-gen
++++ guile-2.0.5/build-aux/git-version-gen
+@@ -187,7 +187,7 @@ else
+ v=UNKNOWN
+ fi
+
+-v=`echo "$v" |sed "s/^$prefix//"`
++v=`echo "$v" |sed "s#^$prefix##"`
+
+ # Test whether to append the "-dirty" suffix only if the version
+ # string we're using came from git. I.e., skip the test if it's "UNKNOWN"
diff --git a/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch b/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch
index be3191a..d3e312f 100644
--- a/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch
+++ b/meta/recipes-devtools/guile/files/opensuse/guile-64bit.patch
@@ -1,6 +1,7 @@
-
Upstream-Status: Inappropriate [opensuse patch]
+Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
+
Index: guile-2.0.3/libguile/hash.c
===================================================================
--- guile-2.0.3.orig/libguile/hash.c 2011-07-06 15:49:59.000000000 -0700
diff --git a/meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch b/meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch
index ed56694..e201486 100644
--- a/meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch
+++ b/meta/recipes-devtools/guile/files/opensuse/guile-turn-off-gc-test.patch
@@ -1,6 +1,7 @@
-
Upstream-Status: Inappropriate [opensuse patch]
+Signed-Off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
+
See http://debbugs.gnu.org/cgi/bugreport.cgi?bug=10096
why this test is turned off.
Index: guile-2.0.3/test-suite/tests/gc.test
diff --git a/meta/recipes-devtools/guile/guile_2.0.3.bb b/meta/recipes-devtools/guile/guile_2.0.5.bb
similarity index 84%
rename from meta/recipes-devtools/guile/guile_2.0.3.bb
rename to meta/recipes-devtools/guile/guile_2.0.5.bb
index 164ab8c..db75863 100644
--- a/meta/recipes-devtools/guile/guile_2.0.3.bb
+++ b/meta/recipes-devtools/guile/guile_2.0.5.bb
@@ -14,17 +14,19 @@ LICENSE = "GPLv3"
LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504"
SRC_URI = "${GNU_MIRROR}/guile/guile-${PV}.tar.gz \
- file://debian/0001-Fix-the-SRFI-60-copy-bit-documentation.patch \
- file://debian/0002-Define-_GNU_SOURCE-to-fix-the-GNU-kFreeBSD-build.patch \
- file://debian/0003-Include-gc.h-rather-than-gc-gc_version.h-in-pthread-.patch \
+ file://debian/0002-Mark-Unused-modules-are-removed-gc-test-as-unresolve.patch \
+ file://debian/0003-Mark-mutex-with-owner-not-retained-threads-test-as-u.patch \
file://opensuse/guile-64bit.patch \
- file://opensuse/guile-turn-off-gc-test.patch \
+ file://guile_2.0.5_fix_sed_error.patch \
"
-SRC_URI[md5sum] = "3b8b4e1083037f29d2c4704a6d55f2a8"
-SRC_URI[sha256sum] = "a53b21159befe3e89bbaca71e9e62cf00af0f49fcca297c407944b988d59eb08"
+# file://debian/0001-Change-guile-to-guile-X.Y-for-info-pages.patch
+# file://opensuse/guile-turn-off-gc-test.patch
-PR = "r5"
+SRC_URI[md5sum] = "bcf70d54b44c99cb9acd3f63c5486b4b"
+SRC_URI[sha256sum] = "2a026ea6cdbc51ca71bcd9787839debfa45ac5db1e26dc00b30ca9b128b10956"
+
+PR = "r0"
inherit autotools gettext
BBCLASSEXTEND = "native"
--
1.7.7.6
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [CONSOLIDATED PULL 10/12] h264_qpel_mmx.patch: fix Upstream-Status tag
2012-05-09 5:29 [CONSOLIDATED PULL 00/12] Subset of Pending Changes Saul Wold
` (8 preceding siblings ...)
2012-05-09 5:29 ` [CONSOLIDATED PULL 09/12] guile: upgrade from 2.0.3 to 2.0.5 Saul Wold
@ 2012-05-09 5:29 ` Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 11/12] zlib: upgrade to 1.2.7 Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 12/12] image_types.bbclass: redefine EXTRA_IMAGECMD_jffs2 to leverage siteinfo Saul Wold
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2012-05-09 5:29 UTC (permalink / raw)
To: openembedded-core
Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
.../gst-ffmpeg-0.10.13/h264_qpel_mmx.patch | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/h264_qpel_mmx.patch b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/h264_qpel_mmx.patch
index 7891329..ade24dc 100644
--- a/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/h264_qpel_mmx.patch
+++ b/meta/recipes-multimedia/gstreamer/gst-ffmpeg-0.10.13/h264_qpel_mmx.patch
@@ -14,7 +14,7 @@ make[5]: *** [libavcodec/x86/dsputil_mmx.o] Error 1
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-Upstream-status: Backport
+Upstream-Status: Backport
Index: gst-ffmpeg-0.10.13/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c
===================================================================
--- gst-ffmpeg-0.10.13.orig/gst-libs/ext/libav/libavcodec/x86/h264_qpel_mmx.c 2012-03-30 11:39:41.324522051 -0700
--
1.7.7.6
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [CONSOLIDATED PULL 11/12] zlib: upgrade to 1.2.7
2012-05-09 5:29 [CONSOLIDATED PULL 00/12] Subset of Pending Changes Saul Wold
` (9 preceding siblings ...)
2012-05-09 5:29 ` [CONSOLIDATED PULL 10/12] h264_qpel_mmx.patch: fix Upstream-Status tag Saul Wold
@ 2012-05-09 5:29 ` Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 12/12] image_types.bbclass: redefine EXTRA_IMAGECMD_jffs2 to leverage siteinfo Saul Wold
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2012-05-09 5:29 UTC (permalink / raw)
To: openembedded-core
From: Eric Bénard <eric@eukrea.com>
1.2.6 is no more fetchable and 1.2.7 fix some bugs, full changelog is
available here : http://zlib.net/ChangeLog.txt
Signed-off-by: Eric Bénard <eric@eukrea.com>
---
.../remove.ldconfig.call.patch | 0
.../zlib/{zlib_1.2.6.bb => zlib_1.2.7.bb} | 6 ++----
2 files changed, 2 insertions(+), 4 deletions(-)
rename meta/recipes-core/zlib/{zlib-1.2.6 => zlib-1.2.7}/remove.ldconfig.call.patch (100%)
rename meta/recipes-core/zlib/{zlib_1.2.6.bb => zlib_1.2.7.bb} (80%)
diff --git a/meta/recipes-core/zlib/zlib-1.2.6/remove.ldconfig.call.patch b/meta/recipes-core/zlib/zlib-1.2.7/remove.ldconfig.call.patch
similarity index 100%
rename from meta/recipes-core/zlib/zlib-1.2.6/remove.ldconfig.call.patch
rename to meta/recipes-core/zlib/zlib-1.2.7/remove.ldconfig.call.patch
diff --git a/meta/recipes-core/zlib/zlib_1.2.6.bb b/meta/recipes-core/zlib/zlib_1.2.7.bb
similarity index 80%
rename from meta/recipes-core/zlib/zlib_1.2.6.bb
rename to meta/recipes-core/zlib/zlib_1.2.7.bb
index 54f8abf..803fec3 100644
--- a/meta/recipes-core/zlib/zlib_1.2.6.bb
+++ b/meta/recipes-core/zlib/zlib_1.2.7.bb
@@ -6,13 +6,11 @@ SECTION = "libs"
LICENSE = "Zlib"
LIC_FILES_CHKSUM = "file://zlib.h;beginline=4;endline=23;md5=94d1b5a40dadd127f3351471727e66a9"
-PR = "r1"
-
SRC_URI = "http://www.zlib.net/${BPN}-${PV}.tar.bz2 \
file://remove.ldconfig.call.patch \
"
-SRC_URI[md5sum] = "dc2cfa0d2313ca77224b4d932b2911e9"
-SRC_URI[sha256sum] = "fa3e3e4881fa5810b8903f2c7e0dcd5a0a673535f0438021c4bbb5db1b918c8e"
+SRC_URI[md5sum] = "2ab442d169156f34c379c968f3f482dd"
+SRC_URI[sha256sum] = "49e2e9658dfb036900da6ea0267a737fa3c4eee6666776d378c79d52e9334934"
do_configure (){
./configure --prefix=${prefix} --shared --libdir=${libdir}
--
1.7.7.6
^ permalink raw reply related [flat|nested] 13+ messages in thread
* [CONSOLIDATED PULL 12/12] image_types.bbclass: redefine EXTRA_IMAGECMD_jffs2 to leverage siteinfo
2012-05-09 5:29 [CONSOLIDATED PULL 00/12] Subset of Pending Changes Saul Wold
` (10 preceding siblings ...)
2012-05-09 5:29 ` [CONSOLIDATED PULL 11/12] zlib: upgrade to 1.2.7 Saul Wold
@ 2012-05-09 5:29 ` Saul Wold
11 siblings, 0 replies; 13+ messages in thread
From: Saul Wold @ 2012-05-09 5:29 UTC (permalink / raw)
To: openembedded-core
From: Ting Liu <b28495@freescale.com>
Signed-off-by: Ting Liu <b28495@freescale.com>
---
meta/classes/image_types.bbclass | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
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=0x40000"
+
+inherit siteinfo
+JFFS2_ENDIANNESS ?= "${@base_conditional('SITEINFO_ENDIANNESS', 'le', '--little-endian', '--big-endian', d)}"
+JFFS2_ERASEBLOCK ?= "0x40000"
+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.7.6
^ permalink raw reply related [flat|nested] 13+ messages in thread
end of thread, other threads:[~2012-05-09 5:40 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-09 5:29 [CONSOLIDATED PULL 00/12] Subset of Pending Changes Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 01/12] libatomics-ops: Make it build for SH4 Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 02/12] qemu-git: Move to tip of git Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 03/12] qt4-graphics-system: set graphic system in profile instead of X11 session Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 04/12] sanity.bbclass: Implement initial toolchain sanity checks Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 05/12] sanity.bbclass: Check for bogus values in BBCLASSEXTEND Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 06/12] libpcap: Move pcap-config to -dev package Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 07/12] openssl: Fix build for mips64(el) Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 08/12] classes/mirrors.bbclass: Point snapshot.debian.org mirror to working location Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 09/12] guile: upgrade from 2.0.3 to 2.0.5 Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 10/12] h264_qpel_mmx.patch: fix Upstream-Status tag Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 11/12] zlib: upgrade to 1.2.7 Saul Wold
2012-05-09 5:29 ` [CONSOLIDATED PULL 12/12] image_types.bbclass: redefine EXTRA_IMAGECMD_jffs2 to leverage siteinfo Saul Wold
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox