Re: [OE-core] [PATCH 2/3] gnutls: update to 3.4.1
So this happens: WARNING: QA Issue: gnutls-openssl rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls-xx rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls-dev rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls-bin rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls rdepends on libidn, but it isn't a build dependency? [build-deps] Ross On 14 June 2015 at 06:37, Armin Kuster akuster...@gmail.com wrote: This version supports the nettle 3.x and higher and requires that version. this include a security fix: GNUTLS-SA-2015-2 no CVE assigned to date. enable openssl compat via PACKAGECONFIG as iputils needs gnutls/openssl.h for migration info: http://www.gnutls.org/manual/gnutls.html#Upgrading-from-previous-versions Signed-off-by: Armin Kuster akuster...@gmail.com --- meta/recipes-support/gnutls/gnutls.inc | 3 ++- .../gnutls/configure.ac-fix-sed-command.patch | 29 ++ meta/recipes-support/gnutls/gnutls_3.3.14.bb | 8 -- meta/recipes-support/gnutls/gnutls_3.4.1.bb| 8 ++ 4 files changed, 23 insertions(+), 25 deletions(-) delete mode 100644 meta/recipes-support/gnutls/gnutls_3.3.14.bb create mode 100644 meta/recipes-support/gnutls/gnutls_3.4.1.bb diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index e9b138a..6928cb9 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc @@ -34,9 +34,10 @@ do_configure_prepend() { done } -PACKAGECONFIG ??= zlib +PACKAGECONFIG ??= zlib openssl_compat PACKAGECONFIG[tpm] = --with-tpm, --without-tpm, trousers PACKAGECONFIG[zlib] = --with-zlib, --without-zlib, zlib +PACKAGECONFIG[openssl_compat] = --enable-openssl-compatibility,, PACKAGES =+ ${PN}-openssl ${PN}-xx diff --git a/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch b/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch index 44a9934..342143f 100644 --- a/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch +++ b/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch @@ -13,19 +13,16 @@ Signed-off-by: Robert Yang liezhi.y...@windriver.com configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index c6818a0..1c4582d 100644 a/configure.ac -+++ b/configure.ac -@@ -466,7 +466,7 @@ if test $NEED_LIBOPTS_DIR = true;then - dnl replace libopts-generated files with distributed backups, if present - missing_baks= - for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do -- nam=`echo $i|sed 's/.bak//g'` -+ nam=`echo $i|sed 's/\.bak$//'` - if test -f $i;then - cp -f $i $nam - else --- -2.0.1 - +Index: gnutls-3.4.1/configure.ac +=== +--- gnutls-3.4.1.orig/configure.ac gnutls-3.4.1/configure.ac +@@ -530,7 +530,7 @@ if test $enable_tools != no || test + dnl replace libopts-generated files with distributed backups, if present + missing_baks= + for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do +- nam=`echo $i|sed 's/.bak//g'` ++ nam=`echo $i|sed 's/\.bak$//'` + if test -f $i;then + cp -f $i $nam + else diff --git a/meta/recipes-support/gnutls/gnutls_3.3.14.bb b/meta/recipes-support/gnutls/gnutls_3.3.14.bb deleted file mode 100644 index f41d183..000 --- a/meta/recipes-support/gnutls/gnutls_3.3.14.bb +++ /dev/null @@ -1,8 +0,0 @@ -require gnutls.inc - -SRC_URI += file://correct_rpl_gettimeofday_signature.patch \ -file://configure.ac-fix-sed-command.patch \ -file://use-pkg-config-to-locate-zlib.patch \ - -SRC_URI[md5sum] = 7f4465f8c564cf9cb8f5cb38b909f7ca -SRC_URI[sha256sum] = 0dfa0030faad8909c1e904105198232d6bc0123cae8cf4933b2bac85ee7cec52 diff --git a/meta/recipes-support/gnutls/gnutls_3.4.1.bb b/meta/recipes-support/gnutls/gnutls_3.4.1.bb new file mode 100644 index 000..1b64813 --- /dev/null +++ b/meta/recipes-support/gnutls/gnutls_3.4.1.bb @@ -0,0 +1,8 @@ +require gnutls.inc + +SRC_URI += file://correct_rpl_gettimeofday_signature.patch \ +file://configure.ac-fix-sed-command.patch \ +file://use-pkg-config-to-locate-zlib.patch \ + +SRC_URI[md5sum] = 2d04f34fa25b45f9dcb9104c0394e12e +SRC_URI[sha256sum] = e9b5f58becf34756464216056cd5abbf04315eda80a374d02699dee83f80b12e -- 2.3.5 -- ___ Openembedded-core mailing
[OE-core] Webkit-gtk will be updated to latest upstream; midori browser to be replaced with Epiphany
Hello everyone, I've been looking into updating oe-core's aging web engine/browser combo, and want to give you a heads up about what's going to happen: 1) webkit-gtk engine will be updated to latest stable upstream release (2.8.3 which is providing Webkit2 API and is a Gtk3 port) 2) midori browser will be replaced with Epiphany browser from the Gnome project. The reason is that the latest release of midori still defaults to Webkit1 and gtk2, a new version of midori is in development, but is a major rewrite with no target release date and is far from ready at the moment (from looking at the list of open issues). The downside to this is extra bloat and dependencies, but I can't see any other way we can provide a modern client stack for the web. Having a browser is important nowadays for any kiosk-type device with a touchscreen, because that's how UIs are written. Regards, Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/2][dizzy] python-nose: backport it to dizzy
On Sun, Jun 14, 2015 at 8:12 PM, akuster808 akuster...@gmail.com wrote: On 6/14/15 9:13 AM, Khem Raj wrote: On Sun, Jun 14, 2015 at 1:56 AM, akuster808 akuster...@gmail.com wrote: Alejandro, This looks to be a new recipe. I don't believe dizzy is taking new features. Contextual. If its a leaf recipe in terms of dependencies, I don't see any harm. It is still a new recipe. If adding new recipes is something that should be allowed on a maintenance release, then the policy should be updated. I still not in favor of adding new recipes nor features to a maintenance release. We should help people to move to Fido, not to stay in Dizzy. I am against this backport as Fido is already out. I would be fine to add new recipes for Fido as it helps people to stay in a Stable release but for oldstable I see no benefit. -- 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] Webkit-gtk will be updated to latest upstream; midori browser to be replaced with Epiphany
On Mon, Jun 15, 2015 at 11:46 AM, Alexander Kanavin alexander.kana...@linux.intel.com wrote: Hello everyone, I've been looking into updating oe-core's aging web engine/browser combo, and want to give you a heads up about what's going to happen: 1) webkit-gtk engine will be updated to latest stable upstream release (2.8.3 which is providing Webkit2 API and is a Gtk3 port) 2) midori browser will be replaced with Epiphany browser from the Gnome project. The reason is that the latest release of midori still defaults to Webkit1 and gtk2, a new version of midori is in development, but is a major rewrite with no target release date and is far from ready at the moment (from looking at the list of open issues). The downside to this is extra bloat and dependencies, but I can't see any other way we can provide a modern client stack for the web. Having a browser is important nowadays for any kiosk-type device with a touchscreen, because that's how UIs are written. So we are loosing last working browser around - what get's better except later is greater? Andreas -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] libpcap: fix PACKAGECONFIG
On 11 June 2015 at 10:08, Robert Yang liezhi.y...@windriver.com wrote: The BLUEZ is default to bluez5, but there is only PACKAGECONFIG[bluez4], no PACKAGECONFIG[bluez5], and the current version of libpcap (or the higher version 1.7.3) only supports bluez4, we can't use ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} for PACKAGECONFIG any more since BLUEZ is default to bluez5, and not supported, and there is no bluez4 in oe-core any more, set PACKAGECONFIG to by default, other layers where bluez4 is available can enable it via bbappend. So the point of this logic is that simply removing bluez5 from DISTRO_FEATURES results in bluez4 being enabled where relevant, which you're removing. Would a better fix would be to have a dummy (empty) bluez5 stanza? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gtk+: Upgrade 2.24.27 - 2.24.28
Signed-off-by: Jussi Kukkonen jussi.kukko...@intel.com --- meta/recipes-gnome/gtk+/{gtk+_2.24.27.bb = gtk+_2.24.28.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-gnome/gtk+/{gtk+_2.24.27.bb = gtk+_2.24.28.bb} (90%) diff --git a/meta/recipes-gnome/gtk+/gtk+_2.24.27.bb b/meta/recipes-gnome/gtk+/gtk+_2.24.28.bb similarity index 90% rename from meta/recipes-gnome/gtk+/gtk+_2.24.27.bb rename to meta/recipes-gnome/gtk+/gtk+_2.24.28.bb index 4f664e4..e343773 100644 --- a/meta/recipes-gnome/gtk+/gtk+_2.24.27.bb +++ b/meta/recipes-gnome/gtk+/gtk+_2.24.28.bb @@ -12,8 +12,8 @@ SRC_URI = http://ftp.gnome.org/pub/gnome/sources/gtk+/2.24/gtk+-${PV}.tar.xz \ file://strict-prototypes.patch \ -SRC_URI[md5sum] = b1e890e15602c5bcb40d85b13fe046fd -SRC_URI[sha256sum] = 20cb10cae43999732a9af2e9aac4d1adebf2a9c2e1ba147050976abca5cd24f4 +SRC_URI[md5sum] = bfacf87b2ea67e4e5c7866a9003e6526 +SRC_URI[sha256sum] = b2c6441e98bc5232e5f9bba6965075dcf580a8726398f7374d39f90b88ed4656 EXTRA_OECONF = --enable-xkb --disable-glibtest --disable-cups --disable-xinerama -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 1/6] gtk+3: Upgrade to 3.16.3
On 12 June 2015 at 14:11, Jussi Kukkonen jussi.kukko...@intel.com wrote: + docbook-utils-native gdk-pixbuf-native libepoxy Note that libepoxy currently doesn't know how to be a no implementation stub of OpenGL so this does mean that GTK+ 3 now has a hard dependency on OpenGL. Upstream GTK+ 3 has no interest in making this an option so if anyone is bothered by this, they'll have to step up and submit patches. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] KCONF_AUDIT_LEVEL + kernel_configcheck
Hello! In Fido and master, the following patch changed the default value of KCONF_AUDIT_LEVEL: $ git annotate origin/fido -- meta/classes/kernel-yocto.bbclass | grep KCONF_AUDIT_LEVEL ad4d5949(Bruce Ashfield 2015-02-18 16:15:35 -0500 308) config_check_visibility = int(d.getVar( KCONF_AUDIT_LEVEL, True ) or 0) $ git annotate origin/master -- meta/classes/kernel-yocto.bbclass | grep KCONF_AUDIT_LEVEL ad4d5949(Bruce Ashfield 2015-02-18 16:15:35 -0500 309) config_check_visibility = int(d.getVar( KCONF_AUDIT_LEVEL, True ) or 0) At least if I read it right, that wasn't the intention. The commit explicitly says that the default should be 1: The visibility of auditing is controlled by KCONF_AUDIT_LEVEL: 0: no reporting 1: report options that are specified, but not in the final config 2: report options that are not hardware related, but set by a BSP The default level is 1, with level 2 and above being for BSP development only. I found that while investigating why having an unsupported config option in one of my kernel fragments did not result in a warning. However, even with KCONF_AUDIT_LEVEL=2 in my local.conf, I still only get warnings about the BSP, but not my unsupported option. To reproduce, modify poky master as follows and build the default configuration: $ git diff --cached diff --git a/meta/recipes-kernel/linux/linux-yocto/foobar.cfg b/meta/recipes-kernel/linux/linux-yocto/foobar.cfg new file mode 100644 index 000..f40043a --- /dev/null +++ b/meta/recipes-kernel/linux/linux-yocto/foobar.cfg @@ -0,0 +1,2 @@ +CONFIG_FOOBAR=y +CONFIG_SECURITY_SMACK=y diff --git a/meta/recipes-kernel/linux/linux-yocto_3.19.bb b/meta/recipes-kernel/linux/linux-yocto_3.19.bb index 6218c02..d4b9437 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.19.bb @@ -38,3 +38,5 @@ KERNEL_FEATURES_append = ${KERNEL_EXTRA_FEATURES} KERNEL_FEATURES_append_qemux86= cfg/sound.scc cfg/paravirt_kvm.scc KERNEL_FEATURES_append_qemux86-64= cfg/sound.scc cfg/paravirt_kvm.scc KERNEL_FEATURES_append = ${@bb.utils.contains(TUNE_FEATURES, mx32, cfg/x32.scc, ,d)} + +SRC_URI += file://foobar.cfg ... $ bitbake -f -c kernel_configcheck linux-yocto Loading cache: 100% || ETA: 00:00:00 Loaded 1288 entries from dependency cache. NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION= 1.27.1 BUILD_SYS = x86_64-linux NATIVELSBSTRING = Debian-8.0 TARGET_SYS= i586-poky-linux MACHINE = qemux86 DISTRO= poky DISTRO_VERSION= 1.8+snapshot-20150615 TUNE_FEATURES = m32 i586 TARGET_FPU= meta meta-yocto meta-yocto-bsp= master:379a030702c985c6e69831173f765a47dfeb8841 NOTE: Preparing RunQueue NOTE: Tainting hash to force rebuild of task /work/poky/meta/recipes-kernel/linux/linux-yocto_3.19.bb, do_kernel_configcheck WARNING: /work/poky/meta/recipes-kernel/linux/linux-yocto_3.19.bb.do_configure is tainted from a forced run WARNING: /work/poky/meta/recipes-kernel/linux/linux-yocto_3.19.bb.do_kernel_configcheck is tainted from a forced run NOTE: Executing SetScene Tasks NOTE: Executing RunQueue Tasks WARNING: [kernel config]: BSP specified non-hw configuration: CONFIG_BLOCK CONFIG_BT CONFIG_BT_6LOWPAN CONFIG_BT_BNEP CONFIG_BT_BNEP_MC_FILTER CONFIG_BT_BNEP_PROTO_FILTER CONFIG_BT_CMTP CONFIG_BT_HIDP CONFIG_BT_RFCOMM CONFIG_BT_RFCOMM_TTY CONFIG_CFG80211_WEXT CONFIG_CORDIC CONFIG_CRC8 CONFIG_EFIVAR_FS CONFIG_EFI_PARTITION CONFIG_NET CONFIG_NETDEVICES CONFIG_PARTITION_ADVANCED CONFIG_WEXT_CORE CONFIG_WEXT_PROC CONFIG_WIRELESS foobar.cfg is used (the CONFIG_SECURITY_SMACK part is used) but the CONFIG_FOOBAR part of course is not. Shouldn't this trigger the specified values did not make it into the kernel's final configuration? There is no mismatch.cfg, only a nonhw_report.cfg. This seems to point towards an error in the configure task, if I understand the kernel recipes correctly. Speaking of nonhw_report.cfg, are there plans to make the core BSPs clean enough to pass the check without warnings? -- Best Regards, Patrick Ohly The content of this message is my personal opinion only and although I am an employee of Intel, the statements I make here in no way represent Intel's position on the issue, nor am I authorized to speak on behalf of Intel on this matter. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] scripts/oe-selftest: enhancement 7865
Hello, Please don't consider this patch. It was intended for 7865, but a better patch was proposed for this -Original Message- From: Constantin, Costin C Sent: Saturday, June 13, 2015 11:59 PM To: openembedded-core@lists.openembedded.org Cc: Constantin, Costin C Subject: [PATCH] scripts/oe-selftest: enhancement 7865 Signed-off-by: Costin Constantin costin.c.constan...@intel.com --- scripts/oe-selftest | 36 1 file changed, 24 insertions(+), 12 deletions(-) diff --git a/scripts/oe-selftest b/scripts/oe-selftest index a04e9fc..1a89c31 100755 --- a/scripts/oe-selftest +++ b/scripts/oe-selftest @@ -16,7 +16,10 @@ # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. # DESCRIPTION -# This script runs tests defined in meta/lib/selftest/ +# This script runs tests defined in meta/lib/selftest/ for all +$BUILDDIR/../meta* layers # In order to work, each meta* layer needs to have a relative lib/oeqa/selftest path to it. +# Subdirectories to this relative path are accepted. +# Test module names need to be unique between all layers. # It's purpose is to automate the testing of different bitbake tools. # To use it you just need to source your build environment setup script and # add the meta-selftest layer to your BBLAYERS. @@ -24,15 +27,26 @@ # Call the script as: oe-selftest module.Class.method to run just a single test # E.g: oe-selftest bboutput.BitbakeLayers will run just the BitbakeLayers class from meta/lib/selftest/bboutput.py - import os import sys import unittest import logging import argparse +import glob as g sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), '..', 'meta/lib'))) +tests_path = g.glob(os.path.abspath(os.path.join(os.getenv(BUILDDIR), +.., meta*/lib/oeqa/selftest))) # adding tests paths to the sys.path +enabling dynamic import further on # support for subdirectories is also +added test_subdirs = [] for pth in tests_path: +sys.path.insert(0, pth) +for sbd in g.glob(pth + /*): +if os.path.isdir(sbd): +sys.path.append(sbd) +test_subdirs.append(sbd) + import oeqa.selftest import oeqa.utils.ftools as ftools from oeqa.utils.commands import runCmd, get_bb_var, get_test_layer @@ -125,14 +139,13 @@ def remove_inc_files(): def get_tests(exclusive_modules=[], include_hidden=False): testslist = [] for x in exclusive_modules: -testslist.append('oeqa.selftest.' + x) +testslist.append(x) if not testslist: -testpath = os.path.abspath(os.path.dirname(oeqa.selftest.__file__)) -files = sorted([f for f in os.listdir(testpath) if f.endswith('.py') and not (f.startswith('_') and not include_hidden) and not f.startswith('__') and f != 'base.py']) -for f in files: -module = 'oeqa.selftest.' + f[:-3] -testslist.append(module) - +for pth in (tests_path + test_subdirs) : +files = sorted([f for f in os.listdir(pth) if f.endswith('.py') and not (f.startswith('_') and not include_hidden) and not f.startswith('__') and f != 'base.py']) +for f in files: +module = f[:-3] +testslist.append(module) return testslist def main(): @@ -145,8 +158,7 @@ def main(): if args.list_modules: log.info('Listing all available test modules:') testslist = get_tests(include_hidden=True) -for test in testslist: -module = test.split('.')[-1] +for module in testslist: info = '' if module.startswith('_'): info = ' (hidden)' @@ -154,7 +166,7 @@ def main(): if args.list_allclasses: try: import importlib -modlib = importlib.import_module(test) +modlib = importlib.import_module(module) for v in vars(modlib): t = vars(modlib)[v] if isinstance(t, type(oeSelfTest)) and issubclass(t, oeSelfTest) and t!=oeSelfTest: -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] base: Fix license checksum rebuild problems
On Mon, Jun 1, 2015 at 2:13 PM, Richard Purdie richard.pur...@linuxfoundation.org wrote: MACHINE=qemux86-64 bitbake init-ifupdown; MACHINE=genericx86-64 bitbake init-ifupdown shows a rebuild when it would be expected. The reason is a LIC_FILES_CHKSUM which contains file://${WORKDIR}, an absolute path which doesn't exist in the first build but does in the second, causing a signature change and a rebuild. Fix the problem by ignoring any file:// url which resolves since TMPDIR for license file dependency purposes. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org diff --git a/meta/classes/base.bbclass b/meta/classes/base.bbclass index 99b512b..7093a19 100644 --- a/meta/classes/base.bbclass +++ b/meta/classes/base.bbclass @@ -97,6 +97,7 @@ PATH_prepend = ${@extra_path_elements(d)} def get_lic_checksum_file_list(d): filelist = [] lic_files = d.getVar(LIC_FILES_CHKSUM, True) or '' +tmpdir = d.getVar(TMPDIR, True) urls = lic_files.split() for url in urls: @@ -105,6 +106,8 @@ def get_lic_checksum_file_list(d): try: path = bb.fetch.decodeurl(url)[2] if path[0] == '/': +if path.startswith(tmpdir): +continue Hmm, this would probably never be a real issue, but this is using a string startswith() without a path separator, meaning it’d match e.g. /path/to/tmpfoo/ as well as /path/to/tmp/ :) -- 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] OE Changelog since 2015-06-07 until 2015-06-14
Changelog since 2015-06-07 until 2015-06-14. Projects included in this report: bitbake: git://git.openembedded.org/bitbake openembedded-core: git://git.openembedded.org/openembedded-core meta-openembedded: git://git.openembedded.org/meta-openembedded meta-angstrom: git://github.com/Angstrom-distribution/meta-angstrom.git meta-arago: git://arago-project.org/git/meta-arago.git meta-atmel: https://github.com/linux4sam/meta-atmel.git meta-beagleboard: git://github.com/beagleboard/meta-beagleboard.git meta-browser: git://github.com/OSSystems/meta-browser.git meta-bug: git://github.com/buglabs/meta-bug.git meta-chicken: git://github.com/OSSystems/meta-chicken meta-efikamx: git://github.com/kraj/meta-efikamx.git meta-ettus: http://github.com/koenkooi/meta-ettus.git meta-fsl-arm: git://git.yoctoproject.org/meta-fsl-arm meta-fsl-arm-extra: git://github.com/Freescale/meta-fsl-arm-extra.git meta-fsl-ppc: git://git.yoctoproject.org/meta-fsl-ppc meta-guacamayo: git://github.com/Guacamayo/meta-guacamayo.git meta-gumstix: git://github.com/gumstix/meta-gumstix.git meta-gumstix-community: git://gitorious.org/schnitzeltony-oe-meta/meta-gumstix-community.git meta-handheld: git://git.openembedded.org/meta-handheld meta-igep: http://github.com/ebutera/meta-igep.git meta-intel: git://git.yoctoproject.org/meta-intel meta-ivi: git://git.yoctoproject.org/meta-ivi meta-java: git://github.com/woglinde/meta-java meta-jetson-tk1: https://github.com/cubicool/meta-jetson-tk1.git meta-kde: git://gitorious.org/openembedded-core-layers/meta-kde.git meta-micro: git://git.openembedded.org/meta-micro meta-mono: git://git.yoctoproject.org/meta-mono.git meta-netbookpro: git://github.com/tworaz/meta-netbookpro meta-nodejs: https://github.com/imyller/meta-nodejs.git meta-nslu2: git://github.com/kraj/meta-nslu2 meta-opie: git://git.openembedded.org/meta-opie meta-qt3: git://git.yoctoproject.org/meta-qt3 meta-qt5: git://github.com/meta-qt5/meta-qt5.git meta-slugos: git://github.com/kraj/meta-slugos meta-systemd: git://git.yoctoproject.org/meta-systemd meta-raspberrypi: git://github.com/djwillis/meta-raspberrypi.git meta-smartphone: http://git.shr-project.org/repo/meta-smartphone.git meta-ti: git://git.yoctoproject.org/meta-ti meta-webos: git://github.com/openwebos/meta-webos.git meta-xilinx: git://git.yoctoproject.org/meta-xilinx meta-yocto: git://git.yoctoproject.org/meta-yocto openembedded: git://git.openembedded.org/openembedded Changelog for bitbake: Alexandru DAMIAN (14): toaster: move project data typeahead to the REST API convert all project-based view to JSON APIs toaster: toastertables REST refactoring toastergui: use defaults on xhr_datatypeahead parameters toastergui: remove xhr_projectedit and xhr_projectinfo URLs toaster: toaster table add raw data toaster: ToasterTables add computational fields toaster: toastertables raise errors toaster: add class template view for single-object pages toaster: eliminate duplicate querysets toastergui: remove xhr_datatypeahead and xhr_XXXbuild toastergui: remove xhr_datatypeahaed layerdeps call toaster: fixes after refactoring toastergui: prevent contamination of libtoaster context Ed Bartosh (2): toaster: Code cleanup: bashisms toaster: Make toaster script to work in dash Michael Wood (2): toaster: Add ajax loading spinner toaster: Add global ajaxError handler Richard Purdie (2): cooker/event: Add an event which lists all stamps reachable after parsing bitbake: Bump version to 1.27.1 Vlad Fulgeanu (1): toaster: tables: Remove obsolete field_name for select column Changelog for openembedded-core: Alejandro Hernandez (5): python3: fix pyconfig.h installation on target python3: Fix distutils import error python3-io: Fixes compilation of python3 ssl module python3-distribute: Upgrade to python3-setuptools 15.2 python3-pip: Adds recipe for python3-pip Andre McCurdy (4): python-numpy: use x86 over-ride instead of i586 gstreamer1.0-plugins-base.inc: use x86 over-ride instead of i586 lame: use x86 over-ride instead of i586 x264: use x86 over-ride instead of i586 Aníbal Limón (4): recipeutils: Improve get_recipe_pv_without_srcpv function distrodata: Remove unnecessary include of package_regex.inc distrodata: checkpkg make usage of oe.recipeutils.get_recipe_upstream_versio distrodata: Use Python CSV instead of did by hand Bruce Ashfield (1): xorg: fix VESA int10 error Cristian Iorga (1): insane: errors out on binaries installed by allarch-inherit recipes Ed Bartosh (21): wic: set legacy_boot flag for gpt partitions wic: check if part_type is set only for msdos partition table wic: Add gpt to the list of supported partition table formats wic: Use gptmbr.bin MBR for gpt partitions wic: Make _ptable_format public wic: create directdisk-gpt.wks wic: Test creation of directdisk image with GPT table wic:
Re: [OE-core] Webkit-gtk will be updated to latest upstream; midori browser to be replaced with Epiphany
On 15 June 2015 at 12:53, Andreas Müller schnitzelt...@googlemail.com wrote: So we are loosing last working browser around - what get's better except later is greater? If you actually compare the build dependencies, you'll see that Midori and Epiphany are actually almost identical. We need to upgrade WebKit as the release we're shipping has known security flaws and is very old - and the community is rightly moaning about that. However Midori doesn't build with a recent WebKit... if you have an alternative solution then your thoughts are welcome. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] copyleft_filter.bbclass: Allow to filter on name
On Tuesday 09 June 2015 12:46:48 mariano.lo...@linux.intel.com wrote: From: Mariano Lopez mariano.lo...@linux.intel.com The archiver uses a license based filter to provide the source code. This patch allows to search on name based on two new variables (COPYLEFT_PN_INCLUDE, COPYLEFT_PN_EXCLUDE). Both variables are empty by default. The filter by name has higher priority than the license filter. [YOCTO # 6929] Signed-off-by: Mariano Lopez mariano.lo...@linux.intel.com --- meta/classes/archiver.bbclass| 14 ++ meta/classes/copyleft_filter.bbclass | 25 + 2 files changed, 27 insertions(+), 12 deletions(-) diff --git a/meta/classes/archiver.bbclass b/meta/classes/archiver.bbclass index b598aa3..7b5274d 100644 --- a/meta/classes/archiver.bbclass +++ b/meta/classes/archiver.bbclass @@ -52,14 +52,12 @@ do_ar_original[dirs] = ${ARCHIVER_OUTDIR} ${ARCHIVER_WORKDIR} python () { pn = d.getVar('PN', True) -if d.getVar('COPYLEFT_LICENSE_INCLUDE', True) or \ -d.getVar('COPYLEFT_LICENSE_EXCLUDE', True): -included, reason = copyleft_should_include(d) -if not included: -bb.debug(1, 'archiver: %s is excluded: %s' % (pn, reason)) -return -else: -bb.debug(1, 'archiver: %s is included: %s' % (pn, reason)) +included, reason = copyleft_should_include(d) +if not included: +bb.debug(1, 'archiver: %s is excluded: %s' % (pn, reason)) +return +else: +bb.debug(1, 'archiver: %s is included: %s' % (pn, reason)) ar_src = d.getVarFlag('ARCHIVER_MODE', 'src', True) ar_dumpdata = d.getVarFlag('ARCHIVER_MODE', 'dumpdata', True) diff --git a/meta/classes/copyleft_filter.bbclass b/meta/classes/copyleft_filter.bbclass index 2c1d8f1..46be7f7 100644 --- a/meta/classes/copyleft_filter.bbclass +++ b/meta/classes/copyleft_filter.bbclass @@ -25,6 +25,14 @@ COPYLEFT_AVAILABLE_RECIPE_TYPES = 'target native nativesdk cross crosssdk cross- COPYLEFT_AVAILABLE_RECIPE_TYPES[type] = 'list' COPYLEFT_AVAILABLE_RECIPE_TYPES[doc] = 'Space separated list of available recipe types' +COPYLEFT_PN_INCLUDE ?= '' +COPYLEFT_PN_INCLUDE[type] = 'list' +COPYLEFT_PN_INCLUDE[doc] = 'Space separated list of recipe names to include' + +COPYLEFT_PN_EXCLUDE ?= '' +COPYLEFT_PN_EXCLUDE[type] = 'list' +COPYLEFT_PN_EXCLUDE[doc] = 'Space separated list of recipe names to exclude' + def copyleft_recipe_type(d): for recipe_type in oe.data.typed_value('COPYLEFT_AVAILABLE_RECIPE_TYPES', d): if oe.utils.inherits(d, recipe_type): @@ -39,9 +47,11 @@ def copyleft_should_include(d): import oe.license from fnmatch import fnmatchcase as fnmatch +included, motive = False, 'recipe did not match anything' + recipe_type = d.getVar('COPYLEFT_RECIPE_TYPE', True) if recipe_type not in oe.data.typed_value('COPYLEFT_RECIPE_TYPES', d): -return False, 'recipe type %s is excluded' % recipe_type +include, motive = False, 'recipe type %s is excluded' % recipe_type include = oe.data.typed_value('COPYLEFT_LICENSE_INCLUDE', d) exclude = oe.data.typed_value('COPYLEFT_LICENSE_EXCLUDE', d) @@ -53,10 +63,17 @@ def copyleft_should_include(d): else: if is_included: if reason: -return True, 'recipe has included licenses: %s' % ', '.join(reason) +included, motive = True, 'recipe has included licenses: %s' % ', '.join(reason) else: -return False, 'recipe does not include a copyleft license' +included, motive = False, 'recipe does not include a copyleft license' else: -return False, 'recipe has excluded licenses: %s' % ', '.join(reason) +included, motive = False, 'recipe has excluded licenses: %s' % ', '.join(reason) +if any(fnmatch(d.getVar('PN', True), name) \ +for name in oe.data.typed_value('COPYLEFT_PN_INCLUDE', d)): +included, motive = True, 'recipe included by name' +if any(fnmatch(d.getVar('PN', True), name) \ +for name in oe.data.typed_value('COPYLEFT_PN_EXCLUDE', d)): +included, motive = False, 'recipe excluded by name' +return included, motive Changes look good. Acked-by: Paul Eggleton paul.eggle...@linux.intel.com -- Paul Eggleton Intel Open Source Technology Centre -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Webkit-gtk will be updated to latest upstream; midori browser to be replaced with Epiphany
On 06/15/2015 05:24 PM, Burton, Ross wrote: If you actually compare the build dependencies, you'll see that Midori and Epiphany are actually almost identical. We need to upgrade WebKit as the release we're shipping has known security flaws and is very old - and the community is rightly moaning about that. However Midori doesn't build with a recent WebKit... if you have an alternative solution then your thoughts are welcome. Also, Webkit2 itself ships with a tiny browser wrapper called MiniBrowser: http://blogs.igalia.com/carlosgc/2011/11/04/webkit2-gtk-minibrowser-ported-to-gtk-api/ That may be enough for many people's needs, and they can simply not include Epiphany into their images if it's too big and bloated or whatever. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] insane.bbclass: fix false negative in build-deps QA check
When a recipe called 'foobar-test' links against 'foobar' without listing that in DEPENDS, the build-deps check misses that error because it looks for 'foobar' in a package string containing (among others) the 'foobar-test' name, leading to the incorrect conclusion that the package is listed as dependency. The 'packages' string needs to be split into individual package names before the check. Doing that once directly after reading the value is more efficient than splitting inside package_qa_check_rdepends() because the caller also needs the individual components. Also use a set to speed up the 'package in packages' check. Signed-off-by: Patrick Ohly patrick.o...@intel.com --- meta/classes/insane.bbclass | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index ab7ca3b..156ae5a 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -975,12 +975,12 @@ python do_package_qa () { # Scan the packages... pkgdest = d.getVar('PKGDEST', True) -packages = d.getVar('PACKAGES', True) +packages = set((d.getVar('PACKAGES', True) or '').split()) cpath = oe.cachedpath.CachedPath() global pkgfiles pkgfiles = {} -for pkg in (packages or ).split(): +for pkg in packages: pkgfiles[pkg] = [] for walkroot, dirs, files in cpath.walk(pkgdest + / + pkg): for file in files: @@ -1004,7 +1004,7 @@ python do_package_qa () { walk_sane = True rdepends_sane = True deps_sane = True -for package in packages.split(): +for package in packages: skip = (d.getVar('INSANE_SKIP_' + package, True) or ).split() if skip: bb.note(Package %s skipping QA tests: %s % (package, str(skip))) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] FW: 7865 patch
Hi Sharron, On 15 June 2015 at 08:04, Liu, Sharron sharron@intel.com wrote: Here attached the patch to 7865 https://bugzilla.yoctoproject.org/show_bug.cgi?id=7865 (component: automated build testing). Patch status: reviewed and agreed by Costin (in copy), issue owner. Can you send this as a proper git patch with a commit log so we can see what the patch does and you get attribution? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] babeltrace: Fix invalid pointer free with trace collection
From: Roy Li rongqing...@windriver.com This fixed the bug https://bugs.lttng.org/issues/790 Signed-off-by: Roy Li rongqing...@windriver.com --- ...nvalid-pointer-free-with-trace-collection.patch | 44 ++ meta/recipes-kernel/lttng/babeltrace_1.2.4.bb | 4 +- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch diff --git a/meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch b/meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch new file mode 100644 index 000..3e2c4e1 --- /dev/null +++ b/meta/recipes-kernel/lttng/babeltrace/0001-Fix-invalid-pointer-free-with-trace-collection.patch @@ -0,0 +1,44 @@ +From e4cad900994cf286d971796a947fea782dfc6651 Mon Sep 17 00:00:00 2001 +From: Francis Giraldeau francis.girald...@gmail.com +Date: Mon, 15 Jun 2015 11:43:02 -0400 +Subject: [PATCH] Fix invalid pointer free with trace collection + +Upstream-Status: Submitted + +Patch proposed by Li RongQing related to bug# 790 + +Signed-off-by: Mikael Beckius mikael.beck...@windriver.com +Signed-off-by: Francis Giraldeau francis.girald...@gmail.com +--- + lib/context.c | 8 +++- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/lib/context.c b/lib/context.c +index 45aab34..8d3770f 100644 +--- a/lib/context.c b/lib/context.c +@@ -79,7 +79,7 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path, + struct bt_trace_descriptor *td; + struct bt_format *fmt; + struct bt_trace_handle *handle; +- int ret, closeret; ++ int ret; + + if (!ctx || !format_name || (!path !stream_list)) + return -EINVAL; +@@ -159,10 +159,8 @@ int bt_context_add_trace(struct bt_context *ctx, const char *path, + return handle-id; + + error: +- closeret = fmt-close_trace(td); +- if (closeret) { +- fprintf(stderr, Error in close_trace callback\n); +- } ++ if (handle) ++ bt_context_remove_trace(ctx, handle-id); + end: + return ret; + } +-- +1.9.1 + diff --git a/meta/recipes-kernel/lttng/babeltrace_1.2.4.bb b/meta/recipes-kernel/lttng/babeltrace_1.2.4.bb index f616146..536be41 100644 --- a/meta/recipes-kernel/lttng/babeltrace_1.2.4.bb +++ b/meta/recipes-kernel/lttng/babeltrace_1.2.4.bb @@ -13,7 +13,9 @@ DEPENDS = glib-2.0 util-linux popt bison-native flex-native SRCREV = 90395824efc007de88787a6b8e400a07c980be1c PV = 1.2.4+git${SRCPV} -SRC_URI = git://git.efficios.com/babeltrace.git;branch=stable-1.2 +SRC_URI = git://git.efficios.com/babeltrace.git;branch=stable-1.2 \ + file://0001-Fix-invalid-pointer-free-with-trace-collection.patch \ + S = ${WORKDIR}/git -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [OE-Core][PATCH] {python, python3}-native: fix TypeError
Doesn't this mean BUILD_SYS or HOST_SYS weren't set in the environment? - You're right. The default env value of BUILD_SYS and HOST_SYS is (empty). - I wonder that the original patch (12-distutils-prefix-is-inside-staging-area.patch) to add is required? Wouldn't this patch just mean you get a value of something like None? - My patch is to prevent errors in runtime. - Do you have any other good idea? Thanks Changhyeok -Original Message- From: Richard Purdie [mailto:richard.pur...@linuxfoundation.org] Sent: Monday, June 15, 2015 3:55 PM To: Changhyeok Bae Cc: openembedded-core@lists.openembedded.org Subject: Re: [OE-core] [OE-Core][PATCH] {python,python3}-native: fix TypeError On Tue, 2015-06-09 at 14:08 +0900, Changhyeok Bae wrote: g-ir-core in meta-gir is building with python-native. When the g-ir-core(v1.42.0) is building, following error is occurred. Error in g-ir-core: EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv(BUILD_SYS), os.getenv(HOST_SYS) ) | TypeError: expected a character buffer object Doesn't this mean BUILD_SYS or HOST_SYS weren't set in the environment? Wouldn't this patch just mean you get a value of something like None? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] mdadm: add systemd service files
Add mdmonitor.service to support systemd systems and add configuration file. Signed-off-by: Li Xin lixin.f...@cn.fujitsu.com --- meta/recipes-extended/mdadm/files/mdadm.conf | 1 + meta/recipes-extended/mdadm/files/mdadm.default| 25 meta/recipes-extended/mdadm/files/mdadm.init | 71 ++ .../recipes-extended/mdadm/files/mdmonitor.service | 13 meta/recipes-extended/mdadm/mdadm_3.3.2.bb | 32 +- 5 files changed, 140 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-extended/mdadm/files/mdadm.conf create mode 100644 meta/recipes-extended/mdadm/files/mdadm.default create mode 100755 meta/recipes-extended/mdadm/files/mdadm.init create mode 100644 meta/recipes-extended/mdadm/files/mdmonitor.service diff --git a/meta/recipes-extended/mdadm/files/mdadm.conf b/meta/recipes-extended/mdadm/files/mdadm.conf new file mode 100644 index 000..b869d8f --- /dev/null +++ b/meta/recipes-extended/mdadm/files/mdadm.conf @@ -0,0 +1 @@ +MAILADDR r...@mydomain.com diff --git a/meta/recipes-extended/mdadm/files/mdadm.default b/meta/recipes-extended/mdadm/files/mdadm.default new file mode 100644 index 000..2e74fdb --- /dev/null +++ b/meta/recipes-extended/mdadm/files/mdadm.default @@ -0,0 +1,25 @@ +# mdadm configuration +# +# You can run 'dpkg-reconfigure mdadm' to modify the values in this file, if +# you want. You can also change the values here and changes will be preserved. +# Do note that only the values are preserved; the rest of the file is +# rewritten. +# + +# AUTOCHECK: +# should mdadm run periodic redundancy checks over your arrays? See +# /etc/cron.d/mdadm. +AUTOCHECK=true + +# START_DAEMON: +# should mdadm start the MD monitoring daemon during boot? +START_DAEMON=true + +# DAEMON_OPTIONS: +# additional options to pass to the daemon. +DAEMON_OPTIONS=--syslog + +# VERBOSE: +# if this variable is set to true, mdadm will be a little more verbose e.g. +# when creating the initramfs. +VERBOSE=false diff --git a/meta/recipes-extended/mdadm/files/mdadm.init b/meta/recipes-extended/mdadm/files/mdadm.init new file mode 100755 index 000..8a9fbe3 --- /dev/null +++ b/meta/recipes-extended/mdadm/files/mdadm.init @@ -0,0 +1,71 @@ +#!/bin/sh +# +# Start the MD monitor daemon for all active MD arrays if desired. +# +### BEGIN INIT INFO +# Provides: mdadm +# Required-Start:$local_fs $syslog mdadm-raid +# Required-Stop: $local_fs $syslog mdadm-raid +# Default-Start: 2 3 4 5 +# Default-Stop: 0 1 6 +# Short-Description: MD monitoring daemon +# Description: mdadm provides a monitor mode, in which it will scan for +#problems with the MD devices. If a problem is found, the +#administrator is alerted via email, or a custom script is +#run. +### END INIT INFO +# + +MDADM=/sbin/mdadm +RUNDIR=/var/run/mdadm +PIDFILE=$RUNDIR/monitor.pid +DEBIANCONFIG=/etc/default/mdadm + +test -x $MDADM || exit 0 + +test -f /proc/mdstat || exit 0 + +START_DAEMON=true +test -f $DEBIANCONFIG . $DEBIANCONFIG + +. /lib/lsb/init-functions + +# Include functions +. /etc/init.d/functions + +case ${1:-} in + start) +if is_true $START_DAEMON; then + log_daemon_msg Starting MD monitoring service mdadm --monitor + mkdir -p $RUNDIR + start-stop-daemon -S -p $PIDFILE -x $MDADM -- \ +--monitor --pid-file $PIDFILE --daemonise --scan ${DAEMON_OPTIONS:-} + RETVAL=$? + log_end_msg $RETVAL + exit $RETVAL +fi +;; + stop) +if [ -f $PIDFILE ] ; then + log_daemon_msg Stopping MD monitoring service mdadm --monitor + start-stop-daemon -K -p $PIDFILE -x $MDADM + RETVAL=$? + rm -f $PIDFILE + log_end_msg $RETVAL + exit $RETVAL +fi +;; + status) +status -p $PIDFILE $MDADM exit 0 || exit $? +;; + restart|reload|force-reload) +${0:-} stop +${0:-} start +;; + *) +echo Usage: ${0:-} {start|stop|status|restart|reload|force-reload} 2 +exit 1 +;; +esac + +exit 0 diff --git a/meta/recipes-extended/mdadm/files/mdmonitor.service b/meta/recipes-extended/mdadm/files/mdmonitor.service new file mode 100644 index 000..3664ceb --- /dev/null +++ b/meta/recipes-extended/mdadm/files/mdmonitor.service @@ -0,0 +1,13 @@ +[Unit] +Description=Software RAID monitoring and management +After=syslog.target +ConditionPathExists=@sysconfdir@/mdadm.conf + +[Service] +Type=forking +PIDFile=@localstatedir@/run/mdadm/mdadm.pid +EnvironmentFile=-@sysconfdir@/sysconfig/mdmonitor +ExecStart=@basesbindir@/mdadm --monitor --scan -f --pid-file=@localstatedir@/run/mdadm/mdadm.pid + +[Install] +WantedBy=multi-user.target diff --git a/meta/recipes-extended/mdadm/mdadm_3.3.2.bb b/meta/recipes-extended/mdadm/mdadm_3.3.2.bb index 87e06f5..3e7e399 100644 --- a/meta/recipes-extended/mdadm/mdadm_3.3.2.bb +++ b/meta/recipes-extended/mdadm/mdadm_3.3.2.bb @@ -14,6 +14,10 @@ SRC_URI =
[OE-core] [PATCH 09/10] init-install: code cleanup: Replace tabs with spaces
Cleaned up spaces from init-install* shell scripts. Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index a6a8679..dca1432 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh @@ -24,22 +24,22 @@ echo Searching for hard drives ... for device in `ls /sys/block/`; do case $device in - loop*) +loop*) # skip loop device - ;; - sr*) +;; +sr*) # skip CDROM device - ;; - ram*) +;; +ram*) # skip ram device - ;; - *) - # skip the device LiveOS is on - # Add valid hard drive name to the list - if [ $device != $live_dev_name -a -e /dev/$device ]; then - hdnamelist=$hdnamelist $device - fi - ;; +;; +*) +# skip the device LiveOS is on +# Add valid hard drive name to the list +if [ $device != $live_dev_name -a -e /dev/$device ]; then +hdnamelist=$hdnamelist $device +fi +;; esac done @@ -49,8 +49,8 @@ for hdname in $hdnamelist; do echo --- echo /dev/$hdname if [ -r /sys/block/$hdname/device/vendor ]; then - echo -n VENDOR= - cat /sys/block/$hdname/device/vendor +echo -n VENDOR= +cat /sys/block/$hdname/device/vendor fi if [ -r /sys/block/$hdname/device/model ]; then echo -n MODEL= @@ -63,18 +63,17 @@ for hdname in $hdnamelist; do echo # Get user choice while true; do - echo -n Do you want to install this image there? [y/n] - read answer - if [ $answer = y -o $answer = n ]; then - break - fi - echo Please answer y or n +echo -n Do you want to install this image there? [y/n] +read answer +if [ $answer = y -o $answer = n ]; then +break +fi +echo Please answer y or n done if [ $answer = y ]; then - TARGET_DEVICE_NAME=$hdname - break +TARGET_DEVICE_NAME=$hdname +break fi - done if [ -n $TARGET_DEVICE_NAME ]; then @@ -170,7 +169,7 @@ if [ -d /tgt_root/etc/ ] ; then echo UUID=$boot_uuid /bootvfat defaults 1 2 /tgt_root/etc/fstab # We dont want udev to mount our root device while we're booting... if [ -d /tgt_root/etc/udev/ ] ; then - echo /dev/${device} /tgt_root/etc/udev/mount.blacklist +echo /dev/${device} /tgt_root/etc/udev/mount.blacklist fi fi diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh index 2c5d530..df2babd 100644 --- a/meta/recipes-core/initrdscripts/files/init-install.sh +++ b/meta/recipes-core/initrdscripts/files/init-install.sh @@ -23,22 +23,22 @@ echo Searching for hard drives ... for device in `ls /sys/block/`; do case $device in - loop*) +loop*) # skip loop device - ;; - sr*) +;; +sr*) # skip CDROM device - ;; - ram*) +;; +ram*) # skip ram device - ;; - *) - # skip the device LiveOS is on - # Add valid hard drive name to the list - if [ $device != $live_dev_name -a -e /dev/$device ]; then - hdnamelist=$hdnamelist $device - fi - ;; +;; +*) +# skip the device LiveOS is on +# Add valid hard drive name to the list +if [ $device != $live_dev_name -a -e /dev/$device ]; then +hdnamelist=$hdnamelist $device +fi +;; esac done @@ -48,8 +48,8 @@ for hdname in $hdnamelist; do echo --- echo /dev/$hdname if [ -r /sys/block/$hdname/device/vendor ]; then - echo -n VENDOR= - cat /sys/block/$hdname/device/vendor +echo -n VENDOR= +cat /sys/block/$hdname/device/vendor fi if [ -r /sys/block/$hdname/device/model ]; then echo -n MODEL= @@ -62,16 +62,16 @@ for hdname in $hdnamelist; do echo # Get user choice while true; do - echo -n Do you want to install this image there? [y/n] - read answer - if [ $answer = y -o $answer = n ]; then - break - fi - echo Please answer y or n +echo -n Do you want to install this image there? [y/n] +read answer +if [ $answer = y -o $answer = n ]; then +break +fi +echo Please answer y or n done if [ $answer = y ]; then - TARGET_DEVICE_NAME=$hdname -
[OE-core] [PATCH 10/10] init-install: code cleanup: replace /dev/$device - $device
Shortened code by including /dev/ prefix into variable. Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index dca1432..74372b0 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh @@ -83,7 +83,7 @@ else exit 1 fi -device=$TARGET_DEVICE_NAME +device=/dev/$TARGET_DEVICE_NAME # # The udev automounter can cause pain here, kill it @@ -94,12 +94,12 @@ rm -f /etc/udev/scripts/mount* # # Unmount anything the automounter had mounted # -umount /dev/${device}* 2 /dev/null || /bin/true +umount ${device}* 2 /dev/null || /bin/true mkdir -p /tmp cat /proc/mounts /etc/mtab -disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d -f 3 | sed -e s/MB//) +disk_size=$(parted ${device} unit mb print | grep Disk | cut -d -f 3 | sed -e s/MB//) swap_size=$((disk_size*swap_ratio/100)) rootfs_size=$((disk_size-boot_size-swap_size)) @@ -117,32 +117,32 @@ if [ ! ${device#mmcblk} = ${device} ]; then part_prefix=p rootwait=rootwait fi -bootfs=/dev/${device}${part_prefix}1 -rootfs=/dev/${device}${part_prefix}2 -swap=/dev/${device}${part_prefix}3 +bootfs=${device}${part_prefix}1 +rootfs=${device}${part_prefix}2 +swap=${device}${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 /dev/${device} ... -dd if=/dev/zero of=/dev/${device} bs=512 count=2 +echo Deleting partition table on ${device} ... +dd if=/dev/zero of=${device} bs=512 count=2 -echo Creating new partition table on /dev/${device} ... -parted /dev/${device} mklabel gpt +echo Creating new partition table on ${device} ... +parted ${device} mklabel gpt echo Creating boot partition on $bootfs -parted /dev/${device} mkpart boot fat32 0% $boot_size -parted /dev/${device} set 1 boot on +parted ${device} mkpart boot fat32 0% $boot_size +parted ${device} set 1 boot on echo Creating rootfs partition on $rootfs -parted /dev/${device} mkpart root ext3 $rootfs_start $rootfs_end +parted ${device} mkpart root ext3 $rootfs_start $rootfs_end echo Creating swap partition on $swap -parted /dev/${device} mkpart swap linux-swap $swap_start 100% +parted ${device} mkpart swap linux-swap $swap_start 100% -parted /dev/${device} print +parted ${device} print echo Formatting $bootfs to vfat... mkfs.vfat $bootfs @@ -163,13 +163,13 @@ mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /src_root echo Copying rootfs files... cp -a /src_root/* /tgt_root if [ -d /tgt_root/etc/ ] ; then -boot_uuid=$(blkid -o value -s UUID /dev/${device}1) -swap_part_uuid=$(blkid -o value -s PARTUUID /dev/${device}3) +boot_uuid=$(blkid -o value -s UUID ${device}1) +swap_part_uuid=$(blkid -o value -s PARTUUID ${device}3) echo /dev/disk/by-partuuid/$swap_part_uuidswap swap defaults 0 0 /tgt_root/etc/fstab echo UUID=$boot_uuid /bootvfat defaults 1 2 /tgt_root/etc/fstab # We dont want udev to mount our root device while we're booting... if [ -d /tgt_root/etc/udev/ ] ; then -echo /dev/${device} /tgt_root/etc/udev/mount.blacklist +echo ${device} /tgt_root/etc/udev/mount.blacklist fi fi @@ -185,7 +185,7 @@ mkdir -p $EFIDIR cp /run/media/$1/EFI/BOOT/*.efi $EFIDIR if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then -root_part_uuid=$(blkid -o value -s PARTUUID /dev/${device}2) +root_part_uuid=$(blkid -o value -s PARTUUID ${device}2) GRUBCFG=$EFIDIR/grub.cfg cp /run/media/$1/EFI/BOOT/grub.cfg $GRUBCFG # Update grub config for the installed image diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh index df2babd..88db0a6 100644 --- a/meta/recipes-core/initrdscripts/files/init-install.sh +++ b/meta/recipes-core/initrdscripts/files/init-install.sh @@ -82,7 +82,7 @@ else exit 1 fi -device=$TARGET_DEVICE_NAME +device=/dev/$TARGET_DEVICE_NAME # # The udev automounter can cause pain here, kill it @@ -93,7 +93,7 @@ rm -f /etc/udev/scripts/mount* # # Unmount anything the automounter had mounted # -umount /dev/${device}* 2 /dev/null || /bin/true +umount ${device}* 2 /dev/null || /bin/true if [ ! -b /dev/loop0 ] ; then mknod /dev/loop0 b 7 0 @@ -104,7 +104,7 @@ if [ ! -L /etc/mtab ]; then cat /proc/mounts /etc/mtab fi -disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d -f 3 | sed -e s/MB//) +disk_size=$(parted ${device} unit mb print | grep Disk | cut -d -f 3 | sed -e s/MB//) grub_version=$(grub-install -v|sed 's/.* \([0-9]\).*/\1/') @@ -136,14 +136,14
[OE-core] [PATCH 07/10] init-install: Specify filesystem type in parted command line
Explicitly specified filesystem type for parted mkpart command. This makes partition table to look more informative. Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index 5fb4d4d..7f3e889 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh @@ -134,14 +134,14 @@ echo Creating new partition table on /dev/${device} ... parted /dev/${device} mklabel gpt echo Creating boot partition on $bootfs -parted /dev/${device} mkpart primary 0% $boot_size +parted /dev/${device} mkpart primary fat32 0% $boot_size parted /dev/${device} set 1 boot on echo Creating rootfs partition on $rootfs -parted /dev/${device} mkpart primary $rootfs_start $rootfs_end +parted /dev/${device} mkpart primary ext3 $rootfs_start $rootfs_end echo Creating swap partition on $swap -parted /dev/${device} mkpart primary $swap_start 100% +parted /dev/${device} mkpart primary linux-swap $swap_start 100% parted /dev/${device} print diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh index 74ca0be..ee191a4 100644 --- a/meta/recipes-core/initrdscripts/files/init-install.sh +++ b/meta/recipes-core/initrdscripts/files/init-install.sh @@ -159,21 +159,21 @@ echo Creating new partition table on /dev/${device} ... if [ $grub_version -eq 0 ] ; then parted /dev/${device} mktable msdos echo Creating boot partition on $bootfs -parted /dev/${device} mkpart primary 0% $boot_size +parted /dev/${device} mkpart primary ext3 0% $boot_size else parted /dev/${device} mktable gpt echo Creating BIOS boot partition on $bios_boot parted /dev/${device} mkpart primary 0% $bios_boot_size parted /dev/${device} set 1 bios_grub on echo Creating boot partition on $bootfs -parted /dev/${device} mkpart primary $boot_start $boot_size +parted /dev/${device} mkpart primary ext3 $boot_start $boot_size fi echo Creating rootfs partition on $rootfs -parted /dev/${device} mkpart primary $rootfs_start $rootfs_end +parted /dev/${device} mkpart primary ext3 $rootfs_start $rootfs_end echo Creating swap partition on $swap -parted /dev/${device} mkpart primary $swap_start 100% +parted /dev/${device} mkpart primary linux-swap $swap_start 100% parted /dev/${device} print -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 08/10] init-install: Specify partition name in parted command line
parted allows to use names for partitions if GPT partition table is used on the device. msdos partitioning can have only partition types: 'primary', 'logical' or 'extended'. Used meaningful partition names in parted command line for GPT partitioning. Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index 7f3e889..a6a8679 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh @@ -134,14 +134,14 @@ echo Creating new partition table on /dev/${device} ... parted /dev/${device} mklabel gpt echo Creating boot partition on $bootfs -parted /dev/${device} mkpart primary fat32 0% $boot_size +parted /dev/${device} mkpart boot fat32 0% $boot_size parted /dev/${device} set 1 boot on echo Creating rootfs partition on $rootfs -parted /dev/${device} mkpart primary ext3 $rootfs_start $rootfs_end +parted /dev/${device} mkpart root ext3 $rootfs_start $rootfs_end echo Creating swap partition on $swap -parted /dev/${device} mkpart primary linux-swap $swap_start 100% +parted /dev/${device} mkpart swap linux-swap $swap_start 100% parted /dev/${device} print diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh index ee191a4..2c5d530 100644 --- a/meta/recipes-core/initrdscripts/files/init-install.sh +++ b/meta/recipes-core/initrdscripts/files/init-install.sh @@ -163,17 +163,19 @@ if [ $grub_version -eq 0 ] ; then else parted /dev/${device} mktable gpt echo Creating BIOS boot partition on $bios_boot -parted /dev/${device} mkpart primary 0% $bios_boot_size +parted /dev/${device} mkpart bios_boot 0% $bios_boot_size parted /dev/${device} set 1 bios_grub on echo Creating boot partition on $bootfs -parted /dev/${device} mkpart primary ext3 $boot_start $boot_size +parted /dev/${device} mkpart boot ext3 $boot_start $boot_size fi echo Creating rootfs partition on $rootfs -parted /dev/${device} mkpart primary ext3 $rootfs_start $rootfs_end +[ $grub_version -eq 0 ] pname='primary' || pname='root' +parted /dev/${device} mkpart $pname ext3 $rootfs_start $rootfs_end echo Creating swap partition on $swap -parted /dev/${device} mkpart primary linux-swap $swap_start 100% +[ $grub_version -eq 0 ] pname='primary' || pname='swap' +parted /dev/${device} mkpart $pname linux-swap $swap_start 100% parted /dev/${device} print -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 04/10] init-install-efi: Implement UUID support
Using UUID in favor of device names is more reliable as UUID names are persistent. Device names can change as the order of adding device nodes is arbitrary. This sometimes results in device names switching on each boot, which can cause system fail to boot. Persistent naming solves these issues. Used partition UUID in kernel command line to specify root partition. Used partition UUID in /etc/fstab to specify swap partition. Used filesystem UUID in /etc/fstab to specify boot partition. [YOCTO #6101] Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com diff --git a/meta/recipes-core/initrdscripts/files/init-install-efi.sh b/meta/recipes-core/initrdscripts/files/init-install-efi.sh index 8dd2749..5fb4d4d 100644 --- a/meta/recipes-core/initrdscripts/files/init-install-efi.sh +++ b/meta/recipes-core/initrdscripts/files/init-install-efi.sh @@ -164,8 +164,10 @@ mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /src_root echo Copying rootfs files... cp -a /src_root/* /tgt_root if [ -d /tgt_root/etc/ ] ; then -echo $swapswap swap defaults 0 0 /tgt_root/etc/fstab -echo $bootfs /bootvfat defaults 1 2 /tgt_root/etc/fstab +boot_uuid=$(blkid -o value -s UUID /dev/${device}1) +swap_part_uuid=$(blkid -o value -s PARTUUID /dev/${device}3) +echo /dev/disk/by-partuuid/$swap_part_uuidswap swap defaults 0 0 /tgt_root/etc/fstab +echo UUID=$boot_uuid /bootvfat defaults 1 2 /tgt_root/etc/fstab # We dont want udev to mount our root device while we're booting... if [ -d /tgt_root/etc/udev/ ] ; then echo /dev/${device} /tgt_root/etc/udev/mount.blacklist @@ -184,6 +186,7 @@ mkdir -p $EFIDIR cp /run/media/$1/EFI/BOOT/*.efi $EFIDIR if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then +root_part_uuid=$(blkid -o value -s PARTUUID /dev/${device}2) GRUBCFG=$EFIDIR/grub.cfg cp /run/media/$1/EFI/BOOT/grub.cfg $GRUBCFG # Update grub config for the installed image @@ -196,7 +199,7 @@ if [ -f /run/media/$1/EFI/BOOT/grub.cfg ]; then # Delete any root= strings sed -i s/ root=[^ ]*/ / $GRUBCFG # Add the root= and other standard boot options -sed -i s@linux /vmlinuz *@linux /vmlinuz root=$rootfs rw $rootwait quiet @ $GRUBCFG +sed -i s@linux /vmlinuz *@linux /vmlinuz root=PARTUUID=$root_part_uuid rw $rootwait quiet @ $GRUBCFG fi if [ -d /run/media/$1/loader ]; then @@ -212,7 +215,7 @@ if [ -d /run/media/$1/loader ]; then # delete any root= strings sed -i s/ root=[^ ]*/ / $GUMMIBOOT_CFGS # add the root= and other standard boot options -sed -i s@options *@options root=$rootfs rw $rootwait quiet @ $GUMMIBOOT_CFGS +sed -i s@options *@options root=PARTUUID=$rootuuid rw $rootwait quiet @ $GUMMIBOOT_CFGS fi umount /tgt_root -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 02/10] initramfs-live-install: Add blkid to initramfs
Added util-linux-blkid to the list of dependencies of initramfs-live-install and initramfs-live-install-efi. This is a part of the work to support partiion UUID in installer. blkid is going to be used to get partition and filesystem UUIDs. Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb index b0994d7..32c1fce 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install-efi_1.0.bb @@ -5,7 +5,7 @@ SRC_URI = file://init-install-efi.sh PR = r1 -RDEPENDS_${PN} = parted e2fsprogs-mke2fs dosfstools +RDEPENDS_${PN} = parted e2fsprogs-mke2fs dosfstools util-linux-blkid S = ${WORKDIR} diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb index 6241a90..88b3b30 100644 --- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb +++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb @@ -7,7 +7,7 @@ PR = r9 S = ${WORKDIR} -RDEPENDS_${PN} = grub parted e2fsprogs-mke2fs +RDEPENDS_${PN} = grub parted e2fsprogs-mke2fs util-linux-blkid do_install() { install -m 0755 ${WORKDIR}/init-install.sh ${D}/install.sh -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 06/10] init-install: Implement UUID support
Used partition UUID in kernel command line to specify root partition. Searched root device by file system uuid in GRUB configuration. Used partition UUID in /etc/fstab to specify swap partition. Used filesystem UUID in /etc/fstab to specify boot partition. [YOCTO #6101] Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh index 298ea8d..74ca0be 100644 --- a/meta/recipes-core/initrdscripts/files/init-install.sh +++ b/meta/recipes-core/initrdscripts/files/init-install.sh @@ -195,9 +195,11 @@ mount $rootfs /tgt_root mount -o rw,loop,noatime,nodiratime /run/media/$1/$2 /src_root echo Copying rootfs files... cp -a /src_root/* /tgt_root -if [ -d /tgt_root/etc/ ] ; then -echo $swapswap swap defaults 0 0 /tgt_root/etc/fstab -echo $bootfs /bootext3 defaults 1 2 /tgt_root/etc/fstab +if [ -d /tgt_root/etc/ -a $grub_version -ne 0 ] ; then +boot_uuid=$(blkid -o value -s UUID /dev/${device}2) +swap_part_uuid=$(blkid -o value -s PARTUUID /dev/${device}4) +echo /dev/disk/by-partuuid/$swap_part_uuidswap swap defaults 0 0 /tgt_root/etc/fstab +echo UUID=$boot_uuid /bootext3 defaults 1 2 /tgt_root/etc/fstab # We dont want udev to mount our root device while we're booting... if [ -d /tgt_root/etc/udev/ ] ; then echo /dev/${device} /tgt_root/etc/udev/mount.blacklist @@ -209,22 +211,24 @@ umount /src_root # Handling of the target boot partition mount $bootfs /boot echo Preparing boot partition... -if [ -f /etc/grub.d/00_header ] ; then +if [ -f /etc/grub.d/00_header -a $grub_version -ne 0 ] ; then echo Preparing custom grub2 menu... +root_part_uuid=$(blkid -o value -s PARTUUID /dev/${device}3) +boot_uuid=$(blkid -o value -s UUID /dev/${device}2) GRUBCFG=/boot/grub/grub.cfg mkdir -p $(dirname $GRUBCFG) cat $GRUBCFG _EOF menuentry Linux { -set root=(hd0,2) -linux /vmlinuz root=$rootfs $rootwait rw $5 $3 $4 quiet +search --no-floppy --fs-uuid $boot_uuid --set root +linux /vmlinuz root=PARTUUID=$root_part_uuid rootwait rw $5 $3 $4 quiet } _EOF chmod 0444 $GRUBCFG fi grub-install /dev/${device} -echo (hd0) /dev/${device} /boot/grub/device.map if [ $grub_version -eq 0 ] ; then +echo (hd0) /dev/${device} /boot/grub/device.map echo Preparing custom grub menu... echo default 0 /boot/grub/menu.lst echo timeout 30 /boot/grub/menu.lst -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/10] UUID support in installer (poky-contrib: ed/oe-core/uuid-init-install)
Hi, This patchet adds support of GPT partition table and UUID support to initramfs installer scripts. Using UUID in favor of device names is more reliable as UUID names are persistent. Device names can change as the order of adding device nodes is arbitrary. This sometimes results in device names switching on each boot, which can cause system fail to boot. Persistent naming solves these issues. Implementation details: Used partition UUID in kernel command line to specify root partition. Used partition UUID in /etc/fstab to specify swap partition. Used filesystem UUID in /etc/fstab to specify boot partition. Code cleanup and usability fixes were done along the way. They're also included into this patchset. Patchest was tested on NUC device in both EFI and non-EFI modes. See more details in [YOCTO #6101] NOTE: Please drop the following pending patches as they're included into the patchset: [OE-core] [PATCH] image-live: Set syslinux timeout to 5s [OE-core] [PATCH] initramfs-live-install: Add gptdisk to initramfs [OE-core] [PATCH] init-install-efi: Implement UUID support Please review Ed Bartosh (10): image-live: Set syslinux timeout to 5s initramfs-live-install: Add blkid to initramfs busybox: Enable UUID-related options init-install-efi: Implement UUID support init-install: Use GPT table with GRUB 2 init-install: Implement UUID support init-install: Specify filesystem type in parted command line init-install: Specify partition name in parted command line init-install: code cleanup: Replace tabs with spaces init-install: code cleanup: replace /dev/$device - $device meta/classes/image-live.bbclass| 2 +- meta/recipes-core/busybox/busybox/defconfig| 8 +- .../initrdscripts/files/init-install-efi.sh| 90 ++--- .../initrdscripts/files/init-install.sh| 146 + .../initramfs-live-install-efi_1.0.bb | 2 +- .../initrdscripts/initramfs-live-install_1.0.bb| 2 +- 6 files changed, 143 insertions(+), 107 deletions(-) -- Ed -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lttng-modules: drop makefile patch
The lttng-modules Makefile allows us to specify the kernel we're building against via the KERNELDIR variable on the build command line. Use that and drop the patch (which tends to need updating whenever the upstream Makefile changes). Signed-off-by: Nathan Lynch nathan_ly...@mentor.com --- ...modules-replace-KERNELDIR-with-KERNEL_SRC.patch | 71 -- meta/recipes-kernel/lttng/lttng-modules_2.6.1.bb | 6 +- 2 files changed, 2 insertions(+), 75 deletions(-) delete mode 100644 meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch diff --git a/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch b/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch deleted file mode 100644 index ccc6c54f8122.. --- a/meta/recipes-kernel/lttng/lttng-modules/lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch +++ /dev/null @@ -1,71 +0,0 @@ -Upstream-Status: Inappropriate [embedded specific] - -lttng-modules: replace KERNELDIR with KERNEL_SRC - -Since lttng-modules uses the default way of module.bbclass to -build and install lttng-modules, we do this replacement for -it as-is. - -Signed-off-by: Zumeng Chen zumeng.c...@windriver.com -[sgw - rebased for 2.6.1] -Signed-off-by: Saul wold s...@linux.intel.com - -Index: git/Makefile -=== git.orig/Makefile -+++ git/Makefile -@@ -68,19 +68,19 @@ obj-m += lib/ - endif # CONFIG_TRACEPOINTS - - else # KERNELRELEASE -- KERNELDIR ?= /lib/modules/$(shell uname -r)/build -- PWD := $(shell pwd) -- CFLAGS = $(EXTCFLAGS) -- -+ KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build -+ PWD := $(shell pwd) -+ CFLAGS = $(EXTCFLAGS) -+ - default: -- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules -+ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules - - modules_install: -- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install -+ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install - - clean: -- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) clean -+ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean - - %.i: %.c -- LTTNG_KERNELDIR=$(KERNELDIR) $(MAKE) -C $(KERNELDIR) M=$(PWD) $@ -+ LTTNG_KERNELDIR=$(KERNEL_SRC) $(MAKE) -C $(KERNEL_SRC) M=$(PWD) $@ - endif # KERNELRELEASE -Index: git/probes/Makefile -=== git.orig/probes/Makefile -+++ git/probes/Makefile -@@ -267,18 +267,18 @@ endif - endif - - else -- KERNELDIR ?= /lib/modules/$(shell uname -r)/build -+ KERNEL_SRC ?= /lib/modules/$(shell uname -r)/build - PWD := $(shell pwd) - CFLAGS = $(EXTCFLAGS) - - default: -- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules -+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules - - modules_install: -- $(MAKE) -C $(KERNELDIR) M=$(PWD) modules_install -+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) modules_install - /sbin/depmod -a - - clean: -- $(MAKE) -C $(KERNELDIR) M=$(PWD) clean -+ $(MAKE) -C $(KERNEL_SRC) M=$(PWD) clean - - endif diff --git a/meta/recipes-kernel/lttng/lttng-modules_2.6.1.bb b/meta/recipes-kernel/lttng/lttng-modules_2.6.1.bb index be09a82f823e..5bde7ec2132e 100644 --- a/meta/recipes-kernel/lttng/lttng-modules_2.6.1.bb +++ b/meta/recipes-kernel/lttng/lttng-modules_2.6.1.bb @@ -12,13 +12,11 @@ SRCREV = 62080b2248fd8ec4111ffc379d0bc5eaf0a5c16d COMPATIBLE_HOST = '(x86_64|i.86|powerpc|aarch64|mips|arm).*-linux' -SRC_URI = git://git.lttng.org/lttng-modules.git;branch=stable-2.6 \ - file://lttng-modules-replace-KERNELDIR-with-KERNEL_SRC.patch \ - +SRC_URI = git://git.lttng.org/lttng-modules.git;branch=stable-2.6 export INSTALL_MOD_DIR=kernel/lttng-modules -export KERNEL_SRC=${STAGING_KERNEL_DIR} +EXTRA_OEMAKE += KERNELDIR='${STAGING_KERNEL_DIR}' S = ${WORKDIR}/git -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 05/10] init-install: Use GPT table with GRUB 2
Changed partition type from 'msdos' to 'gpt'. Added special partition for grub stage2 bootloader. NOTE: This is done only for GRUB 2 as legacy GRUB is rarely used and doesn't support GPT partitions. Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh index cb26163..298ea8d 100644 --- a/meta/recipes-core/initrdscripts/files/init-install.sh +++ b/meta/recipes-core/initrdscripts/files/init-install.sh @@ -106,10 +106,21 @@ fi disk_size=$(parted /dev/${device} unit mb print | grep Disk | cut -d -f 3 | sed -e s/MB//) +grub_version=$(grub-install -v|sed 's/.* \([0-9]\).*/\1/') + +if [ $grub_version -eq 0 ] ; then +bios_boot_size=0 +else +# For GRUB 2 we need separate parition to store stage2 grub image +# 2Mb value is chosen to align partition for best performance. +bios_boot_size=2 +fi + swap_size=$((disk_size*swap_ratio/100)) -rootfs_size=$((disk_size-boot_size-swap_size)) +rootfs_size=$((disk_size-bios_boot_size-boot_size-swap_size)) -rootfs_start=$((boot_size)) +boot_start=$((bios_boot_size)) +rootfs_start=$((bios_boot_size+boot_size)) rootfs_end=$((rootfs_start+rootfs_size)) swap_start=$((rootfs_end)) @@ -122,11 +133,21 @@ if [ ! ${device#mmcblk} = ${device} ]; then part_prefix=p rootwait=rootwait fi -bootfs=/dev/${device}${part_prefix}1 -rootfs=/dev/${device}${part_prefix}2 -swap=/dev/${device}${part_prefix}3 + +if [ $grub_version -eq 0 ] ; then +bios_boot='' +bootfs=/dev/${device}${part_prefix}1 +rootfs=/dev/${device}${part_prefix}2 +swap=/dev/${device}${part_prefix}3 +else +bios_boot=/dev/${device}${part_prefix}1 +bootfs=/dev/${device}${part_prefix}2 +rootfs=/dev/${device}${part_prefix}3 +swap=/dev/${device}${part_prefix}4 +fi echo * +[ $grub_version -ne 0 ] echo BIOS boot partition size: $bios_boot_size MB ($bios_boot) echo Boot partition size: $boot_size MB ($bootfs) echo Rootfs partition size: $rootfs_size MB ($rootfs) echo Swap partition size: $swap_size MB ($swap) @@ -135,10 +156,18 @@ echo Deleting partition table on /dev/${device} ... dd if=/dev/zero of=/dev/${device} bs=512 count=2 echo Creating new partition table on /dev/${device} ... -parted /dev/${device} mklabel msdos - -echo Creating boot partition on $bootfs -parted /dev/${device} mkpart primary 0% $boot_size +if [ $grub_version -eq 0 ] ; then +parted /dev/${device} mktable msdos +echo Creating boot partition on $bootfs +parted /dev/${device} mkpart primary 0% $boot_size +else +parted /dev/${device} mktable gpt +echo Creating BIOS boot partition on $bios_boot +parted /dev/${device} mkpart primary 0% $bios_boot_size +parted /dev/${device} set 1 bios_grub on +echo Creating boot partition on $bootfs +parted /dev/${device} mkpart primary $boot_start $boot_size +fi echo Creating rootfs partition on $rootfs parted /dev/${device} mkpart primary $rootfs_start $rootfs_end @@ -186,7 +215,7 @@ if [ -f /etc/grub.d/00_header ] ; then mkdir -p $(dirname $GRUBCFG) cat $GRUBCFG _EOF menuentry Linux { -set root=(hd0,1) +set root=(hd0,2) linux /vmlinuz root=$rootfs $rootwait rw $5 $3 $4 quiet } _EOF @@ -195,8 +224,7 @@ fi grub-install /dev/${device} echo (hd0) /dev/${device} /boot/grub/device.map -# If grub.cfg doesn't exist, assume GRUB 0.97 and create a menu.lst -if [ ! -f /boot/grub/grub.cfg ] ; then +if [ $grub_version -eq 0 ] ; then echo Preparing custom grub menu... echo default 0 /boot/grub/menu.lst echo timeout 30 /boot/grub/menu.lst -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 03/10] busybox: Enable UUID-related options
Enabled MOUNT_LABEL and VOLUMEID* features for busybox mount to understand 'UUID=' syntax in fstab. Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com diff --git a/meta/recipes-core/busybox/busybox/defconfig b/meta/recipes-core/busybox/busybox/defconfig index c200ee0..468c40e 100644 --- a/meta/recipes-core/busybox/busybox/defconfig +++ b/meta/recipes-core/busybox/busybox/defconfig @@ -582,7 +582,7 @@ CONFIG_MOUNT=y # CONFIG_FEATURE_MOUNT_FAKE is not set # CONFIG_FEATURE_MOUNT_VERBOSE is not set # CONFIG_FEATURE_MOUNT_HELPERS is not set -# CONFIG_FEATURE_MOUNT_LABEL is not set +CONFIG_FEATURE_MOUNT_LABEL=y CONFIG_FEATURE_MOUNT_NFS=y # CONFIG_FEATURE_MOUNT_CIFS is not set CONFIG_FEATURE_MOUNT_FLAGS=y @@ -607,11 +607,11 @@ CONFIG_FEATURE_UMOUNT_ALL=y CONFIG_FEATURE_MOUNT_LOOP=y CONFIG_FEATURE_MOUNT_LOOP_CREATE=y # CONFIG_FEATURE_MTAB_SUPPORT is not set -# CONFIG_VOLUMEID is not set -# CONFIG_FEATURE_VOLUMEID_EXT is not set +CONFIG_VOLUMEID=y +CONFIG_FEATURE_VOLUMEID_EXT=y # CONFIG_FEATURE_VOLUMEID_BTRFS is not set # CONFIG_FEATURE_VOLUMEID_REISERFS is not set -# CONFIG_FEATURE_VOLUMEID_FAT is not set +CONFIG_FEATURE_VOLUMEID_FAT=y # CONFIG_FEATURE_VOLUMEID_HFS is not set # CONFIG_FEATURE_VOLUMEID_JFS is not set # CONFIG_FEATURE_VOLUMEID_XFS is not set -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 01/10] image-live: Set syslinux timeout to 5s
Increased syslinux timeout to 5s as default 1s timeout is not enough to notice syslinux prompt on some devices. Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com diff --git a/meta/classes/image-live.bbclass b/meta/classes/image-live.bbclass index 7b770fb..52b6de7 100644 --- a/meta/classes/image-live.bbclass +++ b/meta/classes/image-live.bbclass @@ -3,7 +3,7 @@ AUTO_SYSLINUXCFG = 1 INITRD_IMAGE ?= core-image-minimal-initramfs INITRD ?= ${DEPLOY_DIR_IMAGE}/${INITRD_IMAGE}-${MACHINE}.cpio.gz SYSLINUX_ROOT = root=/dev/ram0 -SYSLINUX_TIMEOUT ?= 10 +SYSLINUX_TIMEOUT ?= 50 SYSLINUX_LABELS ?= boot install LABELS_append = ${SYSLINUX_LABELS} -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2 3/3] populate_sdk_ext: consider custom configuration in local.conf
On Wednesday 10 June 2015 15:25:24 Chen Qi wrote: Copy the contents of local.conf under TOPDIR into the final generated local.conf. In this way, custom settings are also made into the final local.conf like IMAGE_INSTALL, DISTRO_FEATURES, VIRTUAL-RUNTIME_xxx, etc. Before this change, installing extensible SDK would usually report failure when preparing the build system if the user has custom configuration for DISTRO_FEATURES in local.conf. Also, items in IMAGE_INSTALL_append in local.conf also don't get built correctly. This patch solves the above problem by making use of the bb.utils.edit_metadata. In addition, we check to avoid any setting that might lead to host path bleeding into SDK's configuration. Basically, variables with values starting with '/' are removed. A whitelist mechanism is introduced so that users could specify variables that should not be ignored. The name of the whitelist is SDK_LOCAL_CONF_WHITELIST. [YOCTO #7616] Signed-off-by: Chen Qi qi.c...@windriver.com --- meta/classes/populate_sdk_ext.bbclass | 17 + 1 file changed, 17 insertions(+) diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass index 2fc4c11..08130d4 100644 --- a/meta/classes/populate_sdk_ext.bbclass +++ b/meta/classes/populate_sdk_ext.bbclass @@ -16,6 +16,7 @@ SDK_RDEPENDS_append_task-populate-sdk-ext = ${SDK_TARGETS} SDK_RELOCATE_AFTER_INSTALL_task-populate-sdk-ext = 0 SDK_META_CONF_WHITELIST ?= MACHINE DISTRO PACKAGE_CLASSES +SDK_LOCAL_CONF_WHITELIST ?= SDK_TARGETS ?= ${PN} OE_INIT_ENV_SCRIPT ?= oe-init-build-env @@ -108,12 +109,28 @@ python copy_buildsystem () { f.write('\n') # Create local.conf +local_conf_whitelist = d.getVar('SDK_LOCAL_CONF_WHITELIST', True).split() +def handle_var(varname, origvalue, op, newlines): +if origvalue.strip().startswith('/') and not varname in local_conf_whitelist: +newlines.append('# Removed original setting of %s\n' % varname) +return None, op, 0, True +else: +return origvalue, op, 0, True +varlist = ['[^#=+ ]*'] +builddir = d.getVar('TOPDIR', True) +with open(builddir + '/conf/local.conf', 'r') as f: +oldlines = f.readlines() +(updated, newlines) = bb.utils.edit_metadata(oldlines, varlist, handle_var) + with open(baseoutpath + '/conf/local.conf', 'w') as f: f.write('# WARNING: this configuration has been automatically generated and in\n') f.write('# most cases should not be edited. If you need more flexibility than\n') f.write('# this configuration provides, it is strongly suggested that you set\n') f.write('# up a proper instance of the full build system and use that instead.\n\n') +for line in newlines: +f.write(line) + f.write('INHERIT += %s\n\n' % 'uninative') f.write('CONF_VERSION = %s\n\n' % d.getVar('CONF_VERSION')) OK, this looks good - but do we really need two whitelists now (SDK_META_CONF_WHITELIST and SDK_LOCAL_CONF_WHITELIST)? Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH][fido] runqemu: add support to boot arm64 qemu target from NFS
Ping. Regards, Jagadeesh On Tue, Jun 9, 2015 at 10:18 AM, Jagadeesh Krishnanjanappa jkrishnanjana...@mvista.com wrote: The other changes include, runqemu - fix MACHINE type being detected as qemuarm when qemuarm64 kernel image name is given. runqemu-internal - Added console=ttyAMA0,115200 as one of the boot parameters for qemuarm, in order to print bootlog messages on the console. - Use -nographic option only if serial option is not specified. Otherwise we get below error when 'runqemu kernel_image rootfs_image serial' is executed, (snip) QEMU 2.2.0 monitor - type 'help' for more information (qemu) qemu-system-aarch64: -serial stdio: cannot use stdio by multiple character devices -- CUT -- qemuarm64 NFS booting has been tested successfully on Ubuntu 14.04 host. Signed-off-by: Jagadeesh Krishnanjanappa jkrishnanjana...@mvista.com --- scripts/runqemu | 4 ++-- scripts/runqemu-internal | 20 +++- 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/scripts/runqemu b/scripts/runqemu index 84ece4d..09c507d 100755 --- a/scripts/runqemu +++ b/scripts/runqemu @@ -232,13 +232,13 @@ fi if [ -z $MACHINE ]; then if [ x$FSTYPE = xvmdk ]; then -MACHINE=`basename $VM | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'` +MACHINE=`basename $VM | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'` if [ -z $MACHINE ]; then error Unable to set MACHINE from vmdk filename [$VM] fi echo Set MACHINE to [$MACHINE] based on vmdk [$VM] else -MACHINE=`basename $KERNEL | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'` +MACHINE=`basename $KERNEL | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'` if [ -z $MACHINE ]; then error Unable to set MACHINE from kernel filename [$KERNEL] fi diff --git a/scripts/runqemu-internal b/scripts/runqemu-internal index 2db5566..e346c64 100755 --- a/scripts/runqemu-internal +++ b/scripts/runqemu-internal @@ -275,9 +275,6 @@ else KERNCMDLINE=mem=$QEMU_MEMORY QEMU_UI_OPTIONS=-show-cursor -usb -usbdevice wacom-tablet -if [ $MACHINE = 'qemuarm64' ]; then -QEMU_UI_OPTIONS=-nographic -fi NFS_INSTANCE=`echo $TAP | sed 's/tap//'` export NFS_INSTANCE @@ -368,7 +365,7 @@ if [ $MACHINE = qemuarm -o $MACHINE = qemuarmv6 -o $MACHINE = qemuarm cleanup return 1 fi -KERNCMDLINE=root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY +KERNCMDLINE=root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw console=ttyAMA0,115200 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY QEMUOPTIONS=$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} --no-reboot $QEMU_UI_OPTIONS fi if [ $MACHINE = qemuarmv6 ]; then @@ -383,12 +380,25 @@ if [ $MACHINE = qemuarm64 ]; then QEMU=qemu-system-aarch64 export QEMU_AUDIO_DRV=none -QEMU_UI_OPTIONS=$QEMU_UI_OPTIONS +if [ x$SERIALSTDIO = x ] ; then +QEMU_UI_OPTIONS=-nographic +else +QEMU_UI_OPTIONS= +fi if [ ${FSTYPE:0:3} = ext -o $FSTYPE = btrfs ]; then KERNCMDLINE=root=/dev/vda rw console=ttyAMA0,38400 mem=$QEMU_MEMORY highres=off $KERNEL_NETWORK_CMD # qemu-system-aarch64 only support '-machine virt -cpu cortex-a57' for now QEMUOPTIONS=$QEMU_NETWORK_CMD -machine virt -cpu cortex-a57 $ROOTFS_OPTIONS $QEMU_UI_OPTIONS fi +if [ $FSTYPE = nfs ]; then +if [ $NFS_SERVER = 192.168.7.1 -a ! -d $NFS_DIR ]; then +echo Error: NFS mount point $ROOTFS doesn't exist +cleanup +return 1 +fi +KERNCMDLINE=root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw console=ttyAMA0,38400 mem=$QEMU_MEMORY highres=off $KERNEL_NETWORK_CMD +QEMUOPTIONS=$QEMU_NETWORK_CMD -machine virt -cpu cortex-a57 $QEMU_UI_OPTIONS +fi fi -- 1.8.2.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] openssl: fix building on x32 systems
Fix build on Fedora 21 i686. When building on x32 systems where the default type is 32bit, make sure that 64bit integers can be represented transparently. Signed-off-by: Cristian Iorga cristian.io...@intel.com --- .../openssl/openssl/openssl-1.0.2a-x32-asm.patch | 45 ++ .../recipes-connectivity/openssl/openssl_1.0.2a.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch b/meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch new file mode 100644 index 000..f603399 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch @@ -0,0 +1,45 @@ +https://rt.openssl.org/Ticket/Display.html?id=3759user=guestpass=guest + +From 6257d59b3a68d2feb9d64317a1c556dc3813ee61 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger vap...@gentoo.org +Date: Sat, 21 Mar 2015 06:01:25 -0400 +Subject: [PATCH] crypto: use bigint in x86-64 perl + +Upstream-Status: Pending + +When building on x32 systems where the default type is 32bit, make sure +we can transparently represent 64bit integers. Otherwise we end up with +build errors like: +/usr/bin/perl asm/ghash-x86_64.pl elf ghash-x86_64.s +Integer overflow in hexadecimal number at asm/../../perlasm/x86_64-xlate.pl line 201, line 890. +... +ghash-x86_64.s: Assembler messages: +ghash-x86_64.s:890: Error: junk '.15473355479995e+19' after expression + +We don't enable this globally as there are some cases where we'd get +32bit values interpreted as unsigned when we need them as signed. + +Reported-by: Bertrand Jacquin bertr...@jacquin.bzh +URL: https://bugs.gentoo.org/542618 +--- + crypto/perlasm/x86_64-xlate.pl | 4 + 1 file changed, 4 insertions(+) + +diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl +index aae8288..0bf9774 100755 +--- a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl +@@ -195,6 +195,10 @@ my %globals; + sub out { + my $self = shift; + ++ # When building on x32 ABIs, the expanded hex value might be too ++ # big to fit into 32bits. Enable transparent 64bit support here ++ # so we can safely print it out. ++ use bigint; + if ($gas) { + # Solaris /usr/ccs/bin/as can't handle multiplications + # in $self-{value} +-- +2.3.3 + diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb index f4006f6..d7f0259 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb @@ -37,6 +37,7 @@ SRC_URI += file://configure-targets.patch \ file://run-ptest \ file://crypto_use_bigint_in_x86-64_perl.patch \ file://0001-bn-bn_lcl.h-fix-MIPS-specific-gcc-version-check.patch \ +file://openssl-1.0.2a-x32-asm.patch \ SRC_URI[md5sum] = a06c547dac9044161a477211049f60ef -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] piglit: Add missing inclusion of Xutil.h
The EGL tests rely on Xutil.h being included. Some EGL implementation does not explitly include it by default and than the build fail. This fixes the build in imx53qsb board, of meta-fsl-arm, but is a generic fix. Signed-off-by: Otavio Salvador ota...@ossystems.com.br --- ...0001-tests-Fix-missing-include-of-Xutil.h.patch | 28 ++ meta/recipes-graphics/piglit/piglit_git.bb | 5 ++-- 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-graphics/piglit/files/0001-tests-Fix-missing-include-of-Xutil.h.patch diff --git a/meta/recipes-graphics/piglit/files/0001-tests-Fix-missing-include-of-Xutil.h.patch b/meta/recipes-graphics/piglit/files/0001-tests-Fix-missing-include-of-Xutil.h.patch new file mode 100644 index 000..bbae001 --- /dev/null +++ b/meta/recipes-graphics/piglit/files/0001-tests-Fix-missing-include-of-Xutil.h.patch @@ -0,0 +1,28 @@ +From 824b20391c05e4b1689288eee829563d7bb4d338 Mon Sep 17 00:00:00 2001 +From: Otavio Salvador ota...@ossystems.com.br +Date: Mon, 15 Jun 2015 16:25:30 -0300 +Subject: [PATCH] tests: Fix missing include of Xutil.h +Organization: O.S. Systems Software LTDA. + +Upstream-Status: Pending + +Signed-off-by: Otavio Salvador ota...@ossystems.com.br +--- + tests/egl/egl-configless-context.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/tests/egl/egl-configless-context.c b/tests/egl/egl-configless-context.c +index 0504a26..154b55c 100644 +--- a/tests/egl/egl-configless-context.c b/tests/egl/egl-configless-context.c +@@ -32,6 +32,7 @@ + /* Chunks of code in this file are taken from egl-util.c */ + + #include X11/Xlib.h ++#include X11/Xutil.h + + #include piglit-util-gl.h + #include piglit-util-egl.h +-- +2.1.4 + diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index 75e41fe..9e6dc2c 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -2,7 +2,8 @@ SUMMARY = OpenGL driver testing framework LICENSE = MIT LGPLv2+ GPLv3 GPLv2+ BSD-3-Clause LIC_FILES_CHKSUM = file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0 -SRC_URI = git://anongit.freedesktop.org/piglit +SRC_URI = git://anongit.freedesktop.org/piglit \ + file://0001-tests-Fix-missing-include-of-Xutil.h.patch # From 2014/12/04 SRCREV = 126c7d049b8f32e541625d5a35fbc5f5e4e7fbf8 @@ -28,4 +29,4 @@ RDEPENDS_${PN} = waffle python python-mako python-json python-subprocess \ mesa-demos bash \ -INSANE_SKIP_${PN} += dev-so \ No newline at end of file +INSANE_SKIP_${PN} += dev-so -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] KCONF_AUDIT_LEVEL + kernel_configcheck
On 2015-06-15 8:17 AM, Patrick Ohly wrote: Hello! In Fido and master, the following patch changed the default value of KCONF_AUDIT_LEVEL: $ git annotate origin/fido -- meta/classes/kernel-yocto.bbclass | grep KCONF_AUDIT_LEVEL ad4d5949(Bruce Ashfield 2015-02-18 16:15:35 -0500 308) config_check_visibility = int(d.getVar( KCONF_AUDIT_LEVEL, True ) or 0) $ git annotate origin/master -- meta/classes/kernel-yocto.bbclass | grep KCONF_AUDIT_LEVEL ad4d5949(Bruce Ashfield 2015-02-18 16:15:35 -0500 309) config_check_visibility = int(d.getVar( KCONF_AUDIT_LEVEL, True ) or 0) At least if I read it right, that wasn't the intention. The commit explicitly says that the default should be 1: The visibility of auditing is controlled by KCONF_AUDIT_LEVEL: 0: no reporting 1: report options that are specified, but not in the final config 2: report options that are not hardware related, but set by a BSP The default level is 1, with level 2 and above being for BSP development only. The line is correct, since we don't want it warning for non linux-yocto meta-data enabled kernels. The default is indeed 1, since I set it in the common include file. That was the default I was referring to in that change. I found that while investigating why having an unsupported config option in one of my kernel fragments did not result in a warning. However, even with KCONF_AUDIT_LEVEL=2 in my local.conf, I still only get warnings about the BSP, but not my unsupported option. To reproduce, modify poky master as follows and build the default configuration: $ git diff --cached diff --git a/meta/recipes-kernel/linux/linux-yocto/foobar.cfg b/meta/recipes-kernel/linux/linux-yocto/foobar.cfg new file mode 100644 index 000..f40043a --- /dev/null +++ b/meta/recipes-kernel/linux/linux-yocto/foobar.cfg @@ -0,0 +1,2 @@ +CONFIG_FOOBAR=y +CONFIG_SECURITY_SMACK=y diff --git a/meta/recipes-kernel/linux/linux-yocto_3.19.bb b/meta/recipes-kernel/linux/linux-yocto_3.19.bb index 6218c02..d4b9437 100644 --- a/meta/recipes-kernel/linux/linux-yocto_3.19.bb +++ b/meta/recipes-kernel/linux/linux-yocto_3.19.bb @@ -38,3 +38,5 @@ KERNEL_FEATURES_append = ${KERNEL_EXTRA_FEATURES} KERNEL_FEATURES_append_qemux86= cfg/sound.scc cfg/paravirt_kvm.scc KERNEL_FEATURES_append_qemux86-64= cfg/sound.scc cfg/paravirt_kvm.scc KERNEL_FEATURES_append = ${@bb.utils.contains(TUNE_FEATURES, mx32, cfg/x32.scc, ,d)} + +SRC_URI += file://foobar.cfg ... $ bitbake -f -c kernel_configcheck linux-yocto Loading cache: 100% || ETA: 00:00:00 Loaded 1288 entries from dependency cache. NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION= 1.27.1 BUILD_SYS = x86_64-linux NATIVELSBSTRING = Debian-8.0 TARGET_SYS= i586-poky-linux MACHINE = qemux86 DISTRO= poky DISTRO_VERSION= 1.8+snapshot-20150615 TUNE_FEATURES = m32 i586 TARGET_FPU= meta meta-yocto meta-yocto-bsp= master:379a030702c985c6e69831173f765a47dfeb8841 NOTE: Preparing RunQueue NOTE: Tainting hash to force rebuild of task /work/poky/meta/recipes-kernel/linux/linux-yocto_3.19.bb, do_kernel_configcheck WARNING: /work/poky/meta/recipes-kernel/linux/linux-yocto_3.19.bb.do_configure is tainted from a forced run WARNING: /work/poky/meta/recipes-kernel/linux/linux-yocto_3.19.bb.do_kernel_configcheck is tainted from a forced run NOTE: Executing SetScene Tasks NOTE: Executing RunQueue Tasks WARNING: [kernel config]: BSP specified non-hw configuration: CONFIG_BLOCK CONFIG_BT CONFIG_BT_6LOWPAN CONFIG_BT_BNEP CONFIG_BT_BNEP_MC_FILTER CONFIG_BT_BNEP_PROTO_FILTER CONFIG_BT_CMTP CONFIG_BT_HIDP CONFIG_BT_RFCOMM CONFIG_BT_RFCOMM_TTY CONFIG_CFG80211_WEXT CONFIG_CORDIC CONFIG_CRC8 CONFIG_EFIVAR_FS CONFIG_EFI_PARTITION CONFIG_NET CONFIG_NETDEVICES CONFIG_PARTITION_ADVANCED CONFIG_WEXT_CORE CONFIG_WEXT_PROC CONFIG_WIRELESS foobar.cfg is used (the CONFIG_SECURITY_SMACK part is used) but the CONFIG_FOOBAR part of course is not. Shouldn't this trigger the specified values did not make it into the kernel's final configuration? To keep the noise down, I'm only emitting partial audit information and the warnings only apply to options that are tagged as hardware, since that is also a synonym to 'required' in the configuration scheme. .. and no. That isn't common knowledge, since I've been slowly changing and making the audit information more visible, but don't want to flood too many warnings, or create an ABI that limits how we can change things. There is no mismatch.cfg, only a nonhw_report.cfg. This seems to point towards an error in the configure task, if I understand the kernel
Re: [OE-core] [PATCH] openssl: fix building on x32 systems
Patch applicable to 1.8 branch also. -Original Message- From: Iorga, Cristian Sent: Monday, June 15, 2015 11:35 PM To: openembedded-core@lists.openembedded.org Cc: Iorga, Cristian Subject: [PATCH] openssl: fix building on x32 systems Fix build on Fedora 21 i686. When building on x32 systems where the default type is 32bit, make sure that 64bit integers can be represented transparently. Signed-off-by: Cristian Iorga cristian.io...@intel.com --- .../openssl/openssl/openssl-1.0.2a-x32-asm.patch | 45 ++ .../recipes-connectivity/openssl/openssl_1.0.2a.bb | 1 + 2 files changed, 46 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch b/meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch new file mode 100644 index 000..f603399 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.p +++ atch @@ -0,0 +1,45 @@ +https://rt.openssl.org/Ticket/Display.html?id=3759user=guestpass=gues +t + +From 6257d59b3a68d2feb9d64317a1c556dc3813ee61 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger vap...@gentoo.org +Date: Sat, 21 Mar 2015 06:01:25 -0400 +Subject: [PATCH] crypto: use bigint in x86-64 perl + +Upstream-Status: Pending + +When building on x32 systems where the default type is 32bit, make sure +we can transparently represent 64bit integers. Otherwise we end up +with build errors like: +/usr/bin/perl asm/ghash-x86_64.pl elf ghash-x86_64.s Integer overflow +in hexadecimal number at asm/../../perlasm/x86_64-xlate.pl line 201, line 890. +... +ghash-x86_64.s: Assembler messages: +ghash-x86_64.s:890: Error: junk '.15473355479995e+19' after expression + +We don't enable this globally as there are some cases where we'd get +32bit values interpreted as unsigned when we need them as signed. + +Reported-by: Bertrand Jacquin bertr...@jacquin.bzh +URL: https://bugs.gentoo.org/542618 +--- + crypto/perlasm/x86_64-xlate.pl | 4 + 1 file changed, 4 insertions(+) + +diff --git a/crypto/perlasm/x86_64-xlate.pl +b/crypto/perlasm/x86_64-xlate.pl index aae8288..0bf9774 100755 +--- a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl +@@ -195,6 +195,10 @@ my %globals; + sub out { + my $self = shift; + ++ # When building on x32 ABIs, the expanded hex value might be too ++ # big to fit into 32bits. Enable transparent 64bit support here ++ # so we can safely print it out. ++ use bigint; + if ($gas) { + # Solaris /usr/ccs/bin/as can't handle multiplications + # in $self-{value} +-- +2.3.3 + diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb index f4006f6..d7f0259 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb @@ -37,6 +37,7 @@ SRC_URI += file://configure-targets.patch \ file://run-ptest \ file://crypto_use_bigint_in_x86-64_perl.patch \ file://0001-bn-bn_lcl.h-fix-MIPS-specific-gcc-version-check.patch \ +file://openssl-1.0.2a-x32-asm.patch \ SRC_URI[md5sum] = a06c547dac9044161a477211049f60ef -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] libpcap: fix PACKAGECONFIG
On 06/15/2015 07:52 PM, Burton, Ross wrote: On 11 June 2015 at 10:08, Robert Yang liezhi.y...@windriver.com mailto:liezhi.y...@windriver.com wrote: The BLUEZ is default to bluez5, but there is only PACKAGECONFIG[bluez4], no PACKAGECONFIG[bluez5], and the current version of libpcap (or the higher version 1.7.3) only supports bluez4, we can't use ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} for PACKAGECONFIG any more since BLUEZ is default to bluez5, and not supported, and there is no bluez4 in oe-core any more, set PACKAGECONFIG to by default, other layers where bluez4 is available can enable it via bbappend. So the point of this logic is that simply removing bluez5 from DISTRO_FEATURES results in bluez4 being enabled where relevant, which you're removing. Would a better fix would be to have a dummy (empty) bluez5 stanza? Hi Ross, The code was: PACKAGECONFIG ??= ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} PACKAGECONFIG[bluez4] = --enable-bluetooth,--disable-bluetooth,bluez4 BLUEZ is default to bluez5, did you mean that we add a line like: PACKAGECONFIG[bluez5] = ,, or PACKAGECONFIG[bluez5] = ,--disable-bluetooth, But we didn't need such a line, since when PACKAGECONFIG != bluez4, the --disable-bluetooth will be used. Maybe we can simply drop this patch ? I made this patch to avoid confusing the user. // Robert Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] libpcap: fix PACKAGECONFIG
On 06/16/2015 09:55 AM, Robert Yang wrote: On 06/15/2015 07:52 PM, Burton, Ross wrote: On 11 June 2015 at 10:08, Robert Yang liezhi.y...@windriver.com mailto:liezhi.y...@windriver.com wrote: The BLUEZ is default to bluez5, but there is only PACKAGECONFIG[bluez4], no PACKAGECONFIG[bluez5], and the current version of libpcap (or the higher version 1.7.3) only supports bluez4, we can't use ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} for PACKAGECONFIG any more since BLUEZ is default to bluez5, and not supported, and there is no bluez4 in oe-core any more, set PACKAGECONFIG to by default, other layers where bluez4 is available can enable it via bbappend. So the point of this logic is that simply removing bluez5 from DISTRO_FEATURES results in bluez4 being enabled where relevant, which you're removing. Would a better fix would be to have a dummy (empty) bluez5 stanza? Hi Ross, The code was: PACKAGECONFIG ??= ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} PACKAGECONFIG[bluez4] = --enable-bluetooth,--disable-bluetooth,bluez4 BLUEZ is default to bluez5, did you mean that we add a line like: PACKAGECONFIG[bluez5] = ,, or PACKAGECONFIG[bluez5] = ,--disable-bluetooth, Hi Ross, After more thoughts, add a dummy PACKAGECONFIG can avoid confusing the user, and avoid the warning, so I updated in the repo: git://git.openembedded.org/openembedded-core-contrib rbt/pkgconfig The BLUEZ is default to bluez5, but there is only PACKAGECONFIG[bluez4], no PACKAGECONFIG[bluez5], add a dummy PACKAGECONFIG for bluez5 to avoid confusing the user, and avoid the warning. Signed-off-by: Robert Yang liezhi.y...@windriver.com --- meta/recipes-connectivity/libpcap/libpcap.inc |2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-connectivity/libpcap/libpcap.inc b/meta/recipes-connectivity/libpcap/libpcap.inc index 9b059d7..0873c24 100644 --- a/meta/recipes-connectivity/libpcap/libpcap.inc +++ b/meta/recipes-connectivity/libpcap/libpcap.inc @@ -22,6 +22,8 @@ EXTRA_OECONF = --with-pcap=linux PACKAGECONFIG ??= ${@bb.utils.contains('DISTRO_FEATURES', 'bluetooth', '${BLUEZ}', '', d)} PACKAGECONFIG[bluez4] = --enable-bluetooth,--disable-bluetooth,bluez4 +# Add a dummy PACKAGECONFIG for bluez5 since it is not supported by libpcap. +PACKAGECONFIG[bluez5] = ,, PACKAGECONFIG[canusb] = --enable-canusb,--enable-canusb=no,libusb PACKAGECONFIG[dbus] = --enable-dbus,--disable-dbus,dbus PACKAGECONFIG[libnl] = --with-libnl,--without-libnl,libnl // Robert But we didn't need such a line, since when PACKAGECONFIG != bluez4, the --disable-bluetooth will be used. Maybe we can simply drop this patch ? I made this patch to avoid confusing the user. // Robert Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] openssl: fix building on x32 systems
On 15 June 2015 at 21:34, Cristian Iorga cristian.io...@intel.com wrote: +Upstream-Status: Pending You need a signed-off-by in the patch too. Cheers Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V2] openssl: fix building on x32 systems
Fix build on Fedora 21 i686. When building on x32 systems where the default type is 32bit, make sure that 64bit integers can be represented transparently. Signed-off-by: Cristian Iorga cristian.io...@intel.com --- .../openssl/openssl/openssl-1.0.2a-x32-asm.patch | 46 ++ .../recipes-connectivity/openssl/openssl_1.0.2a.bb | 1 + 2 files changed, 47 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch b/meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch new file mode 100644 index 000..1e5bfa1 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch @@ -0,0 +1,46 @@ +https://rt.openssl.org/Ticket/Display.html?id=3759user=guestpass=guest + +From 6257d59b3a68d2feb9d64317a1c556dc3813ee61 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger vap...@gentoo.org +Date: Sat, 21 Mar 2015 06:01:25 -0400 +Subject: [PATCH] crypto: use bigint in x86-64 perl + +Upstream-Status: Pending +Signed-off-by: Cristian Iorga cristian.io...@intel.com + +When building on x32 systems where the default type is 32bit, make sure +we can transparently represent 64bit integers. Otherwise we end up with +build errors like: +/usr/bin/perl asm/ghash-x86_64.pl elf ghash-x86_64.s +Integer overflow in hexadecimal number at asm/../../perlasm/x86_64-xlate.pl line 201, line 890. +... +ghash-x86_64.s: Assembler messages: +ghash-x86_64.s:890: Error: junk '.15473355479995e+19' after expression + +We don't enable this globally as there are some cases where we'd get +32bit values interpreted as unsigned when we need them as signed. + +Reported-by: Bertrand Jacquin bertr...@jacquin.bzh +URL: https://bugs.gentoo.org/542618 +--- + crypto/perlasm/x86_64-xlate.pl | 4 + 1 file changed, 4 insertions(+) + +diff --git a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl +index aae8288..0bf9774 100755 +--- a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl +@@ -195,6 +195,10 @@ my %globals; + sub out { + my $self = shift; + ++ # When building on x32 ABIs, the expanded hex value might be too ++ # big to fit into 32bits. Enable transparent 64bit support here ++ # so we can safely print it out. ++ use bigint; + if ($gas) { + # Solaris /usr/ccs/bin/as can't handle multiplications + # in $self-{value} +-- +2.3.3 + diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb index f4006f6..d7f0259 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb @@ -37,6 +37,7 @@ SRC_URI += file://configure-targets.patch \ file://run-ptest \ file://crypto_use_bigint_in_x86-64_perl.patch \ file://0001-bn-bn_lcl.h-fix-MIPS-specific-gcc-version-check.patch \ +file://openssl-1.0.2a-x32-asm.patch \ SRC_URI[md5sum] = a06c547dac9044161a477211049f60ef -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] openssl: fix building on x32 systems
Signed off the original patch for V2. /Cristian -Original Message- From: Iorga, Cristian Sent: Tuesday, June 16, 2015 12:32 AM To: openembedded-core@lists.openembedded.org Cc: Iorga, Cristian Subject: [PATCH V2] openssl: fix building on x32 systems Fix build on Fedora 21 i686. When building on x32 systems where the default type is 32bit, make sure that 64bit integers can be represented transparently. Signed-off-by: Cristian Iorga cristian.io...@intel.com --- .../openssl/openssl/openssl-1.0.2a-x32-asm.patch | 46 ++ .../recipes-connectivity/openssl/openssl_1.0.2a.bb | 1 + 2 files changed, 47 insertions(+) create mode 100644 meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch b/meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.patch new file mode 100644 index 000..1e5bfa1 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/openssl-1.0.2a-x32-asm.p +++ atch @@ -0,0 +1,46 @@ +https://rt.openssl.org/Ticket/Display.html?id=3759user=guestpass=gues +t + +From 6257d59b3a68d2feb9d64317a1c556dc3813ee61 Mon Sep 17 00:00:00 2001 +From: Mike Frysinger vap...@gentoo.org +Date: Sat, 21 Mar 2015 06:01:25 -0400 +Subject: [PATCH] crypto: use bigint in x86-64 perl + +Upstream-Status: Pending +Signed-off-by: Cristian Iorga cristian.io...@intel.com + +When building on x32 systems where the default type is 32bit, make sure +we can transparently represent 64bit integers. Otherwise we end up +with build errors like: +/usr/bin/perl asm/ghash-x86_64.pl elf ghash-x86_64.s Integer overflow +in hexadecimal number at asm/../../perlasm/x86_64-xlate.pl line 201, line 890. +... +ghash-x86_64.s: Assembler messages: +ghash-x86_64.s:890: Error: junk '.15473355479995e+19' after expression + +We don't enable this globally as there are some cases where we'd get +32bit values interpreted as unsigned when we need them as signed. + +Reported-by: Bertrand Jacquin bertr...@jacquin.bzh +URL: https://bugs.gentoo.org/542618 +--- + crypto/perlasm/x86_64-xlate.pl | 4 + 1 file changed, 4 insertions(+) + +diff --git a/crypto/perlasm/x86_64-xlate.pl +b/crypto/perlasm/x86_64-xlate.pl index aae8288..0bf9774 100755 +--- a/crypto/perlasm/x86_64-xlate.pl b/crypto/perlasm/x86_64-xlate.pl +@@ -195,6 +195,10 @@ my %globals; + sub out { + my $self = shift; + ++ # When building on x32 ABIs, the expanded hex value might be too ++ # big to fit into 32bits. Enable transparent 64bit support here ++ # so we can safely print it out. ++ use bigint; + if ($gas) { + # Solaris /usr/ccs/bin/as can't handle multiplications + # in $self-{value} +-- +2.3.3 + diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb index f4006f6..d7f0259 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.2a.bb @@ -37,6 +37,7 @@ SRC_URI += file://configure-targets.patch \ file://run-ptest \ file://crypto_use_bigint_in_x86-64_perl.patch \ file://0001-bn-bn_lcl.h-fix-MIPS-specific-gcc-version-check.patch \ +file://openssl-1.0.2a-x32-asm.patch \ SRC_URI[md5sum] = a06c547dac9044161a477211049f60ef -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] logging.bbclass: avoid bashism in bbdebug()
Checking the bbdebug() debug level parameter with a regular test expression only works in bash. Using tr to filter out digits and then checking whether anything is left achieves the same result and is more portable. Signed-off-by: Patrick Ohly patrick.o...@intel.com --- meta/classes/logging.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/logging.bbclass b/ index 78d65bd..f6648b2 100644 --- a/meta/classes/logging.bbclass +++ b/meta/classes/logging.bbclass @@ -62,7 +62,8 @@ bbdebug() { # Strip off the debug level and ensure it is an integer DBGLVL=$1; shift - if ! [[ $DBGLVL =~ ^[0-9]+ ]]; then + NONDIGITS=$(echo $DBGLVL | tr -d [:digit:]) + if [ $NONDIGITS ]; then bbfatal $USAGE fi -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 6/6] midori: Depend on Adwaita, not gnome-icon-theme
On 12 June 2015 at 18:25, Alexander Kanavin alexander.kana...@linux.intel.com wrote: On 06/12/2015 04:11 PM, Jussi Kukkonen wrote: -RRECOMMENDS_${PN} += glib-networking ca-certificates gnome-icon-theme +RRECOMMENDS_${PN} += glib-networking ca-certificates adwaita-icon-theme This should probably be moved to gtk+ recipes or gnome class; if most(all?) gtk+ applications need those icons, then they shouldn't have to list them in their own recipes. Thanks for the reminder, I was going to bring this up: GTK+ does not have fallback icons included and uses symbolic icons in many places (and the hicolor icon set does not include symbolic icons). This means that without symbolic icons installed many GTK+ applications will look bad with placeholder icons even in stock widgets. So gtk+3 should probably RRECOMMEND something that provides a symbolic theme -- currently the only option is Adwaita. If the size increase (of an image that contains GTK) is seen as prohibitive I could separate the symbolic icons and the normal icons: that way gtk+3 could recommend just the symbolic theme which would 'only' be 11MB additional size. Now that I think about it, I guess dividing the icons into those separate packages makes sense anyway. I'm going to do that in V3 of this patch set but would appreciate advice on what to do with the dependency/recommendation question. Jussi -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] gnutls: update to 3.4.1
On 06/15/2015 03:13 AM, Burton, Ross wrote: So this happens: WARNING: QA Issue: gnutls-openssl rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls-xx rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls-dev rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls-bin rdepends on libidn, but it isn't a build dependency? [build-deps] WARNING: QA Issue: gnutls rdepends on libidn, but it isn't a build dependency? [build-deps] Well that is a bummer. I have not seen those otherwise I would have not submitted the request. Thanks for the feedback. - armin Ross On 14 June 2015 at 06:37, Armin Kuster akuster...@gmail.com mailto:akuster...@gmail.com wrote: This version supports the nettle 3.x and higher and requires that version. this include a security fix: GNUTLS-SA-2015-2 no CVE assigned to date. enable openssl compat via PACKAGECONFIG as iputils needs gnutls/openssl.h for migration info: http://www.gnutls.org/manual/gnutls.html#Upgrading-from-previous-versions Signed-off-by: Armin Kuster akuster...@gmail.com mailto:akuster...@gmail.com --- meta/recipes-support/gnutls/gnutls.inc | 3 ++- .../gnutls/configure.ac-fix-sed-command.patch | 29 ++ meta/recipes-support/gnutls/gnutls_3.3.14.bb http://gnutls_3.3.14.bb | 8 -- meta/recipes-support/gnutls/gnutls_3.4.1.bb http://gnutls_3.4.1.bb| 8 ++ 4 files changed, 23 insertions(+), 25 deletions(-) delete mode 100644 meta/recipes-support/gnutls/gnutls_3.3.14.bb http://gnutls_3.3.14.bb create mode 100644 meta/recipes-support/gnutls/gnutls_3.4.1.bb http://gnutls_3.4.1.bb diff --git a/meta/recipes-support/gnutls/gnutls.inc b/meta/recipes-support/gnutls/gnutls.inc index e9b138a..6928cb9 100644 --- a/meta/recipes-support/gnutls/gnutls.inc +++ b/meta/recipes-support/gnutls/gnutls.inc @@ -34,9 +34,10 @@ do_configure_prepend() { done } -PACKAGECONFIG ??= zlib +PACKAGECONFIG ??= zlib openssl_compat PACKAGECONFIG[tpm] = --with-tpm, --without-tpm, trousers PACKAGECONFIG[zlib] = --with-zlib, --without-zlib, zlib +PACKAGECONFIG[openssl_compat] = --enable-openssl-compatibility,, PACKAGES =+ ${PN}-openssl ${PN}-xx diff --git a/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch b/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch index 44a9934..342143f 100644 --- a/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch +++ b/meta/recipes-support/gnutls/gnutls/configure.ac-fix-sed-command.patch @@ -13,19 +13,16 @@ Signed-off-by: Robert Yang liezhi.y...@windriver.com mailto:liezhi.y...@windriver.com configure.ac http://configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/configure.ac http://configure.ac b/configure.ac http://configure.ac -index c6818a0..1c4582d 100644 a/configure.ac http://configure.ac -+++ b/configure.ac http://configure.ac -@@ -466,7 +466,7 @@ if test $NEED_LIBOPTS_DIR = true;then - dnl replace libopts-generated files with distributed backups, if present - missing_baks= - for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do -- nam=`echo $i|sed 's/.bak//g'` -+ nam=`echo $i|sed 's/\.bak$//'` - if test -f $i;then - cp -f $i $nam - else --- -2.0.1 - +Index: gnutls-3.4.1/configure.ac http://configure.ac +=== +--- gnutls-3.4.1.orig/configure.ac http://configure.ac gnutls-3.4.1/configure.ac http://configure.ac +@@ -530,7 +530,7 @@ if test $enable_tools != no || test + dnl replace libopts-generated files with distributed backups, if present + missing_baks= + for i in ${srcdir}/src/*-args.c.bak ${srcdir}/src/*-args.h.bak; do +- nam=`echo $i|sed 's/.bak//g'` ++ nam=`echo $i|sed 's/\.bak$//'` + if test -f $i;then + cp -f $i $nam + else diff --git a/meta/recipes-support/gnutls/gnutls_3.3.14.bb http://gnutls_3.3.14.bb b/meta/recipes-support/gnutls/gnutls_3.3.14.bb http://gnutls_3.3.14.bb deleted file mode 100644 index f41d183..000 --- a/meta/recipes-support/gnutls/gnutls_3.3.14.bb http://gnutls_3.3.14.bb +++ /dev/null @@ -1,8 +0,0 @@ -require gnutls.inc - -SRC_URI += file://correct_rpl_gettimeofday_signature.patch \ -
Re: [OE-core] [OE-Core][PATCH] {python, python3}-native: fix TypeError
On Tue, 2015-06-09 at 14:08 +0900, Changhyeok Bae wrote: g-ir-core in meta-gir is building with python-native. When the g-ir-core(v1.42.0) is building, following error is occurred. Error in g-ir-core: EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv(BUILD_SYS), os.getenv(HOST_SYS) ) | TypeError: expected a character buffer object Doesn't this mean BUILD_SYS or HOST_SYS weren't set in the environment? Wouldn't this patch just mean you get a value of something like None? Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [OE-Core][PATCH] {python, python3}-native: fix TypeError
ping -Original Message- From: Changhyeok Bae [mailto:changhyeok@lge.com] Sent: Tuesday, June 09, 2015 2:08 PM To: openembedded-core@lists.openembedded.org Cc: Changhyeok Bae Subject: [OE-Core][PATCH] {python,python3}-native: fix TypeError g-ir-core in meta-gir is building with python-native. When the g-ir-core(v1.42.0) is building, following error is occurred. Error in g-ir-core: EXEC_PREFIX = os.path.normpath(sys.exec_prefix).replace( os.getenv(BUILD_SYS), os.getenv(HOST_SYS) ) | TypeError: expected a character buffer object Signed-off-by: Changhyeok Bae changhyeok@lge.com --- ...2-distutils-prefix-is-inside-staging-area.patch |4 ++-- .../recipes-devtools/python/python-native_2.7.9.bb |2 +- .../python/python3-native_3.4.3.bb |2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-s taging-area.patch b/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-s taging-area.patch index f89aaff..b9cc4d9 100644 --- a/meta/recipes-devtools/python/python-native/12-distutils-prefix-is-inside-s taging-area.patch +++ b/meta/recipes-devtools/python/python-native/12-distutils-prefix-is- +++ inside-staging-area.patch @@ -12,8 +12,8 @@ Upstream-Status: Inappropriate [embedded specific] # These are needed in a couple of spots, so just compute them once. -PREFIX = os.path.normpath(sys.prefix) -EXEC_PREFIX = os.path.normpath(sys.exec_prefix) -+PREFIX = os.path.normpath(sys.prefix).replace( os.getenv(BUILD_SYS), -+os.getenv(HOST_SYS) ) EXEC_PREFIX = -+os.path.normpath(sys.exec_prefix).replace( os.getenv(BUILD_SYS), -+os.getenv(HOST_SYS) ) ++PREFIX = os.path.normpath(sys.prefix).replace( ++str(os.getenv(BUILD_SYS)), str(os.getenv(HOST_SYS)) ) EXEC_PREFIX ++= os.path.normpath(sys.exec_prefix).replace( ++str(os.getenv(BUILD_SYS)), str(os.getenv(HOST_SYS)) ) # Path to the base directory of the project. On Windows the binary may # live in project/PCBuild9. If we're dealing with an x64 Windows build, diff --git a/meta/recipes-devtools/python/python-native_2.7.9.bb b/meta/recipes-devtools/python/python-native_2.7.9.bb index 34f5c29..5be7bb9 100644 --- a/meta/recipes-devtools/python/python-native_2.7.9.bb +++ b/meta/recipes-devtools/python/python-native_2.7.9.bb @@ -2,7 +2,7 @@ require python.inc EXTRANATIVEPATH += bzip2-native DEPENDS = openssl-native bzip2-replacement-native zlib-native readline-native sqlite3-native -PR = ${INC_PR}.1 +PR = ${INC_PR}.2 SRC_URI += \ file://05-enable-ctypes-cross-build.patch \ diff --git a/meta/recipes-devtools/python/python3-native_3.4.3.bb b/meta/recipes-devtools/python/python3-native_3.4.3.bb index 464ff05..105c0c9 100644 --- a/meta/recipes-devtools/python/python3-native_3.4.3.bb +++ b/meta/recipes-devtools/python/python3-native_3.4.3.bb @@ -1,6 +1,6 @@ require recipes-devtools/python/python.inc -PR = ${INC_PR}.0 +PR = ${INC_PR}.1 PYTHON_MAJMIN = 3.4 DISTRO_SRC_URI ?= file://sitecustomize.py DISTRO_SRC_URI_linuxstdbase = -- 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 0/1] scripts: Add cleanup-downloads-dir tool
On 12 June 2015 at 13:15, Laurentiu Palcu laurentiu.pa...@intel.com wrote: A few days ago I noticed I had no space on disk and decided to make some space. Since my downloads directory was never deleted since denzil, it consumed 25GB of space which I needed. However, I wanted to delete only old and unneeded tarbals/git repos and keep the ones that my current Yocto version needed, so I wrote this tool. Something is not quite right, after running this and causing a rebuild I got this: ERROR: No checksum specified for /home/ross/Yocto/downloads/git2_git.lttng.org.lttng-modules.git.tar.gz, please add at least one to the recipe: SRC_URI[md5sum] = c32ceb7d4b208b2b1d8132c3bbc7d638 SRC_URI[sha256sum] = d593cca435003770e981c8ae5def3db0e95d72bc3f83f3d43a18287ea1f6d165 ERROR: Function failed: Fetcher failure for URL: ' http://downloads.yoctoproject.org/mirror/sources/git2_git.lttng.org.lttng-modules.git.tar.gz'. Missing SRC_URI checksum A few too many files pruned? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [daisy][PATCH 0/1] Backport BAD_RECOMMENDATIONS fix from master/dizzy
I know Daisy is rather old, but is there any chance to get this fix pulled in? Or should I look for a local workaround instead? Thanks! -- Denys On Thu, Jun 11, 2015 at 03:07:54PM -0400, Denys Dmytriyenko wrote: From: Denys Dmytriyenko de...@ti.com This is a self-contained clean backport of BAD_RECOMMENDATIONS fix for opkg. Please consider applying to daisy. Paul Barker (1): package_manager: Fix BAD_RECOMMENDATIONS for opkg meta/lib/oe/package_manager.py | 4 1 file changed, 4 insertions(+) -- 2.2.0 -- ___ 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