[OE-core] [PATCH] grub-core: fix endianness problem
Fix tftp stalls on loading files bigger than ~32k bug by cherry picking a patch from grub upstream. Upstream-Status: Backport Signed-off-by: Shan Hai shan@windriver.com --- .../grub/grub-2.00/fix-endianness-problem.patch| 46 ++ meta/recipes-bsp/grub/grub_2.00.bb | 1 + 2 files changed, 47 insertions(+) create mode 100644 meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch diff --git a/meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch b/meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch new file mode 100644 index 000..bb5ba9b --- /dev/null +++ b/meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch @@ -0,0 +1,46 @@ +grub-core/net/tftp.c: fix endianness problem. + + * grub-core/net/tftp.c (ack): Fix endianness problem. + (tftp_receive): Likewise. + Reported by: Michael Davidsaver. + +Upstream-Status: Submitted [grub-de...@gnu.org] + +Signed-off-by: Vladimir 'phcoder' Serbinenko phco...@gmail.com + +diff --git a/ChangeLog b/ChangeLog +index 81bdae9..c2f42d5 100644 +--- a/ChangeLog b/ChangeLog +@@ -1,3 +1,9 @@ ++2012-07-02 Vladimir Serbinenko phco...@gmail.com ++ ++ * grub-core/net/tftp.c (ack): Fix endianness problem. ++ (tftp_receive): Likewise. ++ Reported by: Michael Davidsaver. ++ + 2012-06-27 Vladimir Serbinenko phco...@gmail.com + + * configure.ac: Bump version to 2.00. +diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c +index 9c70efb..d0f39ea 100644 +--- a/grub-core/net/tftp.c b/grub-core/net/tftp.c +@@ -143,7 +143,7 @@ ack (tftp_data_t data, grub_uint16_t block) + + tftph_ack = (struct tftphdr *) nb_ack.data; + tftph_ack-opcode = grub_cpu_to_be16 (TFTP_ACK); +- tftph_ack-u.ack.block = block; ++ tftph_ack-u.ack.block = grub_cpu_to_be16 (block); + + err = grub_net_send_udp_packet (data-sock, nb_ack); + if (err) +@@ -225,7 +225,7 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__ ((unused)), + grub_priority_queue_pop (data-pq); + + if (file-device-net-packs.count 50) +-err = ack (data, tftph-u.data.block); ++err = ack (data, data-block + 1); + else + { + file-device-net-stall = 1; diff --git a/meta/recipes-bsp/grub/grub_2.00.bb b/meta/recipes-bsp/grub/grub_2.00.bb index 72ed402..36c648e 100644 --- a/meta/recipes-bsp/grub/grub_2.00.bb +++ b/meta/recipes-bsp/grub/grub_2.00.bb @@ -22,6 +22,7 @@ SRC_URI = ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ file://check-if-liblzma-is-disabled.patch \ file://fix-issue-with-flex-2.5.37.patch \ file://grub-2.00-add-oe-kernel.patch \ + file://fix-endianness-problem.patch \ SRC_URI[md5sum] = e927540b6eda8b024fb0391eeaa4091c -- 1.8.5.2.233.g932f7e4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] libav: set LICENSE and LICENSE_FLAGS according to PACKAGECONFIG options
Hi again, Some optional parts of Libav are licensed under the GNU General Public License version 2 or later (GPL v2+). See the file COPYING.GPLv2 for details. None of these parts are used by default, you have to explicitly pass --enable-gpl to configure to activate them. In this case, Libav's license changes to GPL v2+. I may misunderstood something here. For example: - libavfiler. It contains yadif code which is GPLv2+ and frei0r code is LGPLv2.1+. Libavfiler is clearly contaminated: LICENSE_libavfilter = GPLv2+ - libavutils is 100% LGPL LICENSE_libavutils = LGPLv2.1+ Giving --enable-gpl to configure does not convert pure 100% LGPL licensed library to GPL license. Am I wrong? Do you think it would be feasible to add code which decides whether to set --enable-gpl or not? Because --enable-gpl forbids linking libav for programs with incompatible licenses. Yes it's possible. Regards, M -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] perf: split package
The following changes since commit 1dcdd877c7946be4c0b1203deb14e2f842f9d0c2: bitbake: toasterui: fix build - project identification (2014-07-14 14:10:03 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib chonglu/perf http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=chonglu/perf Chong Lu (1): perf: split package meta/recipes-kernel/perf/perf.bb | 8 1 file changed, 4 insertions(+), 4 deletions(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] perf: split package
Fix incorrect paths to split perf package. Signed-off-by: Chong Lu chong...@windriver.com --- meta/recipes-kernel/perf/perf.bb | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 20968f9..781a738 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -166,10 +166,10 @@ RSUGGESTS_${PN} += ${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING} FILES_${PN} += ${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent FILES_${PN}-dbg += ${libdir}/python*/site-packages/.debug -FILES_${PN}-archive = ${libdir}/perf/perf-core/perf-archive -FILES_${PN}-tests = ${libdir}/perf/perf-core/tests -FILES_${PN}-python = ${libdir}/python*/site-packages ${libdir}/perf/perf-core/scripts/python -FILES_${PN}-perl = ${libdir}/perf/perf-core/scripts/perl +FILES_${PN}-archive = ${exec_prefix}/libexec/perf-core/perf-archive +FILES_${PN}-tests = ${exec_prefix}/libexec/perf-core/tests +FILES_${PN}-python = ${libdir}/python*/site-packages ${exec_prefix}/libexec/perf-core/scripts/python +FILES_${PN}-perl = ${exec_prefix}/libexec/perf-core/scripts/perl INHIBIT_PACKAGE_DEBUG_SPLIT=1 -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] libav: set LICENSE and LICENSE_FLAGS according to PACKAGECONFIG options
On 16.07.2014 08:43, Matthieu CRAPET wrote: Hi again, Some optional parts of Libav are licensed under the GNU General Public License version 2 or later (GPL v2+). See the file COPYING.GPLv2 for details. None of these parts are used by default, you have to explicitly pass --enable-gpl to configure to activate them. In this case, Libav's license changes to GPL v2+. I may misunderstood something here. For example: - libavfiler. It contains yadif code which is GPLv2+ and frei0r code is LGPLv2.1+. Libavfiler is clearly contaminated: Yadif needs to be enabled explicitly with --enable-gpl. frei0r is disabled by default. If enabled, it's linked at runtime using dlopen. At least, this is what the 'configure' script suggests. LICENSE_libavfilter = GPLv2+ - libavutils is 100% LGPL LICENSE_libavutils = LGPLv2.1+ Giving --enable-gpl to configure does not convert pure 100% LGPL licensed library to GPL license. Am I wrong? If you combine GPL'ed and LGPL'ed code, the resulting binary will be GPL'ed. https://en.wikipedia.org/wiki/GNU_Lesser_General_Public_License#Compatibility Regards, Andreas -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] perl: strip RPATH from libxml-parser-perl Expat.so
On Wed, 2014-07-16 at 00:00 -0300, João Henrique Ferreira de Freitas wrote: Hi Paul, I got this error. On daisy branch, I was using a MACHINE=genericx86 then I changed to MACHINE=crownbay and build my image. libxml-parser-perl shows the same problem. So I did 'bitbake perl -c cleansstate' and 'bitbake libxml-parser-perl'. No problems anymore, until I change back to genericx86. But this is odd and I am trying to figure out what is the problem. I've seen this happen before with a half built perl recipe where you've switched machines half way through a build of perl. Stripping out the RPATH is not the right fix though. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 13/38] gnu-config: add perl to RDEPENDS_gnu-config
On Wed, 2014-07-16 at 11:01 +0800, Robert Yang wrote: On 07/15/2014 11:40 PM, Khem Raj wrote: On Tue, Jul 15, 2014 at 7:19 AM, Robert Yang liezhi.y...@windriver.com wrote: Perl script: gnu-config/usr/bin/gnu-configize will it impact native recipes too ? Yes, it will, thanks, update it to target only in the git repo, RDEPENDS_${PN}_class-target += perl Please don't do that. perl-native should be in ASSUME_PROVIDED so we should be safe from that angle (but we should check). The autobuilder showed an error with these changes: https://autobuilder.yoctoproject.org/main/builders/build-appliance/builds/170/steps/BuildImages/logs/stdio (see the bash-native ERROR) so we probably need to add bash-native to ASSUME_PROVIDED to fix that. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v3] libav: set LICENSE and LICENSE_FLAGS according to PACKAGECONFIG options
On 16.07.2014 10:31, Andreas Oberritter wrote: On 16.07.2014 08:43, Matthieu CRAPET wrote: Giving --enable-gpl to configure does not convert pure 100% LGPL licensed library to GPL license. Am I wrong? If you combine GPL'ed and LGPL'ed code, the resulting binary will be GPL'ed. https://en.wikipedia.org/wiki/GNU_Lesser_General_Public_License#Compatibility Sorry, I misunderstood that part of your question. If libavutils contains LGPL'ed code only, then there's no technical reason to automatically convert the license of libavutils to GPL, just because --enable-gpl was given on the comand-line. However, the libav 'LICENSE' clearly states that it's still the case anyway, but for non-technical reasons. Regards, Andreas -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] diffstat: update to version 1.59
Remove unneeded patches, since they're included in new version. Signed-off-by: Chong Lu chong...@windriver.com --- .../diffstat/diffstat/aclocal-popen.patch | 20 .../diffstat/diffstat/aclocal.patch| 38 -- .../diffstat/diffstat/dirfix.patch | 27 --- .../{diffstat_1.58.bb = diffstat_1.59.bb} | 7 ++-- 4 files changed, 2 insertions(+), 90 deletions(-) delete mode 100644 meta/recipes-devtools/diffstat/diffstat/aclocal-popen.patch delete mode 100644 meta/recipes-devtools/diffstat/diffstat/aclocal.patch delete mode 100644 meta/recipes-devtools/diffstat/diffstat/dirfix.patch rename meta/recipes-devtools/diffstat/{diffstat_1.58.bb = diffstat_1.59.bb} (75%) diff --git a/meta/recipes-devtools/diffstat/diffstat/aclocal-popen.patch b/meta/recipes-devtools/diffstat/diffstat/aclocal-popen.patch deleted file mode 100644 index d95561b..000 --- a/meta/recipes-devtools/diffstat/diffstat/aclocal-popen.patch +++ /dev/null @@ -1,20 +0,0 @@ -Add a description to the HAVE_POPEN_PROTOTYPE AC_DEFINE so that this define is -included in config.h. - -Upstream-Status: Submitted (via email) -Signed-off-by: Ross Burton ross.bur...@intel.com - - -diff --git a/aclocal.m4 b/aclocal.m4 -index 3f20573..ec5ca51 100644 a/aclocal.m4 -+++ b/aclocal.m4 -@@ -931,7 +931,7 @@ ac_cv_td_popen=no, - ac_cv_td_popen=yes)) - AC_MSG_RESULT($ac_cv_td_popen) - if test $ac_cv_td_popen = yes; then -- AC_DEFINE(HAVE_POPEN_PROTOTYPE) -+ AC_DEFINE(HAVE_POPEN_PROTOTYPE,[1],[Conflicting popen prototype]) - fi - ])dnl - dnl --- diff --git a/meta/recipes-devtools/diffstat/diffstat/aclocal.patch b/meta/recipes-devtools/diffstat/diffstat/aclocal.patch deleted file mode 100644 index cde4a40..000 --- a/meta/recipes-devtools/diffstat/diffstat/aclocal.patch +++ /dev/null @@ -1,38 +0,0 @@ -Use the correct macro name (AC_AUTOCONF_VERSION) in the CF_ACVERSION_CHECK macro. -The original macro name (AC_ACVERSION) leads to this error: - -| autoreconf: running: aclocal --system-acdir=/poky/buildnew/tmp/work/i586-poky-linux/diffstat/1.57-r0/build/aclocal-copy/ --automake-acdir=/poky/buildnew/tmp/sysroots/x86_64-linux/usr/share/aclocal-1.12 --force -| aclocal: warning: autoconf input should be named 'configure.ac', not 'configure.in' -| configure.in:9: error: m4_defn: undefined macro: AC_ACVERSION -| acinclude.m4:989: CF_PROG_CC is expanded from... -| configure.in:9: the top level -| autom4te: m4 failed with exit status: 1 - -Upstream-Status: Submitted (via email) -Signed-off-by: Bogdan Marinescu bogdan.a.marine...@intel.com - -Index: diffstat-1.58/aclocal.m4 -=== diffstat-1.58.orig/aclocal.m4 2013-10-29 01:43:23.0 +0200 -+++ diffstat-1.58/aclocal.m4 2013-11-04 11:22:53.461562567 +0200 -@@ -13,16 +13,16 @@ - dnl Conditionally generate script according to whether we're using a given autoconf. - dnl - dnl $1 = version to compare against --dnl $2 = code to use if AC_ACVERSION is at least as high as $1. --dnl $3 = code to use if AC_ACVERSION is older than $1. -+dnl $2 = code to use if AC_AUTOCONF_VERSION is at least as high as $1. -+dnl $3 = code to use if AC_AUTOCONF_VERSION is older than $1. - define([CF_ACVERSION_CHECK], - [ - ifdef([AC_ACVERSION], ,[m4_copy([m4_PACKAGE_VERSION],[AC_ACVERSION])])dnl - ifdef([m4_version_compare], --[m4_if(m4_version_compare(m4_defn([AC_ACVERSION]), [$1]), -1, [$3], [$2])], -+[m4_if(m4_version_compare(m4_defn([AC_AUTOCONF_VERSION]), [$1]), -1, [$3], [$2])], - [CF_ACVERSION_COMPARE( - AC_PREREQ_CANON(AC_PREREQ_SPLIT([$1])), --AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_ACVERSION)), AC_ACVERSION, [$2], [$3])])])dnl -+AC_PREREQ_CANON(AC_PREREQ_SPLIT(AC_AUTOCONF_VERSION)), AC_AUTOCONF_VERSION, [$2], [$3])])])dnl - dnl --- - dnl CF_ACVERSION_COMPARE version: 3 updated: 2012/10/03 18:39:53 - dnl diff --git a/meta/recipes-devtools/diffstat/diffstat/dirfix.patch b/meta/recipes-devtools/diffstat/diffstat/dirfix.patch deleted file mode 100644 index 15dbf2b..000 --- a/meta/recipes-devtools/diffstat/diffstat/dirfix.patch +++ /dev/null @@ -1,27 +0,0 @@ -$libdir isn't used by the Makefile at all apart from in this mkdir. -This will be used without any DESTDIR so if your libdir is a different -layout to the bulid system it will cause a failure. E.g: - -Build system has /usr/lib only -libdir = /usr/lib64 for the target -Results in mkdir: cannot create directory `/usr/lib64': Permission denied - -Since the directory is never used, we can just remove the mkdir. - -Upstream-Status: Submitted (via email) - -RP 23/9/2011 - -Index: diffstat-1.54/makefile.in -=== diffstat-1.54.orig/makefile.in 2011-09-22
Re: [OE-core] [PATCH v3] libav: set LICENSE and LICENSE_FLAGS according to PACKAGECONFIG options
However, the libav 'LICENSE' clearly states that it's still the case anyway, but for non-technical reasons. If so, I'll post a v4 patch asap. Regards, M -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH] V2 lz4: update to latest version
On Mon, 2014-07-14 at 18:41 -0700, Armin Kuster wrote: update to version r119 Use github instead of svn I'm still a little concerned about this change from svn to git. Which is the definitive source? It looks like the svn repo is active too? I just don't want to end up in a position where we're pulling from someone's hack'n'dev version of lz4 rather than the place considered the real master source... Cheers, Richard LICENSE md5sum changed since it was updated in r117 FIxes CVE-2014-4611 Signed-off-by: Armin Kuster akus...@mvista.com --- meta/recipes-support/lz4/lz4_git.bb | 18 ++ 1 file changed, 18 insertions(+) create mode 100644 meta/recipes-support/lz4/lz4_git.bb diff --git a/meta/recipes-support/lz4/lz4_git.bb b/meta/recipes-support/lz4/lz4_git.bb new file mode 100644 index 000..3978d76 --- /dev/null +++ b/meta/recipes-support/lz4/lz4_git.bb @@ -0,0 +1,18 @@ +SUMMARY = Extremely Fast Compression algorithm +DESCRIPTION = LZ4 is a very fast lossless compression algorithm, providing compression speed at 400 MB/s per core, scalable with multi-cores CPU. It also features an extremely fast decoder, with speed in multiple GB/s per core, typically reaching RAM speed limits on multi-core systems. + +LICENSE = BSD +LIC_FILES_CHKSUM = file://LICENSE;md5=0b0d063f37a4477b54af2459477dcafd + +SRCREV = 28fd251bc7b42e5cde15f9a2d78fc53b3b575558 +SRC_URI= git://github.com/Cyan4973/lz4.git;branch=master + +S = ${WORKDIR}/git + +EXTRA_OEMAKE = PREFIX=${prefix} CC='${CC}' DESTDIR=${D} LIBDIR=${libdir} INCLUDEDIR=${includedir} + +do_install() { + oe_runmake install +} + +BBCLASSEXTEND += native nativesdk -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC] Busybox: do not enable ENABLE_FEATURE_NON_POSIX_CP
Hi, I was hit by a strange issue while benchmarking: I was copying some large files to /dev/null and that was failing. In fact, busybox cp foo /dev/null (and even cat foo /dev/null) are transforming the target in a regular file, with increasing size.At the end devtmpfs was full... After som eresearch I discovered that strange Busybox configuration option ENABLE_FEATURE_NON_POSIX_CP. Guess what? It is ENABLED in oe-core! http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/busybox/busybox/defconfig#n113 Now, do we really want it enabled by default? Cheers Andrea P.S. I agree with https://forum.openwrt.org/viewtopic.php?id=27235 ...ill-conceived feature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH 1/3] python-numpy: add support for powerpc64 architecture
From: Ting Liu ting@freescale.com Signed-off-by: Ting Liu ting@freescale.com --- .../python/python-numpy/powerpc64/_numpyconfig.h | 30 .../python/python-numpy/powerpc64/config.h | 139 meta/recipes-devtools/python/python-numpy_1.7.0.bb |4 + 3 files changed, 173 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-devtools/python/python-numpy/powerpc64/_numpyconfig.h create mode 100644 meta/recipes-devtools/python/python-numpy/powerpc64/config.h diff --git a/meta/recipes-devtools/python/python-numpy/powerpc64/_numpyconfig.h b/meta/recipes-devtools/python/python-numpy/powerpc64/_numpyconfig.h new file mode 100644 index 000..be57ac2 --- /dev/null +++ b/meta/recipes-devtools/python/python-numpy/powerpc64/_numpyconfig.h @@ -0,0 +1,30 @@ +#define NPY_HAVE_ENDIAN_H 1 +#define NPY_SIZEOF_SHORT SIZEOF_SHORT +#define NPY_SIZEOF_INT SIZEOF_INT +#define NPY_SIZEOF_LONG SIZEOF_LONG +#define NPY_SIZEOF_FLOAT 4 +#define NPY_SIZEOF_COMPLEX_FLOAT 8 +#define NPY_SIZEOF_DOUBLE 8 +#define NPY_SIZEOF_COMPLEX_DOUBLE 16 +#define NPY_SIZEOF_LONGDOUBLE 16 +#define NPY_SIZEOF_COMPLEX_LONGDOUBLE 32 +#define NPY_SIZEOF_PY_INTPTR_T 8 +#define NPY_SIZEOF_PY_LONG_LONG 8 +#define NPY_SIZEOF_LONGLONG 8 +#define NPY_NO_SMP 0 +#define NPY_HAVE_DECL_ISNAN +#define NPY_HAVE_DECL_ISINF +#define NPY_HAVE_DECL_ISFINITE +#define NPY_HAVE_DECL_SIGNBIT +#define NPY_USE_C99_COMPLEX 1 +#define NPY_HAVE_COMPLEX_DOUBLE 1 +#define NPY_HAVE_COMPLEX_FLOAT 1 +#define NPY_HAVE_COMPLEX_LONG_DOUBLE 1 +#define NPY_USE_C99_FORMATS 1 +#define NPY_VISIBILITY_HIDDEN __attribute__((visibility(hidden))) +#define NPY_ABI_VERSION 0x0109 +#define NPY_API_VERSION 0x0007 + +#ifndef __STDC_FORMAT_MACROS +#define __STDC_FORMAT_MACROS 1 +#endif diff --git a/meta/recipes-devtools/python/python-numpy/powerpc64/config.h b/meta/recipes-devtools/python/python-numpy/powerpc64/config.h new file mode 100644 index 000..c30b868 --- /dev/null +++ b/meta/recipes-devtools/python/python-numpy/powerpc64/config.h @@ -0,0 +1,139 @@ +#define HAVE_ENDIAN_H 1 +#define SIZEOF_PY_INTPTR_T 8 +#define SIZEOF_PY_LONG_LONG 8 +#define MATHLIB m +#define HAVE_SIN 1 +#define HAVE_COS 1 +#define HAVE_TAN 1 +#define HAVE_SINH 1 +#define HAVE_COSH 1 +#define HAVE_TANH 1 +#define HAVE_FABS 1 +#define HAVE_FLOOR 1 +#define HAVE_CEIL 1 +#define HAVE_SQRT 1 +#define HAVE_LOG10 1 +#define HAVE_LOG 1 +#define HAVE_EXP 1 +#define HAVE_ASIN 1 +#define HAVE_ACOS 1 +#define HAVE_ATAN 1 +#define HAVE_FMOD 1 +#define HAVE_MODF 1 +#define HAVE_FREXP 1 +#define HAVE_LDEXP 1 +#define HAVE_RINT 1 +#define HAVE_TRUNC 1 +#define HAVE_EXP2 1 +#define HAVE_LOG2 1 +#define HAVE_ATAN2 1 +#define HAVE_POW 1 +#define HAVE_NEXTAFTER 1 +#define HAVE_SINF 1 +#define HAVE_COSF 1 +#define HAVE_TANF 1 +#define HAVE_SINHF 1 +#define HAVE_COSHF 1 +#define HAVE_TANHF 1 +#define HAVE_FABSF 1 +#define HAVE_FLOORF 1 +#define HAVE_CEILF 1 +#define HAVE_RINTF 1 +#define HAVE_TRUNCF 1 +#define HAVE_SQRTF 1 +#define HAVE_LOG10F 1 +#define HAVE_LOGF 1 +#define HAVE_LOG1PF 1 +#define HAVE_EXPF 1 +#define HAVE_EXPM1F 1 +#define HAVE_ASINF 1 +#define HAVE_ACOSF 1 +#define HAVE_ATANF 1 +#define HAVE_ASINHF 1 +#define HAVE_ACOSHF 1 +#define HAVE_ATANHF 1 +#define HAVE_HYPOTF 1 +#define HAVE_ATAN2F 1 +#define HAVE_POWF 1 +#define HAVE_FMODF 1 +#define HAVE_MODFF 1 +#define HAVE_FREXPF 1 +#define HAVE_LDEXPF 1 +#define HAVE_EXP2F 1 +#define HAVE_LOG2F 1 +#define HAVE_COPYSIGNF 1 +#define HAVE_NEXTAFTERF 1 +#define HAVE_SINL 1 +#define HAVE_COSL 1 +#define HAVE_TANL 1 +#define HAVE_SINHL 1 +#define HAVE_COSHL 1 +#define HAVE_TANHL 1 +#define HAVE_FABSL 1 +#define HAVE_FLOORL 1 +#define HAVE_CEILL 1 +#define HAVE_RINTL 1 +#define HAVE_TRUNCL 1 +#define HAVE_SQRTL 1 +#define HAVE_LOG10L 1 +#define HAVE_LOGL 1 +#define HAVE_LOG1PL 1 +#define HAVE_EXPL 1 +#define HAVE_EXPM1L 1 +#define HAVE_ASINL 1 +#define HAVE_ACOSL 1 +#define HAVE_ATANL 1 +#define HAVE_ASINHL 1 +#define HAVE_ACOSHL 1 +#define HAVE_ATANHL 1 +#define HAVE_HYPOTL 1 +#define HAVE_ATAN2L 1 +#define HAVE_POWL 1 +#define HAVE_FMODL 1 +#define HAVE_MODFL 1 +#define HAVE_FREXPL 1 +#define HAVE_LDEXPL 1 +#define HAVE_EXP2L 1 +#define HAVE_LOG2L 1 +#define HAVE_COPYSIGNL 1 +#define HAVE_NEXTAFTERL 1 +#define HAVE_DECL_SIGNBIT +#define HAVE_COMPLEX_H 1 +#define HAVE_CREAL 1 +#define HAVE_CIMAG 1 +#define HAVE_CABS 1 +#define HAVE_CARG 1 +#define HAVE_CEXP 1 +#define HAVE_CSQRT 1 +#define HAVE_CLOG 1 +#define HAVE_CCOS 1 +#define HAVE_CSIN 1 +#define HAVE_CPOW 1 +#define HAVE_CREALF 1 +#define HAVE_CIMAGF 1 +#define HAVE_CABSF 1 +#define HAVE_CARGF 1 +#define HAVE_CEXPF 1 +#define HAVE_CSQRTF 1 +#define HAVE_CLOGF 1 +#define HAVE_CCOSF 1 +#define HAVE_CSINF 1 +#define HAVE_CPOWF 1 +#define HAVE_CREALL 1 +#define HAVE_CIMAGL 1 +#define HAVE_CABSL 1 +#define HAVE_CARGL 1 +#define HAVE_CEXPL 1 +#define HAVE_CSQRTL 1 +#define HAVE_CLOGL 1 +#define HAVE_CCOSL 1 +#define HAVE_CSINL 1 +#define HAVE_CPOWL 1 +#define
[OE-core] [oe-core][PATCH 2/3] strace: fix 64 bit process detection
From: Ting Liu b28...@freescale.com Signed-off-by: Ting Liu b28...@freescale.com --- .../strace-fix-64-bit-process-detection.patch | 34 meta/recipes-devtools/strace/strace_4.8.bb |1 + 2 files changed, 35 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-devtools/strace/strace-4.8/strace-fix-64-bit-process-detection.patch diff --git a/meta/recipes-devtools/strace/strace-4.8/strace-fix-64-bit-process-detection.patch b/meta/recipes-devtools/strace/strace-4.8/strace-fix-64-bit-process-detection.patch new file mode 100644 index 000..a6579df --- /dev/null +++ b/meta/recipes-devtools/strace/strace-4.8/strace-fix-64-bit-process-detection.patch @@ -0,0 +1,34 @@ +powerpc64: fix 64-bit process detection on embedded + +* syscall.c (get_scno) [POWERPC64]: Fix 64-bit process detection +on embedded powerpc. + +Upstream-Status: Backport + +Signed-off-by: James Yang james.y...@freescale.com +Signed-off-by: Dmitry V. Levin l...@altlinux.org + +diff --git a/syscall.c.orig b/syscall.c +index 7efee0e..72d9453 100644 +--- a/syscall.c.orig b/syscall.c +@@ -1207,11 +1207,14 @@ get_scno(struct tcb *tcp) + /* Check for 64/32 bit mode. */ + if (upeek(tcp, sizeof(unsigned long)*PT_MSR, val) 0) + return -1; +- /* SF is bit 0 of MSR */ +- if (val 0) +- currpers = 0; +- else +- currpers = 1; ++ ++ /* ++ * Check for 64/32 bit mode. ++ * Embedded implementations covered by Book E extension of PPC use ++ * bit 0 (CM) of 32-bit Machine state register (MSR). ++ * Other implementations use bit 0 (SF) of 64-bit MSR. ++ */ ++ currpers = (val 0x80008000) ? 0 : 1; + update_personality(tcp, currpers); + # endif + #elif defined(AVR32) diff --git a/meta/recipes-devtools/strace/strace_4.8.bb b/meta/recipes-devtools/strace/strace_4.8.bb index 71563d4..d954c37 100644 --- a/meta/recipes-devtools/strace/strace_4.8.bb +++ b/meta/recipes-devtools/strace/strace_4.8.bb @@ -8,6 +8,7 @@ SRC_URI = ${SOURCEFORGE_MIRROR}/strace/strace-${PV}.tar.xz \ file://git-version-gen \ file://strace-add-configure-options.patch \ file://Makefile-ptest.patch \ + file://strace-fix-64-bit-process-detection.patch \ file://run-ptest \ -- 1.7.3.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [RFC] Busybox: do not enable ENABLE_FEATURE_NON_POSIX_CP
On Wed, Jul 16, 2014 at 11:35 AM, Andrea Adami andrea.ad...@gmail.com wrote: Hi, I was hit by a strange issue while benchmarking: I was copying some large files to /dev/null and that was failing. In fact, busybox cp foo /dev/null (and even cat foo /dev/null) are transforming the target in a regular file, with increasing size.At the end devtmpfs was full... After som eresearch I discovered that strange Busybox configuration option ENABLE_FEATURE_NON_POSIX_CP. Guess what? It is ENABLED in oe-core! http://cgit.openembedded.org/openembedded-core/tree/meta/recipes-core/busybox/busybox/defconfig#n113 Now, do we really want it enabled by default? Cheers Andrea P.S. I agree with https://forum.openwrt.org/viewtopic.php?id=27235 ...ill-conceived feature I add the WONTIFX bug: http://lists.busybox.net/pipermail/busybox-cvs/2011-February/032161.html It seems that cat should not have adverse effects, probably I tried cat once /dev/null was already b0rked (unlinked) by the non-posix cp. Regards Andrea -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [oe-core][PATCH] gcc: update *LIBC_* linker relocation reglex
From: Ting Liu ting@freescale.com * GLIBC_DYNAMIC_LINKER64 reglex does not work for rs6000/linux64.h, update it. * it turns out that UCLIBC_DYNAMIC_LINKER reglex will strip the 32/64 chars from UCLIBC_DYNAMIC_LINKER64/UCLIBC_DYNAMIC_LINKER32, add '\b'. my two PCs: Centos 6.5 (python 2.7.5) and Fedora 13 (python 2.7.3) Signed-off-by: Ting Liu ting@freescale.com --- meta/recipes-devtools/gcc/gcc-multilib-config.inc |6 -- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/recipes-devtools/gcc/gcc-multilib-config.inc b/meta/recipes-devtools/gcc/gcc-multilib-config.inc index 81d664a..acea6d8 100644 --- a/meta/recipes-devtools/gcc/gcc-multilib-config.inc +++ b/meta/recipes-devtools/gcc/gcc-multilib-config.inc @@ -88,8 +88,10 @@ python gcc_multilib_setup() { substs = [ (r'^(#define\s*GLIBC_DYNAMIC_LINKER32\s*)(\S+)(\s*\.*\)$', r'\1' + wrap_libdir(libdir32) + r'\3'), - (r'^(#define\s*GLIBC_DYNAMIC_LINKER64\s*)(\S+)(\s*\.*\)$', + (r'^(#define\s*GLIBC_DYNAMIC_LINKER64\s*)(\S+)(\s*\\S+\)$', r'\1' + wrap_libdir(libdir64) + r'\3'), + (r'^(#define\s*GLIBC_DYNAMIC_LINKER64\s*\\S+\\s*)(\S+)(\s*\\S+\\s*)(\S+)(\s*\.*\)$', +r'\1' + wrap_libdir(libdir64) + r'\3' + wrap_libdir(libdir64) + r'\5'), (r'^(#define\s*GLIBC_DYNAMIC_LINKERX32\s*)(\S+)(\s*\.*\)$', r'\1' + wrap_libdir(libdirx32) + r'\3'), (r'^(#define\s*GLIBC_DYNAMIC_LINKERN32\s*)(\S+)(\s*\.*\)$', @@ -100,7 +102,7 @@ python gcc_multilib_setup() { r'\1' + wrap_libdir(libdir64) + r'\3'), (r'^(#define\s*UCLIBC_DYNAMIC_LINKERN32\s*)(\S+)(\s*\.*\)$', r'\1' + wrap_libdir(libdirn32) + r'\3'), -(r'^(#define\s*UCLIBC_DYNAMIC_LINKER\s*)(\S+)(\s*\.*\)$', + (r'^(#define\s*UCLIBC_DYNAMIC_LINKER\b\s*)(\S+)(\s*\.*\)$', r'\1' + wrap_libdir(libdir32) + r'\3'), ] -- 1.7.3.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] two variations for distro-specific FILESEXTRAPATHS prepending
just ran across this in the meta-yocto layer but it's a general OE question -- the psplash_git.bbappend file contains the following distro-conditional line: FILESEXTRAPATHS_prepend_poky := ${THISDIR}/files: and the accompanying files/ directory has, unsurprisingly, a poky-specific splash image file, psplash-poky-img.h. but based on how FILESEXTRAPATHS is processed by incorporating all of the FILESOVERRIDES variations (one of which is the distro name), would it not have been entirely equivalent to have used simply FILESEXTRAPATHS_prepend := ${THISDIR}/files: and placed that splash file in the accompanying directory files/poky/? would these two approaches do the same thing? is there a preferred way? that's the only example of that i've seen in all the layers i've played with. rday -- Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH] libav: drop unused FFMPEG_LIBS and move libpostproc only to 0.8.11
* standalone libpostproc recipe depends on libav, but current PACKAGES_DYNAMIC indicated that libav-9.13 also provides libpostproc Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-multimedia/libav/libav.inc | 5 - meta/recipes-multimedia/libav/libav_0.8.11.bb | 2 ++ meta/recipes-multimedia/libav/libav_9.13.bb | 3 +++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/meta/recipes-multimedia/libav/libav.inc b/meta/recipes-multimedia/libav/libav.inc index 1d617a2..ff1ab0e 100644 --- a/meta/recipes-multimedia/libav/libav.inc +++ b/meta/recipes-multimedia/libav/libav.inc @@ -87,9 +87,6 @@ do_install_append() { install -m 0644 ${S}/libavfilter/*.h ${D}${includedir}/libavfilter/ } -FFMPEG_LIBS = libavcodec libavdevice libavformat \ - libavutil libpostproc libswscale libavfilter - PACKAGES += ${PN}-vhook-dbg ${PN}-vhook ffmpeg-x264-presets RSUGGESTS_${PN} = mplayer @@ -142,5 +139,3 @@ python populate_packages_prepend() { for pkg in pkgs: d.appendVar('INSANE_SKIP_%s' % pkg, ' textrel') } - -PACKAGES_DYNAMIC += ^lib(av(codec|device|filter|format|util)|postproc|swscale).* diff --git a/meta/recipes-multimedia/libav/libav_0.8.11.bb b/meta/recipes-multimedia/libav/libav_0.8.11.bb index 662d205..1344a2a 100644 --- a/meta/recipes-multimedia/libav/libav_0.8.11.bb +++ b/meta/recipes-multimedia/libav/libav_0.8.11.bb @@ -16,3 +16,5 @@ PROVIDES += libpostproc EXTRA_OECONF += \ --enable-postproc \ + +PACKAGES_DYNAMIC += ^lib(av(codec|device|filter|format|util)|postproc|swscale).* diff --git a/meta/recipes-multimedia/libav/libav_9.13.bb b/meta/recipes-multimedia/libav/libav_9.13.bb index 7bfbc48..f9c413f 100644 --- a/meta/recipes-multimedia/libav/libav_9.13.bb +++ b/meta/recipes-multimedia/libav/libav_9.13.bb @@ -11,3 +11,6 @@ SRC_URI[md5sum] = 23b9e34bffdaee366710fdf20157a570 SRC_URI[sha256sum] = 2ff05df6cd2259b3bb277eb16c234214f8e0530700d0c774d033eba23edde6ca DEFAULT_PREFERENCE = -1 + +# unlike 0.8.11 we don't provide libpostproc +PACKAGES_DYNAMIC += ^lib(av(codec|device|filter|format|util)|swscale).* -- 2.0.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] perf: split package
On Wed, Jul 16, 2014 at 4:00 AM, Chong Lu chong...@windriver.com wrote: Fix incorrect paths to split perf package. Can you elaborate here ? This commit message doesn't really tell us much. Why is the current split incorrect ? What is the symptom and result of the incorrect split ? Are the package contents the same after this change ? Bruce Signed-off-by: Chong Lu chong...@windriver.com --- meta/recipes-kernel/perf/perf.bb | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 20968f9..781a738 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -166,10 +166,10 @@ RSUGGESTS_${PN} += ${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING} FILES_${PN} += ${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent FILES_${PN}-dbg += ${libdir}/python*/site-packages/.debug -FILES_${PN}-archive = ${libdir}/perf/perf-core/perf-archive -FILES_${PN}-tests = ${libdir}/perf/perf-core/tests -FILES_${PN}-python = ${libdir}/python*/site-packages ${libdir}/perf/perf-core/scripts/python -FILES_${PN}-perl = ${libdir}/perf/perf-core/scripts/perl +FILES_${PN}-archive = ${exec_prefix}/libexec/perf-core/perf-archive +FILES_${PN}-tests = ${exec_prefix}/libexec/perf-core/tests +FILES_${PN}-python = ${libdir}/python*/site-packages ${exec_prefix}/libexec/perf-core/scripts/python +FILES_${PN}-perl = ${exec_prefix}/libexec/perf-core/scripts/perl INHIBIT_PACKAGE_DEBUG_SPLIT=1 -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] State of bitbake world, test-dependencies 2014-06-27
This was incremental build. I've sent fix for xfconf which was causing many issues, but there is still too many of them. Complete logs: http://logs.nslu2-linux.org/buildlogs/oe/world/log.dependencies.20140714_130534.log/ ERROR: 208 issues were found in these recipes: atd-over-fso aurora-daemon clutter-box2d daemonize ecore efl exo farsight2 fbgrab ffalarms firefox flite-alsa fltk frameworkd fso-gpsd gdal gst-ffmpeg gwaterpas hexedit hplip lcdproc libgnomeprint libhugetlbfs libhybris libnice liboauth libotr libxfce4ui lksctp-tools llvm3 lttng-modules mcnavi mkvtoolnix mokomaze monkey numptyphysics openal-soft orage orrery osmocon owfs packagegroup-shr packagegroup-shr-feed packagegroup-shr-minimal packagegroup-xfce-base packagegroup-xfce-multimedia phonefsod pidgin pidgin-otr python-cython python-phoneutils python-pyrtc python-pyyaml rtorrent sensmon shr-settings shr-wizard smbnetfs snort subsurface thunar thunar-archive-plugin thunar-media-tags-plugin thunar-volman tsmd usbpath vagalume valacompass vlc webmin wvdial wvstreams xfce4-appfinder xfce4-battery-plugin xfce4-clipman-plugin xfce4-closebutton-plugin xfce4-cpufreq-plugin xfce4-cpugraph-plugin xfce4-datetime-plugin xfce4-diskperf-plugin xfce4-embed-plugin xfce4-equake-plugin xfce4-eyes-plugin xfce4-fsguard-plugin xfce4-genmon-plugin xfce4-mixer xfce4-mount-plugin xfce4-mpc-plugin xfce4-netload-plugin xfce4-notes-plugin xfce4-notifyd xfce4-panel xfce4-places-plugin xfce4-screenshooter xfce4-session xfce4-settings xfce4-systemload-plugin xfce4-terminal xfce4-time-out-plugin xfce4-vala xfce4-wavelan-plugin xfce4-weather-plugin xfce4-xkb-plugin xfconf xfdesktop xfmpc xfwm4 xwd zeroc-ice zhone INFO: Output written in: test-dependencies/1405343134 As bonus there is separate log file for each failing recipe, see http://logs.nslu2-linux.org/buildlogs/oe/world/log.dependencies.20140714_130534.log/3_min/failed/ http://logs.nslu2-linux.org/buildlogs/oe/world/log.dependencies.20140714_130534.log/2_max/failed/ -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH] V2 lz4: update to latest version
On 16 July 2014 10:11, Richard Purdie richard.pur...@linuxfoundation.org wrote: I'm still a little concerned about this change from svn to git. Which is the definitive source? It looks like the svn repo is active too? I just don't want to end up in a position where we're pulling from someone's hack'n'dev version of lz4 rather than the place considered the real master source... The revision histories *are* different (commits marked untested and then fixed in another commit) but the owner of the git repo is the same as the owner of the svn repo. It looks like git is his working area and then changes that have been tested are merged and committed to git. Unless there's a good reason I'd keep with the svn repo for now. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-commits] Mark Hatle : db: Add version 6.0.30
On Tue, Jul 08, 2014 at 10:20:41AM +, g...@git.openembedded.org wrote: Module: openembedded-core.git Branch: master Commit: 04bb223110da2f92725c341bc3ec0cf26325f675 URL: http://git.openembedded.org/?p=openembedded-core.gita=commit;h=04bb223110da2f92725c341bc3ec0cf26325f675 Author: Mark Hatle mark.ha...@windriver.com Date: Wed Jul 2 19:57:43 2014 -0500 db: Add version 6.0.30 The latest version of RPM5 requires Berkley DB 6.0.20 or newer. The license is now AGPL-3.0 in BDB 6.0. This may not be acceptable to some, so the previous version is retained as an alternative. This is failing on some hosts with: | In file included from /OE/build/shr-core/tmp-eglibc/work/xscalete-oe-linux-gnueabi/db/6.0.30-r0/db-6.0.30/lang/cxx/cxx_channel.cpp:13:0: | ./db_cxx.h:59:22: fatal error: iostream.h: No such file or directory | #include iostream.h | ^ Signed-off-by: Mark Hatle mark.ha...@windriver.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- .../db/db/arm-thumb-mutex_db5.patch| 10 ++ meta/recipes-support/db/db_6.0.30.bb | 114 + 2 files changed, 124 insertions(+) diff --git a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch index 40b13de..34e8db8 100644 --- a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch +++ b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch @@ -1,5 +1,15 @@ +Original patch submitted by jbow...@nslu2-linux.org on 2005-11-17: + +db: fix thumb uclibc operation in 4.3.29 + - uclibc thumb builds were using libpthread to implement mutexes, the + - uclibc version seems to be a stub (at least on thumb). This commit + - fixes the ARM/gcc-assembly mutex implementation so that it has thumb + - support and the resultant db4 works (tested on LE Thumb uclibc) + Upstream-Status: Inappropriate [embedded specific] +Author: jbow...@nslu2-linux.org + --- db-5.1.19/src/dbinc/mutex_int.h.orig 2011-01-05 19:21:42.181805366 -0600 +++ db-5.1.19/src/dbinc/mutex_int.h 2011-01-05 19:24:53.141853117 -0600 @@ -474,6 +474,25 @@ diff --git a/meta/recipes-support/db/db_6.0.30.bb b/meta/recipes-support/db/db_6.0.30.bb new file mode 100644 index 000..9fc4a30 --- /dev/null +++ b/meta/recipes-support/db/db_6.0.30.bb @@ -0,0 +1,114 @@ +# Version 6 of the Berkeley DB from Oracle (formerly Sleepycat) +# +# At present this package only installs the DB code +# itself (shared libraries, .a in the dev package), +# documentation and headers. +# +# The headers have the same names as those as v3 +# of the DB, only one version can be used *for dev* +# at once - DB3 and DB6 can both be installed on the +# same system at the same time if really necessary. +SECTION = libs +SUMMARY = Berkeley Database v6 +HOMEPAGE = http://www.oracle.com/technology/products/berkeley-db/db/index.html; +LICENSE = AGPL-3.0 +VIRTUAL_NAME ?= virtual/db +RCONFLICTS_${PN} = db3 + +SRC_URI = http://download.oracle.com/berkeley-db/db-${PV}.tar.gz; +SRC_URI += file://arm-thumb-mutex_db5.patch;patchdir=.. \ +file://fix-parallel-build.patch \ + + +SRC_URI[md5sum] = ad28eb86ad3203b5422844db179c585b +SRC_URI[sha256sum] = 608e4b1cf390e9bf54c0ef00c5bd9ca76d36e2261b9f4d33d54516f3f6a20fd2 + +LIC_FILES_CHKSUM = file://../LICENSE;md5=1ec8b0b17cc31513fe35ab10716f8490 + +inherit autotools + +# Put virtual/db in any appropriate provider of a +# relational database, use it as a dependency in +# place of a specific db and use: +# +# PREFERRED_PROVIDER_virtual/db +# +# to select the correct db in the build (distro) .conf +PROVIDES += ${VIRTUAL_NAME} + +# bitbake isn't quite clever enough to deal with sleepycat, +# the distribution sits in the expected directory, but all +# the builds must occur from a sub-directory. The following +# persuades bitbake to go to the right place +S = ${WORKDIR}/db-${PV}/dist +B = ${WORKDIR}/db-${PV}/build_unix + +# The executables go in a separate package - typically there +# is no need to install these unless doing real database +# management on the system. +inherit lib_package + +PACKAGES =+ ${PN}-cxx +FILES_${PN}-cxx = ${libdir}/*cxx*so + + +# The dev package has the .so link (as in db3) and the .a's - +# it is therefore incompatible (cannot be installed at the +# same time) as the db3 package +# sort out the .so since they do version prior to the .so +SOLIBS = -6*.so +FILES_SOLIBSDEV = ${libdir}/libdb.so ${libdir}/libdb_cxx.so + +#configuration - set in local.conf to override +# All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix) +DB6_CONFIG ?= --enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-verify --disable-compat185 --disable-sql + +EXTRA_OECONF = ${DB6_CONFIG} --enable-shared --enable-cxx --with-sysroot +
Re: [OE-core] [oe-commits] Mark Hatle : db: Add version 6.0.30
On 7/16/14, 8:52 AM, Martin Jansa wrote: On Tue, Jul 08, 2014 at 10:20:41AM +, g...@git.openembedded.org wrote: Module: openembedded-core.git Branch: master Commit: 04bb223110da2f92725c341bc3ec0cf26325f675 URL: http://git.openembedded.org/?p=openembedded-core.gita=commit;h=04bb223110da2f92725c341bc3ec0cf26325f675 Author: Mark Hatle mark.ha...@windriver.com Date: Wed Jul 2 19:57:43 2014 -0500 db: Add version 6.0.30 The latest version of RPM5 requires Berkley DB 6.0.20 or newer. The license is now AGPL-3.0 in BDB 6.0. This may not be acceptable to some, so the previous version is retained as an alternative. This is failing on some hosts with: That's odd.. what host OS's and toolchain versions is it failing on? The iostream.h file SHOULD exist in all systems that have C++ development installed. --Mark | In file included from /OE/build/shr-core/tmp-eglibc/work/xscalete-oe-linux-gnueabi/db/6.0.30-r0/db-6.0.30/lang/cxx/cxx_channel.cpp:13:0: | ./db_cxx.h:59:22: fatal error: iostream.h: No such file or directory | #include iostream.h | ^ Signed-off-by: Mark Hatle mark.ha...@windriver.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- .../db/db/arm-thumb-mutex_db5.patch| 10 ++ meta/recipes-support/db/db_6.0.30.bb | 114 + 2 files changed, 124 insertions(+) diff --git a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch index 40b13de..34e8db8 100644 --- a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch +++ b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch @@ -1,5 +1,15 @@ +Original patch submitted by jbow...@nslu2-linux.org on 2005-11-17: + +db: fix thumb uclibc operation in 4.3.29 + - uclibc thumb builds were using libpthread to implement mutexes, the + - uclibc version seems to be a stub (at least on thumb). This commit + - fixes the ARM/gcc-assembly mutex implementation so that it has thumb + - support and the resultant db4 works (tested on LE Thumb uclibc) + Upstream-Status: Inappropriate [embedded specific] +Author: jbow...@nslu2-linux.org + --- db-5.1.19/src/dbinc/mutex_int.h.orig 2011-01-05 19:21:42.181805366 -0600 +++ db-5.1.19/src/dbinc/mutex_int.h 2011-01-05 19:24:53.141853117 -0600 @@ -474,6 +474,25 @@ diff --git a/meta/recipes-support/db/db_6.0.30.bb b/meta/recipes-support/db/db_6.0.30.bb new file mode 100644 index 000..9fc4a30 --- /dev/null +++ b/meta/recipes-support/db/db_6.0.30.bb @@ -0,0 +1,114 @@ +# Version 6 of the Berkeley DB from Oracle (formerly Sleepycat) +# +# At present this package only installs the DB code +# itself (shared libraries, .a in the dev package), +# documentation and headers. +# +# The headers have the same names as those as v3 +# of the DB, only one version can be used *for dev* +# at once - DB3 and DB6 can both be installed on the +# same system at the same time if really necessary. +SECTION = libs +SUMMARY = Berkeley Database v6 +HOMEPAGE = http://www.oracle.com/technology/products/berkeley-db/db/index.html; +LICENSE = AGPL-3.0 +VIRTUAL_NAME ?= virtual/db +RCONFLICTS_${PN} = db3 + +SRC_URI = http://download.oracle.com/berkeley-db/db-${PV}.tar.gz; +SRC_URI += file://arm-thumb-mutex_db5.patch;patchdir=.. \ +file://fix-parallel-build.patch \ + + +SRC_URI[md5sum] = ad28eb86ad3203b5422844db179c585b +SRC_URI[sha256sum] = 608e4b1cf390e9bf54c0ef00c5bd9ca76d36e2261b9f4d33d54516f3f6a20fd2 + +LIC_FILES_CHKSUM = file://../LICENSE;md5=1ec8b0b17cc31513fe35ab10716f8490 + +inherit autotools + +# Put virtual/db in any appropriate provider of a +# relational database, use it as a dependency in +# place of a specific db and use: +# +# PREFERRED_PROVIDER_virtual/db +# +# to select the correct db in the build (distro) .conf +PROVIDES += ${VIRTUAL_NAME} + +# bitbake isn't quite clever enough to deal with sleepycat, +# the distribution sits in the expected directory, but all +# the builds must occur from a sub-directory. The following +# persuades bitbake to go to the right place +S = ${WORKDIR}/db-${PV}/dist +B = ${WORKDIR}/db-${PV}/build_unix + +# The executables go in a separate package - typically there +# is no need to install these unless doing real database +# management on the system. +inherit lib_package + +PACKAGES =+ ${PN}-cxx +FILES_${PN}-cxx = ${libdir}/*cxx*so + + +# The dev package has the .so link (as in db3) and the .a's - +# it is therefore incompatible (cannot be installed at the +# same time) as the db3 package +# sort out the .so since they do version prior to the .so +SOLIBS = -6*.so +FILES_SOLIBSDEV = ${libdir}/libdb.so ${libdir}/libdb_cxx.so + +#configuration - set in local.conf to override +# All the --disable-* options replace --enable-smallbuild, which breaks a bunch of stuff (eg. postfix) +DB6_CONFIG ?= --enable-o_direct --disable-cryptography --disable-queue --disable-replication --disable-verify --disable-compat185
Re: [OE-core] Reagrding meta-networking
[Re: [OE-core] Reagrding meta-networking] On 14.07.01 (Tue 02:24) Himanshu Pandey wrote: So, do I have to set IMAGE_INSTALL variable in local.conf and packagename_X is what to be followed for the addition of each package. That is certainly an option, though I tend to prefer IMAGE_INSTALL_append for local.conf tweaks. If you expect this to be a longer-term thing, you may want to consider defining an image type for your project that includes specifically what you want in it. -J. Regards, Himanshu From: Henning Heinold henn...@itconsulting-heinold.de Sent: Tue, 01 Jul 2014 01:01:52 To: openembedded-core@lists.openembedded.org openembedded-core@lists.openembedded.org Subject: Re: [OE-core] Reagrding meta-networking On Mon, Jun 30, 2014 at 01:29:26PM -, Himanshu Pandey wrote: Hi, Since I want dhcp and pppoe, so I downloaded the same from git and included meta-networking layer in bblayers.conf. This layer is getting compiled but somehow dhcp and pppoe are not getting included in the final image. So what I have to do inorder to add dhcp and pppoe in the final image. Please help. Regards, Himanshu IMAGE_INSTALL += packagename_dhcp packagname_pppoe Be aware that recipe(bb)-name is mostly not the resulting packagename. Bye Henning -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core [signaturel] Get your own FREE website, FREE domain FREE mobile app withKnow More Company email. -- -Joe MacDonald. :wq signature.asc Description: Digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-commits] Mark Hatle : db: Add version 6.0.30
On Wed, Jul 16, 2014 at 09:07:54AM -0500, Mark Hatle wrote: On 7/16/14, 8:52 AM, Martin Jansa wrote: On Tue, Jul 08, 2014 at 10:20:41AM +, g...@git.openembedded.org wrote: Module: openembedded-core.git Branch: master Commit: 04bb223110da2f92725c341bc3ec0cf26325f675 URL: http://git.openembedded.org/?p=openembedded-core.gita=commit;h=04bb223110da2f92725c341bc3ec0cf26325f675 Author: Mark Hatle mark.ha...@windriver.com Date: Wed Jul 2 19:57:43 2014 -0500 db: Add version 6.0.30 The latest version of RPM5 requires Berkley DB 6.0.20 or newer. The license is now AGPL-3.0 in BDB 6.0. This may not be acceptable to some, so the previous version is retained as an alternative. This is failing on some hosts with: That's odd.. what host OS's and toolchain versions is it failing on? The iostream.h file SHOULD exist in all systems that have C++ development installed. Gentoo, gcc-4.9 and iostream.h exists in usual locations (at least now), rebuilding db manually helped | In file included from /OE/build/shr-core/tmp-eglibc/work/xscalete-oe-linux-gnueabi/db/6.0.30-r0/db-6.0.30/lang/cxx/cxx_channel.cpp:13:0: | ./db_cxx.h:59:22: fatal error: iostream.h: No such file or directory | #include iostream.h | ^ Signed-off-by: Mark Hatle mark.ha...@windriver.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- .../db/db/arm-thumb-mutex_db5.patch| 10 ++ meta/recipes-support/db/db_6.0.30.bb | 114 + 2 files changed, 124 insertions(+) diff --git a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch index 40b13de..34e8db8 100644 --- a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch +++ b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch @@ -1,5 +1,15 @@ +Original patch submitted by jbow...@nslu2-linux.org on 2005-11-17: + +db: fix thumb uclibc operation in 4.3.29 + - uclibc thumb builds were using libpthread to implement mutexes, the + - uclibc version seems to be a stub (at least on thumb). This commit + - fixes the ARM/gcc-assembly mutex implementation so that it has thumb + - support and the resultant db4 works (tested on LE Thumb uclibc) + Upstream-Status: Inappropriate [embedded specific] +Author: jbow...@nslu2-linux.org + --- db-5.1.19/src/dbinc/mutex_int.h.orig 2011-01-05 19:21:42.181805366 -0600 +++ db-5.1.19/src/dbinc/mutex_int.h 2011-01-05 19:24:53.141853117 -0600 @@ -474,6 +474,25 @@ diff --git a/meta/recipes-support/db/db_6.0.30.bb b/meta/recipes-support/db/db_6.0.30.bb new file mode 100644 index 000..9fc4a30 --- /dev/null +++ b/meta/recipes-support/db/db_6.0.30.bb @@ -0,0 +1,114 @@ +# Version 6 of the Berkeley DB from Oracle (formerly Sleepycat) +# +# At present this package only installs the DB code +# itself (shared libraries, .a in the dev package), +# documentation and headers. +# +# The headers have the same names as those as v3 +# of the DB, only one version can be used *for dev* +# at once - DB3 and DB6 can both be installed on the +# same system at the same time if really necessary. +SECTION = libs +SUMMARY = Berkeley Database v6 +HOMEPAGE = http://www.oracle.com/technology/products/berkeley-db/db/index.html; +LICENSE = AGPL-3.0 +VIRTUAL_NAME ?= virtual/db +RCONFLICTS_${PN} = db3 + +SRC_URI = http://download.oracle.com/berkeley-db/db-${PV}.tar.gz; +SRC_URI += file://arm-thumb-mutex_db5.patch;patchdir=.. \ +file://fix-parallel-build.patch \ + + +SRC_URI[md5sum] = ad28eb86ad3203b5422844db179c585b +SRC_URI[sha256sum] = 608e4b1cf390e9bf54c0ef00c5bd9ca76d36e2261b9f4d33d54516f3f6a20fd2 + +LIC_FILES_CHKSUM = file://../LICENSE;md5=1ec8b0b17cc31513fe35ab10716f8490 + +inherit autotools + +# Put virtual/db in any appropriate provider of a +# relational database, use it as a dependency in +# place of a specific db and use: +# +# PREFERRED_PROVIDER_virtual/db +# +# to select the correct db in the build (distro) .conf +PROVIDES += ${VIRTUAL_NAME} + +# bitbake isn't quite clever enough to deal with sleepycat, +# the distribution sits in the expected directory, but all +# the builds must occur from a sub-directory. The following +# persuades bitbake to go to the right place +S = ${WORKDIR}/db-${PV}/dist +B = ${WORKDIR}/db-${PV}/build_unix + +# The executables go in a separate package - typically there +# is no need to install these unless doing real database +# management on the system. +inherit lib_package + +PACKAGES =+ ${PN}-cxx +FILES_${PN}-cxx = ${libdir}/*cxx*so + + +# The dev package has the .so link (as in db3) and the .a's - +# it is therefore incompatible (cannot be installed at the +# same time) as the db3 package +# sort out the .so
Re: [OE-core] [oe-commits] Valentin Popa : icu: upgrade to 53.1
On Sun, May 11, 2014 at 11:28:16AM +, g...@git.openembedded.org wrote: Module: openembedded-core.git Branch: master Commit: cce150502fada2068ef1ab92b88a08ed0b64d766 URL: http://git.openembedded.org/?p=openembedded-core.gita=commit;h=cce150502fada2068ef1ab92b88a08ed0b64d766 Author: Valentin Popa valentin.p...@intel.com Date: Tue May 6 17:25:04 2014 +0300 icu: upgrade to 53.1 Removed patches: (*) add_buffer_length_check_to_UTF_16_or_32_detector.patch - not needed anymore License is the same. BSD-like copyright inserted for lao-dictionary. Signed-off-by: Valentin Popa valentin.p...@intel.com Signed-off-by: Saul Wold s...@linux.intel.com Someone else seeing ICEs when thumb is enabled since this upgrade? armv5te | /OE/build/shr-core/tmp-eglibc/work/xscalete-oe-linux-gnueabi/icu/53.1-r0/icu/source/common/ubidiwrt.c: In function 'ubidi_writeReordered_53': | /OE/build/shr-core/tmp-eglibc/work/xscalete-oe-linux-gnueabi/icu/53.1-r0/icu/source/common/ubidiwrt.c:643:1: internal compiler error: in patch_jump_insn, at cfgrtl.c:1275 | } | ^ | Please submit a full bug report, | with preprocessed source if appropriate. | See http://gcc.gnu.org/bugs.html for instructions. | *** Failed compilation command follows: -- | arm-oe-linux-gnueabi-gcc -march=armv5te -mthumb -mthumb-interwork -mtune=xscale --sysroot=/OE/build/shr-core/tmp-eglibc/sysroots/spitz -D_REENTRANT -DU_HAVE_ELF_H=1 -DU_HAVE_ATOMIC=1 -I/OE/build/shr-core/tmp-eglibc/work/xscalete-oe-linux-gnueabi/icu/53.1-r0/icu/source/common -DDEFAULT_ICU_PLUGINS=/usr/lib/icu -DU_ATTRIBUTE_DEPRECATED= -DU_COMMON_IMPLEMENTATION -O2 -pipe -g -feliminate-unused-debug-types -std=c99 -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -c -DPIC -fPIC -o ubidiwrt.o /OE/build/shr-core/tmp-eglibc/work/xscalete-oe-linux-gnueabi/icu/53.1-r0/icu/source/common/ubidiwrt.c | --- ( rebuild with make VERBOSE=1 all to show all parameters ) | /OE/build/shr-core/tmp-eglibc/work/xscalete-oe-linux-gnueabi/icu/53.1-r0/icu/source/config/mh-linux:44: recipe for target 'ubidiwrt.o' failed | make[1]: *** [ubidiwrt.o] Error 1 armv4t: ERROR: Function failed: do_compile (log file is located at /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/temp/log.do_compile.21570) ERROR: Logfile of failure stored in: /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/temp/log.do_compile.21570 Log data follows: | DEBUG: SITE files ['endian-little', 'bit-32', 'arm-common', 'common-linux', 'common-glibc', 'arm-linux', 'arm-linux-gnueabi', 'common'] | DEBUG: Executing shell function do_compile | NOTE: make | Note: rebuild with make VERBOSE=1 to show all compiler parameters. | make[0]: Making `all' in `stubdata' | make[1]: Entering directory '/OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/build/stubdata' | make[1]: Nothing to be done for 'all'. | make[1]: Leaving directory '/OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/build/stubdata' | make[0]: Making `all' in `common' | make[1]: Entering directory '/OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/build/common' |arm-oe-linux-gnueabi-gcc... /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/icu/source/common/ubidiwrt.c | /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/icu/source/common/ubidiwrt.c: In function 'ubidi_writeReordered_53': | /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/icu/source/common/ubidiwrt.c:643:1: internal compiler error: in patch_jump_insn, at cfgrtl.c:1275 | } | ^ | Please submit a full bug report, | with preprocessed source if appropriate. | See http://gcc.gnu.org/bugs.html for instructions. | *** Failed compilation command follows: -- | arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb -mthumb-interwork -mtune=arm920t --sysroot=/OE/build/shr-core/tmp-eglibc/sysroots/om-gta02 -D_REENTRANT -DU_HAVE_ELF_H=1 -DU_HAVE_ATOMIC=1 -I/OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/icu/source/common -DDEFAULT_ICU_PLUGINS=/usr/lib/icu -DU_ATTRIBUTE_DEPRECATED= -DU_COMMON_IMPLEMENTATION -O2 -pipe -g -feliminate-unused-debug-types -std=c99 -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -c -DPIC -fPIC -o ubidiwrt.o /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/icu/source/common/ubidiwrt.c | --- ( rebuild with make VERBOSE=1 all to show all parameters ) | /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/icu/source/config/mh-linux:44: recipe for target 'ubidiwrt.o' failed | make[1]: *** [ubidiwrt.o] Error 1 | make[1]: Leaving directory '/OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/build/common' | Makefile:141:
Re: [OE-core] [PATCH] alsa-tools: Disable use of GTK+ when using DirectFB
On 15 July 2014 22:33, Otavio Salvador ota...@ossystems.com.br wrote: -PACKAGECONFIG ??= ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland directfb', 'gtk+', '', d)} +PACKAGECONFIG ??= ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk+', '', d)} PACKAGECONFIG[gtk+] = ,,gtk+ gtk+3, Some tools use GTK+2 and some use GTK+3, so as GTK+ 2 has DirectFB support you could add pkgconfigs for gtk2 and gtk3, and still get some tools when using directfb. Then again, the packageconfig doesn't add any determinism so this is fairly broken anyway. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] alsa-tools: Disable use of GTK+ when using DirectFB
On Wed, Jul 16, 2014 at 12:42 PM, Burton, Ross ross.bur...@intel.com wrote: On 15 July 2014 22:33, Otavio Salvador ota...@ossystems.com.br wrote: -PACKAGECONFIG ??= ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland directfb', 'gtk+', '', d)} +PACKAGECONFIG ??= ${@bb.utils.contains_any('DISTRO_FEATURES', 'x11 wayland', 'gtk+', '', d)} PACKAGECONFIG[gtk+] = ,,gtk+ gtk+3, Some tools use GTK+2 and some use GTK+3, so as GTK+ 2 has DirectFB support you could add pkgconfigs for gtk2 and gtk3, and still get some tools when using directfb. Then again, the packageconfig doesn't add any determinism so this is fairly broken anyway. Yes I know but I don't think it is worth it at this moment. The build is broken now and most users been using X11 so I think it is not a blocker. -- Otavio Salvador O.S. Systems http://www.ossystems.com.brhttp://code.ossystems.com.br Mobile: +55 (53) 9981-7854Mobile: +1 (347) 903-9750 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-commits] Mark Hatle : db: Add version 6.0.30
On 7/16/14, 10:33 AM, Martin Jansa wrote: On Wed, Jul 16, 2014 at 09:07:54AM -0500, Mark Hatle wrote: On 7/16/14, 8:52 AM, Martin Jansa wrote: On Tue, Jul 08, 2014 at 10:20:41AM +, g...@git.openembedded.org wrote: Module: openembedded-core.git Branch: master Commit: 04bb223110da2f92725c341bc3ec0cf26325f675 URL: http://git.openembedded.org/?p=openembedded-core.gita=commit;h=04bb223110da2f92725c341bc3ec0cf26325f675 Author: Mark Hatle mark.ha...@windriver.com Date: Wed Jul 2 19:57:43 2014 -0500 db: Add version 6.0.30 The latest version of RPM5 requires Berkley DB 6.0.20 or newer. The license is now AGPL-3.0 in BDB 6.0. This may not be acceptable to some, so the previous version is retained as an alternative. This is failing on some hosts with: That's odd.. what host OS's and toolchain versions is it failing on? The iostream.h file SHOULD exist in all systems that have C++ development installed. Gentoo, gcc-4.9 and iostream.h exists in usual locations (at least now), rebuilding db manually helped I don't have gentoo anywhere to try to reproduce and figure out what is wrong here. Does the db 5.x still compile properly? (Switching preferred version) Otherwise we'll have to find someone who has access to one of these hosts and can dig in to figure out why the include isn't being found. --Mark | In file included from /OE/build/shr-core/tmp-eglibc/work/xscalete-oe-linux-gnueabi/db/6.0.30-r0/db-6.0.30/lang/cxx/cxx_channel.cpp:13:0: | ./db_cxx.h:59:22: fatal error: iostream.h: No such file or directory | #include iostream.h | ^ Signed-off-by: Mark Hatle mark.ha...@windriver.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- .../db/db/arm-thumb-mutex_db5.patch| 10 ++ meta/recipes-support/db/db_6.0.30.bb | 114 + 2 files changed, 124 insertions(+) diff --git a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch index 40b13de..34e8db8 100644 --- a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch +++ b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch @@ -1,5 +1,15 @@ +Original patch submitted by jbow...@nslu2-linux.org on 2005-11-17: + +db: fix thumb uclibc operation in 4.3.29 + - uclibc thumb builds were using libpthread to implement mutexes, the + - uclibc version seems to be a stub (at least on thumb). This commit + - fixes the ARM/gcc-assembly mutex implementation so that it has thumb + - support and the resultant db4 works (tested on LE Thumb uclibc) + Upstream-Status: Inappropriate [embedded specific] +Author: jbow...@nslu2-linux.org + --- db-5.1.19/src/dbinc/mutex_int.h.orig 2011-01-05 19:21:42.181805366 -0600 +++ db-5.1.19/src/dbinc/mutex_int.h 2011-01-05 19:24:53.141853117 -0600 @@ -474,6 +474,25 @@ diff --git a/meta/recipes-support/db/db_6.0.30.bb b/meta/recipes-support/db/db_6.0.30.bb new file mode 100644 index 000..9fc4a30 --- /dev/null +++ b/meta/recipes-support/db/db_6.0.30.bb @@ -0,0 +1,114 @@ +# Version 6 of the Berkeley DB from Oracle (formerly Sleepycat) +# +# At present this package only installs the DB code +# itself (shared libraries, .a in the dev package), +# documentation and headers. +# +# The headers have the same names as those as v3 +# of the DB, only one version can be used *for dev* +# at once - DB3 and DB6 can both be installed on the +# same system at the same time if really necessary. +SECTION = libs +SUMMARY = Berkeley Database v6 +HOMEPAGE = http://www.oracle.com/technology/products/berkeley-db/db/index.html; +LICENSE = AGPL-3.0 +VIRTUAL_NAME ?= virtual/db +RCONFLICTS_${PN} = db3 + +SRC_URI = http://download.oracle.com/berkeley-db/db-${PV}.tar.gz; +SRC_URI += file://arm-thumb-mutex_db5.patch;patchdir=.. \ +file://fix-parallel-build.patch \ + + +SRC_URI[md5sum] = ad28eb86ad3203b5422844db179c585b +SRC_URI[sha256sum] = 608e4b1cf390e9bf54c0ef00c5bd9ca76d36e2261b9f4d33d54516f3f6a20fd2 + +LIC_FILES_CHKSUM = file://../LICENSE;md5=1ec8b0b17cc31513fe35ab10716f8490 + +inherit autotools + +# Put virtual/db in any appropriate provider of a +# relational database, use it as a dependency in +# place of a specific db and use: +# +# PREFERRED_PROVIDER_virtual/db +# +# to select the correct db in the build (distro) .conf +PROVIDES += ${VIRTUAL_NAME} + +# bitbake isn't quite clever enough to deal with sleepycat, +# the distribution sits in the expected directory, but all +# the builds must occur from a sub-directory. The following +# persuades bitbake to go to the right place +S = ${WORKDIR}/db-${PV}/dist +B = ${WORKDIR}/db-${PV}/build_unix + +# The executables go in a separate package - typically there +# is no need to install these unless doing real database +# management on the system. +inherit lib_package + +PACKAGES =+ ${PN}-cxx +FILES_${PN}-cxx = ${libdir}/*cxx*so + + +# The dev package has the .so link (as in db3) and the .a's -
Re: [OE-core] [PATCH v3] libav: set LICENSE and LICENSE_FLAGS according to PACKAGECONFIG options
On 07/16/2014 02:05 AM, Matthieu CRAPET wrote: However, the libav 'LICENSE' clearly states that it's still the case anyway, but for non-technical reasons. If so, I'll post a v4 patch asap. We also saw a build failure with this patch last night, please see this log file: https://autobuilder.yoctoproject.org/main/builders/nightly-world/builds/164/steps/BuildImages/logs/stdio You can also run generated qemu images with a command like 'runqemu qemux86' Parsing recipes...done. Parsing of 889 .bb files complete (0 cached, 889 parsed). 2154 targets, 166 skipped, 0 masked, 0 errors. NOTE: Resolving any missing task queue dependencies ERROR: Nothing PROVIDES 'lib32-x264' (but virtual:multilib:lib32:/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-world/build/meta/recipes-multimedia/libav/libav_0.8.11.bb DEPENDS on or otherwise requires it) ERROR: lib32-x264 was skipped: because it has a restricted license not whitelisted in LICENSE_FLAGS_WHITELIST ERROR: Nothing PROVIDES 'x264' (but /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-world/build/meta/recipes-multimedia/libav/libav_0.8.11.bb DEPENDS on or otherwise requires it) ERROR: x264 was skipped: because it has a restricted license not whitelisted in LICENSE_FLAGS_WHITELIST ERROR: Nothing RPROVIDES 'lib32-libav' (but virtual:multilib:lib32:/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-world/build/meta/recipes-multimedia/libav/libav_0.8.11.bb RDEPENDS on or otherwise requires it) ERROR: No eligible RPROVIDERs exist for 'lib32-libav' NOTE: Runtime target 'lib32-libav' is unbuildable, removing... Missing or unbuildable dependency chain was: ['lib32-libav'] ERROR: Nothing RPROVIDES 'lib32-libav-dev' (but virtual:multilib:lib32:/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-world/build/meta/recipes-multimedia/libav/libav_0.8.11.bb RDEPENDS on or otherwise requires it) ERROR: No eligible RPROVIDERs exist for 'lib32-libav-dev' NOTE: Runtime target 'lib32-libav-dev' is unbuildable, removing... Missing or unbuildable dependency chain was: ['lib32-libav-dev'] ERROR: Nothing RPROVIDES 'libav' (but /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-world/build/meta/recipes-multimedia/libav/libav_0.8.11.bb RDEPENDS on or otherwise requires it) ERROR: No eligible RPROVIDERs exist for 'libav' NOTE: Runtime target 'libav' is unbuildable, removing... Missing or unbuildable dependency chain was: ['libav'] ERROR: Nothing RPROVIDES 'libav-dev' (but /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-world/build/meta/recipes-multimedia/libav/libav_0.8.11.bb RDEPENDS on or otherwise requires it) ERROR: No eligible RPROVIDERs exist for 'libav-dev' NOTE: Runtime target 'libav-dev' is unbuildable, removing... Missing or unbuildable dependency chain was: ['libav-dev'] Please look into this failure as you work on your next version of the patch. Sau! Regards, M -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 19/19] python: Forcibly disable tk
Avoids the determinism problem shown with the warnings: WARNING: QA Issue: python-tkinter rdepends on libx11 but its not a build dependency? [build-deps] WARNING: QA Issue: python-tkinter rdepends on tcl-lib but its not a build dependency? [build-deps Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- .../python/python/avoid_warning_about_tkinter.patch | 15 ++- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch b/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch index 208c57c..bedc390 100644 --- a/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch +++ b/meta/recipes-devtools/python/python/avoid_warning_about_tkinter.patch @@ -2,17 +2,22 @@ _tkinter module needs tk module along with tcl. tk is not yet integrated in yocto so we skip the check for this module. Avoid a warning by not adding this module to missing variable. +Also simply disable the tk module since its not in DEPENDS. + Upstream-Status: Inappropriate [distribution] Signed-off-by: Andrei Gherzan and...@gherzan.ro -Index: Python-2.7.2/setup.py +Index: Python-2.7.3/setup.py === Python-2.7.2.orig/setup.py 2012-04-05 23:18:38.500136647 +0300 -+++ Python-2.7.2/setup.py 2012-04-05 23:19:35.888134969 +0300 -@@ -1634,8 +1634,10 @@ +--- Python-2.7.3.orig/setup.py 2014-07-07 13:45:15.056233820 + Python-2.7.3/setup.py 2014-07-16 16:06:37.145656284 + +@@ -1639,10 +1639,12 @@ + self.extensions.extend(exts) + # Call the method for detecting whether _tkinter can be compiled - self.detect_tkinter(inc_dirs, lib_dirs) +-self.detect_tkinter(inc_dirs, lib_dirs) ++#self.detect_tkinter(inc_dirs, lib_dirs) -if '_tkinter' not in [e.name for e in self.extensions]: -missing.append('_tkinter') -- 1.9.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] two variations for distro-specific FILESEXTRAPATHS prepending
On Wed, Jul 16, 2014 at 4:26 AM, Robert P. J. Day rpj...@crashcourse.ca wrote: just ran across this in the meta-yocto layer but it's a general OE question -- the psplash_git.bbappend file contains the following distro-conditional line: FILESEXTRAPATHS_prepend_poky := ${THISDIR}/files: and the accompanying files/ directory has, unsurprisingly, a poky-specific splash image file, psplash-poky-img.h. but based on how FILESEXTRAPATHS is processed by incorporating all of the FILESOVERRIDES variations (one of which is the distro name), would it not have been entirely equivalent to have used simply FILESEXTRAPATHS_prepend := ${THISDIR}/files: and placed that splash file in the accompanying directory files/poky/? would these two approaches do the same thing? is there a preferred way? that's the only example of that i've seen in all the layers i've played with. Both would do the same thing, I'm personally of the opinion that the latter would be more consistent with how such things are normally done. -- Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/19] pkgconfig: Drop version from RPROVIDES
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-devtools/pkgconfig/pkgconfig.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/pkgconfig/pkgconfig.inc b/meta/recipes-devtools/pkgconfig/pkgconfig.inc index 62c886f..c4ada80 100644 --- a/meta/recipes-devtools/pkgconfig/pkgconfig.inc +++ b/meta/recipes-devtools/pkgconfig/pkgconfig.inc @@ -35,7 +35,7 @@ FILES_${PN} += ${datadir}/aclocal/pkg.m4 # When using the RPM generated automatic package dependencies, some packages # will end up requiring 'pkgconfig(pkg-config)'. Allow this behavior by # specifying an appropriate provide. -RPROVIDES_${PN} += pkgconfig(pkg-config) (= ${PV}) +RPROVIDES_${PN} += pkgconfig(pkg-config) # Install a pkg-config-native wrapper that will use the native sysroot instead # of the MACHINE sysroot, for using pkg-config when building native tools. -- 1.9.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 17/19] gnutls: Fix floating libidn dependency
Avoids WARNING: QA Issue: gnutls-bin rdepends on libidn but its not a build dependency? [build-deps] Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-support/gnutls/gnutls.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index 8820b0e..d89b764 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc @@ -25,6 +25,7 @@ EXTRA_OECONF=--disable-rpath \ --with-libpthread-prefix=${STAGING_DIR_HOST}${prefix} \ --with-libz-prefix=${STAGING_DIR_HOST}${prefix} \ --disable-guile \ + --disable-crywrap \ --without-p11-kit \ -- 1.9.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/19] python-docutil: Upgrade 0.11 - 0.12
License change is just a date change in the license file, looks like English to German locale change to the date display. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- .../python/{python-docutils_0.11.bb = python-docutils_0.12.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-devtools/python/{python-docutils_0.11.bb = python-docutils_0.12.bb} (60%) diff --git a/meta/recipes-devtools/python/python-docutils_0.11.bb b/meta/recipes-devtools/python/python-docutils_0.12.bb similarity index 60% rename from meta/recipes-devtools/python/python-docutils_0.11.bb rename to meta/recipes-devtools/python/python-docutils_0.12.bb index f5da973..8cda88d 100644 --- a/meta/recipes-devtools/python/python-docutils_0.11.bb +++ b/meta/recipes-devtools/python/python-docutils_0.12.bb @@ -2,13 +2,13 @@ SUMMARY = Text processing system for documentation HOMEPAGE = http://docutils.sourceforge.net; SECTION = devel/python LICENSE = PSF BSD-2-Clause GPLv3 -LIC_FILES_CHKSUM = file://COPYING.txt;md5=da0d261d1db78ab21ce86c79364a4098 +LIC_FILES_CHKSUM = file://COPYING.txt;md5=a722fbdc20347db7b69223594dd54574 DEPENDS = python SRC_URI = ${SOURCEFORGE_MIRROR}/docutils/docutils-${PV}.tar.gz -SRC_URI[md5sum] = 20ac380a18b369824276864d98ec0ad6 -SRC_URI[sha256sum] = 9af4166adf364447289c5c697bb83c52f1d6f57e77849abcccd6a4a18a5e7ec9 +SRC_URI[md5sum] = 4622263b62c5c771c03502afa3157768 +SRC_URI[sha256sum] = c7db717810ab6965f66c8cf0398a98c9d8df982da39b4cd7f162911eb89596fa S = ${WORKDIR}/docutils-${PV} -- 1.9.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 11/19] python-pycurl: Upgrade 7.19.3 - 7.19.3.1
License text just moved within the README.rst (same checksum) Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- .../python/python-pycurl/no-static-link.patch | 24 +++--- ...-pycurl_7.19.3.bb = python-pycurl_7.19.3.1.bb} | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) rename meta/recipes-devtools/python/{python-pycurl_7.19.3.bb = python-pycurl_7.19.3.1.bb} (78%) diff --git a/meta/recipes-devtools/python/python-pycurl/no-static-link.patch b/meta/recipes-devtools/python/python-pycurl/no-static-link.patch index 907380f..c5349ee 100644 --- a/meta/recipes-devtools/python/python-pycurl/no-static-link.patch +++ b/meta/recipes-devtools/python/python-pycurl/no-static-link.patch @@ -2,16 +2,16 @@ Upstream-Status: Pending Signed-off-by: Laurentiu Palcu laurentiu.pa...@intel.com -Index: pycurl-7.19.3/setup.py +Index: pycurl-7.19.3.1/setup.py === pycurl-7.19.3.orig/setup.py2014-01-10 08:04:40.0 +0200 -+++ pycurl-7.19.3/setup.py 2014-02-04 15:09:08.411552887 +0200 -@@ -211,7 +211,7 @@ - # If neither --libs nor --static-libs work, fail. - optbuf = - errtext = '' --for option in [--libs, --static-libs]: -+for option in [--libs]: - p = subprocess.Popen((CURL_CONFIG, option), - stdout=subprocess.PIPE, stderr=subprocess.PIPE) - stdout, stderr = p.communicate() +--- pycurl-7.19.3.1.orig/setup.py 2014-07-16 12:57:24.065346887 + pycurl-7.19.3.1/setup.py 2014-07-16 12:57:53.057347678 + +@@ -147,7 +147,7 @@ + optbuf = '' + sslhintbuf = '' + errtext = '' +-for option in [--libs, --static-libs]: ++for option in [--libs]: + p = subprocess.Popen((CURL_CONFIG, option), + stdout=subprocess.PIPE, stderr=subprocess.PIPE) + stdout, stderr = p.communicate() diff --git a/meta/recipes-devtools/python/python-pycurl_7.19.3.bb b/meta/recipes-devtools/python/python-pycurl_7.19.3.1.bb similarity index 78% rename from meta/recipes-devtools/python/python-pycurl_7.19.3.bb rename to meta/recipes-devtools/python/python-pycurl_7.19.3.1.bb index aee6cdd..02d0ae9 100644 --- a/meta/recipes-devtools/python/python-pycurl_7.19.3.bb +++ b/meta/recipes-devtools/python/python-pycurl_7.19.3.1.bb @@ -2,7 +2,7 @@ SUMMARY = Python bindings for libcurl HOMEPAGE = http://pycurl.sourceforge.net/; SECTION = devel/python LICENSE = LGPLv2.1+ | MIT -LIC_FILES_CHKSUM = file://README.rst;beginline=204;endline=219;md5=57e5ab0c0f964533fc59d93dec5695bb \ +LIC_FILES_CHKSUM = file://README.rst;beginline=148;endline=163;md5=57e5ab0c0f964533fc59d93dec5695bb \ file://COPYING-LGPL;md5=3579a9fd0221d49a237aaa33492f988c \ file://COPYING-MIT;md5=e8200955c773b2a0fd6cea36ea5e87be @@ -15,8 +15,8 @@ SRC_URI = \ file://no-static-link.patch \ -SRC_URI[archive.md5sum] = b9091b7438d3de1552e28862d2971cd1 -SRC_URI[archive.sha256sum] = 05e48835fe445ff327dcd373f49d9970e0b828a07cd4d08a23264507a742d616 +SRC_URI[archive.md5sum] = 6df8fa7fe8b680d93248da1f8d4fcd12 +SRC_URI[archive.sha256sum] = c0d673fe99a9de07239eabe77c798f1b043f60c02afaec1430ceaf59d7501a4f S = ${WORKDIR}/${SRCNAME}-${PV} inherit distutils -- 1.9.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/19] python-scons: Upgrade 2.3.0 - 2.3.2
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- .../{python-scons-native_2.3.0.bb = python-scons-native_2.3.2.bb} | 0 .../python/{python-scons_2.3.0.bb = python-scons_2.3.2.bb} | 6 +++--- 2 files changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-devtools/python/{python-scons-native_2.3.0.bb = python-scons-native_2.3.2.bb} (100%) rename meta/recipes-devtools/python/{python-scons_2.3.0.bb = python-scons_2.3.2.bb} (52%) diff --git a/meta/recipes-devtools/python/python-scons-native_2.3.0.bb b/meta/recipes-devtools/python/python-scons-native_2.3.2.bb similarity index 100% rename from meta/recipes-devtools/python/python-scons-native_2.3.0.bb rename to meta/recipes-devtools/python/python-scons-native_2.3.2.bb diff --git a/meta/recipes-devtools/python/python-scons_2.3.0.bb b/meta/recipes-devtools/python/python-scons_2.3.2.bb similarity index 52% rename from meta/recipes-devtools/python/python-scons_2.3.0.bb rename to meta/recipes-devtools/python/python-scons_2.3.2.bb index eb2735d..fc5b302 100644 --- a/meta/recipes-devtools/python/python-scons_2.3.0.bb +++ b/meta/recipes-devtools/python/python-scons_2.3.2.bb @@ -1,13 +1,13 @@ SUMMARY = Software Construction tool (make/autotools replacement) SECTION = devel/python LICENSE = MIT -LIC_FILES_CHKSUM = file://LICENSE.txt;md5=98e9a1e6029e715255c52032a1eba637 +LIC_FILES_CHKSUM = file://LICENSE.txt;md5=f0ad8a74a10870caa5e08a3e45d719e2 SRCNAME = scons SRC_URI = ${SOURCEFORGE_MIRROR}/scons/scons-${PV}.tar.gz -SRC_URI[md5sum] = 083ce5624d6adcbdaf2526623f456ca9 -SRC_URI[sha256sum] = 944206cf4b2caa94a5886ab4c2c71de1718ed5e9176c18e2b6dbca463b4b +SRC_URI[md5sum] = bbd428da35ec176575a2b0be1f8d7162 +SRC_URI[sha256sum] = f993320c5e9515e6567fcce73df0a7a8808414bf1223c69123d3dcf339a449d4 S = ${WORKDIR}/${SRCNAME}-${PV} -- 1.9.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/19] nasm: Update 2.11.02 - 2.11.05
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-devtools/nasm/{nasm_2.11.02.bb = nasm_2.11.05.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/nasm/{nasm_2.11.02.bb = nasm_2.11.05.bb} (81%) diff --git a/meta/recipes-devtools/nasm/nasm_2.11.02.bb b/meta/recipes-devtools/nasm/nasm_2.11.05.bb similarity index 81% rename from meta/recipes-devtools/nasm/nasm_2.11.02.bb rename to meta/recipes-devtools/nasm/nasm_2.11.05.bb index db84ec5..fbfd585 100644 --- a/meta/recipes-devtools/nasm/nasm_2.11.02.bb +++ b/meta/recipes-devtools/nasm/nasm_2.11.05.bb @@ -6,8 +6,8 @@ COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)' SRC_URI = http://www.nasm.us/pub/nasm/releasebuilds/${PV}/nasm-${PV}.tar.bz2 -SRC_URI[md5sum] = 3bbc8ed83115b8caf7931f35ec3bc5e0 -SRC_URI[sha256sum] = ece26b5ef565f94d19a72756d05965e424d2e5ca55f88b949852da70dd62f0e0 +SRC_URI[md5sum] = f6b1db2858cad82bbb0c8c6f3e2b0fb2 +SRC_URI[sha256sum] = 4a417bcf5cde5d203e228feea3f428a6ff4d700d558e4d79d50a30a695bdfae9 inherit autotools-brokensep -- 1.9.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 09/19] cross-canadian: Fix shlibs directory after recent shlibs changes
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/classes/cross-canadian.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index 25e246d..e536118 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -119,8 +119,8 @@ TARGET_ARCH[vardepsexclude] = TUNE_ARCH # If MLPREFIX is set by multilib code, shlibs # points to the wrong place so force it -SHLIBSDIRS = ${PKGDATA_DIR}/nativesdk-shlibs -SHLIBSWORKDIR = ${PKGDATA_DIR}/nativesdk-shlibs +SHLIBSDIRS = ${PKGDATA_DIR}/nativesdk-shlibs2 +SHLIBSWORKDIR = ${PKGDATA_DIR}/nativesdk-shlibs2 cross_canadian_bindirlinks () { for i in ${CANADIANEXTRAOS} -- 1.9.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 15/19] fontcache: Fix build dependency errors
This addresses warnings like: WARNING: QA Issue: liberation-fonts rdepends on fontconfig-utils but its not a build dependency? [build-deps] since the dependencies were being added at package time and were not visible to bitbake. Also take the opportunity to convert to use PACKAGEFUNCS rather than the horrible populate_packages_append. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/classes/fontcache.bbclass | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/classes/fontcache.bbclass b/meta/classes/fontcache.bbclass index afd3fd2..2bf1e4b 100644 --- a/meta/classes/fontcache.bbclass +++ b/meta/classes/fontcache.bbclass @@ -18,13 +18,16 @@ else fi } -python populate_packages_append() { +python () { font_pkgs = d.getVar('FONT_PACKAGES', True).split() deps = d.getVar(FONT_EXTRA_RDEPENDS, True) for pkg in font_pkgs: if deps: d.appendVar('RDEPENDS_' + pkg, ' '+deps) +} +python add_fontcache_postinsts() { +for pkg in d.getVar('FONT_PACKAGES', True).split(): bb.note(adding fonts postinst and postrm scripts to %s % pkg) postinst = d.getVar('pkg_postinst_%s' % pkg, True) or d.getVar('pkg_postinst', True) if not postinst: @@ -38,3 +41,5 @@ python populate_packages_append() { postrm += d.getVar('fontcache_common', True) d.setVar('pkg_postrm_%s' % pkg, postrm) } + +PACKAGEFUNCS += add_fontcache_postinsts -- 1.9.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/19] Various fixes and package upgrades
The following changes since commit f826b13e4ae2f2f2ffebdf22435452c1a72980d8: libpcap: Avoid libpcap build error when libnl1 is involved (2014-07-16 17:18:25 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core master-next http://cgit.openembedded.org/cgit.cgi/openembedded-core/log/?h=master-next Richard Purdie (19): pkgconfig: Drop version from RPROVIDES python-docutil: Upgrade 0.11 - 0.12 python-scons: Upgrade 2.3.0 - 2.3.2 gdb: Upgrade 7.7 - 7.7.1 mdadm: Upgrade 3.3 - 3.3.1 gccmakedep: Upgrade 1.0.2 - 1.0.3 powertop: Upgrade 2.5 - 2.6.1 nasm: Update 2.11.02 - 2.11.05 cross-canadian: Fix shlibs directory after recent shlibs changes subversion: Upgrade 1.7.7 - 1.8.9 python-pycurl: Upgrade 7.19.3 - 7.19.3.1 libconvert-asn1-perl: Upgrade 0.26 - 0.27 btrfs-tools: Upgrade 3.12 - 3.14.2 neard: Fix typo in patch leading to parallel make race fontcache: Fix build dependency errors libpcap: Fix floating dbus dependency gnutls: Fix floating libidn dependency xserver-xorg: Fix build determinism problem python: Forcibly disable tk meta/classes/cross-canadian.bbclass| 4 +- meta/classes/fontcache.bbclass | 7 +- meta/recipes-connectivity/libpcap/libpcap.inc | 1 + .../neard/neard/parallel-build.patch | 2 +- .../btrfs-tools/allow-relative-path.patch | 58 - .../btrfs-tools/btrfs-tools/nodocs.patch | 22 .../btrfs-tools/btrfs-tools/weak-defaults.patch| 31 - .../btrfs-tools/btrfs-tools_git.bb | 9 +- .../gdb/{gdb-7.7.inc = gdb-7.7.1.inc} | 4 +- ...canadian_7.7.bb = gdb-cross-canadian_7.7.1.bb} | 0 .../gdb/{gdb-cross_7.7.bb = gdb-cross_7.7.1.bb} | 0 .../gdb/{gdb_7.7.bb = gdb_7.7.1.bb} | 0 .../nasm/{nasm_2.11.02.bb = nasm_2.11.05.bb} | 4 +- meta/recipes-devtools/pkgconfig/pkgconfig.inc | 2 +- ...on-docutils_0.11.bb = python-docutils_0.12.bb} | 6 +- .../python/python-pycurl/no-static-link.patch | 24 ++-- ...-pycurl_7.19.3.bb = python-pycurl_7.19.3.1.bb} | 6 +- ...ative_2.3.0.bb = python-scons-native_2.3.2.bb} | 0 ...python-scons_2.3.0.bb = python-scons_2.3.2.bb} | 6 +- .../python/avoid_warning_about_tkinter.patch | 15 ++- .../subversion-1.7.10/allow-updated-neon.patch | 20 .../subversion-1.7.10/fix-install-depends.patch| 48 .../neon.m4-fix-includes-and-cflags.patch | 32 - .../subversion-CVE-2013-4131.patch | 42 --- .../subversion-CVE-2013-4277.patch | 15 --- .../subversion-CVE-2013-4505.patch | 130 - .../subversion-1.8.9/disable_macos.patch | 68 +++ .../libtool2.patch | 0 .../{subversion_1.7.10.bb = subversion_1.8.9.bb} | 15 +-- .../mdadm/{mdadm_3.3.bb = mdadm_3.3.1.bb} | 6 +- ...1-perl_0.26.bb = libconvert-asn1-perl_0.27.bb} | 4 +- .../{gccmakedep_1.0.2.bb = gccmakedep_1.0.3.bb} | 4 +- .../recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 + .../{powertop_2.5.bb = powertop_2.6.1.bb} | 5 +- meta/recipes-support/gnutls/gnutls.inc | 1 + 35 files changed, 157 insertions(+), 435 deletions(-) delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/allow-relative-path.patch create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch rename meta/recipes-devtools/gdb/{gdb-7.7.inc = gdb-7.7.1.inc} (70%) rename meta/recipes-devtools/gdb/{gdb-cross-canadian_7.7.bb = gdb-cross-canadian_7.7.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb-cross_7.7.bb = gdb-cross_7.7.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb_7.7.bb = gdb_7.7.1.bb} (100%) rename meta/recipes-devtools/nasm/{nasm_2.11.02.bb = nasm_2.11.05.bb} (81%) rename meta/recipes-devtools/python/{python-docutils_0.11.bb = python-docutils_0.12.bb} (60%) rename meta/recipes-devtools/python/{python-pycurl_7.19.3.bb = python-pycurl_7.19.3.1.bb} (78%) rename meta/recipes-devtools/python/{python-scons-native_2.3.0.bb = python-scons-native_2.3.2.bb} (100%) rename meta/recipes-devtools/python/{python-scons_2.3.0.bb = python-scons_2.3.2.bb} (52%) delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/allow-updated-neon.patch delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4131.patch delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4277.patch delete mode 100644
[OE-core] [PATCH 14/19] neard: Fix typo in patch leading to parallel make race
The typo left room for a parallel make race for unit/test-snep-read.o, fix it. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-connectivity/neard/neard/parallel-build.patch | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/neard/neard/parallel-build.patch b/meta/recipes-connectivity/neard/neard/parallel-build.patch index 1837ad0..5624749 100644 --- a/meta/recipes-connectivity/neard/neard/parallel-build.patch +++ b/meta/recipes-connectivity/neard/neard/parallel-build.patch @@ -30,7 +30,7 @@ index c51351f..8e58ac1 100644 +$(se_seeld_OBJECTS) \ +$(unit_test_ndef_parse_OBJECTS) \ +$(unit_test_ndef_build_OBJECTS) \ -+$(unit_test_snep-read_OBJECTS) \ ++$(unit_test_snep_read_OBJECTS) \ +$(tools_snep_send_OBJECTS): $(local_headers) include/near/version.h: include/version.h -- 1.9.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 07/19] powertop: Upgrade 2.5 - 2.6.1
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-kernel/powertop/{powertop_2.5.bb = powertop_2.6.1.bb} | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) rename meta/recipes-kernel/powertop/{powertop_2.5.bb = powertop_2.6.1.bb} (85%) diff --git a/meta/recipes-kernel/powertop/powertop_2.5.bb b/meta/recipes-kernel/powertop/powertop_2.6.1.bb similarity index 85% rename from meta/recipes-kernel/powertop/powertop_2.5.bb rename to meta/recipes-kernel/powertop/powertop_2.6.1.bb index 86a7f60..58216c2 100644 --- a/meta/recipes-kernel/powertop/powertop_2.5.bb +++ b/meta/recipes-kernel/powertop/powertop_2.6.1.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e SRC_URI = http://01.org/powertop/sites/default/files/downloads/powertop-${PV}.tar.gz; -SRC_URI[md5sum] = 806bbcbd44fcea1f807c9582fc1f7d3e -SRC_URI[sha256sum] = 8b2c08a555d79e1c428863470c41cb023971d74ba4801d80a05e35adeec23c0b +SRC_URI[md5sum] = 4391e7b0af854ecf722cdf712f24b631 +SRC_URI[sha256sum] = 034cde6d5bb433fe0d29251d5cde5d4c2948abf05fe29ef10966b659331b20e4 inherit autotools gettext pkgconfig @@ -21,6 +21,7 @@ EXTRA_LDFLAGS_libc-uclibc = -lintl do_configure_prepend() { # configure.ac checks for delwin() in ncursesw ncurses so let's drop first one sed -i -e s/ncursesw//g ${S}/configure.ac +mkdir -p ${B}/src/tuning/ } inherit update-alternatives -- 1.9.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 16/19] libpcap: Fix floating dbus dependency
Avoids WARNING: QA Issue: libpcap rdepends on dbus-lib but its not a build dependency? [build-deps] Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-connectivity/libpcap/libpcap.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc index 1a3c0c1..92d6eff 100644 --- a/meta/recipes-connectivity/libpcap/libpcap.inc +++ b/meta/recipes-connectivity/libpcap/libpcap.inc @@ -27,6 +27,7 @@ EXTRA_OECONF = --with-pcap=linux PACKAGECONFIG ??= PACKAGECONFIG[libnl1] = --with-libnl,--without-libnl,libnl1,libnl1 +PACKAGECONFIG[dbus] = --enable-dbus,--disable-dbus,dbus CPPFLAGS_prepend = -I${S} CFLAGS_prepend = -I${S} -- 1.9.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 18/19] xserver-xorg: Fix build determinism problem
We're seeing the warning: WARNING: QA Issue: xserver-xorg rdepends on nettle but its not a build dependency? [build-deps] We list openssl in DEPENDS so we need to specify that as the sha1 provider rather that nettle which is autodetected. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 628da58..dd60884 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -112,6 +112,7 @@ EXTRA_OECONF += --with-fop=no \ --sysconfdir=/etc/X11 \ --localstatedir=/var \ --with-xkb-output=/var/lib/xkb \ + --with-sha1=libcrypto \ ac_cv_file__usr_share_sgml_X11_defs_ent=no \ -- 1.9.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/19] gccmakedep: Upgrade 1.0.2 - 1.0.3
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- .../xorg-util/{gccmakedep_1.0.2.bb = gccmakedep_1.0.3.bb}| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-util/{gccmakedep_1.0.2.bb = gccmakedep_1.0.3.bb} (78%) diff --git a/meta/recipes-graphics/xorg-util/gccmakedep_1.0.2.bb b/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb similarity index 78% rename from meta/recipes-graphics/xorg-util/gccmakedep_1.0.2.bb rename to meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb index 23cef63..ccf2f4b 100644 --- a/meta/recipes-graphics/xorg-util/gccmakedep_1.0.2.bb +++ b/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb @@ -13,5 +13,5 @@ RDEPENDS_${PN} = gcc PR = r3 PE = 1 -SRC_URI[md5sum] = fc49f45251c1336fe1dad5dba1c83fcd -SRC_URI[sha256sum] = fdd3963294e80b27416f902a5c029c033d321f03310d3cafa3afb62b50ddce92 +SRC_URI[md5sum] = 127ddb6131eb4a56fdf6644a63ade788 +SRC_URI[sha256sum] = f9e2e7a590e27f84b6708ab7a81e546399b949bf652fb9b95193e0e543e6a548 \ No newline at end of file -- 1.9.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 13/19] btrfs-tools: Upgrade 3.12 - 3.14.2
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- .../btrfs-tools/allow-relative-path.patch | 58 -- .../btrfs-tools/btrfs-tools/nodocs.patch | 22 .../btrfs-tools/btrfs-tools/weak-defaults.patch| 31 .../btrfs-tools/btrfs-tools_git.bb | 9 ++-- 4 files changed, 25 insertions(+), 95 deletions(-) delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/allow-relative-path.patch create mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch delete mode 100644 meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/allow-relative-path.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/allow-relative-path.patch deleted file mode 100644 index 695973e..000 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/allow-relative-path.patch +++ /dev/null @@ -1,58 +0,0 @@ -From: Gui Hecheng guihc.f...@cn.fujitsu.com - -The bug accurs when exec: - # mkfs.btrfs -r a relative path device - (note: the path should be 'valid' correspond to your `pwd`) -error msg: - $ scandir for a relative path failed: No such file... - -Replace strdup() with realpath() to get the correct scan path. - -Upstream-Status: Backport (pending) - -Reported-by: Saul Wold s...@linux.intel.com -Signed-off-by: Gui Hecheng guihc.f...@cn.fujitsu.com - mkfs.c | 5 ++--- - 1 file changed, 2 insertions(+), 3 deletions(-) - -diff --git a/mkfs.c b/mkfs.c -index 2dc90c2..1bd3069 100644 a/mkfs.c -+++ b/mkfs.c -@@ -756,6 +756,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans, - ino_t parent_inum, cur_inum; - ino_t highest_inum = 0; - char *parent_dir_name; -+ char real_path[PATH_MAX]; - struct btrfs_path path; - struct extent_buffer *leaf; - struct btrfs_key root_dir_key; -@@ -764,7 +765,7 @@ static int traverse_directory(struct btrfs_trans_handle *trans, - /* Add list for source directory */ - dir_entry = malloc(sizeof(struct directory_name_entry)); - dir_entry-dir_name = dir_name; -- dir_entry-path = strdup(dir_name); -+ dir_entry-path = realpath(dir_name, real_path); - - parent_inum = highest_inum + BTRFS_FIRST_FREE_OBJECTID; - dir_entry-inum = parent_inum; -@@ -876,7 +877,6 @@ static int traverse_directory(struct btrfs_trans_handle *trans, - } - - free_namelist(files, count); -- free(parent_dir_entry-path); - free(parent_dir_entry); - - index_cnt = 2; -@@ -887,7 +887,6 @@ static int traverse_directory(struct btrfs_trans_handle *trans, - fail: - free_namelist(files, count); - fail_no_files: -- free(parent_dir_entry-path); - free(parent_dir_entry); - return -1; - } --- -1.8.1.4 - diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch new file mode 100644 index 000..6df4e10 --- /dev/null +++ b/meta/recipes-devtools/btrfs-tools/btrfs-tools/nodocs.patch @@ -0,0 +1,22 @@ +Doc generation requires xmlto and ascidoc which we don't have right now. +Disable doc generation until such times as we have the right dependencies. + +RP 2014/7/16 + +Upstream-Status: Inappropriate + +Index: git/Makefile +=== +--- git.orig/Makefile 2014-07-16 13:21:43.289386655 + git/Makefile 2014-07-16 13:42:46.453421079 + +@@ -57,8 +57,8 @@ + btrfs_fragment_libs = -lgd -lpng -ljpeg -lfreetype + + SUBDIRS = +-BUILDDIRS = $(patsubst %,build-%,$(SUBDIRS)) build-Documentation +-INSTALLDIRS = $(patsubst %,install-%,$(SUBDIRS)) install-Documentation ++BUILDDIRS = $(patsubst %,build-%,$(SUBDIRS)) ++INSTALLDIRS = $(patsubst %,install-%,$(SUBDIRS)) + CLEANDIRS = $(patsubst %,clean-%,$(SUBDIRS)) + + .PHONY: $(SUBDIRS) diff --git a/meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch b/meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch deleted file mode 100644 index 9ca9fca..000 --- a/meta/recipes-devtools/btrfs-tools/btrfs-tools/weak-defaults.patch +++ /dev/null @@ -1,31 +0,0 @@ -Upstream-Status: Pending - -Allow mandir to be set from the environment, fixing the following packaging warnings: - -WARNING: For recipe btrfs-tools, the following files were installed but not shipped in any package: -WARNING: /usr/man/man8/btrfs-show.8.gz -WARNING: /usr/man/man8/btrfs-image.8.gz -WARNING: /usr/man/man8/btrfsctl.8.gz -WARNING: /usr/man/man8/btrfs.8.gz -WARNING: /usr/man/man8/btrfsck.8.gz -WARNING: /usr/man/man8/mkfs.btrfs.8.gz - -RP - 5/7/2011 - -Index: git/man/Makefile -=== git.orig/man/Makefile 2011-07-05 22:03:58.949919067 +0100 -+++ git/man/Makefile 2011-07-05 22:04:07.789919856 +0100 -@@ -2,9
[OE-core] [PATCH 12/19] libconvert-asn1-perl: Upgrade 0.26 - 0.27
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- .../{libconvert-asn1-perl_0.26.bb = libconvert-asn1-perl_0.27.bb}| 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-extended/perl/{libconvert-asn1-perl_0.26.bb = libconvert-asn1-perl_0.27.bb} (76%) diff --git a/meta/recipes-extended/perl/libconvert-asn1-perl_0.26.bb b/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb similarity index 76% rename from meta/recipes-extended/perl/libconvert-asn1-perl_0.26.bb rename to meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb index 9c2c9d5..ebe0422 100644 --- a/meta/recipes-extended/perl/libconvert-asn1-perl_0.26.bb +++ b/meta/recipes-extended/perl/libconvert-asn1-perl_0.27.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = file://README.md;beginline=91;endline=97;md5=ceff7fd286eb6d8 SRC_URI = http://search.cpan.org/CPAN/authors/id/G/GB/GBARR/Convert-ASN1-${PV}.tar.gz; -SRC_URI[md5sum] = 1c846c8c1125e6a075444abe65d99b63 -SRC_URI[sha256sum] = 5db8b62fa0d036bd0cabc869ffe17941ad587d9a2af1ff030d554872adbc1ca1 +SRC_URI[md5sum] = 68723e96be0b258a9e20480276e8a62c +SRC_URI[sha256sum] = 74a4a78ae0c5e973100ac0a8f203a110f76fb047b79dae4fc1fd7d6814d3d58a S = ${WORKDIR}/Convert-ASN1-${PV} -- 1.9.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe] [PATCH 7/7] autoconf: remove automake patch enforcing --foreign
On Tue, Jul 15, 2014 at 2:51 PM, Burton, Ross ross.bur...@intel.com wrote: On 15 July 2014 21:14, Khem Raj raj.k...@gmail.com wrote: can it be somehow made such that it can be passed via option flags so we dont have to patch the packages not using above automake macro Packages that don't use the right automake macro are generally very old and we're already carrying patches to fix the autoconf/automake files, so I'm not sure this is actually worth it. I'm trying to drop the patches we're carrying against core build tools, not increase it. :) While I understand that, I am also worried about breakage/work it will cause for layers additional to OE-Core thats why providing a least impact migration path is desirable. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] grub-core: fix endianness problem
On 07/15/2014 11:15 PM, Shan Hai wrote: Fix tftp stalls on loading files bigger than ~32k bug by cherry picking a patch from grub upstream. Upstream-Status: Backport Signed-off-by: Shan Hai shan@windriver.com --- .../grub/grub-2.00/fix-endianness-problem.patch| 46 ++ meta/recipes-bsp/grub/grub_2.00.bb | 1 + 2 files changed, 47 insertions(+) create mode 100644 meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch diff --git a/meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch b/meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch new file mode 100644 index 000..bb5ba9b --- /dev/null +++ b/meta/recipes-bsp/grub/grub-2.00/fix-endianness-problem.patch @@ -0,0 +1,46 @@ +grub-core/net/tftp.c: fix endianness problem. + + * grub-core/net/tftp.c (ack): Fix endianness problem. + (tftp_receive): Likewise. + Reported by: Michael Davidsaver. + +Upstream-Status: Submitted [grub-de...@gnu.org] + Is this patch a backport from the upstream or submitted only on the mailing list? Sau! +Signed-off-by: Vladimir 'phcoder' Serbinenko phco...@gmail.com + +diff --git a/ChangeLog b/ChangeLog +index 81bdae9..c2f42d5 100644 +--- a/ChangeLog b/ChangeLog +@@ -1,3 +1,9 @@ ++2012-07-02 Vladimir Serbinenko phco...@gmail.com ++ ++ * grub-core/net/tftp.c (ack): Fix endianness problem. ++ (tftp_receive): Likewise. ++ Reported by: Michael Davidsaver. ++ + 2012-06-27 Vladimir Serbinenko phco...@gmail.com + + * configure.ac: Bump version to 2.00. +diff --git a/grub-core/net/tftp.c b/grub-core/net/tftp.c +index 9c70efb..d0f39ea 100644 +--- a/grub-core/net/tftp.c b/grub-core/net/tftp.c +@@ -143,7 +143,7 @@ ack (tftp_data_t data, grub_uint16_t block) + + tftph_ack = (struct tftphdr *) nb_ack.data; + tftph_ack-opcode = grub_cpu_to_be16 (TFTP_ACK); +- tftph_ack-u.ack.block = block; ++ tftph_ack-u.ack.block = grub_cpu_to_be16 (block); + + err = grub_net_send_udp_packet (data-sock, nb_ack); + if (err) +@@ -225,7 +225,7 @@ tftp_receive (grub_net_udp_socket_t sock __attribute__ ((unused)), + grub_priority_queue_pop (data-pq); + + if (file-device-net-packs.count 50) +-err = ack (data, tftph-u.data.block); ++err = ack (data, data-block + 1); + else + { + file-device-net-stall = 1; diff --git a/meta/recipes-bsp/grub/grub_2.00.bb b/meta/recipes-bsp/grub/grub_2.00.bb index 72ed402..36c648e 100644 --- a/meta/recipes-bsp/grub/grub_2.00.bb +++ b/meta/recipes-bsp/grub/grub_2.00.bb @@ -22,6 +22,7 @@ SRC_URI = ftp://ftp.gnu.org/gnu/grub/grub-${PV}.tar.gz \ file://check-if-liblzma-is-disabled.patch \ file://fix-issue-with-flex-2.5.37.patch \ file://grub-2.00-add-oe-kernel.patch \ + file://fix-endianness-problem.patch \ SRC_URI[md5sum] = e927540b6eda8b024fb0391eeaa4091c -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V4 0/1] shadow: upgrade from 4.1.4.3 to 4.2.1
On 07/14/2014 11:27 PM, Chen Qi wrote: Test Case: Fire a clean build for core-image-sato with the following lines in local.conf: INHERIT += extrausers EXTRA_USERS_PARAMS = usermod -P 'root' root; \ useradd -P 'test' --create-home test; \ groupadd -g 1314 no-zuo-no-die; There seems to be a failure with PAM enabled. We see this failure with the sanity tests enabled. We enable pam via DISTRO_FEATURES_append = pam and the sanity tests as follows: INHERIT += testimage TEST_SUITES_append = pam bitbake core-image-sato and then bitbake core-image-sato -c testimage | == | FAIL: test_pam (oeqa.runtime.pam.PamBasicTest) | -- | Traceback (most recent call last): | File /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-pam/build/meta/lib/oeqa/utils/decorators.py, line 50, in wrapped_f | return f(*args) | File /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-qa-pam/build/meta/lib/oeqa/runtime/pam.py, line 20, in test_pam | self.assertEqual(status, 6, msg = passwd command does not work as expected. Status and output:%s and %s %(status, output)) | AssertionError: 0 != 6 : passwd command does not work as expected. Status and output:0 and Usage: passwd [options] [LOGIN] | | Options: | -a, --all report password status on all accounts | -d, --delete delete the password for the named account | -e, --expire force expire the password for the named account | -h, --helpdisplay this help message and exit | -k, --keep-tokens change password only if expired | -i, --inactive INACTIVE set password inactive after expiration | to INACTIVE | -l, --locklock the password of the named account | -n, --mindays MIN_DAYSset minimum number of days before password | change to MIN_DAYS | -q, --quiet quiet mode | -r, --repository REPOSITORY change password in REPOSITORY repository | -R, --root CHROOT_DIR directory to chroot into | -S, --status report password status on the named account | -u, --unlock unlock the password of the named account | -w, --warndays WARN_DAYS set expiration warning days to WARN_DAYS | -x, --maxdays MAX_DAYSset maximum number of days before password | change to MAX_DAYS The following changes since commit fa325e44f5b429b4038022b31285af9c94672943: insane: Ensure do_package_qa happens after do_packagedata (2014-07-11 23:19:18 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib ChenQi/shadow-4.2.1 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/shadow-4.2.1 Chen Qi (1): shadow: upgrade from 4.1.4.3 to 4.2.1 ...-create-parent-directories-when-necessary.patch | 109 ++ .../shadow/files/add_root_cmd_groupmems.patch | 75 -- .../shadow/files/add_root_cmd_options.patch| 1384 .../allow-for-setting-password-in-clear-text.patch | 215 ++- ...fix-unexpected-open-failure-in-chroot-env.patch | 46 + .../shadow/files/fix-etc-gshadow-reading.patch | 36 - ...installation-failure-with-subids-disabled.patch | 28 + .../shadow-4.1.4.2-env-reset-keep-locale.patch | 31 - .../files/shadow-4.1.4.2-groupmod-pam-check.patch | 36 - .../files/shadow-4.1.4.2-su_no_sanitize_env.patch | 31 - .../shadow/files/shadow.automake-1.11.patch| 106 -- .../files/shadow_fix_for_automake-1.12.patch | 23 - .../files/slackware_fix_for_glib-2.17_crypt.patch | 63 - meta/recipes-extended/shadow/files/useradd.patch | 17 - ...-compilation-failure-with-subids-disabled.patch | 33 + ...uretty_4.1.4.3.bb = shadow-securetty_4.2.1.bb} |0 ...-sysroot_4.1.4.3.bb = shadow-sysroot_4.2.1.bb} |0 meta/recipes-extended/shadow/shadow.inc| 36 +- .../shadow/{shadow_4.1.4.3.bb = shadow_4.2.1.bb} |0 19 files changed, 333 insertions(+), 1936 deletions(-) create mode 100644 meta/recipes-extended/shadow/files/0001-useradd.c-create-parent-directories-when-necessary.patch delete mode 100644 meta/recipes-extended/shadow/files/add_root_cmd_groupmems.patch delete mode 100644 meta/recipes-extended/shadow/files/add_root_cmd_options.patch create mode 100644 meta/recipes-extended/shadow/files/commonio.c-fix-unexpected-open-failure-in-chroot-env.patch delete mode 100644 meta/recipes-extended/shadow/files/fix-etc-gshadow-reading.patch create mode 100644 meta/recipes-extended/shadow/files/fix-installation-failure-with-subids-disabled.patch delete mode 100644
[OE-core] [PATCH 10/19] subversion: Upgrade 1.7.7 - 1.8.9
Dropped neon patches as neon support was dropped. Dropped CVE patches as applied in later version Added patch to avoid OS-X check which doesn't cross compile Add PACKAGECONFIG for gnome-keyring Addition to license: For the file subversion/libsvn_subr/utf_width.c * Markus Kuhn -- 2007-05-26 (Unicode 5.0) * * Permission to use, copy, modify, and distribute this software * for any purpose and without fee is hereby granted. The author * disclaims all warranties with regard to this software. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- .../subversion-1.7.10/allow-updated-neon.patch | 20 .../subversion-1.7.10/fix-install-depends.patch| 48 .../neon.m4-fix-includes-and-cflags.patch | 32 - .../subversion-CVE-2013-4131.patch | 42 --- .../subversion-CVE-2013-4277.patch | 15 --- .../subversion-CVE-2013-4505.patch | 130 - .../subversion-1.8.9/disable_macos.patch | 68 +++ .../libtool2.patch | 0 .../{subversion_1.7.10.bb = subversion_1.8.9.bb} | 15 +-- 9 files changed, 74 insertions(+), 296 deletions(-) delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/allow-updated-neon.patch delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/neon.m4-fix-includes-and-cflags.patch delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4131.patch delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4277.patch delete mode 100644 meta/recipes-devtools/subversion/subversion-1.7.10/subversion-CVE-2013-4505.patch create mode 100644 meta/recipes-devtools/subversion/subversion-1.8.9/disable_macos.patch rename meta/recipes-devtools/subversion/{subversion-1.7.10 = subversion-1.8.9}/libtool2.patch (100%) rename meta/recipes-devtools/subversion/{subversion_1.7.10.bb = subversion_1.8.9.bb} (67%) diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/allow-updated-neon.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/allow-updated-neon.patch deleted file mode 100644 index e8acb12..000 --- a/meta/recipes-devtools/subversion/subversion-1.7.10/allow-updated-neon.patch +++ /dev/null @@ -1,20 +0,0 @@ - -Allow neon 0.30 to be usable also - -Upstream-Status: Pending - -Signed-off-by: Saul Wold s...@linux.intel.com - -Index: subversion-1.7.10/configure.ac -=== subversion-1.7.10.orig/configure.ac -+++ subversion-1.7.10/configure.ac -@@ -118,7 +118,7 @@ AC_PATH_PROG(PKG_CONFIG, pkg-config) - - # Either a space-separated list of allowable Neon versions, or any to - # mean allow anything. --NEON_ALLOWED_LIST=0\.25 0\.26 0\.27\.2 0\.28 0\.29 -+NEON_ALLOWED_LIST=0\.25 0\.26 0\.27\.2 0\.28 0\.29 0\.30 - NEON_RECOMMENDED_VER=0.29.6 - NEON_URL=http://www.webdav.org/neon/neon-${NEON_RECOMMENDED_VER}.tar.gz; - dnl You can skip the neon version check only if you know what you are doing diff --git a/meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch b/meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch deleted file mode 100644 index fb79b8c..000 --- a/meta/recipes-devtools/subversion/subversion-1.7.10/fix-install-depends.patch +++ /dev/null @@ -1,48 +0,0 @@ -install-neon-lib should depend on libsvn_delta's installation - -install-neon-lib needs libsvn_delta-1.la which will be regenerated -during libsvn_delta-1.la's installation, if libsvn_delta-1.la is -in regenerating and at the same time install-neon-lib links it, the -error willl happen. - -Let install-neon-lib run after libsvn_delta-1.la is installed will fix -the problem. - -Upstream-Status: Pending - -Signed-off-by: Robert Yang liezhi.y...@windriver.com - build-outputs.mk |2 +- - build.conf |2 ++ - 2 files changed, 3 insertions(+), 1 deletion(-) - subversion-1.7.6.orig/build-outputs.mk -+++ subversion-1.7.6/build-outputs.mk -@@ -983,11 +983,11 @@ install-locale: subversion/po/de.mo subv - $(MKDIR) $(DESTDIR)$(localedir)/zh_CN/LC_MESSAGES - cd subversion/po ; $(INSTALL_LOCALE) zh_CN.mo $(DESTDIR)$(localedir)/zh_CN/LC_MESSAGES/$(PACKAGE_NAME).mo - $(MKDIR) $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES - cd subversion/po ; $(INSTALL_LOCALE) zh_TW.mo $(DESTDIR)$(localedir)/zh_TW/LC_MESSAGES/$(PACKAGE_NAME).mo - --install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la -+install-neon-lib: subversion/libsvn_ra_neon/libsvn_ra_neon-1.la $(SVN_FS_LIB_INSTALL_DEPS) - $(MKDIR) $(DESTDIR)$(neon_libdir) - cd subversion/libsvn_ra_neon ; $(INSTALL_NEON_LIB) libsvn_ra_neon-1.la $(DESTDIR)$(neon_libdir)/libsvn_ra_neon-1.la - - install-ramod-lib: subversion/libsvn_fs/libsvn_fs-1.la
[OE-core] [PATCH 05/19] mdadm: Upgrade 3.3 - 3.3.1
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-extended/mdadm/{mdadm_3.3.bb = mdadm_3.3.1.bb} | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) rename meta/recipes-extended/mdadm/{mdadm_3.3.bb = mdadm_3.3.1.bb} (90%) diff --git a/meta/recipes-extended/mdadm/mdadm_3.3.bb b/meta/recipes-extended/mdadm/mdadm_3.3.1.bb similarity index 90% rename from meta/recipes-extended/mdadm/mdadm_3.3.bb rename to meta/recipes-extended/mdadm/mdadm_3.3.1.bb index 40d68d6..59bc587 100644 --- a/meta/recipes-extended/mdadm/mdadm_3.3.bb +++ b/meta/recipes-extended/mdadm/mdadm_3.3.1.bb @@ -8,13 +8,13 @@ LIC_FILES_CHKSUM = file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://mdadm.h;beglinlne=4;endline=22;md5=462bc9936ac0d3da110191a3f9994161 -SRC_URI = ${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.bz2 \ +SRC_URI = ${KERNELORG_MIRROR}/linux/utils/raid/mdadm/${BPN}-${PV}.tar.xz \ file://mdadm-3.2.2_fix_for_x32.patch \ file://gcc-4.9.patch \ -SRC_URI[md5sum] = 8ac04259cdd74b4566c3b6dea9414b57 -SRC_URI[sha256sum] = 9c07e518bdf3392ebac8874eb686258e10ea3ae0ff7a8acb6d014718a9c3ed45 +SRC_URI[md5sum] = 4227d48de62dfb217c92fa0c54171bbe +SRC_URI[sha256sum] = d8c74112cfd77bdc1dbc1291fe8d9243c76d91bfa276fcb95f2a75ca7717ab02 CFLAGS += -fno-strict-aliasing -- 1.9.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/19] gdb: Upgrade 7.7 - 7.7.1
Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- meta/recipes-devtools/gdb/{gdb-7.7.inc = gdb-7.7.1.inc} | 4 ++-- .../gdb/{gdb-cross-canadian_7.7.bb = gdb-cross-canadian_7.7.1.bb}| 0 meta/recipes-devtools/gdb/{gdb-cross_7.7.bb = gdb-cross_7.7.1.bb}| 0 meta/recipes-devtools/gdb/{gdb_7.7.bb = gdb_7.7.1.bb}| 0 4 files changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-devtools/gdb/{gdb-7.7.inc = gdb-7.7.1.inc} (70%) rename meta/recipes-devtools/gdb/{gdb-cross-canadian_7.7.bb = gdb-cross-canadian_7.7.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb-cross_7.7.bb = gdb-cross_7.7.1.bb} (100%) rename meta/recipes-devtools/gdb/{gdb_7.7.bb = gdb_7.7.1.bb} (100%) diff --git a/meta/recipes-devtools/gdb/gdb-7.7.inc b/meta/recipes-devtools/gdb/gdb-7.7.1.inc similarity index 70% rename from meta/recipes-devtools/gdb/gdb-7.7.inc rename to meta/recipes-devtools/gdb/gdb-7.7.1.inc index 62adcaa..aa16d5a 100644 --- a/meta/recipes-devtools/gdb/gdb-7.7.inc +++ b/meta/recipes-devtools/gdb/gdb-7.7.1.inc @@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ S = ${WORKDIR}/${BPN}-${PV} -SRC_URI[md5sum] = 40051ff95b39bd57b14b1809e2c16152 -SRC_URI[sha256sum] = 8814d98c2733639cb602b6ecd8d69e02498017e02b5724c9451c285b0e9ee173 +SRC_URI[md5sum] = 45b07b53d81832d32ccd4829465d4886 +SRC_URI[sha256sum] = eefadb9831e3695d1eaef34e98b8f1fb441df6fe5071317ea49c6bd6ba213eff diff --git a/meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.bb b/meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.bb rename to meta/recipes-devtools/gdb/gdb-cross-canadian_7.7.1.bb diff --git a/meta/recipes-devtools/gdb/gdb-cross_7.7.bb b/meta/recipes-devtools/gdb/gdb-cross_7.7.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb-cross_7.7.bb rename to meta/recipes-devtools/gdb/gdb-cross_7.7.1.bb diff --git a/meta/recipes-devtools/gdb/gdb_7.7.bb b/meta/recipes-devtools/gdb/gdb_7.7.1.bb similarity index 100% rename from meta/recipes-devtools/gdb/gdb_7.7.bb rename to meta/recipes-devtools/gdb/gdb_7.7.1.bb -- 1.9.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [RFC][PATCH] icu: force arm mode
* otherwise it triggers following ICE: ERROR: Function failed: do_compile (log file is located at /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/temp/log.do_compile.21570) ERROR: Logfile of failure stored in: /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/temp/log.do_compile.21570 Log data follows: | DEBUG: SITE files ['endian-little', 'bit-32', 'arm-common', 'common-linux', 'common-glibc', 'arm-linux', 'arm-linux-gnueabi', 'common'] | DEBUG: Executing shell function do_compile | NOTE: make | Note: rebuild with make VERBOSE=1 to show all compiler parameters. | make[0]: Making `all' in `stubdata' | make[1]: Entering directory '/OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/build/stubdata' | make[1]: Nothing to be done for 'all'. | make[1]: Leaving directory '/OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/build/stubdata' | make[0]: Making `all' in `common' | make[1]: Entering directory '/OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/build/common' |arm-oe-linux-gnueabi-gcc... /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/icu/source/common/ubidiwrt.c | /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/icu/source/common/ubidiwrt.c: In function 'ubidi_writeReordered_53': | /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/icu/source/common/ubidiwrt.c:643:1: internal compiler error: in patch_jump_insn, at cfgrtl.c:1275 | } | ^ | Please submit a full bug report, | with preprocessed source if appropriate. | See http://gcc.gnu.org/bugs.html for instructions. | *** Failed compilation command follows: -- | arm-oe-linux-gnueabi-gcc -march=armv4t -mthumb -mthumb-interwork -mtune=arm920t --sysroot=/OE/build/shr-core/tmp-eglibc/sysroots/om-gta02 -D_REENTRANT -DU_HAVE_ELF_H=1 -DU_HAVE_ATOMIC=1 -I/OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/icu/source/common -DDEFAULT_ICU_PLUGINS=/usr/lib/icu -DU_ATTRIBUTE_DEPRECATED= -DU_COMMON_IMPLEMENTATION -O2 -pipe -g -feliminate-unused-debug-types -std=c99 -Wall -pedantic -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -c -DPIC -fPIC -o ubidiwrt.o /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/icu/source/common/ubidiwrt.c | --- ( rebuild with make VERBOSE=1 all to show all parameters ) | /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/icu/source/config/mh-linux:44: recipe for target 'ubidiwrt.o' failed | make[1]: *** [ubidiwrt.o] Error 1 | make[1]: Leaving directory '/OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/build/common' | Makefile:141: recipe for target 'all-recursive' failed | make: *** [all-recursive] Error 2 | ERROR: oe_runmake failed | WARNING: /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/temp/run.do_compile.21570:1 exit 1 from | exit 1 | ERROR: Function failed: do_compile (log file is located at /OE/build/shr-core/tmp-eglibc/work/arm920tt-oe-linux-gnueabi/icu/53.1-r0/temp/log.do_compile.21570) NOTE: recipe icu-53.1-r0: task do_compile: Failed ERROR: Task 6803 (/OE/build/shr-core/openembedded-core/meta/recipes-support/icu/icu_53.1.bb, do_compile) failed with exit code '1' Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-support/icu/icu_53.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/icu/icu_53.1.bb b/meta/recipes-support/icu/icu_53.1.bb index d93af68..82c8d8c 100644 --- a/meta/recipes-support/icu/icu_53.1.bb +++ b/meta/recipes-support/icu/icu_53.1.bb @@ -8,6 +8,8 @@ def icu_download_version(d): ICU_PV = ${@icu_download_version(d)} +ARM_INSTRUCTION_SET = arm + BASE_SRC_URI = http://download.icu-project.org/files/icu4c/${PV}/icu4c-${ICU_PV}-src.tgz; SRC_URI = ${BASE_SRC_URI} \ file://icu-pkgdata-large-cmd.patch \ -- 2.0.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH] [v2] nettle: update to version 3.0
On 07/15/2014 08:34 AM, akuster wrote: On 07/15/2014 08:24 AM, Burton, Ross wrote: On 15 July 2014 16:13, Armin Kuster akus...@mvista.com wrote: +LICENSE = LGPLv2.1 GPLv2 GPLv3 The manual says: Nettle is dual licenced under the GNU General Public License version 2 or later, and the GNU Lesser General Public License version 3 or later. When using Nettle, you must comply fully with all conditions of at least one of these licenses. So I think you mean LICENSE=GPLv2+ | LGPLv3+ I'm undecided whether this means we can drop the old Nettle or not... Ok. I will wait for the dust to settle before I submit patch v3. So I checked on this and it would be an or ('|'). The only other concern I have is there is a COPYING.GPLv3, you might want to check with the upstream what the intent of having that License file is for, do they intend on some parts being v3 and if so which parts? I am not sure if the INCOMPATIBLE_LICENSE will handle the OR properly, but we should just have one version. Sau! - Armin Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe-commits] Mark Hatle : db: Add version 6.0.30
On Wed, Jul 16, 2014 at 11:25:27AM -0500, Mark Hatle wrote: On 7/16/14, 10:33 AM, Martin Jansa wrote: On Wed, Jul 16, 2014 at 09:07:54AM -0500, Mark Hatle wrote: On 7/16/14, 8:52 AM, Martin Jansa wrote: On Tue, Jul 08, 2014 at 10:20:41AM +, g...@git.openembedded.org wrote: Module: openembedded-core.git Branch: master Commit: 04bb223110da2f92725c341bc3ec0cf26325f675 URL: http://git.openembedded.org/?p=openembedded-core.gita=commit;h=04bb223110da2f92725c341bc3ec0cf26325f675 Author: Mark Hatle mark.ha...@windriver.com Date: Wed Jul 2 19:57:43 2014 -0500 db: Add version 6.0.30 The latest version of RPM5 requires Berkley DB 6.0.20 or newer. The license is now AGPL-3.0 in BDB 6.0. This may not be acceptable to some, so the previous version is retained as an alternative. This is failing on some hosts with: That's odd.. what host OS's and toolchain versions is it failing on? The iostream.h file SHOULD exist in all systems that have C++ development installed. Gentoo, gcc-4.9 and iostream.h exists in usual locations (at least now), rebuilding db manually helped I don't have gentoo anywhere to try to reproduce and figure out what is wrong here. Does the db 5.x still compile properly? (Switching preferred version) Otherwise we'll have to find someone who has access to one of these hosts and can dig in to figure out why the include isn't being found. You can easily download small Gentoo chroot: http://git.shr-project.org/git/?p=shr-chroot.git but it probably isn't worth your time, it was only temporary (after cleansstate it worked fine) - so maybe it isn't even host distro specific. Feel free to ignored it if other people don't start reporting the same. Cheers, | In file included from /OE/build/shr-core/tmp-eglibc/work/xscalete-oe-linux-gnueabi/db/6.0.30-r0/db-6.0.30/lang/cxx/cxx_channel.cpp:13:0: | ./db_cxx.h:59:22: fatal error: iostream.h: No such file or directory | #include iostream.h | ^ Signed-off-by: Mark Hatle mark.ha...@windriver.com Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org --- .../db/db/arm-thumb-mutex_db5.patch| 10 ++ meta/recipes-support/db/db_6.0.30.bb | 114 + 2 files changed, 124 insertions(+) diff --git a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch index 40b13de..34e8db8 100644 --- a/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch +++ b/meta/recipes-support/db/db/arm-thumb-mutex_db5.patch @@ -1,5 +1,15 @@ +Original patch submitted by jbow...@nslu2-linux.org on 2005-11-17: + +db: fix thumb uclibc operation in 4.3.29 + - uclibc thumb builds were using libpthread to implement mutexes, the + - uclibc version seems to be a stub (at least on thumb). This commit + - fixes the ARM/gcc-assembly mutex implementation so that it has thumb + - support and the resultant db4 works (tested on LE Thumb uclibc) + Upstream-Status: Inappropriate [embedded specific] +Author: jbow...@nslu2-linux.org + --- db-5.1.19/src/dbinc/mutex_int.h.orig 2011-01-05 19:21:42.181805366 -0600 +++ db-5.1.19/src/dbinc/mutex_int.h 2011-01-05 19:24:53.141853117 -0600 @@ -474,6 +474,25 @@ diff --git a/meta/recipes-support/db/db_6.0.30.bb b/meta/recipes-support/db/db_6.0.30.bb new file mode 100644 index 000..9fc4a30 --- /dev/null +++ b/meta/recipes-support/db/db_6.0.30.bb @@ -0,0 +1,114 @@ +# Version 6 of the Berkeley DB from Oracle (formerly Sleepycat) +# +# At present this package only installs the DB code +# itself (shared libraries, .a in the dev package), +# documentation and headers. +# +# The headers have the same names as those as v3 +# of the DB, only one version can be used *for dev* +# at once - DB3 and DB6 can both be installed on the +# same system at the same time if really necessary. +SECTION = libs +SUMMARY = Berkeley Database v6 +HOMEPAGE = http://www.oracle.com/technology/products/berkeley-db/db/index.html; +LICENSE = AGPL-3.0 +VIRTUAL_NAME ?= virtual/db +RCONFLICTS_${PN} = db3 + +SRC_URI = http://download.oracle.com/berkeley-db/db-${PV}.tar.gz; +SRC_URI += file://arm-thumb-mutex_db5.patch;patchdir=.. \ +file://fix-parallel-build.patch \ + + +SRC_URI[md5sum] = ad28eb86ad3203b5422844db179c585b +SRC_URI[sha256sum] = 608e4b1cf390e9bf54c0ef00c5bd9ca76d36e2261b9f4d33d54516f3f6a20fd2 + +LIC_FILES_CHKSUM = file://../LICENSE;md5=1ec8b0b17cc31513fe35ab10716f8490 + +inherit autotools + +# Put virtual/db in any appropriate provider of a +# relational database, use it as a dependency in +# place of a specific db and use: +# +# PREFERRED_PROVIDER_virtual/db +# +# to select the correct db in the build (distro) .conf +PROVIDES += ${VIRTUAL_NAME} +
[OE-core] (resending) [oe-core][PATCH 1/1] rpm: compile rpmqv.c instead of rpmqv.cc
Some versions of gcc will put a reference to __gxx_personality_v0 into rpm.o and rpmbuild.o. This means we must link using g++, and Makefile does not. Go back to using rpmqv.c (which is currently identical to rpmqv.cc). Signed-off-by: Joe Slater jsla...@windriver.com --- .../recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch | 25 meta/recipes-devtools/rpm/rpm_5.4.14.bb|1 + 2 files changed, 26 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch diff --git a/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch b/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch new file mode 100644 index 000..0996448 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch @@ -0,0 +1,25 @@ + +Some versions of gcc, 4.4.5 for example, will put a reference to __gxx_personality_v0 +into rpm.o and rpmbuild.o. This means we must link with g++, and the Makefile we +generate does not. + +So, go back to using rpmqv.c (which is currently identical to rpmqv.cc). + +--- a/Makefile.am b/Makefile.am +@@ -127,13 +127,13 @@ rpm_SOURCES =build.c + rpm_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) + rpm_LDADD = rpm.o $(myLDADD) + rpm.o:$(top_srcdir)/rpmqv.c +- $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $(top_srcdir)/rpmqv.cc ++ $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $(top_srcdir)/rpmqv.c + + rpmbuild_SOURCES =build.c + rpmbuild_LDFLAGS =@LDFLAGS_STATIC@ $(LDFLAGS) + rpmbuild_LDADD = rpmbuild.o $(myLDADD) + rpmbuild.o: $(top_srcdir)/rpmqv.c +- $(COMPILE) -DIAM_RPMBT -o $@ -c $(top_srcdir)/rpmqv.cc ++ $(COMPILE) -DIAM_RPMBT -o $@ -c $(top_srcdir)/rpmqv.c + + .PHONY: splint + splint: diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb index 15c1738..8fec656 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb @@ -92,6 +92,7 @@ SRC_URI = http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e file://rpm-fix-logio-cp.patch \ file://rpm-db5-or-db6.patch \ file://rpm-disable-Wno-override-init.patch \ + file://rpmqv_cc_b_gone.patch \ # Uncomment the following line to enable platform score debugging -- 1.7.3.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] oe-core/kernel: Deploy KERNEL_ALT_IMAGETYPE and check it for uImage
Install, deploy and package KERNEL_ALT_IMAGETYPE and create kernel-alt-image package. Check if KERNEL_ALT_IMAGETYPE is empty or not. If KERNEL_ALT_IMAGETYPE is empty, just skip alt image install and deploy, otherwise it is failed to install/deploy because KERNEL_ALT_OUTPUT doesn't point to a real kernel image file. Check if KERNEL_ALT_IMAGETYPE is uImage in do_uboot_mkimage and adding u-boot-mkimage-native depend if it is uImage. Signed-off-by: Yang Shi yang@windriver.com --- meta/classes/kernel.bbclass | 38 +++--- 1 file changed, 35 insertions(+), 3 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 6ed1cb7..1520079 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -13,7 +13,8 @@ INITRAMFS_IMAGE_BUNDLE ?= python __anonymous () { kerneltype = d.getVar('KERNEL_IMAGETYPE', True) or '' -if kerneltype == 'uImage': +kernelalttype = d.getVar('KERNEL_ALT_IMAGETYPE', True) or '' +if kerneltype == 'uImage' or kernelalttype == 'uImage': depends = d.getVar(DEPENDS, True) depends = %s u-boot-mkimage-native % depends d.setVar(DEPENDS, depends) @@ -74,6 +75,7 @@ KERNEL_EXTRA_ARGS ?= EXTRA_OEMAKE = KERNEL_ALT_IMAGETYPE ??= +KERNEL_ALT_OUTPUT ?= arch/${ARCH}/boot/${KERNEL_ALT_IMAGETYPE} # Define where the kernel headers are installed on the target as well as where # they are staged. @@ -200,6 +202,9 @@ kernel_do_install() { install -d ${D}/${KERNEL_IMAGEDEST} install -d ${D}/boot install -m 0644 ${KERNEL_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_IMAGETYPE}-${KERNEL_VERSION} + if [ ${KERNEL_ALT_IMAGETYPE} != ]; then + install -m 0644 ${KERNEL_ALT_OUTPUT} ${D}/${KERNEL_IMAGEDEST}/${KERNEL_ALT_IMAGETYPE}-${KERNEL_VERSION} + fi install -m 0644 System.map ${D}/boot/System.map-${KERNEL_VERSION} install -m 0644 .config ${D}/boot/config-${KERNEL_VERSION} install -m 0644 vmlinux ${D}/boot/vmlinux-${KERNEL_VERSION} @@ -225,6 +230,7 @@ kernel_do_install() { # echo ${KERNEL_IMAGE_BASE_NAME} $kerneldir/kernel-image-name + echo ${KERNEL_ALT_IMAGE_BASE_NAME} $kerneldir/kernel-alt-image-name # # Copy the entire source tree. In case an external build directory is @@ -245,6 +251,9 @@ kernel_do_install() { # the same file. If hardlinking is used, they will be the same, and there's # no need to install. ! [ ${KERNEL_OUTPUT} -ef $kerneldir/${KERNEL_IMAGETYPE} ] install -m 0644 ${KERNEL_OUTPUT} $kerneldir/${KERNEL_IMAGETYPE} + if [ ${KERNEL_ALT_IMAGETYPE} != ]; then + ! [ ${KERNEL_ALT_OUTPUT} -ef $kerneldir/${KERNEL_ALT_IMAGETYPE} ] install -m 0644 ${KERNEL_ALT_OUTPUT} $kerneldir/${KERNEL_ALT_IMAGETYPE} + fi install -m 0644 System.map $kerneldir/System.map-${KERNEL_VERSION} # Dummy Makefile so the clean below works @@ -342,10 +351,11 @@ EXPORT_FUNCTIONS do_compile do_install do_configure # kernel-base becomes kernel-${KERNEL_VERSION} # kernel-image becomes kernel-image-${KERNEL_VERISON} -PACKAGES = kernel kernel-base kernel-vmlinux kernel-image kernel-dev kernel-modules +PACKAGES = kernel kernel-base kernel-vmlinux kernel-image kernel-alt-image kernel-dev kernel-modules FILES_${PN} = FILES_kernel-base = /lib/modules/${KERNEL_VERSION}/modules.order /lib/modules/${KERNEL_VERSION}/modules.builtin FILES_kernel-image = /boot/${KERNEL_IMAGETYPE}* +FILES_kernel-alt-image = /boot/${KERNEL_ALT_IMAGETYPE}* FILES_kernel-dev = /boot/System.map* /boot/Module.symvers* /boot/config* ${KERNEL_SRC_PATH} FILES_kernel-vmlinux = /boot/vmlinux* FILES_kernel-modules = @@ -354,11 +364,13 @@ RDEPENDS_kernel = kernel-base # not wanted in images as standard RDEPENDS_kernel-base ?= kernel-image PKG_kernel-image = kernel-image-${@legitimize_package_name('${KERNEL_VERSION}')} +PKG_kernel-alt-image = kernel-alt-image-${@legitimize_package_name('${KERNEL_VERSION}')} PKG_kernel-base = kernel-${@legitimize_package_name('${KERNEL_VERSION}')} RPROVIDES_kernel-base += kernel-${KERNEL_VERSION} ALLOW_EMPTY_kernel = 1 ALLOW_EMPTY_kernel-base = 1 ALLOW_EMPTY_kernel-image = 1 +ALLOW_EMPTY_kernel-alt-image = 1 ALLOW_EMPTY_kernel-modules = 1 DESCRIPTION_kernel-modules = Kernel modules meta package @@ -381,6 +393,14 @@ pkg_postrm_kernel-image () { update-alternatives --remove ${KERNEL_IMAGETYPE} ${KERNEL_IMAGETYPE}-${KERNEL_VERSION} || true } +pkg_postinst_kernel-alt-image () { + update-alternatives --install /${KERNEL_IMAGEDEST}/${KERNEL_ALT_IMAGETYPE} ${KERNEL_ALT_IMAGETYPE} /${KERNEL_IMAGEDEST}/${KERNEL_ALT_IMAGETYPE}-${KERNEL_VERSION} ${KERNEL_PRIORITY} || true +} + +pkg_postrm_kernel-alt-image () { + update-alternatives --remove ${KERNEL_ALT_IMAGETYPE} ${KERNEL_ALT_IMAGETYPE}-${KERNEL_VERSION} || true +} + PACKAGESPLITFUNCS_prepend = split_kernel_packages python
[OE-core] [oe-core][PATCH 0/1 V2] Fix KERNEL_ALT_IMAGETYPE deploy
When trying to bootup qemuarma9 BSP with uImage, I ran into the below issues: 1. Need u-boot-mkimage-native depend. kernel.bbclass just checks if KERNEL_IMAGETYPE is uImage, if it is the depend will be added. But, it doesn't check KERNEL_ALT_IMAGETYPE. In the patch, the check for alt image is added. 2. UBOOT_LOADADDRESS is passed to uboot-mkimage in do_uboot_mkimage. But, this function just check if KERNEL_IMAGETYPE is uImage or not. It doesn't check KERNEL_ALT_IMAGETYPE. The patch adds the check. 3. KERNEL_ALT_IMAGETYPE is not deployed at all, although it is built. So, we need install, deploy and package the atl image. Changelog V1 - V2: Check if KERNEL_ALT_IMAGETYPE is empty or not. If KERNEL_ALT_IMAGETYPE is empty, just skip alt image install and deploy, otherwise it is failed to install/deploy because KERNEL_ALT_OUTPUT doesn't point to a real kernel image file. Yang The following changes since commit 68824d9b8f6e290da078383316b3f4b732585f2b: u-boot-fw-utils: install config file (2014-06-25 13:51:49 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib yshi/kernel_altimg_v2 http://git.yoctoproject.org/cgit/cgit.cgi/poky-contrib/log/?h=yshi/kernel_altimg_v2 for you to fetch changes up to a4d3971a48d0fb490537d755a19740cb25ea5f4c: oe-core/kernel: Deploy KERNEL_ALT_IMAGETYPE and check it for uImage (2014-07-16 11:36:12 -0700) Yang Shi (1): oe-core/kernel: Deploy KERNEL_ALT_IMAGETYPE and check it for uImage meta/classes/kernel.bbclass | 38 +++--- 1 file changed, 35 insertions(+), 3 deletions(-) -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH] V2 lz4: update to latest version
Did not mean to generate extra work for you all. Thanks for the input. I will go back to the drawing board. regards, Armin On 07/16/2014 06:48 AM, Burton, Ross wrote: On 16 July 2014 10:11, Richard Purdie richard.pur...@linuxfoundation.org wrote: I'm still a little concerned about this change from svn to git. Which is the definitive source? It looks like the svn repo is active too? I just don't want to end up in a position where we're pulling from someone's hack'n'dev version of lz4 rather than the place considered the real master source... The revision histories *are* different (commits marked untested and then fixed in another commit) but the owner of the git repo is the same as the owner of the svn repo. It looks like git is his working area and then changes that have been tested are merged and committed to git. Unless there's a good reason I'd keep with the svn repo for now. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] two variations for distro-specific FILESEXTRAPATHS prepending
On Wed, 16 Jul 2014, Christopher Larson wrote: On Wed, Jul 16, 2014 at 4:26 AM, Robert P. J. Day rpj...@crashcourse.ca wrote: just ran across this in the meta-yocto layer but it's a general OE question -- the psplash_git.bbappend file contains the following distro-conditional line: FILESEXTRAPATHS_prepend_poky := ${THISDIR}/files: and the accompanying files/ directory has, unsurprisingly, a poky-specific splash image file, psplash-poky-img.h. but based on how FILESEXTRAPATHS is processed by incorporating all of the FILESOVERRIDES variations (one of which is the distro name), would it not have been entirely equivalent to have used simply FILESEXTRAPATHS_prepend := ${THISDIR}/files: and placed that splash file in the accompanying directory files/poky/? would these two approaches do the same thing? is there a preferred way? that's the only example of that i've seen in all the layers i've played with. Both would do the same thing, I'm personally of the opinion that the latter would be more consistent with how such things are normally done. i was ready to bet internal organs that they had the same effect, but i've perused the OE code base enough that i trip over oddities and i just really want to make sure i know what i'm looking at. rday p.s. if someone wants to submit a poky patch that changes that, feel free. otherwise, i'll just use it in class as a check out what someone did *here*! example. :-) -- Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe] [PATCH] core-image.bbclass: Reformat definition of CORE_IMAGE_BASE_INSTALL
On Jul 12, 2014 1:41 AM, Robert P. J. Day rpj...@crashcourse.ca wrote: On Fri, 11 Jul 2014, Khem Raj wrote: On Fri, Jul 11, 2014 at 4:41 PM, Otavio Salvador ota...@ossystems.com.br wrote: Hello, +OE-Core On Fri, Jul 11, 2014 at 7:23 PM, Robert P. J. Day rpj...@crashcourse.ca wrote: Reformat the assignment to CORE_IMAGE_BASE_INSTALL to be more intuitively obvious. Signed-off-by: Robert P. J. Day rpj...@crashcourse.ca --- compile and run-time tested, building a core-image-minimal for qemuarm. diff --git a/meta/classes/core-image.bbclass b/meta/classes/core-image.bbclass index 1b36cba..d2b9d69 100644 --- a/meta/classes/core-image.bbclass +++ b/meta/classes/core-image.bbclass @@ -59,13 +59,11 @@ MACHINE_HWCODECS ??= CORE_IMAGE_BASE_INSTALL = '\ packagegroup-core-boot \ packagegroup-base-extended \ -\ -${CORE_IMAGE_EXTRA_INSTALL} \ ' CORE_IMAGE_EXTRA_INSTALL ?= -IMAGE_INSTALL ?= ${CORE_IMAGE_BASE_INSTALL} +IMAGE_INSTALL ?= ${CORE_IMAGE_BASE_INSTALL} ${CORE_IMAGE_EXTRA_INSTALL} For me, more intuitively would be: CORE_IMAGE_BASE_INSTALL ?= ... weak assignment here would mean overridable base install which is not the intention. we want a working base image when inheriting core-image except that that argument doesn't really hold water given how one can inherit core-image, then (as i pointed out) immediately wipe out that supposedly inviolable definition of CORE_IMAGE_BASE_INSTALL by simply reassigning to IMAGE_INSTALL. these classes are provided as basic working blocks. it would be a bad use case if one were to override basic constructs inside it completely. some variables are sort of interfaces some are not. besides your change is ok its just the preset is not. we should start using the constructs as intended. i *like* the idea of a weak assignment to CORE_IMAGE_BASE INSTALL. it's effectively what core-image-minimal is doing anyway, it just allows you to do it in a way that's not grotesquely ugly. rday -- Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 18/19] xserver-xorg: Fix build determinism problem
On 16 July 2014 17:26, Richard Purdie richard.pur...@linuxfoundation.org wrote: WARNING: QA Issue: xserver-xorg rdepends on nettle but its not a build dependency? [build-deps] We list openssl in DEPENDS so we need to specify that as the sha1 provider rather that nettle which is autodetected. If xserver is seeing both openssl and nettle installed but picking nettle, should we switch the build dependency from openssl to nettle? The nettle library is half the size of openssl and has saner licensing, so this seems like a win to me. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] (resending) [oe-core][PATCH 1/1] rpm: compile rpmqv.c instead of rpmqv.cc
On 07/16/2014 11:40 AM, Joe Slater wrote: Some versions of gcc will put a reference to __gxx_personality_v0 into rpm.o and rpmbuild.o. This means we must link using g++, and Makefile does not. Go back to using rpmqv.c (which is currently identical to rpmqv.cc). Signed-off-by: Joe Slater jsla...@windriver.com --- .../recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch | 25 meta/recipes-devtools/rpm/rpm_5.4.14.bb|1 + 2 files changed, 26 insertions(+), 0 deletions(-) create mode 100644 meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch diff --git a/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch b/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch new file mode 100644 index 000..0996448 --- /dev/null +++ b/meta/recipes-devtools/rpm/rpm/rpmqv_cc_b_gone.patch @@ -0,0 +1,25 @@ + Patch needs Signed-off-by: and Upstream-Status tags please Thanks Sau! +Some versions of gcc, 4.4.5 for example, will put a reference to __gxx_personality_v0 +into rpm.o and rpmbuild.o. This means we must link with g++, and the Makefile we +generate does not. + +So, go back to using rpmqv.c (which is currently identical to rpmqv.cc). + +--- a/Makefile.am b/Makefile.am +@@ -127,13 +127,13 @@ rpm_SOURCES =build.c + rpm_LDFLAGS = @LDFLAGS_STATIC@ $(LDFLAGS) + rpm_LDADD = rpm.o $(myLDADD) + rpm.o:$(top_srcdir)/rpmqv.c +- $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $(top_srcdir)/rpmqv.cc ++ $(COMPILE) -DIAM_RPMBT -DIAM_RPMDB -DIAM_RPMEIU -DIAM_RPMK -DIAM_RPMQV -o $@ -c $(top_srcdir)/rpmqv.c + + rpmbuild_SOURCES =build.c + rpmbuild_LDFLAGS =@LDFLAGS_STATIC@ $(LDFLAGS) + rpmbuild_LDADD = rpmbuild.o $(myLDADD) + rpmbuild.o: $(top_srcdir)/rpmqv.c +- $(COMPILE) -DIAM_RPMBT -o $@ -c $(top_srcdir)/rpmqv.cc ++ $(COMPILE) -DIAM_RPMBT -o $@ -c $(top_srcdir)/rpmqv.c + + .PHONY: splint + splint: diff --git a/meta/recipes-devtools/rpm/rpm_5.4.14.bb b/meta/recipes-devtools/rpm/rpm_5.4.14.bb index 15c1738..8fec656 100644 --- a/meta/recipes-devtools/rpm/rpm_5.4.14.bb +++ b/meta/recipes-devtools/rpm/rpm_5.4.14.bb @@ -92,6 +92,7 @@ SRC_URI = http://www.rpm5.org/files/rpm/rpm-5.4/rpm-5.4.14-0.20131024.src.rpm;e file://rpm-fix-logio-cp.patch \ file://rpm-db5-or-db6.patch \ file://rpm-disable-Wno-override-init.patch \ + file://rpmqv_cc_b_gone.patch \ # Uncomment the following line to enable platform score debugging -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] license.bbclass: canonicalise licenses when dealing with INCOMPATIBLE_LICENSE
If INCOMPATIBLE_LICENSE=GPLv3.0 but the recipe sets LICENSE=GPLv3, the current code won't trigger because they're different strings. Fix this by attempting to canonicalise every license name to a SPDX name, so both names in this example become GPL-3.0. [ YOCTO #5622 ] Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/classes/base.bbclass|2 ++ meta/classes/license.bbclass | 14 +++--- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index c0d2c8ec8..8114cf6 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -540,6 +540,8 @@ python () { check_license = False if check_license and bad_licenses: +bad_licenses = map(lambda l: canonical_license(d, l), bad_licenses) + whitelist = [] for lic in bad_licenses: for w in [HOSTTOOLS_WHITELIST_, LGPLv2_WHITELIST_, WHITELIST_]: diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 08f0665..973a95b 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -264,10 +264,18 @@ def return_spdx(d, license): return d.getVarFlag('SPDXLICENSEMAP', license, True) +def canonical_license(d, license): + +Return the canonical (SPDX) form of the license if available (so GPLv3 +becomes GPL-3.0), or the passed license if there is no canonical form. + +return d.getVarFlag('SPDXLICENSEMAP', license, True) or license + def incompatible_license(d, dont_want_licenses, package=None): -This function checks if a recipe has only incompatible licenses. It also take into consideration 'or' -operand. +This function checks if a recipe has only incompatible licenses. It also +take into consideration 'or' operand. dont_want_licenses should be passed +as canonical (SPDX) names. import re import oe.license @@ -298,7 +306,7 @@ def incompatible_license(d, dont_want_licenses, package=None): licenses = oe.license.flattened_licenses(license, choose_lic_set) except oe.license.LicenseError as exc: bb.fatal('%s: %s' % (d.getVar('P', True), exc)) -return any(not license_ok(l) for l in licenses) +return any(not license_ok(canonical_license(d, l)) for l in licenses) def check_license_flags(d): -- 1.7.10.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2][V2] License compliance fixes
Hi, If INCOMPATIBLE_LICENSE=GPLv3.0 but the recipe sets LICENSE=GPLv3, the current code won't trigger because they're different strings. Fix this by attempting to canonicalise every license name to a SPDX name, so both names in this example become GPL-3.0. The whitelists also have to be updated. This means using variable names that could be considered non-standard (or crazy), such as WHITELIST_GPL-3.0. This does look strange and if the community agrees we can take the compatibility hit I'll change the whitelists to use flags, i.e HOSTTOOLS_WHITELIST[GPL-3.0]. Ross The following changes since commit 1dcdd877c7946be4c0b1203deb14e2f842f9d0c2: bitbake: toasterui: fix build - project identification (2014-07-14 14:10:03 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ross/license for you to fetch changes up to 934289b8ba6a8b7a0f1eec8aabf723f823d515d8: default-distrovars: update license whitelists to use canonical names (2014-07-16 21:02:45 +0100) Ross Burton (2): license.bbclass: canonicalise licenses when dealing with INCOMPATIBLE_LICENSE default-distrovars: update license whitelists to use canonical names meta/classes/base.bbclass |2 ++ meta/classes/license.bbclass| 14 +++--- meta/conf/distro/include/default-distrovars.inc |6 +++--- 3 files changed, 16 insertions(+), 6 deletions(-) Ross Burton (2): license.bbclass: canonicalise licenses when dealing with INCOMPATIBLE_LICENSE default-distrovars: update license whitelists to use canonical names meta/classes/base.bbclass |2 ++ meta/classes/license.bbclass| 14 +++--- meta/conf/distro/include/default-distrovars.inc |6 +++--- 3 files changed, 16 insertions(+), 6 deletions(-) -- 1.7.10.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] default-distrovars: update license whitelists to use canonical names
Now that all licenses are canonicalised to SPDX names when processing, we need to rename the whitelists to the match. Signed-off-by: Ross Burton ross.bur...@intel.com --- meta/conf/distro/include/default-distrovars.inc |6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/conf/distro/include/default-distrovars.inc b/meta/conf/distro/include/default-distrovars.inc index 1bc8e46..8d24d66 100644 --- a/meta/conf/distro/include/default-distrovars.inc +++ b/meta/conf/distro/include/default-distrovars.inc @@ -23,9 +23,9 @@ IMAGE_FEATURES ?= # This is a list of packages that are used by the build system to build the distribution, they are not # directly part of the distribution. -HOSTTOOLS_WHITELIST_GPLv3 ?= -WHITELIST_GPLv3 ?= less -LGPLv2_WHITELIST_GPLv3 ?= libassuan gnutls libtasn1 libidn libgcc libgcc-initial gcc-runtime +HOSTTOOLS_WHITELIST_GPL-3.0 ?= +WHITELIST_GPL-3.0 ?= less +LGPLv2_WHITELIST_GPL-3.0 ?= libassuan gnutls libtasn1 libidn libgcc libgcc-initial gcc-runtime COMMERCIAL_AUDIO_PLUGINS ?= # COMMERCIAL_AUDIO_PLUGINS ?= gst-plugins-ugly-mad gst-plugins-ugly-mpegaudioparse -- 1.7.10.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/8] mkefidisk.sh: Use all caps for volume names
Avoid some mkfs warnings by using all caps in the volume names. Signed-off-by: Darren Hart dvh...@linux.intel.com --- scripts/contrib/mkefidisk.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh index 1992d6c..959307a 100755 --- a/scripts/contrib/mkefidisk.sh +++ b/scripts/contrib/mkefidisk.sh @@ -208,14 +208,14 @@ unmount_device echo echo Formatting $BOOTFS as vfat... if [ ! ${DEVICE#/dev/loop} = ${DEVICE} ]; then - mkfs.vfat -I $BOOTFS -n efi + mkfs.vfat -I $BOOTFS -n EFI else - mkfs.vfat $BOOTFS -n efi + mkfs.vfat $BOOTFS -n EFI fi echo Formatting $ROOTFS as ext3... -mkfs.ext3 $ROOTFS -L root +mkfs.ext3 -F $ROOTFS -L ROOT echo Formatting swap partition...($SWAP) mkswap $SWAP -- 2.0.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/8] mkefidisk.sh: Add mount error checking
Provide reasonable feedabck if the mount commands fail. Signed-off-by: Darren Hart dvh...@linux.intel.com --- scripts/contrib/mkefidisk.sh | 4 1 file changed, 4 insertions(+) diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh index 959307a..0d0674b 100755 --- a/scripts/contrib/mkefidisk.sh +++ b/scripts/contrib/mkefidisk.sh @@ -241,7 +241,11 @@ mkdir $ROOTFS_MNT mkdir $BOOTFS_MNT mount -o loop $HDDIMG $HDDIMG_MNT +if [ $? -ne 0 ]; then echo ERROR: Failed to mount $HDDIMG; fi + mount -o loop $HDDIMG_MNT/rootfs.img $HDDIMG_ROOTFS_MNT +if [ $? -ne 0 ]; then echo ERROR: Failed to mount rootfs.img; fi + mount $ROOTFS $ROOTFS_MNT mount $BOOTFS $BOOTFS_MNT -- 2.0.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/8] mkefidisk.sh: Add gummiboot support
Fixes [YOCTO 6295] Add gummiboot support for images built using: EFI_PROVIDER=gummiboot Add conditional configuration for GRUB and gummiboot. Provide some messaging about which is being performed. Signed-off-by: Darren Hart dvh...@linux.intel.com --- scripts/contrib/mkefidisk.sh | 53 ++-- 1 file changed, 41 insertions(+), 12 deletions(-) diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh index 0d0674b..9b13041 100755 --- a/scripts/contrib/mkefidisk.sh +++ b/scripts/contrib/mkefidisk.sh @@ -265,31 +265,60 @@ umount $HDDIMG_ROOTFS_MNT echo Preparing boot partition... EFIDIR=$BOOTFS_MNT/EFI/BOOT mkdir -p $EFIDIR -GRUBCFG=$EFIDIR/grub.cfg cp $HDDIMG_MNT/vmlinuz $BOOTFS_MNT -# Copy the efi loader and config (booti*.efi and grub.cfg) +# Copy the efi loader and configs (booti*.efi and grub.cfg if it exists) cp $HDDIMG_MNT/EFI/BOOT/* $EFIDIR +# Silently ignore a missing gummiboot loader dir (we might just be a GRUB image) +cp -r $HDDIMG_MNT/loader $BOOTFS_MNT 2 /dev/null -# Update grub config for the installed image -# Delete the install entry -sed -i /menuentry 'install'/,/^}/d $GRUBCFG -# Delete the initrd lines -sed -i /initrd /d $GRUBCFG -# Delete any LABEL= strings -sed -i s/ LABEL=[^ ]*/ / $GRUBCFG +# Update the boot loaders configurations for an installed image # Remove any existing root= kernel parameters and: # o Add a root= parameter with the target rootfs # o Specify ro so fsck can be run during boot # o Specify rootwait in case the target media is an asyncronous block device # such as MMC or USB disks # o Specify quiet to minimize boot time when using slow serial consoles -sed -i s@ root=[^ ]*@ @ $GRUBCFG -sed -i s@vmlinuz @vmlinuz root=$TARGET_ROOTFS ro rootwait quiet @ $GRUBCFG + +# Look for a GRUB installation +GRUB_CFG=$EFIDIR/grub.cfg +if [ -e $GRUB_CFG ]; then + echo Configuring GRUB + # Delete the install entry + sed -i /menuentry 'install'/,/^}/d $GRUB_CFG + # Delete the initrd lines + sed -i /initrd /d $GRUB_CFG + # Delete any LABEL= strings + sed -i s/ LABEL=[^ ]*/ / $GRUB_CFG + + sed -i s@ root=[^ ]*@ @ $GRUB_CFG + sed -i s@vmlinuz @vmlinuz root=$TARGET_ROOTFS ro rootwait quiet @ $GRUB_CFG +fi + +# Look for a gummiboot installation +GUMMI_ENTRIES=$BOOTFS_MNT/loader/entries +GUMMI_CFG=$GUMMI_ENTRIES/boot.conf +if [ -d $GUMMI_ENTRIES ]; then + echo Configuring Gummiboot + # remove the install target if it exists + rm $GUMMI_ENTRIES/install.conf /dev/null + + if [ ! -e $GUMMI_CFG ]; then + echo ERROR: $GUMMI_CFG not found + fi + + sed -i s@ root=[^ ]*@ @ $GUMMI_CFG + sed -i s@options *LABEL=boot @options LABEL=Boot root=$TARGET_ROOTFS ro rootwait quiet @ $GUMMI_CFG +fi + +# Ensure we have at least one EFI bootloader configured +if [ ! -e $GRUB_CFG ] [ ! -e $GUMMI_CFG ]; then + echo ERROR: No EFI bootloader configuration found +fi umount $BOOTFS_MNT umount $HDDIMG_MNT rm -rf $TMPDIR sync -echo Installation complete. +echo Installation complete -- 2.0.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 8/8] mkefidisk.sh: Reduce output and add verbose flag
Remove superfluous output from commands, add a -v verbose flag, and cleanup output. Signed-off-by: Darren Hart dvh...@linux.intel.com --- scripts/contrib/mkefidisk.sh | 114 +-- 1 file changed, 67 insertions(+), 47 deletions(-) diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh index 85e58ef..7ec373e 100755 --- a/scripts/contrib/mkefidisk.sh +++ b/scripts/contrib/mkefidisk.sh @@ -20,6 +20,10 @@ LANG=C +# Set to 1 to enable additional output +DEBUG=0 +OUT=/dev/null + # # Defaults # @@ -30,7 +34,7 @@ SWAP_RATIO=5 # Cleanup after die() cleanup() { - echo Syncing and unmounting devices... + debug Syncing and unmounting devices # Unmount anything we mounted unmount $ROOTFS_MNT || error Failed to unmount $ROOTFS_MNT unmount $BOOTFS_MNT || error Failed to unmount $BOOTFS_MNT @@ -38,7 +42,7 @@ cleanup() { unmount $HDDIMG_MNT || error Failed to unmount $HDDIMG_MNT # Remove the TMPDIR - echo Removing temporary files... + debug Removing temporary files if [ -d $TMPDIR ]; then rm -rf $TMPDIR || error Failed to remove $TMPDIR fi @@ -71,9 +75,15 @@ die() { cleanup exit 1 } +debug() { + if [ $DEBUG -eq 1 ]; then + echo $1 + fi +} usage() { - echo Usage: $(basename $0) DEVICE HDDIMG TARGET_DEVICE + echo Usage: $(basename $0) [-v] DEVICE HDDIMG TARGET_DEVICE + echo-v: Verbose debug echoDEVICE: The device to write the image to, e.g. /dev/sdh echoHDDIMG: The hddimg file to generate the efi disk from echoTARGET_DEVICE: The device the target will boot from, e.g. /dev/mmcblk0 @@ -82,7 +92,6 @@ usage() { image_details() { IMG=$1 info Image details - echo = echo image: $(stat --printf '%N\n' $IMG) echo size: $(stat -L --printf '%s bytes\n' $IMG) echo modified: $(stat -L --printf '%y\n' $IMG) @@ -95,7 +104,6 @@ device_details() { BLOCK_SIZE=512 info Device details - echo == echo device: $DEVICE if [ -f /sys/class/block/$DEV/device/vendor ]; then echo vendor: $(cat /sys/class/block/$DEV/device/vendor) @@ -118,7 +126,7 @@ device_details() { unmount_device() { grep -q $DEVICE /proc/mounts if [ $? -eq 0 ]; then - warn $DEVICE listed in /proc/mounts, attempting to unmount... + warn $DEVICE listed in /proc/mounts, attempting to unmount umount $DEVICE* 2/dev/null return $? fi @@ -128,7 +136,7 @@ unmount_device() { unmount() { grep -q $1 /proc/mounts if [ $? -eq 0 ]; then - echo Unmounting $1... + debug Unmounting $1 umount $1 return $? fi @@ -138,11 +146,17 @@ unmount() { # # Parse and validate arguments # -if [ $# -ne 3 ]; then +if [ $# -lt 3 ] || [ $# -gt 4 ]; then usage exit 1 fi +if [ $1 = -v ]; then + DEBUG=1 + OUT=1 + shift +fi + DEVICE=$1 HDDIMG=$2 TARGET_DEVICE=$3 @@ -230,34 +244,39 @@ fi TARGET_ROOTFS=$TARGET_DEVICE${TARGET_PART_PREFIX}2 TARGET_SWAP=$TARGET_DEVICE${TARGET_PART_PREFIX}3 -echo * -echo Boot partition size: $BOOT_SIZE MB ($BOOTFS) -echo ROOTFS partition size: $ROOTFS_SIZE MB ($ROOTFS) -echo Swap partition size: $SWAP_SIZE MB ($SWAP) -echo * - -echo Deleting partition table on $DEVICE ... -dd if=/dev/zero of=$DEVICE bs=512 count=2 /dev/null || die Failed to zero beginning of $DEVICE +echo +info Boot partition size: $BOOT_SIZE MB ($BOOTFS) +info ROOTFS partition size: $ROOTFS_SIZE MB ($ROOTFS) +info Swap partition size: $SWAP_SIZE MB ($SWAP) +echo # Use MSDOS by default as GPT cannot be reliably distributed in disk image form # as it requires the backup table to be on the last block of the device, which # of course varies from device to device. -echo Creating new partition table (MSDOS) on $DEVICE ... -parted $DEVICE mklabel msdos || die Failed to create MSDOS partition table -echo Creating boot partition on $BOOTFS -parted $DEVICE mkpart primary 0% $BOOT_SIZE || die Failed to create BOOT partition +info Partitioning installation media ($DEVICE) -echo Enabling boot flag on $BOOTFS -parted $DEVICE set 1 boot on || die Failed to enable boot flag +debug Deleting partition table on $DEVICE +dd if=/dev/zero of=$DEVICE bs=512 count=2 $OUT 21 || die Failed to zero beginning of $DEVICE -echo Creating ROOTFS partition on $ROOTFS -parted $DEVICE mkpart primary $ROOTFS_START $ROOTFS_END || die Failed to create ROOTFS partition +debug Creating new partition table (MSDOS) on $DEVICE +parted $DEVICE mklabel msdos $OUT 21 || die Failed to create MSDOS partition table -echo Creating swap partition on $SWAP -parted $DEVICE mkpart
[OE-core] [PATCH 4/8] mkefidisk.sh: Copy the EFI dir recursively
Rather than only copying the EFI/BOOT dir, copy the entire EFI dir recursively. This allows for custom configurations to be enabled implicitly with no extra work required. Signed-off-by: Darren Hart dvh...@linux.intel.com --- scripts/contrib/mkefidisk.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh index 9b13041..98c43f5 100755 --- a/scripts/contrib/mkefidisk.sh +++ b/scripts/contrib/mkefidisk.sh @@ -264,11 +264,9 @@ umount $HDDIMG_ROOTFS_MNT echo Preparing boot partition... EFIDIR=$BOOTFS_MNT/EFI/BOOT -mkdir -p $EFIDIR - cp $HDDIMG_MNT/vmlinuz $BOOTFS_MNT # Copy the efi loader and configs (booti*.efi and grub.cfg if it exists) -cp $HDDIMG_MNT/EFI/BOOT/* $EFIDIR +cp -r $HDDIMG_MNT/EFI $BOOTFS_MNT # Silently ignore a missing gummiboot loader dir (we might just be a GRUB image) cp -r $HDDIMG_MNT/loader $BOOTFS_MNT 2 /dev/null -- 2.0.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/8] mkefidisk.sh: Add die() and cleanup() routines
Currently the script will attempt to continue even after a fatal error. Add a die() routine which will abort in the case of a fatal error and call a cleanup() routine to unmount any images or devices and remove the TMPDIR. Move the variable assignment and directory creation earlier in the script, making it more obvious what we need to clean up. Signed-off-by: Darren Hart dvh...@linux.intel.com --- scripts/contrib/mkefidisk.sh | 115 +-- 1 file changed, 68 insertions(+), 47 deletions(-) diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh index 530b784..6cc6b78 100755 --- a/scripts/contrib/mkefidisk.sh +++ b/scripts/contrib/mkefidisk.sh @@ -28,6 +28,22 @@ BOOT_SIZE=20 # 5% for swap SWAP_RATIO=5 +# Cleanup after die() +cleanup() { + echo Syncing and unmounting devices... + # Unmount anything we mounted + unmount $ROOTFS_MNT || error Failed to unmount $ROOTFS_MNT + unmount $BOOTFS_MNT || error Failed to unmount $BOOTFS_MNT + unmount $HDDIMG_ROOTFS_MNT || error Failed to unmount $HDDIMG_ROOTFS_MNT + unmount $HDDIMG_MNT || error Failed to unmount $HDDIMG_MNT + + # Remove the TMPDIR + echo Removing temporary files... + if [ -d $TMPDIR ]; then + rm -rf $TMPDIR || error Failed to remove $TMPDIR + fi +} + # Logging routines WARNINGS=0 ERRORS=0 @@ -50,6 +66,11 @@ warn() { success() { echo ${GREEN}$1${CLEAR} } +die() { + error $1 + cleanup + exit 1 +} usage() { echo Usage: $(basename $0) DEVICE HDDIMG TARGET_DEVICE @@ -99,14 +120,20 @@ unmount_device() { if [ $? -eq 0 ]; then warn $DEVICE listed in /proc/mounts, attempting to unmount... umount $DEVICE* 2/dev/null - grep -q $DEVICE /proc/mounts - if [ $? -eq 0 ]; then - error Failed to unmount $DEVICE - exit 1 - fi + return $? fi + return 0 } +unmount() { + grep -q $1 /proc/mounts + if [ $? -eq 0 ]; then + echo Unmounting $1... + umount $1 + return $? + fi + return 0 +} # # Parse and validate arguments @@ -126,23 +153,24 @@ if [ $? -eq 0 ]; then fi if [ ! -w $DEVICE ]; then - error Device $DEVICE does not exist or is not writable usage - exit 1 + die Device $DEVICE does not exist or is not writable fi if [ ! -e $HDDIMG ]; then - error HDDIMG $HDDIMG does not exist usage - exit 1 + die HDDIMG $HDDIMG does not exist fi +# +# Ensure the hddimg is not mounted +# +unmount $HDDIMG || die Failed to unmount $HDDIMG # # Check if any $DEVICE partitions are mounted # -unmount_device - +unmount_device || die Failed to unmount $DEVICE # # Confirm device with user @@ -158,12 +186,26 @@ fi # +# Prepare the temporary working space +# +TMPDIR=$(mktemp -d mkefidisk-XXX) || die Failed to create temporary mounting directory. +HDDIMG_MNT=$TMPDIR/hddimg +HDDIMG_ROOTFS_MNT=$TMPDIR/hddimg_rootfs +ROOTFS_MNT=$TMPDIR/rootfs +BOOTFS_MNT=$TMPDIR/bootfs +mkdir $HDDIMG_MNT || die Failed to create $HDDIMG_MNT +mkdir $HDDIMG_ROOTFS_MNT || die Failed to create $HDDIMG_ROOTFS_MNT +mkdir $ROOTFS_MNT || die Failed to create $ROOTFS_MNT +mkdir $BOOTFS_MNT || die Failed to create $BOOTFS_MNT + + +# # Partition $DEVICE # DEVICE_SIZE=$(parted $DEVICE unit mb print | grep ^Disk | cut -d -f 3 | sed -e s/MB//) # If the device size is not reported there may not be a valid label if [ $DEVICE_SIZE = ] ; then - parted $DEVICE mklabel msdos + parted $DEVICE mklabel msdos || die Failed to create MSDOS partition table DEVICE_SIZE=$(parted $DEVICE unit mb print | grep ^Disk | cut -d -f 3 | sed -e s/MB//) fi SWAP_SIZE=$((DEVICE_SIZE*SWAP_RATIO/100)) @@ -195,25 +237,25 @@ echo Swap partition size: $SWAP_SIZE MB ($SWAP) echo * echo Deleting partition table on $DEVICE ... -dd if=/dev/zero of=$DEVICE bs=512 count=2 +dd if=/dev/zero of=$DEVICE bs=512 count=2 /dev/null || die Failed to zero beginning of $DEVICE # Use MSDOS by default as GPT cannot be reliably distributed in disk image form # as it requires the backup table to be on the last block of the device, which # of course varies from device to device. echo Creating new partition table (MSDOS) on $DEVICE ... -parted $DEVICE mklabel msdos +parted $DEVICE mklabel msdos || die Failed to create MSDOS partition table echo Creating boot partition on $BOOTFS -parted $DEVICE mkpart primary 0% $BOOT_SIZE +parted $DEVICE mkpart primary 0% $BOOT_SIZE || die Failed to create BOOT partition echo Enabling boot flag on $BOOTFS -parted $DEVICE set 1 boot on +parted $DEVICE set 1 boot on || die Failed to enable boot flag echo Creating ROOTFS partition on $ROOTFS -parted $DEVICE mkpart primary $ROOTFS_START $ROOTFS_END +parted
[OE-core] [PATCH 7/8] mkefidisk.sh: Make the rootfs copy the last step
Copying the rootfs is the most time intensive task. Move it last so if we are to encounter other errors, we do so quickly and error out. Signed-off-by: Darren Hart dvh...@linux.intel.com --- scripts/contrib/mkefidisk.sh | 22 -- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh index 6cc6b78..85e58ef 100755 --- a/scripts/contrib/mkefidisk.sh +++ b/scripts/contrib/mkefidisk.sh @@ -294,16 +294,6 @@ mount -o loop $HDDIMG_MNT/rootfs.img $HDDIMG_ROOTFS_MNT || error Failed to moun mount $ROOTFS $ROOTFS_MNT || error Failed to mount $ROOTFS on $ROOTFS_MNT mount $BOOTFS $BOOTFS_MNT || error Failed to mount $BOOTFS on $BOOTFS_MNT -echo Copying ROOTFS files... -cp -a $HDDIMG_ROOTFS_MNT/* $ROOTFS_MNT || error Root FS copy failed - -echo $TARGET_SWAP swap swap defaults 0 0 $ROOTFS_MNT/etc/fstab - -# We dont want udev to mount our root device while we're booting... -if [ -d $ROOTFS_MNT/etc/udev/ ] ; then - echo $TARGET_DEVICE $ROOTFS_MNT/etc/udev/mount.blacklist -fi - echo Preparing boot partition... EFIDIR=$BOOTFS_MNT/EFI/BOOT cp $HDDIMG_MNT/vmlinuz $BOOTFS_MNT || error Failed to copy vmlinuz @@ -356,6 +346,18 @@ if [ ! -e $GRUB_CFG ] [ ! -e $GUMMI_CFG ]; then die No EFI bootloader configuration found fi + +info Copying ROOTFS files (this may take a while) +cp -a $HDDIMG_ROOTFS_MNT/* $ROOTFS_MNT || die Root FS copy failed + +echo $TARGET_SWAP swap swap defaults 0 0 $ROOTFS_MNT/etc/fstab + +# We dont want udev to mount our root device while we're booting... +if [ -d $ROOTFS_MNT/etc/udev/ ] ; then + echo $TARGET_DEVICE $ROOTFS_MNT/etc/udev/mount.blacklist +fi + + # Call cleanup to unmount devices and images and remove the TMPDIR cleanup -- 2.0.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/8] mkefidisk.sh: Improve logging
Add logging functions: error, warn, info, and success, using tput to add color highlighting. Use these routines throughout the script, replacing echo statements and adding || error in several places to eliminate silent failures. Add a simple exit block which checks for issues encountered while running. Signed-off-by: Darren Hart dvh...@linux.intel.com --- scripts/contrib/mkefidisk.sh | 92 +--- 1 file changed, 60 insertions(+), 32 deletions(-) diff --git a/scripts/contrib/mkefidisk.sh b/scripts/contrib/mkefidisk.sh index 98c43f5..530b784 100755 --- a/scripts/contrib/mkefidisk.sh +++ b/scripts/contrib/mkefidisk.sh @@ -28,6 +28,29 @@ BOOT_SIZE=20 # 5% for swap SWAP_RATIO=5 +# Logging routines +WARNINGS=0 +ERRORS=0 +CLEAR=$(tput sgr0) +INFO=$(tput bold) +RED=$(tput setaf 1)$(tput bold) +GREEN=$(tput setaf 2)$(tput bold) +YELLOW=$(tput setaf 3)$(tput bold) +info() { + echo ${INFO}$1${CLEAR} +} +error() { + ERRORS=$((ERRORS+1)) + echo ${RED}$1${CLEAR} +} +warn() { + WARNINGS=$((WARNINGS+1)) + echo ${YELLOW}$1${CLEAR} +} +success() { + echo ${GREEN}$1${CLEAR} +} + usage() { echo Usage: $(basename $0) DEVICE HDDIMG TARGET_DEVICE echoDEVICE: The device to write the image to, e.g. /dev/sdh @@ -37,7 +60,7 @@ usage() { image_details() { IMG=$1 - echo Image details + info Image details echo = echo image: $(stat --printf '%N\n' $IMG) echo size: $(stat -L --printf '%s bytes\n' $IMG) @@ -50,7 +73,7 @@ device_details() { DEV=$1 BLOCK_SIZE=512 - echo Device details + info Device details echo == echo device: $DEVICE if [ -f /sys/class/block/$DEV/device/vendor ]; then @@ -74,14 +97,13 @@ device_details() { unmount_device() { grep -q $DEVICE /proc/mounts if [ $? -eq 0 ]; then - echo -n $DEVICE listed in /proc/mounts, attempting to unmount... + warn $DEVICE listed in /proc/mounts, attempting to unmount... umount $DEVICE* 2/dev/null grep -q $DEVICE /proc/mounts if [ $? -eq 0 ]; then - echo FAILED + error Failed to unmount $DEVICE exit 1 fi - echo OK fi } @@ -104,13 +126,13 @@ if [ $? -eq 0 ]; then fi if [ ! -w $DEVICE ]; then - echo ERROR: Device $DEVICE does not exist or is not writable + error Device $DEVICE does not exist or is not writable usage exit 1 fi if [ ! -e $HDDIMG ]; then - echo ERROR: HDDIMG $HDDIMG does not exist + error HDDIMG $HDDIMG does not exist usage exit 1 fi @@ -127,7 +149,7 @@ unmount_device # image_details $HDDIMG device_details $(basename $DEVICE) -echo -n Prepare EFI image on $DEVICE [y/N]? +echo -n ${INFO}Prepare EFI image on $DEVICE [y/N]?${CLEAR} read RESPONSE if [ $RESPONSE != y ]; then echo Image creation aborted @@ -208,17 +230,16 @@ unmount_device echo echo Formatting $BOOTFS as vfat... if [ ! ${DEVICE#/dev/loop} = ${DEVICE} ]; then - mkfs.vfat -I $BOOTFS -n EFI + mkfs.vfat -I $BOOTFS -n EFI || error Failed to format $BOOTFS else - mkfs.vfat $BOOTFS -n EFI - + mkfs.vfat $BOOTFS -n EFI || error Failed to format $BOOTFS fi echo Formatting $ROOTFS as ext3... -mkfs.ext3 -F $ROOTFS -L ROOT +mkfs.ext3 -F $ROOTFS -L ROOT || error Failed to format $ROOTFS echo Formatting swap partition...($SWAP) -mkswap $SWAP +mkswap $SWAP || error Failed to prepare swap # @@ -228,7 +249,7 @@ echo echo Mounting images and device in preparation for installation... TMPDIR=$(mktemp -d mkefidisk-XXX) if [ $? -ne 0 ]; then - echo ERROR: Failed to create temporary mounting directory. + error Failed to create temporary mounting directory. exit 1 fi HDDIMG_MNT=$TMPDIR/hddimg @@ -240,17 +261,15 @@ mkdir $HDDIMG_ROOTFS_MNT mkdir $ROOTFS_MNT mkdir $BOOTFS_MNT -mount -o loop $HDDIMG $HDDIMG_MNT -if [ $? -ne 0 ]; then echo ERROR: Failed to mount $HDDIMG; fi +mount -o loop $HDDIMG $HDDIMG_MNT || error Failed to mount $HDDIMG -mount -o loop $HDDIMG_MNT/rootfs.img $HDDIMG_ROOTFS_MNT -if [ $? -ne 0 ]; then echo ERROR: Failed to mount rootfs.img; fi +mount -o loop $HDDIMG_MNT/rootfs.img $HDDIMG_ROOTFS_MNT || error Failed to mount rootfs.img -mount $ROOTFS $ROOTFS_MNT -mount $BOOTFS $BOOTFS_MNT +mount $ROOTFS $ROOTFS_MNT || error Failed to mount $ROOTFS on $ROOTFS_MNT +mount $BOOTFS $BOOTFS_MNT || error Failed to mount $BOOTFS on $BOOTFS_MNT echo Copying ROOTFS files... -cp -a $HDDIMG_ROOTFS_MNT/* $ROOTFS_MNT +cp -a $HDDIMG_ROOTFS_MNT/* $ROOTFS_MNT || error Root FS copy failed echo $TARGET_SWAP swap swap defaults 0 0 $ROOTFS_MNT/etc/fstab @@ -259,14 +278,14 @@ if [ -d $ROOTFS_MNT/etc/udev/ ] ; then
[OE-core] [PATCH 0/8] mkefidisk updates and gummiboot support
mkefidisk was in need of some improvements. This adds gummiboot support, but also adds improved logging, output formatting, robustness, error trapping, cleanup, and verbosity control. The following changes since commit 03c6fd0caab0ea8dcc2e0c3ab827a287a4f36910: ltp: use foreign automake strictness (2014-07-16 10:31:17 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib dvhart/mkefidisk http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=dvhart/mkefidisk Darren Hart (8): mkefidisk.sh: Use all caps for volume names mkefidisk.sh: Add mount error checking mkefidisk.sh: Add gummiboot support mkefidisk.sh: Copy the EFI dir recursively mkefidisk.sh: Improve logging mkefidisk.sh: Add die() and cleanup() routines mkefidisk.sh: Make the rootfs copy the last step mkefidisk.sh: Reduce output and add verbose flag scripts/contrib/mkefidisk.sh | 306 --- 1 file changed, 204 insertions(+), 102 deletions(-) -- 2.0.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [meta-oe][PATCH] [v2] nettle: update to version 3.0
On 16 July 2014 18:18, Saul Wold s...@linux.intel.com wrote: The only other concern I have is there is a COPYING.GPLv3, you might want to check with the upstream what the intent of having that License file is for, do they intend on some parts being v3 and if so which parts? They'll need a LGPLv3 license alongside the GPLv2 license if they're dual-licensing, but we should checksum the LGPLv3 or GPLv2 statement if it's written down anywhere in the tarball (which I hope it is) so we get alerted if they ever decide to be LGPLv3+ only. I am not sure if the INCOMPATIBLE_LICENSE will handle the OR properly, but we should just have one version. The INCOMPATIBLE_LICENSE checks do handle or license statements. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] openssh: use pidfile in initscript
From: Richard Tollerton rich.toller...@ni.com Stopping sshd must only kill the listening (top-level) daemon; it must not stop any other sshd process, because those are forked ssh connections which may include e.g. the connection that called /etc/init.d/sshd stop. This initscript uses start-stop-daemon -x exe for starting/stopping. When that is provided by busybox, this behavior is broken: `/etc/init.d/sshd stop` stops *all* sshd processes. This was caused by a fix to busybox 1.20: 17eedcad9406c43beddab3906c8c693626c351fb ssd: compat: match -x EXECUTABLE by /proc/pid/exe too. The fix is to use a pidfile. All initscripts in upstream openssh do this, as does dropbear. Acked-by: Gratian Crisan gratian.cri...@ni.com Acked-by: Ken Sharp ken.sh...@ni.com Signed-off-by: Richard Tollerton rich.toller...@ni.com Signed-off-by: Ben Shelton ben.shel...@ni.com --- meta/recipes-connectivity/openssh/openssh/init | 12 +++- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/meta/recipes-connectivity/openssh/openssh/init b/meta/recipes-connectivity/openssh/openssh/init index 37c8e7b..70d4a34 100644 --- a/meta/recipes-connectivity/openssh/openssh/init +++ b/meta/recipes-connectivity/openssh/openssh/init @@ -1,6 +1,8 @@ #! /bin/sh set -e +PIDFILE=/var/run/sshd.pid + # source function library . /etc/init.d/functions @@ -70,12 +72,12 @@ case $1 in echo Starting OpenBSD Secure Shell server: sshd check_keys check_privsep_dir - start-stop-daemon -S -x /usr/sbin/sshd -- $SSHD_OPTS + start-stop-daemon -S -p $PIDFILE -x /usr/sbin/sshd -- $SSHD_OPTS echo done. ;; stop) echo -n Stopping OpenBSD Secure Shell server: sshd - start-stop-daemon -K -x /usr/sbin/sshd + start-stop-daemon -K -p $PIDFILE -x /usr/sbin/sshd echo . ;; @@ -84,7 +86,7 @@ case $1 in check_keys check_config echo -n Reloading OpenBSD Secure Shell server's configuration - start-stop-daemon -K -s 1 -x /usr/sbin/sshd + start-stop-daemon -K -p $PIDFILE -s 1 -x /usr/sbin/sshd echo . ;; @@ -92,11 +94,11 @@ case $1 in check_keys check_config echo -n Restarting OpenBSD Secure Shell server: sshd - start-stop-daemon -K --oknodo -x /usr/sbin/sshd + start-stop-daemon -K -p $PIDFILE --oknodo -x /usr/sbin/sshd check_for_no_start check_privsep_dir sleep 2 - start-stop-daemon -S -x /usr/sbin/sshd -- $SSHD_OPTS + start-stop-daemon -S -p $PIDFILE -x /usr/sbin/sshd -- $SSHD_OPTS echo . ;; -- 2.0.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/5] initscripts: make hostname.sh coreutils-compatible
From: Richard Tollerton rich.toller...@ni.com inetutils and busybox hostname utils support `hostname -F`; coreutils hostname doesn't. So just use `cat` instead. Signed-off-by: Richard Tollerton rich.toller...@ni.com Signed-off-by: Ben Shelton ben.shel...@ni.com --- meta/recipes-core/initscripts/initscripts-1.0/hostname.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh b/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh index 78fb91c..95287cc 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/hostname.sh @@ -16,7 +16,7 @@ fi # Busybox hostname doesn't support -b so we need implement it on our own if [ -f /etc/hostname ];then - hostname -F /etc/hostname + hostname `cat /etc/hostname` elif [ -z $HOSTNAME -o $HOSTNAME = (none) -o ! -z `echo $HOSTNAME | sed -n '/^[0-9]*\.[0-9].*/p'` ] ; then hostname localhost fi -- 2.0.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] initscripts: parametrize random seed file location
From: Richard Tollerton rich.toller...@ni.com Currently, the random seed file location is hardcoded to /var/lib/urandom/random-seed. Refactor it to a parameter (RANDOM_SEED_FILE) so the file location is defined in only one place. Signed-off-by: Richard Tollerton rich.toller...@ni.com Signed-off-by: Ben Shelton ben.shel...@ni.com --- meta/recipes-core/initscripts/initscripts-1.0/urandom | 13 - 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/meta/recipes-core/initscripts/initscripts-1.0/urandom b/meta/recipes-core/initscripts/initscripts-1.0/urandom index eb3a7c3..a0549de 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/urandom +++ b/meta/recipes-core/initscripts/initscripts-1.0/urandom @@ -12,6 +12,9 @@ ### END INIT INFO test -c /dev/urandom || exit 0 + +RANDOM_SEED_FILE=/var/lib/urandom/random-seed + . /etc/default/rcS case $1 in @@ -19,13 +22,13 @@ case $1 in test $VERBOSE != no echo Initializing random number generator... # Load and then save 512 bytes, # which is the size of the entropy pool - if test -f /var/lib/urandom/random-seed + if test -f $RANDOM_SEED_FILE then - cat /var/lib/urandom/random-seed /dev/urandom + cat $RANDOM_SEED_FILE /dev/urandom fi - rm -f /var/lib/urandom/random-seed + rm -f $RANDOM_SEED_FILE umask 077 - dd if=/dev/urandom of=/var/lib/urandom/random-seed count=1 \ + dd if=/dev/urandom of=$RANDOM_SEED_FILE count=1 \ /dev/null 21 || echo urandom start: failed. umask 022 ;; @@ -34,7 +37,7 @@ case $1 in # see documentation in linux/drivers/char/random.c test $VERBOSE != no echo Saving random seed... umask 077 - dd if=/dev/urandom of=/var/lib/urandom/random-seed count=1 \ + dd if=/dev/urandom of=$RANDOM_SEED_FILE count=1 \ /dev/null 21 || echo urandom stop: failed. ;; *) -- 2.0.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] initscripts: save /etc/timestamp with seconds accuracy
From: Blair Elliott blair.elli...@ni.com Currently, /etc/timestamp is saved with minutes accuracy. To increase the accuracy, modify the save-rtc.sh and bootmisc.sh scripts to save and read /etc/timestamp respectively with seconds accuracy. Signed-off-by: Richard Tollerton rich.toller...@ni.com Signed-off-by: Ben Shelton ben.shel...@ni.com --- meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh | 5 +++-- meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh index 5211824..ccc7f9f 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh @@ -66,10 +66,11 @@ fi test -x /etc/init.d/hwclock.sh /etc/init.d/hwclock.sh start if test -e /etc/timestamp then - SYSTEMDATE=`date -u +%4Y%2m%2d%2H%2M` + SYSTEMDATE=`date -u +%4Y%2m%2d%2H%2M%2S` read TIMESTAMP /etc/timestamp if [ ${TIMESTAMP} -gt $SYSTEMDATE ]; then - date -u ${TIMESTAMP#}${TIMESTAMP%} + # format the timestamp as date expects it (2m2d2H2M4Y.2S) + date -u ${TIMESTAMP:4:8}${TIMESTAMP:0:4}.${TIMESTAMP:(-2)} test -x /etc/init.d/hwclock.sh /etc/init.d/hwclock.sh stop fi fi diff --git a/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh b/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh index 1f804e2..b038fc5 100644 --- a/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh @@ -10,4 +10,4 @@ ### END INIT INFO # Update the timestamp -date -u +%4Y%2m%2d%2H%2M /etc/timestamp +date -u +%4Y%2m%2d%2H%2M%2S /etc/timestamp -- 2.0.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 18/19] xserver-xorg: Fix build determinism problem
On Wed, 2014-07-16 at 21:38 +0100, Burton, Ross wrote: On 16 July 2014 17:26, Richard Purdie richard.pur...@linuxfoundation.org wrote: WARNING: QA Issue: xserver-xorg rdepends on nettle but its not a build dependency? [build-deps] We list openssl in DEPENDS so we need to specify that as the sha1 provider rather that nettle which is autodetected. If xserver is seeing both openssl and nettle installed but picking nettle, should we switch the build dependency from openssl to nettle? The nettle library is half the size of openssl and has saner licensing, so this seems like a win to me. Happy to have a follow up patch. I just fixed it so it was at least doing what we were supposedly configuring it to. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/5] Various fixes and improvements to initscripts
This patch series contains fixes and improvements we've made to several init scripts. These changes have been thoroughly tested on Dylan and ported to master. The following changes since commit 846bc50fde11bbb36c8eb5b2e3ae6bb644c037f3: ltp: use foreign automake strictness (2014-07-16 10:27:16 +0100) are available in the git repository at: git://github.com/ni/openembedded-core dev/bshelton/upstream_initscripts https://github.com/ni/openembedded-core/tree/dev/bshelton/upstream_initscripts Blair Elliott (1): initscripts: save /etc/timestamp with seconds accuracy Ken Sharp (1): initscripts: Use current date as an additional source of entropy Richard Tollerton (3): initscripts: bootmisc.sh: Make sysctl -p honor VERBOSE initscripts: parametrize random seed file location initscripts: make hostname.sh coreutils-compatible .../initscripts/initscripts-1.0/bootmisc.sh | 12 +--- .../initscripts/initscripts-1.0/hostname.sh | 2 +- .../initscripts/initscripts-1.0/save-rtc.sh | 2 +- .../recipes-core/initscripts/initscripts-1.0/urandom | 20 +++- 4 files changed, 22 insertions(+), 14 deletions(-) -- 2.0.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] initscripts: Use current date as an additional source of entropy
From: Ken Sharp ken.sh...@ni.com If the seed file is empty or does not exist, the date is an extremely poor backup source of entropy, but it is better than nothing. Signed-off-by: Richard Tollerton rich.toller...@ni.com Signed-off-by: Ben Shelton ben.shel...@ni.com --- meta/recipes-core/initscripts/initscripts-1.0/urandom | 11 +-- 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/meta/recipes-core/initscripts/initscripts-1.0/urandom b/meta/recipes-core/initscripts/initscripts-1.0/urandom index a0549de..ec4ef61 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/urandom +++ b/meta/recipes-core/initscripts/initscripts-1.0/urandom @@ -20,12 +20,11 @@ RANDOM_SEED_FILE=/var/lib/urandom/random-seed case $1 in start|) test $VERBOSE != no echo Initializing random number generator... - # Load and then save 512 bytes, - # which is the size of the entropy pool - if test -f $RANDOM_SEED_FILE - then - cat $RANDOM_SEED_FILE /dev/urandom - fi + # Load and then save 512 bytes, which is the size of the entropy + # pool. Also load the current date, in case the seed file is + # empty. + ( date +%s.%N; [ -f $RANDOM_SEED_FILE ] cat $RANDOM_SEED_FILE ) \ + /dev/urandom rm -f $RANDOM_SEED_FILE umask 077 dd if=/dev/urandom of=$RANDOM_SEED_FILE count=1 \ -- 2.0.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] initscripts: bootmisc.sh: Make sysctl -p honor VERBOSE
From: Richard Tollerton rich.toller...@ni.com busybox sysctl may lack the -q setting, so simulate it with redirects. Signed-off-by: Richard Tollerton rich.toller...@ni.com Signed-off-by: Ben Shelton ben.shel...@ni.com --- meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh index 3b5a47f..5211824 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh @@ -36,7 +36,12 @@ if [ -f ${SYSCTL_CONF} ] then if [ -x /sbin/sysctl ] then - /sbin/sysctl -p ${SYSCTL_CONF} + # busybox sysctl does not support -q + VERBOSE_REDIR=1/dev/null + if [ ${VERBOSE} != no ]; then + VERBOSE_REDIR=11 + fi + eval /sbin/sysctl -p ${SYSCTL_CONF} $VERBOSE_REDIR else echo To have ${SYSCTL_CONF} applied during boot, install package procps. fi -- 2.0.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/5] initscripts: save /etc/timestamp with seconds accuracy
On 07/16/2014 01:59 PM, Ben Shelton wrote: From: Blair Elliott blair.elli...@ni.com Currently, /etc/timestamp is saved with minutes accuracy. To increase the accuracy, modify the save-rtc.sh and bootmisc.sh scripts to save and read /etc/timestamp respectively with seconds accuracy. We also initialize it in the image.bbclass, you may want to tweak that one. Since we deal with readonly it's possible it won't get updated after the image creation. Sau! Signed-off-by: Richard Tollerton rich.toller...@ni.com Signed-off-by: Ben Shelton ben.shel...@ni.com --- meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh | 5 +++-- meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh index 5211824..ccc7f9f 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh @@ -66,10 +66,11 @@ fi test -x /etc/init.d/hwclock.sh /etc/init.d/hwclock.sh start if test -e /etc/timestamp then - SYSTEMDATE=`date -u +%4Y%2m%2d%2H%2M` + SYSTEMDATE=`date -u +%4Y%2m%2d%2H%2M%2S` read TIMESTAMP /etc/timestamp if [ ${TIMESTAMP} -gt $SYSTEMDATE ]; then - date -u ${TIMESTAMP#}${TIMESTAMP%} + # format the timestamp as date expects it (2m2d2H2M4Y.2S) + date -u ${TIMESTAMP:4:8}${TIMESTAMP:0:4}.${TIMESTAMP:(-2)} test -x /etc/init.d/hwclock.sh /etc/init.d/hwclock.sh stop fi fi diff --git a/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh b/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh index 1f804e2..b038fc5 100644 --- a/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/save-rtc.sh @@ -10,4 +10,4 @@ ### END INIT INFO # Update the timestamp -date -u +%4Y%2m%2d%2H%2M /etc/timestamp +date -u +%4Y%2m%2d%2H%2M%2S /etc/timestamp -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/5] initscripts: bootmisc.sh: Make sysctl -p honor VERBOSE
On 07/16/2014 01:59 PM, Ben Shelton wrote: From: Richard Tollerton rich.toller...@ni.com busybox sysctl may lack the -q setting, so simulate it with redirects. Signed-off-by: Richard Tollerton rich.toller...@ni.com Signed-off-by: Ben Shelton ben.shel...@ni.com --- meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh | 7 ++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh index 3b5a47f..5211824 100755 --- a/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh +++ b/meta/recipes-core/initscripts/initscripts-1.0/bootmisc.sh @@ -36,7 +36,12 @@ if [ -f ${SYSCTL_CONF} ] then if [ -x /sbin/sysctl ] then - /sbin/sysctl -p ${SYSCTL_CONF} + # busybox sysctl does not support -q Will this work if procps's sysctl is used instead, I think it will but wanted to verify it. Sau! + VERBOSE_REDIR=1/dev/null + if [ ${VERBOSE} != no ]; then + VERBOSE_REDIR=11 + fi + eval /sbin/sysctl -p ${SYSCTL_CONF} $VERBOSE_REDIR else echo To have ${SYSCTL_CONF} applied during boot, install package procps. fi -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 03/19] python-scons: Upgrade 2.3.0 - 2.3.2
On 16 July 2014 17:26, Richard Purdie richard.pur...@linuxfoundation.org wrote: -LIC_FILES_CHKSUM = file://LICENSE.txt;md5=98e9a1e6029e715255c52032a1eba637 +LIC_FILES_CHKSUM = file://LICENSE.txt;md5=f0ad8a74a10870caa5e08a3e45d719e2 Why did the checksum change? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [oe] [PATCH 0/7][RFC] Remove enforced --foreign in autoreconf
On Tue, 2014-07-15 at 18:58 +0200, Martin Jansa wrote: On Tue, Jul 15, 2014 at 05:18:30PM +0100, Ross Burton wrote: Hi, Since 2004 we've been forcibly passing --foreign to automake in autoreconf. This is a change from upstream behaviour and can actually break packages that expect GNU behaviour (admittedly the failure case reported was interesting), and I'm on a bit of a mission to remove patches that don't have a solid reason behind them. Forcing --foreign doesn't seem that important these days as the majority of packages are telling automake they're foreign, There are a few packages that need patches for this change, notably they're mostly packages that haven't seen a release for ten years. This series is build tested against a world build in oe-core for NUC, so I'd call it a demonstration that the patch is viable and would appreciate others running build tests against other machines or layers. world builds from http://www.openembedded.org/wiki/Bitbake_World_Status already have around ~50 failed recipes per architecture, I don't think we need more now :/ Do we have some volunteers to fix-up meta-oe/* layers? I'm going to use PNBLACKLIST more aggressively as agreed on OEDAM, but with this speed next meta-oe release will have half of recipes which were available in daisy. I made a quick test and the failures I spotted from meta-oe likely due to this patch were: re2c libsdl-iomage claws-plugin-gtkhtml2-viewer claws-plugin-rssyl libsdl-tiff libol ode dejagnu memcached rp-pppoe ipsec-tools mtr hplip onig Its probably not a complete list as I have a lot more failures than your world builds but it gives some idea of number and its not a massive list. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 03/19] python-scons: Upgrade 2.3.0 - 2.3.2
On Wed, 2014-07-16 at 23:30 +0100, Burton, Ross wrote: On 16 July 2014 17:26, Richard Purdie richard.pur...@linuxfoundation.org wrote: -LIC_FILES_CHKSUM = file://LICENSE.txt;md5=98e9a1e6029e715255c52032a1eba637 +LIC_FILES_CHKSUM = file://LICENSE.txt;md5=f0ad8a74a10870caa5e08a3e45d719e2 Why did the checksum change? Gah, I did check but forgot to put it in the log. It was the copyright year. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 1/2] python-distribute: add nativesdk to BBCLASSEXTEND
Hi Otavio, Em 15-07-2014 10:35, Otavio Salvador escreveu: On Mon, Jul 14, 2014 at 7:55 PM, João Henrique Ferreira de Freitas joa...@gmail.com wrote: Without this, python tools that need python-distribute doesn't install in SDK generated by OE. Signed-off-by: João Henrique Ferreira de Freitas joa...@gmail.com --- meta/recipes-devtools/python/python-distribute_0.6.32.bb | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/recipes-devtools/python/python-distribute_0.6.32.bb b/meta/recipes-devtools/python/python-distribute_0.6.32.bb index 58bb8b4..7000145 100644 --- a/meta/recipes-devtools/python/python-distribute_0.6.32.bb +++ b/meta/recipes-devtools/python/python-distribute_0.6.32.bb @@ -39,6 +39,12 @@ do_install_append() { echo ./${SRCNAME}-${PV}-py${PYTHON_BASEVERSION}.egg ${D}${PYTHON_SITEPACKAGES_DIR}/setuptools.pth } +do_install_append_class-nativesdk() { + sed -i -e '1s|^#!.*|#!/usr/bin/env python|' ${D}${PYTHON_SITEPACKAGES_DIR}/distribute-${PV}-py${PYTHON_BASEVERSION}.egg/setuptools/tests/test_resources.py + sed -i -e '1s|^#!.*|#!/usr/bin/env python|' ${D}${bindir}/easy_install + sed -i -e '1s|^#!.*|#!/usr/bin/env python|' ${D}${bindir}/easy_install-${PYTHON_BASEVERSION} +} Couldn't this be done unconditionally for all target types? /usr/bin/env python should work fine in target as well, no? I don't know if I fully understood your question... Do you mean by 'all target types' like native, nativesdk ? In some recipes (gnome-doc-utils.inc, createrepo_0.4.11.bb) , this pattern was used: # Wrap the python script since the native python is # ${bindir}/python-native/python, and the #! /usr/bin/env python can't # find it since it is not in PATH. do_install_append_class-native () { ... sed -i -e 's|^#!.*/usr/bin/env python|#! /usr/bin/env nativepython|' $i ... } Sometimes I feel really lost when need to fixes things like that. What is the correct way? Without do_install_append_class-nativesdk() I got: Computing transaction...error: Can't install nativesdk-python-distribute-0.6.32-ml5@x86_64_nativesdk: no package provides /usr/bin/python Thanks. -- João Henrique Ferreira de Freitas - joaohf_at_gmail.com Campinas-SP-Brasil -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] perl: strip RPATH from libxml-parser-perl Expat.so
Em 16-07-2014 05:33, Richard Purdie escreveu: On Wed, 2014-07-16 at 00:00 -0300, João Henrique Ferreira de Freitas wrote: I've seen this happen before with a half built perl recipe where you've switched machines half way through a build of perl. Stripping out the RPATH is not the right fix though. Cheers, Richard I agree. And what is the right way to fix it? Is an issue from perl recipes ? I want to get an start point. Thanks. -- João Henrique Ferreira de Freitas - joaohf_at_gmail.com Campinas-SP-Brasil -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] perf: split package
On 07/16/2014 09:04 PM, Bruce Ashfield wrote: On Wed, Jul 16, 2014 at 4:00 AM, Chong Lu chong...@windriver.com wrote: Fix incorrect paths to split perf package. Can you elaborate here ? This commit message doesn't really tell us much. Why is the current split incorrect ? What is the symptom and result of the incorrect split ? Are the package contents the same after this change ? Bruce Hi Bruce, Currently, perf can't split to perf-archive, perf-tests, perf-python and perf-perl. All files are included in perf package. For example, like perf-tests package: It generates files in '${exec_prefix}/libexec/perf-core/tests', not in '${libdir}/perf/perf-core/tests'. So I change the files paths to make split successfully. I will improve commit message and resend a V2. Best Regards Chong Signed-off-by: Chong Lu chong...@windriver.com --- meta/recipes-kernel/perf/perf.bb | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 20968f9..781a738 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -166,10 +166,10 @@ RSUGGESTS_${PN} += ${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING} FILES_${PN} += ${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent FILES_${PN}-dbg += ${libdir}/python*/site-packages/.debug -FILES_${PN}-archive = ${libdir}/perf/perf-core/perf-archive -FILES_${PN}-tests = ${libdir}/perf/perf-core/tests -FILES_${PN}-python = ${libdir}/python*/site-packages ${libdir}/perf/perf-core/scripts/python -FILES_${PN}-perl = ${libdir}/perf/perf-core/scripts/perl +FILES_${PN}-archive = ${exec_prefix}/libexec/perf-core/perf-archive +FILES_${PN}-tests = ${exec_prefix}/libexec/perf-core/tests +FILES_${PN}-python = ${libdir}/python*/site-packages ${exec_prefix}/libexec/perf-core/scripts/python +FILES_${PN}-perl = ${exec_prefix}/libexec/perf-core/scripts/perl INHIBIT_PACKAGE_DEBUG_SPLIT=1 -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] libgcrypt workaround
OE-devs/Tim: Here's the basic recipe patch; not sure if I should submit it formally or not. Maybe a configure patch is preferred? Feedback welcome. Thanks, Steve diff --git a/meta/recipes-support/libgcrypt/libgcrypt.inc b/meta/recipes-support/libgcrypt/libgcrypt.inc index bba4a79..bd4eedd 100644 --- a/meta/recipes-support/libgcrypt/libgcrypt.inc +++ b/meta/recipes-support/libgcrypt/libgcrypt.inc @@ -22,11 +22,17 @@ inherit autotools-brokensep texinfo binconfig-disabled pkgconfig ASFLAGS=--divide CPPFLAGS_append = -DPIC -fPIC + EXTRA_OECONF = --without-capabilities --disable-padlock-support do_configure_prepend () { # Else these could be used in prefernce to those in aclocal-copy rm -f ${S}/m4/*.m4 + export GPG_ERROR_LIBS=-L${STAGING_LIBDIR} -lgpg-error +} + +do_configure_prepend_class-native() { + export GPG_ERROR_LIBS=-L${STAGING_LIBDIR_NATIVE} -lgpg-error } # libgcrypt.pc is added locally and thus installed here -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] package.bbclass: ensure correct modes on directories
The following changes since commit 846bc50fde11bbb36c8eb5b2e3ae6bb644c037f3: ltp: use foreign automake strictness (2014-07-16 10:27:16 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib ChenQi/package-file-modes http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/package-file-modes Chen Qi (1): package.bbclass: ensure correct modes on directories meta/classes/package.bbclass |1 + 1 file changed, 1 insertion(+) -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] package.bbclass: ensure correct modes on directories
Previously, when we create directories in populate_packages, the directory modes are not all correct. Take the base-files recipe as an example. The directory package/home has mode 2755, but packages-split/base-files/home has mode 0755. So after using creating directory, we need to use chmod to ensure it gets the correct mode. [YOCTO #6517] Signed-off-by: Chen Qi qi.c...@windriver.com --- meta/classes/package.bbclass |1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 26a20d1..7e85af4 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -1019,6 +1019,7 @@ python populate_packages () { dest = os.path.join(dest, p) fstat = cpath.stat(src) os.mkdir(dest, fstat.st_mode) +os.chmod(dest, fstat.st_mode) os.chown(dest, fstat.st_uid, fstat.st_gid) if p not in seen: seen.append(p) -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] perf: split package
On Wed, Jul 16, 2014 at 9:43 PM, Chong Lu chong...@windriver.com wrote: On 07/16/2014 09:04 PM, Bruce Ashfield wrote: On Wed, Jul 16, 2014 at 4:00 AM, Chong Lu chong...@windriver.com wrote: Fix incorrect paths to split perf package. Can you elaborate here ? This commit message doesn't really tell us much. Why is the current split incorrect ? What is the symptom and result of the incorrect split ? Are the package contents the same after this change ? Bruce Hi Bruce, Currently, perf can't split to perf-archive, perf-tests, perf-python and perf-perl. All files are included in perf package. For example, like perf-tests package: It generates files in '${exec_prefix}/libexec/perf-core/tests', not in '${libdir}/perf/perf-core/tests'. So I change the files paths to make split successfully. But that means, whether or not we like it, anything using perf has been using those non splits and getting everything when perf is installed. It's also might be in order to make the main perf package RDEPEND on the other three, to keep it consistent. Make it a ?= so it can be overridden, and then we can age it out over time. Bruce I will improve commit message and resend a V2. Best Regards Chong Signed-off-by: Chong Lu chong...@windriver.com --- meta/recipes-kernel/perf/perf.bb | 8 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-kernel/perf/perf.bb b/meta/recipes-kernel/perf/perf.bb index 20968f9..781a738 100644 --- a/meta/recipes-kernel/perf/perf.bb +++ b/meta/recipes-kernel/perf/perf.bb @@ -166,10 +166,10 @@ RSUGGESTS_${PN} += ${PN}-archive ${PN}-tests ${RSUGGESTS_SCRIPTING} FILES_${PN} += ${libexecdir}/perf-core ${exec_prefix}/libexec/perf-core ${libdir}/traceevent FILES_${PN}-dbg += ${libdir}/python*/site-packages/.debug -FILES_${PN}-archive = ${libdir}/perf/perf-core/perf-archive -FILES_${PN}-tests = ${libdir}/perf/perf-core/tests -FILES_${PN}-python = ${libdir}/python*/site-packages ${libdir}/perf/perf-core/scripts/python -FILES_${PN}-perl = ${libdir}/perf/perf-core/scripts/perl +FILES_${PN}-archive = ${exec_prefix}/libexec/perf-core/perf-archive +FILES_${PN}-tests = ${exec_prefix}/libexec/perf-core/tests +FILES_${PN}-python = ${libdir}/python*/site-packages ${exec_prefix}/libexec/perf-core/scripts/python +FILES_${PN}-perl = ${exec_prefix}/libexec/perf-core/scripts/perl INHIBIT_PACKAGE_DEBUG_SPLIT=1 -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2]rewrite eglibc-utils/usr/bin/tzselect as a posix sh and let it work
[YOCTO #6544] Test Steps: 1. Vim local.conf The tzdata supplyed timezone info. ... MACHINE ?= qemuarm IMAGE_FEATURES += ssh-server-dropbear IMAGE_INSTALL_append = tzcode tzdata ... 2. bitbake core-image-minimal 3. start qemu and ssh target 4. Use busybox as default shell(bash not installed any more) root@qemuarm:~# ls /bin/sh -al lrwxrwxrwx1 root root19 Jul 17 03:45 /bin/sh - /bin/busybox.nosuid 5. Use busybox's awk by default root@qemuarm:~# which awk /usr/bin/awk root@qemuarm:~# ls -al /usr/bin/awk lrwxrwxrwx1 root root19 Jul 17 03:45 /usr/bin/awk - /bin/busybox.nosuid 6. test case 1: set timezone directly ... root@qemuarm:~# tzselect -c +4852+00220 Please identify a location so that time zone rules can be set correctly. Please select one of the following time zone regions, listed roughly in increasing order of distance from +4852+00220. 1) France 2) Belgium 3) Luxembourg 4) Jersey 5) Britain (UK) 6) Guernsey 7) Netherlands 8) Germany - Busingen 9) Switzerland 10) Liechtenstein #? 1 The following information has been given: coord +4852+00220 France Therefore TZ='Europe/Paris' will be used. Local time is now: Wed Jul 16 13:42:29 CEST 2014. Universal Time is now: Wed Jul 16 11:42:29 UTC 2014. Is the above information OK? 1) Yes 2) No #? 1) Yes 2) No #? 1 You can make this change permanent for yourself by appending the line TZ='Europe/Paris'; export TZ to the file '.profile' in your home directory; then log out and log in again. Here is that TZ value again, this time on standard output so that you can use the /usr/bin/tzselect command in shell scripts: Europe/Paris 7. test case 2: set timezone interactively ... root@qemuarm:~# tzselect Please identify a location so that time zone rules can be set correctly. Please select a continent, ocean, coord, or TZ. 1) Africa 2) Americas 3) Antarctica 4) Arctic Ocean 5) Asia 6) Atlantic Ocean 7) Australia 8) Europe 9) Indian Ocean 10) Pacific Ocean 11) coord - I want to use geographical coordinates. 12) TZ - I want to specify the time zone using the Posix TZ format. #? 2 Please select a country whose clocks agree with yours. 1) Anguilla 2) Antigua Barbuda 3) Argentina 4) Aruba 5) Bahamas 6) Barbados 7) Belize 8) Bolivia 9) Brazil 10) Canada 11) Caribbean Netherlands 12) Cayman Islands 13) Chile 14) Colombia 15) Costa Rica 16) Cuba 17) Curacao 18) Dominica 19) Dominican Republic 20) Ecuador 21) El Salvador 22) French Guiana 23) Greenland 24) Grenada 25) Guadeloupe 26) Guatemala 27) Guyana 28) Haiti 29) Honduras 30) Jamaica 31) Martinique 32) Mexico 33) Montserrat 34) Nicaragua 35) Panama 36) Paraguay 37) Peru 38) Puerto Rico 39) St Barthelemy 40) St Kitts Nevis 41) St Lucia 42) St Maarten (Dutch part) 43) St Martin (French part) 44) St Pierre Miquelon 45) St Vincent 46) Suriname 47) Trinidad Tobago 48) Turks Caicos Is 49) United States 50) Uruguay 51) Venezuela 52) Virgin Islands (UK) 53) Virgin Islands (US) #? 49 Please select one of the following time zone regions. 1) Eastern Time 2) Eastern Time - Michigan - most locations 3) Eastern Time - Kentucky - Louisville area 4) Eastern Time - Kentucky - Wayne County 5) Eastern Time - Indiana - most locations 6) Eastern Time - Indiana - Daviess, Dubois, Knox Martin Counties 7) Eastern Time - Indiana - Pulaski County 8) Eastern Time - Indiana - Crawford County 9) Eastern Time - Indiana - Pike County 10) Eastern Time - Indiana - Switzerland County 11) Central Time 12) Central Time - Indiana - Perry County 13) Central Time - Indiana - Starke County 14) Central Time - Michigan - Dickinson, Gogebic, Iron Menominee Counties 15) Central Time - North Dakota - Oliver County 16) Central Time - North Dakota - Morton County (except Mandan area) 17) Central Time - North Dakota - Mercer County 18) Mountain Time 19) Mountain Time - south Idaho east Oregon 20) Mountain Standard Time - Arizona (except Navajo) 21) Pacific Time 22) Alaska Time 23) Alaska Time - Alaska panhandle 24) Alaska Time - southeast Alaska panhandle 25) Alaska Time - Alaska panhandle neck 26) Alaska Time - west Alaska 27) Aleutian Islands 28) Metlakatla Time - Annette Island 29) Hawaii #? 1 The following information has been given: United States Eastern Time Therefore TZ='America/New_York' will be used. Local time is now: Thu Jul 17 00:33:16 EDT 2014. Universal Time is now: Thu Jul 17 04:33:16 UTC 2014. Is the above information OK? 1) Yes 2) No #? 1 You can make this change permanent for yourself by appending the line TZ='America/New_York'; export TZ to the file '.profile' in your home directory; then log out and log in again. Here is that TZ value again, this time on standard output so that you can use the /usr/bin/tzselect command in shell scripts: America/New_York ... //Hongxu The following changes since commit 1dcdd877c7946be4c0b1203deb14e2f842f9d0c2: bitbake: toasterui: fix build - project
[OE-core] [PATCH 1/2] busybox: enable CONFIG_FEATURE_AWK_LIBM by default
It was required by tzselect which is provided by eglibc utils. The eglibc is a fundamental package, so enable math functions of awk is reasonable. Here is the error if we not enable that: ... root@qemuarm:~# tzselect -c +4852+00220 awk: cmd. line:39: Math support is not compiled in ... [YOCTO #6544] Signed-off-by: Hongxu Jia hongxu@windriver.com --- meta/recipes-core/busybox/busybox/defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig index 47eca21..0107231 100644 --- a/meta/recipes-core/busybox/busybox/defconfig +++ b/meta/recipes-core/busybox/busybox/defconfig @@ -377,7 +377,7 @@ CONFIG_FEATURE_VI_WIN_RESIZE=y # CONFIG_FEATURE_VI_ASK_TERMINAL is not set CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y CONFIG_AWK=y -# CONFIG_FEATURE_AWK_LIBM is not set +CONFIG_FEATURE_AWK_LIBM=y CONFIG_CMP=y CONFIG_DIFF=y # CONFIG_FEATURE_DIFF_LONG_OPTIONS is not set -- 1.8.1.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core