[OE-core] [oe-core][PATCH 0/2] OVMF recipe

2014-08-13 Thread Matt Fleming 
From: Matt Fleming matt.flem...@intel.com

This is v2 of the OVMF recipe patch. This version addresses some of the
comments from Martin Jansa on style, as documented in the openembedded
styleguide.

Additionally, iasl is a dependency of OVMF but no iasl recipe currently
exists in oe-core so one is included in this series.

Matt Fleming (2):
  recipes-extended: Add iasl recipe
  recipes-devtools: Add OVMF recipe

 ...s-Force-tools-variables-to-host-toolchain.patch | 48 
 meta/recipes-devtools/ovmf/ovmf_git.bb | 52 ++
 meta/recipes-extended/iasl/iasl_20120215.bb| 27 +++
 3 files changed, 127 insertions(+)
 create mode 100644 
meta/recipes-devtools/ovmf/ovmf/0001-BaseTools-Force-tools-variables-to-host-toolchain.patch
 create mode 100644 meta/recipes-devtools/ovmf/ovmf_git.bb
 create mode 100644 meta/recipes-extended/iasl/iasl_20120215.bb

-- 
1.9.3

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][PATCH v2 2/2] recipes-devtools: Add OVMF recipe

2014-08-13 Thread Matt Fleming 
From: Matt Fleming matt.flem...@intel.com

The EDK2 project provides a UEFI firmware image for Qemu.

Import the OVMF recipe from the meta-luv layer.

Partial solution for [YOCTO #5654]

Cc: Max Eliaser max.elia...@intel.com
Cc: Darren Hart dvh...@linux.intel.com
Cc: Ricardo Neri ricardo.neri-calde...@linux.intel.com
Signed-off-by: Matt Fleming matt.flem...@intel.com
---

v2: Put spaces around assignments and do config variable futzing in
do_configure_prepend() instead of do_patch_append().

 ...s-Force-tools-variables-to-host-toolchain.patch | 48 
 meta/recipes-devtools/ovmf/ovmf_git.bb | 52 ++
 2 files changed, 100 insertions(+)
 create mode 100644 
meta/recipes-devtools/ovmf/ovmf/0001-BaseTools-Force-tools-variables-to-host-toolchain.patch
 create mode 100644 meta/recipes-devtools/ovmf/ovmf_git.bb

diff --git 
a/meta/recipes-devtools/ovmf/ovmf/0001-BaseTools-Force-tools-variables-to-host-toolchain.patch
 
b/meta/recipes-devtools/ovmf/ovmf/0001-BaseTools-Force-tools-variables-to-host-toolchain.patch
new file mode 100644
index 000..c0cc633
--- /dev/null
+++ 
b/meta/recipes-devtools/ovmf/ovmf/0001-BaseTools-Force-tools-variables-to-host-toolchain.patch
@@ -0,0 +1,48 @@
+From 6e24bde1979c2d7149b37d142fb882dfde0e9770 Mon Sep 17 00:00:00 2001
+From: Matt Fleming matt.flem...@intel.com
+Date: Fri, 27 Jun 2014 11:12:18 +0100
+Subject: [PATCH] BaseTools: Force tools variables to host toolchain
+
+Signed-off-by: Matt Fleming matt.flem...@intel.com
+---
+ BaseTools/Source/C/Makefiles/app.makefile | 7 +++
+ BaseTools/Source/C/VfrCompile/GNUmakefile | 5 +
+ 2 files changed, 12 insertions(+)
+
+diff --git a/BaseTools/Source/C/Makefiles/app.makefile 
b/BaseTools/Source/C/Makefiles/app.makefile
+index 19269a1..62aad0f 100644
+--- a/BaseTools/Source/C/Makefiles/app.makefile
 b/BaseTools/Source/C/Makefiles/app.makefile
+@@ -16,6 +16,13 @@ include $(MAKEROOT)/Makefiles/header.makefile
+ 
+ APPLICATION = $(MAKEROOT)/bin/$(APPNAME)
+ 
++CC = gcc
++CXX = g++
++AS = gcc
++AR = ar
++LD = ld
++LINKER = $(CC)
++
+ .PHONY:all
+ all: $(MAKEROOT)/bin $(APPLICATION) 
+ 
+diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile 
b/BaseTools/Source/C/VfrCompile/GNUmakefile
+index 82005e1..5ac5f7e 100644
+--- a/BaseTools/Source/C/VfrCompile/GNUmakefile
 b/BaseTools/Source/C/VfrCompile/GNUmakefile
+@@ -26,6 +26,11 @@ OBJECTS = AParser.o DLexerBase.o ATokenBuffer.o 
EfiVfrParser.o VfrLexer.o VfrSyn
+ 
+ VFR_CPPFLAGS = -DPCCTS_USE_NAMESPACE_STD $(CPPFLAGS)
+ 
++CC = gcc
++CXX = g++
++AS = gcc
++AR = ar
++LD = ld
+ LINKER = $(CXX)
+ 
+ EXTRA_CLEAN_OBJECTS = EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg 
VfrTokens.h VfrLexer.cpp VfrLexer.h VfrSyntax.cpp tokens.h
+-- 
+1.9.0
+
diff --git a/meta/recipes-devtools/ovmf/ovmf_git.bb 
b/meta/recipes-devtools/ovmf/ovmf_git.bb
new file mode 100644
index 000..b70142c
--- /dev/null
+++ b/meta/recipes-devtools/ovmf/ovmf_git.bb
@@ -0,0 +1,52 @@
+DESCRIPTION = OVMF - UEFI firmware for Qemu and KVM
+HOMEPAGE = 
http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF;
+LICENSE = BSD
+LIC_FILES_CHKSUM = 
file://OvmfPkg/License.txt;md5=ffd52cf9a8e0e036b9a61a0de2dc87ed
+
+SRC_URI = git://github.com/tianocore/edk2.git;branch=master \
+   file://0001-BaseTools-Force-tools-variables-to-host-toolchain.patch
+
+SRCREV = dc4ad1532e59fd1a185d6b90d1c2a92cf8713f40
+
+S = ${WORKDIR}/git
+
+DEPENDS = util-linux-native iasl-native
+
+# OVMF has trouble building with the default optimization of -O2.
+BUILD_OPTIMIZATION = -pipe
+
+# OVMF supports IA only, although it could conceivably support ARM someday.
+COMPATIBLE_HOST = '(i.86|x86_64).*'
+
+do_configure_prepend() {
+sed -i -e 's#/usr/bin/iasl#${STAGING_BINDIR_NATIVE}/iasl#' 
${S}/BaseTools/Conf/tools_def.template
+
+sed -i -e 's#DEF(ELFGCC_BIN)/#${TARGET_PREFIX}#' 
${S}/BaseTools/Conf/tools_def.template
+sed -i -e 's#DEF(GCC.*PREFIX)#${TARGET_PREFIX}#' 
${S}/BaseTools/Conf/tools_def.template
+sed -i -e s#^LINKER\(.*\)#LINKER\1\nLFLAGS += ${BUILD_LDFLAGS}# 
${S}/BaseTools/Source/C/Makefiles/app.makefile
+sed -i -e s#^LINKER\(.*\)#LINKER\1\nCFLAGS += ${BUILD_CFLAGS}# 
${S}/BaseTools/Source/C/Makefiles/app.makefile
+sed -i -e s#^LINKER\(.*\)#LINKER\1\nLFLAGS += ${BUILD_LDFLAGS}# 
${S}/BaseTools/Source/C/VfrCompile/GNUmakefile
+sed -i -e s#^LINKER\(.*\)#LINKER\1\nCFLAGS += ${BUILD_CFLAGS}# 
${S}/BaseTools/Source/C/VfrCompile/GNUmakefile
+}
+
+GCC_VER = $(${CC} -v 21 | tail -n1 | awk '{print $3}' | awk -F. '{print 
$1$2}')
+
+do_compile() {
+export LFLAGS=${LDFLAGS}
+OVMF_ARCH=X64
+if [ ${TARGET_ARCH} != x86_64 ] ; then
+OVMF_ARCH=IA32
+fi
+${S}/OvmfPkg/build.sh -a $OVMF_ARCH -b RELEASE -t GCC${GCC_VER}
+}
+
+do_install() {
+OVMF_DIR_SUFFIX=X64
+if [ ${TARGET_ARCH} != x86_64 ] ; then
+OVMF_DIR_SUFFIX=Ia32 # Note the different capitalization
+fi
+install -d ${D}${datadir}/ovmf
+build_dir=${S}/Build

[OE-core] [oe-core][PATCH 1/2] recipes-extended: Add iasl recipe

2014-08-13 Thread Matt Fleming 
From: Matt Fleming matt.flem...@intel.com

Import the Intel ACPI toolchain from the meta-virtualization layer.

Cc: Mihai Prica mihai.pr...@intel.com
Cc: Raymond Danks ray.da...@se-eng.com
Signed-off-by: Matt Fleming matt.flem...@intel.com
---
 meta/recipes-extended/iasl/iasl_20120215.bb | 27 +++
 1 file changed, 27 insertions(+)
 create mode 100644 meta/recipes-extended/iasl/iasl_20120215.bb

diff --git a/meta/recipes-extended/iasl/iasl_20120215.bb 
b/meta/recipes-extended/iasl/iasl_20120215.bb
new file mode 100644
index 000..a14d2ec
--- /dev/null
+++ b/meta/recipes-extended/iasl/iasl_20120215.bb
@@ -0,0 +1,27 @@
+DESCRIPTION = This is a cross development C compiler, assembler and linker 
environment for the production of 8086 executables (Optionally MSDOS COM)
+HOMEPAGE = http://www.acpica.org/;
+LICENSE = Intel-ACPI
+LIC_FILES_CHKSUM = 
file://asldefine.h;endline=115;md5=d4d7cf809b8b5e03131327b3f718e8f0
+SECTION = console/tools
+PR = r1
+
+DEPENDS = flex-native bison-native
+
+SRC_URI = https://acpica.org/sites/acpica/files/acpica-unix-${PV}.tar.gz;
+
+SRC_URI[md5sum] = 324c89e5bb9002e2711e0494290ceacc
+SRC_URI[sha256sum] = 
b2b497415f29ddbefe7be8b9429b62c1f1f6e1ec11456928e4e7da86578e5b8d
+
+S = ${WORKDIR}/acpica-unix-${PV}/source/compiler
+
+NATIVE_INSTALL_WORKS = 1
+BBCLASSEXTEND = native
+
+do_compile() {
+   CFLAGS=-Wno-error=redundant-decls $MAKE
+}
+
+do_install() {
+   mkdir -p ${D}${prefix}/bin
+   cp ${S}/iasl ${D}${prefix}/bin
+}
-- 
1.9.3

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [oe-core][PATCH 1/2] recipes-extended: Add iasl recipe

2014-08-13 Thread Matt Fleming 
On Wed, 13 Aug, at 02:17:16PM, Richard Purdie wrote:
 On Wed, 2014-08-13 at 14:03 +0100, Matt Fleming wrote:
 +NATIVE_INSTALL_WORKS = 1
  +BBCLASSEXTEND = native
 
 Please remove the NATIVE_INSTALL_WORKS, you don't need it!
 
 You're making me feel old, I remember why that was added (by me iirc),
 what it did and also removing it. Its never been needed with OE-Core and
 if that is any any modern layers, it should be removed.

Sure, I'll get it removed in the next version (along with the Cc's since
they're bouncing anyway).

Thanks.

-- 
Matt Fleming, Intel Open Source Technology Center
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [oe-core][PATCH 1/2] recipes-extended: Add iasl recipe

2014-08-13 Thread Matt Fleming 
On Wed, 13 Aug, at 03:45:11PM, Martin Jansa wrote:
 
 There is acpica-unix2 in meta-oe:
 meta-oe/recipes-extended/acpica/acpica_20140424.bb:SRC_URI = 
 https://acpica.org/sites/acpica/files/acpica-unix2-${PV}.tar.gz \
 
 can we use that one instead?

Sure, I don't see why not. Though something like this is probably
required?

---

diff --git a/meta-luv/recipes-extended/acpica/acpica_20140424.bb 
b/meta-luv/recipes-extended/acpica/acpica_20140424.bb
index d10a31b..03f69ad 100644
--- a/meta-luv/recipes-extended/acpica/acpica_20140424.bb
+++ b/meta-luv/recipes-extended/acpica/acpica_20140424.bb
@@ -32,3 +32,5 @@ do_install() {
 }
 
 COMPATIBLE_HOST = (i.86|x86_64|arm|aarch64).*-linux
+
+BBCLASSEXTEND = native

-- 
Matt Fleming, Intel Open Source Technology Center
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [oe-core][PATCH] recipes-devtools: Add OVMF recipe

2014-08-12 Thread Matt Fleming 
From: Matt Fleming matt.flem...@intel.com

The EDK2 project provides a UEFI firmware image for Qemu.

Import the OVMF recipe from the meta-luv layer.

Partial solution for [YOCTO #5654]

Cc: Max Eliaser max.elia...@intel.com
Cc: Darren Hart dvh...@linux.intel.com
Cc: Ricardo Neri ricardo.neri-calde...@linux.intel.com
Signed-off-by: Matt Fleming matt.flem...@intel.com
---
 ...s-Force-tools-variables-to-host-toolchain.patch | 48 ++
 meta/recipes-devtools/ovmf/ovmf_git.bb | 59 ++
 2 files changed, 107 insertions(+)
 create mode 100644 
meta/recipes-devtools/ovmf/ovmf/0001-BaseTools-Force-tools-variables-to-host-toolchain.patch
 create mode 100644 meta/recipes-devtools/ovmf/ovmf_git.bb

diff --git 
a/meta/recipes-devtools/ovmf/ovmf/0001-BaseTools-Force-tools-variables-to-host-toolchain.patch
 
b/meta/recipes-devtools/ovmf/ovmf/0001-BaseTools-Force-tools-variables-to-host-toolchain.patch
new file mode 100644
index 000..c0cc633
--- /dev/null
+++ 
b/meta/recipes-devtools/ovmf/ovmf/0001-BaseTools-Force-tools-variables-to-host-toolchain.patch
@@ -0,0 +1,48 @@
+From 6e24bde1979c2d7149b37d142fb882dfde0e9770 Mon Sep 17 00:00:00 2001
+From: Matt Fleming matt.flem...@intel.com
+Date: Fri, 27 Jun 2014 11:12:18 +0100
+Subject: [PATCH] BaseTools: Force tools variables to host toolchain
+
+Signed-off-by: Matt Fleming matt.flem...@intel.com
+---
+ BaseTools/Source/C/Makefiles/app.makefile | 7 +++
+ BaseTools/Source/C/VfrCompile/GNUmakefile | 5 +
+ 2 files changed, 12 insertions(+)
+
+diff --git a/BaseTools/Source/C/Makefiles/app.makefile 
b/BaseTools/Source/C/Makefiles/app.makefile
+index 19269a1..62aad0f 100644
+--- a/BaseTools/Source/C/Makefiles/app.makefile
 b/BaseTools/Source/C/Makefiles/app.makefile
+@@ -16,6 +16,13 @@ include $(MAKEROOT)/Makefiles/header.makefile
+ 
+ APPLICATION = $(MAKEROOT)/bin/$(APPNAME)
+ 
++CC = gcc
++CXX = g++
++AS = gcc
++AR = ar
++LD = ld
++LINKER = $(CC)
++
+ .PHONY:all
+ all: $(MAKEROOT)/bin $(APPLICATION) 
+ 
+diff --git a/BaseTools/Source/C/VfrCompile/GNUmakefile 
b/BaseTools/Source/C/VfrCompile/GNUmakefile
+index 82005e1..5ac5f7e 100644
+--- a/BaseTools/Source/C/VfrCompile/GNUmakefile
 b/BaseTools/Source/C/VfrCompile/GNUmakefile
+@@ -26,6 +26,11 @@ OBJECTS = AParser.o DLexerBase.o ATokenBuffer.o 
EfiVfrParser.o VfrLexer.o VfrSyn
+ 
+ VFR_CPPFLAGS = -DPCCTS_USE_NAMESPACE_STD $(CPPFLAGS)
+ 
++CC = gcc
++CXX = g++
++AS = gcc
++AR = ar
++LD = ld
+ LINKER = $(CXX)
+ 
+ EXTRA_CLEAN_OBJECTS = EfiVfrParser.cpp EfiVfrParser.h VfrParser.dlg 
VfrTokens.h VfrLexer.cpp VfrLexer.h VfrSyntax.cpp tokens.h
+-- 
+1.9.0
+
diff --git a/meta/recipes-devtools/ovmf/ovmf_git.bb 
b/meta/recipes-devtools/ovmf/ovmf_git.bb
new file mode 100644
index 000..7afd695
--- /dev/null
+++ b/meta/recipes-devtools/ovmf/ovmf_git.bb
@@ -0,0 +1,59 @@
+DESCRIPTION = OVMF - UEFI firmware for Qemu and KVM
+HOMEPAGE = 
http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF;
+LICENSE = BSD
+LIC_FILES_CHKSUM = 
file://OvmfPkg/License.txt;md5=ffd52cf9a8e0e036b9a61a0de2dc87ed
+
+SRC_URI = git://github.com/tianocore/edk2.git;branch=master \
+   file://0001-BaseTools-Force-tools-variables-to-host-toolchain.patch
+
+SRCREV=dc4ad1532e59fd1a185d6b90d1c2a92cf8713f40
+
+S = ${WORKDIR}/git
+
+DEPENDS=util-linux-native iasl-native
+
+# OVMF has trouble building with the default optimization of -O2.
+BUILD_OPTIMIZATION=-pipe
+
+# OVMF supports IA only, although it could conceivably support ARM someday.
+COMPATIBLE_HOST='(i.86|x86_64).*'
+
+do_patch_append() {
+bb.build.exec_func('do_fix_iasl', d)
+bb.build.exec_func('do_fix_toolchain', d)
+}
+
+do_fix_iasl() {
+sed -i -e 's#/usr/bin/iasl#${STAGING_BINDIR_NATIVE}/iasl#' 
${S}/BaseTools/Conf/tools_def.template
+}
+
+do_fix_toolchain(){
+sed -i -e 's#DEF(ELFGCC_BIN)/#${TARGET_PREFIX}#' 
${S}/BaseTools/Conf/tools_def.template
+sed -i -e 's#DEF(GCC.*PREFIX)#${TARGET_PREFIX}#' 
${S}/BaseTools/Conf/tools_def.template
+sed -i -e s#^LINKER\(.*\)#LINKER\1\nLFLAGS += ${BUILD_LDFLAGS}# 
${S}/BaseTools/Source/C/Makefiles/app.makefile
+sed -i -e s#^LINKER\(.*\)#LINKER\1\nCFLAGS += ${BUILD_CFLAGS}# 
${S}/BaseTools/Source/C/Makefiles/app.makefile
+sed -i -e s#^LINKER\(.*\)#LINKER\1\nLFLAGS += ${BUILD_LDFLAGS}# 
${S}/BaseTools/Source/C/VfrCompile/GNUmakefile
+sed -i -e s#^LINKER\(.*\)#LINKER\1\nCFLAGS += ${BUILD_CFLAGS}# 
${S}/BaseTools/Source/C/VfrCompile/GNUmakefile
+}
+
+GCC_VER=$(${CC} -v 21 | tail -n1 | awk '{print $3}' | awk -F. '{print 
$1$2}')
+
+do_compile() {
+export LFLAGS=${LDFLAGS}
+OVMF_ARCH=X64
+if [ ${TARGET_ARCH} != x86_64 ] ; then
+OVMF_ARCH=IA32
+fi
+${S}/OvmfPkg/build.sh -a $OVMF_ARCH -b RELEASE -t GCC${GCC_VER}
+}
+
+do_install() {
+OVMF_DIR_SUFFIX=X64
+if [ ${TARGET_ARCH} != x86_64 ] ; then
+OVMF_DIR_SUFFIX=Ia32 # Note the different capitalization
+fi
+install -d ${D}${datadir}/ovmf
+build_dir=${S}/Build/Ovmf

Re: [OE-core] [oe-core][PATCH] recipes-devtools: Add OVMF recipe

2014-08-12 Thread Matt Fleming 
On Tue, 12 Aug, at 05:51:38PM, Martin Jansa wrote:
 
 I don't think we have iasl in oe-core.
 
Oops, my bad. I thought I'd checked that but turns out I was looking in
the wrong tree.

I'll include the iasl recipe with the next submission.

 Also the styleguide says you should use space around = (SRCREV, DEPENDS,
 COMPATIBLE_HOST, BUILD_OPTIMIZATION, GCC_VER)
 
Thanks, I'll update the patch.

  +# OVMF has trouble building with the default optimization of -O2.
  +BUILD_OPTIMIZATION=-pipe
  +
  +# OVMF supports IA only, although it could conceivably support ARM someday.
  +COMPATIBLE_HOST='(i.86|x86_64).*'
  +
  +do_patch_append() {
  +bb.build.exec_func('do_fix_iasl', d)
  +bb.build.exec_func('do_fix_toolchain', d)
 
 Why don't you fix them in do_configure_prepend?

What's the tradeoff?

Though I realise that we're not actually *patching* anything and so
do_configure_prepend() probably does make more semantic sense.

Ah, after a bit of grepping I see that it's a pretty common pattern. OK,
sure, I'll update this.

Thanks for the review.

-- 
Matt Fleming, Intel Open Source Technology Center
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 1/2] generate-manifest-2.7.py: Add importlib

2014-06-06 Thread Matt Fleming 
On 6 June 2014 01:16, Saul Wold s...@linux.intel.com wrote:

 I think this needs to be rebased to master, I had some trouble applying this
 patch, the other one applied just fine.

Hi Saul,

Sure I can do that. Let me respin another version.
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] generate-manifest-2.7.py: Add importlib

2014-06-06 Thread Matt Fleming 
From: Matt Fleming matt.flem...@intel.com

importlib isn't currently included in any of the python packages, so
create a new one for recipes that require it.

Cc: Paul Eggleton paul.eggle...@linux.intel.com
Signed-off-by: Matt Fleming matt.flem...@intel.com
---
 meta/recipes-devtools/python/python-2.7-manifest.inc | 13 -
 scripts/contrib/python/generate-manifest-2.7.py  |  3 +++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-devtools/python/python-2.7-manifest.inc 
b/meta/recipes-devtools/python/python-2.7-manifest.inc
index a557cdc..a8afe13 100644
--- a/meta/recipes-devtools/python/python-2.7-manifest.inc
+++ b/meta/recipes-devtools/python/python-2.7-manifest.inc
@@ -5,9 +5,9 @@
 
  
 
-PROVIDES+=${PN}-2to3 ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile 
${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes 
${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib 
${PN}-distutils ${PN}-distutils-staticdev ${PN}-doctest ${PN}-elementtree 
${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle 
${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox 
${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient 
${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint 
${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource 
${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests 
${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests 
${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin 
${PN}-xml ${PN}-xmlrpc ${PN}-zlib 
+PROVIDES+=${PN}-2to3 ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile 
${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes 
${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib 
${PN}-distutils ${PN}-distutils-staticdev ${PN}-doctest ${PN}-elementtree 
${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle 
${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging 
${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing 
${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil 
${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource 
${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests 
${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests 
${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin 
${PN}-xml ${PN}-xmlrpc ${PN}-zlib 
 
-PACKAGES=${PN}-dbg ${PN}-2to3 ${PN}-audio ${PN}-bsddb ${PN}-codecs 
${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt 
${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev 
${PN}-difflib ${PN}-distutils-staticdev ${PN}-distutils ${PN}-doctest 
${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html 
${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging 
${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing 
${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil 
${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource 
${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests 
${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests 
${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin 
${PN}-xml ${PN}-xmlrpc ${PN}-zlib ${PN}-modules
+PACKAGES=${PN}-dbg ${PN}-2to3 ${PN}-audio ${PN}-bsddb ${PN}-codecs 
${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt 
${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev 
${PN}-difflib ${PN}-distutils-staticdev ${PN}-distutils ${PN}-doctest 
${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html 
${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang 
${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap 
${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers 
${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re 
${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd 
${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog 
${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter 
${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib ${PN}-modules
 
 SUMMARY_${PN}-2to3=Python automated Python 2 to 3 code translator
 RDEPENDS_${PN}-2to3=${PN}-core
@@ -39,8 +39,7 @@ FILES_${PN}-compression=${libdir}/python2.7/gzip.* 
${libdir}/python2.7/zipfile.
 
 SUMMARY_${PN}-core=Python interpreter and core modules
 RDEPENDS_${PN}-core=${PN}-lang ${PN}-re
-FILES_${PN}-core=${libdir}/python2.7/__future__.* 
${libdir}/python2.7/_abcoll.* ${libdir}/python2.7/abc.* 
${libdir}/python2.7/copy.* ${libdir}/python2.7/copy_reg.* 
${libdir}/python2.7/ConfigParser.* ${libdir}/python2.7

[OE-core] [PATCH 0/2] Add python-importlib

2014-06-04 Thread Matt Fleming 
From: Matt Fleming matt.flem...@intel.com

It seems that the importlib python module isn't available to recipes
because the importlib/ directory isn't included in the
python*manifest.py files.

Create a new python-importlib package for exporting this module.

Matt Fleming (2):
  generate-manifest-2.7.py: Add importlib
  generate-manifest-3.3.py: Add importlib

 meta/recipes-devtools/python/python-2.7-manifest.inc | 13 -
 meta/recipes-devtools/python/python-3.3-manifest.inc | 10 +++---
 scripts/contrib/python/generate-manifest-2.7.py  |  3 +++
 scripts/contrib/python/generate-manifest-3.3.py  |  3 +++
 4 files changed, 21 insertions(+), 8 deletions(-)

-- 
1.9.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH 2/2] generate-manifest-3.3.py: Add importlib

2014-06-04 Thread Matt Fleming 
From: Matt Fleming matt.flem...@intel.com

importlib isn't currently included in any of the python packages, so
create a new one for recipes that require it.

Cc: Paul Eggleton paul.eggle...@linux.intel.com
Signed-off-by: Matt Fleming matt.flem...@intel.com
---
 meta/recipes-devtools/python/python-3.3-manifest.inc | 10 +++---
 scripts/contrib/python/generate-manifest-3.3.py  |  3 +++
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/meta/recipes-devtools/python/python-3.3-manifest.inc 
b/meta/recipes-devtools/python/python-3.3-manifest.inc
index ea56970..46a2d44 100644
--- a/meta/recipes-devtools/python/python-3.3-manifest.inc
+++ b/meta/recipes-devtools/python/python-3.3-manifest.inc
@@ -5,9 +5,9 @@
 
  
 
-PROVIDES+=${PN}-2to3 ${PN}-audio ${PN}-codecs ${PN}-compile ${PN}-compression 
${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db 
${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils 
${PN}-distutils-staticdev ${PN}-doctest ${PN}-elementtree ${PN}-email 
${PN}-fcntl ${PN}-gdbm ${PN}-html ${PN}-idle ${PN}-image ${PN}-io ${PN}-json 
${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap 
${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers 
${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re 
${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd 
${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog 
${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter 
${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc 
+PROVIDES+=${PN}-2to3 ${PN}-audio ${PN}-codecs ${PN}-compile ${PN}-compression 
${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db 
${PN}-debugger ${PN}-dev ${PN}-difflib ${PN}-distutils 
${PN}-distutils-staticdev ${PN}-doctest ${PN}-elementtree ${PN}-email 
${PN}-fcntl ${PN}-gdbm ${PN}-html ${PN}-idle ${PN}-image ${PN}-importlib 
${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math 
${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver 
${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc 
${PN}-re ${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell 
${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess 
${PN}-syslog ${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading 
${PN}-tkinter ${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc 
 
-PACKAGES=${PN}-dbg ${PN}-2to3 ${PN}-audio ${PN}-codecs ${PN}-compile 
${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses 
${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib 
${PN}-distutils-staticdev ${PN}-distutils ${PN}-doctest ${PN}-elementtree 
${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-html ${PN}-idle ${PN}-image ${PN}-io 
${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime 
${PN}-mmap ${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers 
${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re 
${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd 
${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog 
${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter 
${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-modules
+PACKAGES=${PN}-dbg ${PN}-2to3 ${PN}-audio ${PN}-codecs ${PN}-compile 
${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes ${PN}-curses 
${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib 
${PN}-distutils-staticdev ${PN}-distutils ${PN}-doctest ${PN}-elementtree 
${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-html ${PN}-idle ${PN}-image 
${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox 
${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient 
${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint 
${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource 
${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests 
${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests 
${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin 
${PN}-xml ${PN}-xmlrpc ${PN}-modules
 
 SUMMARY_${PN}-2to3=Python automated Python 2 to 3 code translator
 RDEPENDS_${PN}-2to3=${PN}-core
@@ -105,6 +105,10 @@ SUMMARY_${PN}-image=Python graphical image handling
 RDEPENDS_${PN}-image=${PN}-core
 FILES_${PN}-image=${libdir}/python3.3/colorsys.* ${libdir}/python3.3/imghdr.* 
${libdir}/python3.3/lib-dynload/imageop.*.so 
${libdir}/python3.3/lib-dynload/rgbimg.*.so 
 
+SUMMARY_${PN}-importlib=Python import implementation library
+RDEPENDS_${PN}-importlib=${PN}-core
+FILES_${PN}-importlib=${libdir}/python3.3/importlib 
+
 SUMMARY_${PN}-io=Python low-level I/O
 RDEPENDS_${PN}-io=${PN}-core ${PN}-math
 FILES_${PN}-io=${libdir}/python3.3/lib-dynload/_socket.*.so 
${libdir}/python3.3/lib-dynload/_io.*.so 
${libdir}/python3.3

[OE-core] [PATCH 1/2] generate-manifest-2.7.py: Add importlib

2014-06-04 Thread Matt Fleming 
From: Matt Fleming matt.flem...@intel.com

importlib isn't currently included in any of the python packages, so
create a new one for recipes that require it.

Cc: Paul Eggleton paul.eggle...@linux.intel.com
Signed-off-by: Matt Fleming matt.flem...@intel.com
---
 meta/recipes-devtools/python/python-2.7-manifest.inc | 13 -
 scripts/contrib/python/generate-manifest-2.7.py  |  3 +++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/meta/recipes-devtools/python/python-2.7-manifest.inc 
b/meta/recipes-devtools/python/python-2.7-manifest.inc
index a557cdc..a8afe13 100644
--- a/meta/recipes-devtools/python/python-2.7-manifest.inc
+++ b/meta/recipes-devtools/python/python-2.7-manifest.inc
@@ -5,9 +5,9 @@
 
  
 
-PROVIDES+=${PN}-2to3 ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile 
${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes 
${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib 
${PN}-distutils ${PN}-distutils-staticdev ${PN}-doctest ${PN}-elementtree 
${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle 
${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging ${PN}-mailbox 
${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing ${PN}-netclient 
${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil ${PN}-pprint 
${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource 
${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests 
${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests 
${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin 
${PN}-xml ${PN}-xmlrpc ${PN}-zlib 
+PROVIDES+=${PN}-2to3 ${PN}-audio ${PN}-bsddb ${PN}-codecs ${PN}-compile 
${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt ${PN}-ctypes 
${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev ${PN}-difflib 
${PN}-distutils ${PN}-distutils-staticdev ${PN}-doctest ${PN}-elementtree 
${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html ${PN}-idle 
${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging 
${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing 
${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil 
${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource 
${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests 
${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests 
${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin 
${PN}-xml ${PN}-xmlrpc ${PN}-zlib 
 
-PACKAGES=${PN}-dbg ${PN}-2to3 ${PN}-audio ${PN}-bsddb ${PN}-codecs 
${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt 
${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev 
${PN}-difflib ${PN}-distutils-staticdev ${PN}-distutils ${PN}-doctest 
${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html 
${PN}-idle ${PN}-image ${PN}-io ${PN}-json ${PN}-lang ${PN}-logging 
${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap ${PN}-multiprocessing 
${PN}-netclient ${PN}-netserver ${PN}-numbers ${PN}-pickle ${PN}-pkgutil 
${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re ${PN}-readline ${PN}-resource 
${PN}-robotparser ${PN}-shell ${PN}-smtpd ${PN}-sqlite3 ${PN}-sqlite3-tests 
${PN}-stringold ${PN}-subprocess ${PN}-syslog ${PN}-terminal ${PN}-tests 
${PN}-textutils ${PN}-threading ${PN}-tkinter ${PN}-unittest ${PN}-unixadmin 
${PN}-xml ${PN}-xmlrpc ${PN}-zlib ${PN}-modules
+PACKAGES=${PN}-dbg ${PN}-2to3 ${PN}-audio ${PN}-bsddb ${PN}-codecs 
${PN}-compile ${PN}-compiler ${PN}-compression ${PN}-core ${PN}-crypt 
${PN}-ctypes ${PN}-curses ${PN}-datetime ${PN}-db ${PN}-debugger ${PN}-dev 
${PN}-difflib ${PN}-distutils-staticdev ${PN}-distutils ${PN}-doctest 
${PN}-elementtree ${PN}-email ${PN}-fcntl ${PN}-gdbm ${PN}-hotshot ${PN}-html 
${PN}-idle ${PN}-image ${PN}-importlib ${PN}-io ${PN}-json ${PN}-lang 
${PN}-logging ${PN}-mailbox ${PN}-math ${PN}-mime ${PN}-mmap 
${PN}-multiprocessing ${PN}-netclient ${PN}-netserver ${PN}-numbers 
${PN}-pickle ${PN}-pkgutil ${PN}-pprint ${PN}-profile ${PN}-pydoc ${PN}-re 
${PN}-readline ${PN}-resource ${PN}-robotparser ${PN}-shell ${PN}-smtpd 
${PN}-sqlite3 ${PN}-sqlite3-tests ${PN}-stringold ${PN}-subprocess ${PN}-syslog 
${PN}-terminal ${PN}-tests ${PN}-textutils ${PN}-threading ${PN}-tkinter 
${PN}-unittest ${PN}-unixadmin ${PN}-xml ${PN}-xmlrpc ${PN}-zlib ${PN}-modules
 
 SUMMARY_${PN}-2to3=Python automated Python 2 to 3 code translator
 RDEPENDS_${PN}-2to3=${PN}-core
@@ -39,8 +39,7 @@ FILES_${PN}-compression=${libdir}/python2.7/gzip.* 
${libdir}/python2.7/zipfile.
 
 SUMMARY_${PN}-core=Python interpreter and core modules
 RDEPENDS_${PN}-core=${PN}-lang ${PN}-re
-FILES_${PN}-core=${libdir}/python2.7/__future__.* 
${libdir}/python2.7/_abcoll.* ${libdir}/python2.7/abc.* 
${libdir}/python2.7/copy.* ${libdir}/python2.7/copy_reg.* 
${libdir}/python2.7/ConfigParser.* ${libdir}/python2.7

[OE-core] [PATCH][Dora] openssl: fix CVE-2014-0198

2014-05-19 Thread Matt Fleming 
From: Maxin B. John maxin.j...@enea.com

A null pointer dereference bug was discovered in do_ssl3_write().
An attacker could possibly use this to cause OpenSSL to crash, resulting
in a denial of service.

https://access.redhat.com/security/cve/CVE-2014-0198

Signed-off-by: Maxin B. John maxin.j...@enea.com
Signed-off-by: Matt Fleming matt.flem...@intel.com
---
 .../openssl-1.0.1e/openssl-CVE-2014-0198-fix.patch | 23 ++
 .../recipes-connectivity/openssl/openssl_1.0.1e.bb |  3 ++-
 2 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 
meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-CVE-2014-0198-fix.patch

diff --git 
a/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-CVE-2014-0198-fix.patch
 
b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-CVE-2014-0198-fix.patch
new file mode 100644
index 000..4c51d74
--- /dev/null
+++ 
b/meta/recipes-connectivity/openssl/openssl-1.0.1e/openssl-CVE-2014-0198-fix.patch
@@ -0,0 +1,23 @@
+Upstream-Status: Backport
+
+Reference: https://bugzilla.redhat.com/show_bug.cgi?id=1093837
+
+CVE-2014-0198: An attacker can trigger generation of an SSL
+alert which could cause a null pointer dereference.
+
+Signed-off-by: Maxin B. John maxin.j...@enea.com
+---
+diff -Naur openssl-1.0.1g-orig/ssl/s3_pkt.c openssl-1.0.1g/ssl/s3_pkt.c
+--- openssl-1.0.1g-orig/ssl/s3_pkt.c   2014-03-17 17:14:20.0 +0100
 openssl-1.0.1g/ssl/s3_pkt.c2014-05-06 02:32:43.862587660 +0200
+@@ -657,6 +657,10 @@
+   if (i = 0)
+   return(i);
+   /* if it went, fall through and send more stuff */
++  /* we may have released our buffer, so get it again */
++  if (wb-buf == NULL)
++  if (!ssl3_setup_write_buffer(s))
++  return -1;
+   }
+ 
+   if (len == 0  !create_empty_fragment)
diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb 
b/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
index bfdb25e..842a903 100644
--- a/meta/recipes-connectivity/openssl/openssl_1.0.1e.bb
+++ b/meta/recipes-connectivity/openssl/openssl_1.0.1e.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
 
@@ -38,6 +38,7 @@ SRC_URI += file://configure-targets.patch \
 file://0001-Fix-DTLS-retransmission-from-previous-session.patch \
 file://0001-Use-version-in-SSL_METHOD-not-SSL-structure.patch \
 file://CVE-2014-0160.patch \
+file://openssl-CVE-2014-0198-fix.patch \

 
 SRC_URI[md5sum] = 66bf6f10f060d561929de96f9dfe5b8c
-- 
1.9.0

-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH 3/3] classes: Add gummiboot class

2014-03-12 Thread Matt Fleming 
On Tue, 11 Mar, at 01:38:08PM, Darren Hart wrote:
 
 I'm surprised gummiboot requires STUB... Since STUB is there to allow the
 kernel to be booted directly, no bootloader required. I guess gummiboot is
 slightly less than a boot loader :-)

Gummiboot is an EFI application loader.

Since CONFIG_EFI_STUB sticks a PE/COFF header at the front of the
bzImage, it appears as an EFI application which gummiboot knows how to
load and run. This is also the reason you can execute the bzImage from
the EFI shell (or Boot Manager).

-- 
Matt Fleming, Intel Open Source Technology Center
-- 
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Re: [OE-core] [PATCH] kernel-yocto: Inspect remote branches with git ls-remote

2014-03-06 Thread Matt Fleming 
On Wed, 05 Mar, at 12:02:27PM, Bruce Ashfield wrote:
 Please cc' me directly on any kernel-yocto changes, I only noticed this
 by chance.
 
Noted.

 On Wed, Mar 5, 2014 at 11:49 AM, Matt Fleming m...@console-pimps.org wrote:
 
  Furthermore, the output of 'git branch' is subject to change and trying
  to parse it could potentially lead to breakage in the future.
 
 I've never had a problem with it in 7 years of the tools and their variants, 
 so
 the point is arguable and could be dropped from the commit log.
 
I'm referring to this,

  
http://git-blame.blogspot.co.uk/2013/06/checking-current-branch-programatically.html

 Good catch on the issue, like I said, I've never run into it .. but I
 can definitely see the need for the tweak.

OK, I'll send an updated version. Thanks for the review.

-- 
Matt Fleming, Intel Open Source Technology Center
___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH v2] kernel-yocto: Disable ANSI escape codes from git branch

2014-03-06 Thread Matt Fleming 
From: Matt Fleming matt.flem...@intel.com

'git branch' may use ANSI escape codes in its output (to provide colour)
which doesn't play well with commands expecting pure plain text, e.g.

fatal: '^[[31mmaster^[[m' is not a valid branch name.

Use the --no-color option to ensure all branch names are plain text.

Cc: Bruce Ashfield bruce.ashfi...@gmail.com
Signed-off-by: Matt Fleming matt.flem...@intel.com
---

v2: Make the minimum change necessary to disable the escape codes per
Bruce's suggestion.

 meta/classes/kernel-yocto.bbclass | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass 
b/meta/classes/kernel-yocto.bbclass
index fb8e04e..7913dd8 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -196,7 +196,7 @@ do_kernel_checkout() {
# If KMETA is defined, the branch must exist, but a machine 
branch
# can be missing since it may be created later by the tools.
if [ -n ${KMETA} ]; then
-   git branch -a | grep -q ${KMETA}
+   git branch -a --no-color | grep -q ${KMETA}
if [ $? -ne 0 ]; then
echo ERROR. The branch '${KMETA}' is required and was 
not
echo found. Ensure that the SRC_URI points to a valid 
linux-yocto
@@ -214,7 +214,7 @@ do_kernel_checkout() {
fi
 
# convert any remote branches to local tracking ones
-   for i in `git branch -a | grep remotes | grep -v HEAD`; do
+   for i in `git branch -a --no-color | grep remotes | grep -v HEAD`; do
b=`echo $i | cut -d' ' -f2 | sed 's%remotes/origin/%%'`;
git show-ref --quiet --verify -- refs/heads/$b
if [ $? -ne 0 ]; then
-- 
1.8.5.3

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

[OE-core] [PATCH] kernel-yocto: Inspect remote branches with git ls-remote

2014-03-05 Thread Matt Fleming 
From: Matt Fleming matt.flem...@intel.com

'git branch' may use ANSI escape codes in its output (to provide colour)
which doesn't play well with commands expecting pure plain text, e.g.

fatal: '^[[31mmaster^[[m' is not a valid branch name.

Furthermore, the output of 'git branch' is subject to change and trying
to parse it could potentially lead to breakage in the future.

Signed-off-by: Matt Fleming matt.flem...@intel.com
---
 meta/classes/kernel-yocto.bbclass | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta/classes/kernel-yocto.bbclass 
b/meta/classes/kernel-yocto.bbclass
index fb8e04e..1115056 100644
--- a/meta/classes/kernel-yocto.bbclass
+++ b/meta/classes/kernel-yocto.bbclass
@@ -196,7 +196,7 @@ do_kernel_checkout() {
# If KMETA is defined, the branch must exist, but a machine 
branch
# can be missing since it may be created later by the tools.
if [ -n ${KMETA} ]; then
-   git branch -a | grep -q ${KMETA}
+   git ls-remote --heads 2/dev/null | awk '{print $NF}' | grep -q 
${KMETA}
if [ $? -ne 0 ]; then
echo ERROR. The branch '${KMETA}' is required and was 
not
echo found. Ensure that the SRC_URI points to a valid 
linux-yocto
@@ -214,11 +214,11 @@ do_kernel_checkout() {
fi
 
# convert any remote branches to local tracking ones
-   for i in `git branch -a | grep remotes | grep -v HEAD`; do
-   b=`echo $i | cut -d' ' -f2 | sed 's%remotes/origin/%%'`;
-   git show-ref --quiet --verify -- refs/heads/$b
+   for i in `git ls-remote --heads 2/dev/null | awk '{print $NF}'`; do
+   b=`echo $i | sed 's%refs/heads/%%'`;
+   git show-ref --quiet --verify -- $i
if [ $? -ne 0 ]; then
-   git branch $b $i  /dev/null
+   git branch $b remotes/origin/$b  /dev/null
fi
done
 
-- 
1.8.5.3

___
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core