[OE-core] [PATCH] linux-dummy: provide empty shared_workdir method
Perf.bb (among others) requires access to the kernel source, so have linux-dummy fake that as well. As before, perf will fail to build, but there are use cases where this patch is needed. For example a perf.bbappend that will always build it from the debian linux-tools tarball. Using linux-dummy is still a bad, bad idea, but it shouldn't start breaking existing use cases. Signed-off-by: Koen Kooi --- meta/recipes-kernel/linux/linux-dummy.bb | 6 +- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/linux/linux-dummy.bb b/meta/recipes-kernel/linux/linux-dummy.bb index 8f25f17..cc0e4e6 100644 --- a/meta/recipes-kernel/linux/linux-dummy.bb +++ b/meta/recipes-kernel/linux/linux-dummy.bb @@ -33,6 +33,10 @@ do_compile () { : } +do_shared_workdir () { + : +} + do_install() { : } @@ -47,4 +51,4 @@ do_deploy() { addtask bundle_initramfs after do_install before do_deploy addtask deploy after do_install - +addtask shared_workdir after do_compile before do_install -- 1.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 2/3] packagegroup-core-sdk: add gcc-sanitizers to core SDK
On 15 January 2015 at 03:51, Dan McGregor wrote: > -PR = "r9" > +PR = "r10" > Note that there's no need to bump PR anymore. I've fixed this locally so don't bother sending an update right now. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Broken toolchain/SDK installation (master and dizzy)
Hi all, Seems that there is a problem with the toolchain installation script when you try to install it in a path which is not the default one but is derived from it (i.e. the default path is a prefix of the real installation path) To reproduce it I just used poky as layer, configured a project for qemuarm and built a toolchain with: # bitbake -c populate_sdk core-image-minimal Once finished I installed the toolchain: $ ./poky-glibc-x86_64-core-image-minimal-armv5te-toolchain-1.7.sh Enter target directory for SDK (default: /opt/poky/1.7): /opt/poky/1.7-custom You are about to install the SDK to "/opt/poky/1.7-custom". Proceed[Y/n]?Y ... If we now have a look at the environment file (/opt/poky/1.7-custom/environment-setup-armv5te-poky-linux-gnueabi): export SDKTARGETSYSROOT=/opt/poky/1.7-custom-custom/sysroots/armv5te-poky-linux-gnueabi export PATH=/opt/poky/1.7-custom-custom/sysroots/x86_64-pokysdk-linux/usr/bin:/opt/poky/1.7-custom-custom/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi:$PATH export CCACHE_PATH=/opt/poky/1.7-custom-custom/sysroots/x86_64-pokysdk-linux/usr/bin:/opt/poky/1.7-custom-custom/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi:$CCACHE_PATH export CONFIG_SITE=/opt/poky/1.7-custom-custom/site-config-armv5te-poky-linux-gnueabi export OECORE_NATIVE_SYSROOT="/opt/poky/1.7-custom-custom/sysroots/x86_64-pokysdk-linux" export OECORE_ACLOCAL_OPTS="-I /opt/poky/1.7-custom-custom/sysroots/x86_64-pokysdk-linux/usr/share/aclocal" export PYTHONHOME=/opt/poky/1.7-custom-custom/sysroots/x86_64-pokysdk-linux/usr See the paths are wrong (/opt/poky/1.7-custom-custom) Digging into this I see the problem come from 'poky/meta/files/toolchain-shar-template.sh' where there are two rounds where the environment file is path-fixed. First: # fix environment paths for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do $SUDO_EXEC sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" -i $env_setup_script done In my example this first step does the change: /opt/poky/1.7 -> /opt/poky/1.7-custom But later in this script we have: for replace in "$target_sdk_dir -maxdepth 1" "$native_sysroot"; do $SUDO_EXEC find $replace -type f -exec file '{}' \; | \ grep ":.*\(ASCII\|script\|source\).*text" | \ awk -F':' '{printf "\"%s\"\n", $1}' | \ $SUDO_EXEC xargs -n32 sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" done This loop finds *again* the 'environment-setup' file and because at this point we have the correct path '/opt/poky/1.7-custom' in the environment file it matches again against the default dir '/opt/poky/1.7' resulting in the replacement: /opt/poky/1.7-custom -> /opt/poky/1.7-custom-custom that we have at the end. A possible workaround is to filter out the environment file in the second loop: for replace in "$target_sdk_dir -maxdepth 1" "$native_sysroot"; do $SUDO_EXEC find $replace -type f -not -name 'environment-setup-*' -exec file '{}' \; | \ grep ":.*\(ASCII\|script\|source\).*text" | \ awk -F':' '{printf "\"%s\"\n", $1}' | \ $SUDO_EXEC xargs -n32 sed -i -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" done But I'm not sure if this is the proper fix or not. Comments? - Thanks, Javier Viguera Software Engineer Digi International(r) Spain S.A.U. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lib/oe/package: Ensure strip breaks hardlinks
Normally, strip preserves hardlinks which in the case of the way our hardlink rather than copy functionality works, is a disadvantage and leads to non-deterministic builds. This adds a move into place after the strip operation to ensure hardlinks are broken and we bring back build determinism. Signed-off-by: Richard Purdie diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index ea6feaa..7c728fc 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -30,7 +30,8 @@ def runstrip(arg): elif elftype & 8 or elftype & 4: extraflags = "--remove-section=.comment --remove-section=.note" -stripcmd = "'%s' %s '%s'" % (strip, extraflags, file) +# Use mv to break hardlinks +stripcmd = "'%s' %s '%s' -o '%s.tmp' && mv '%s.tmp' '%s'" % (strip, extraflags, file, file, file, file) bb.debug(1, "runstrip: %s" % stripcmd) ret = subprocess.call(stripcmd, shell=True) -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] in sysfsutils_2.1.0.bb, is 'S = "${WORKDIR}/sysfsutils-${PV}"' redundant?
On 13 January 2015 at 13:14, Robert P. J. Day wrote: > i'll defer to the list ... is it worth tracking down all the recipes > that are doing that and just deleting that redundant line from them? > or is that just unnecessary code churn? > A single patch to clean up all of oe-core would be clean and as you say, removing redundancy is good. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2 01/10] libxml-parser-perl: upgrade to 2.43
On 13 January 2015 at 06:19, Hongxu Jia wrote: > --- a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb >> +++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.43.bb > > 2.43 doesn't exist anymore, can you update and test 2.44? Cheers, Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] python-2.7-manifest: Add package for contextlib module
On 13 January 2015 at 03:06, Philip Tricca wrote: > Rebased on master before sending. No changes since. Did you mean > master-next? I wasn't sure which was preferred but I can submit the > patch on either. > Generally, keep to master. > https://github.com/flihp/openembedded-core/tree/contextlib > > Thanks for taking a look at this and sorry for the confusion. > Thanks for this - I've discovered it was the very long lines being mangled by email or copy/paste, but taking the commit directly from there works fine. Cheers Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv2 2/4] recipes: add x11 to required DISTRO_FEATURES
On Tue, Jan 20, 2015 at 09:17:01PM +, Burton, Ross wrote: > On 10 December 2014 at 14:18, Martin Jansa wrote: > > > DEPENDS = "virtual/libx11 virtual/libgl libglu libxext libxi libxmu" > > > > +# depends on virtual/libx11 > > +REQUIRED_DISTRO_FEATURES = "x11" > > > Please drop piglit from this series, as that depending on x11 is a bug and > I've a branch that is sorting that. > > But this does make me wonder why we can't make bitbake handle this for > us... just thinking out loud... would it be possible to have a "recursive" > exception so that libx11 can say it needs the x11 DISTRO_FEATURE and > anything that depends on libx11 is cleanly handled instead of erroring? We have discussed this in July.. -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com signature.asc Description: Digital signature -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: update to 2015.01
On Tue, Jan 13, 2015 at 2:09 PM, Denys Dmytriyenko wrote: > From: Denys Dmytriyenko > > Signed-off-by: Denys Dmytriyenko ... > +++ > b/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch > @@ -0,0 +1,36 @@ > +From ee2d75513452aa6d5306fd380104adc8a2f6d8f2 Mon Sep 17 00:00:00 2001 > +From: Masahiro Yamada > +Date: Wed, 3 Dec 2014 10:22:50 +0900 > +Subject: [PATCH] tools: env: fix build error > + > +Since CONFIG_SYS_ARCH, CONFIG_SYS_CPU, ... were moved to Kconfig, > +tools/env/fw_printenv fails to build if CONFIG_ENV_VARS_UBOOT_CONFIG > +is defined. > +(I do not think this is the right way to fix the problem, but > +for now I do not have enough time to take a close look.) > + > +Upstream-Status: Submitted [http://patchwork.ozlabs.org/patch/417192/] > + > +Signed-off-by: Masahiro Yamada > +Reported-by: Denys Dmytriyenko Is it necessary? In meta-fsl-arm we don't have this patch and get the tools built. -- 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
[OE-core] OE Changelog since 2015-01-11 until 2015-01-18
Changelog since 2015-01-11 until 2015-01-18. 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-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-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 (2): toastergui: all builds page lists failed build requests toasterui: fix variable data error Aníbal Limón (1): bb/fetch2/ssh.py: Fix urldata.localpath use os.path.normpath Michael Wood (2): toaster: Add layer details page feature toaster: layerdetails Remove compatibility setting Richard Purdie (6): bitbake: Add pyinotify to lib/ cooker/cache/parse: Implement pyinofity based reconfigure cooker: Fix pyinotify handling of ENOENT issues cooker: Improve pyinotify performance ConfHandler: Rename oldfn to parentfn to be clearer ConfHandler: Clean up bogus imports Changelog for openembedded-core: Armin Kuster (1): lz4: update to r127 Bruce Ashfield (2): kernel: move source and build output to work-shared kernel-yocto: remove GUILT_BASE from terminal exports Chen Qi (3): sysstat: upgrade to stable version 11.0.2 coreutils: upgrade to 8.23 sysklogd: upgrade to 1.5.1 Darren Hart (2): kernel-devsrc: Depend on virtual/kernel:do_compile kernel.bbclass: Update cleandirs to remove new kernel staging dirs Dmitry Eremin-Solenikov (1): icecc.bbclass: properly handle disabling of icecc Hongxu Jia (2): directfb: upgrade to 1.7.6 qt4-embedded: support c++0x stand for directfb Kai Kang (1): openssh: deliver ssh-copy-id Martin Jansa (1): package.bbclass: Fix support for private libs Maxin B. John (1): curl: upgrade to 7.40 Otavio Salvador (2): module.bbclass: Add KERNEL_SRC in EXTRA_OEMAKE kernel.bbclass: When linux/version.h exists, copy it Paul Eggleton (4): pigz: add Apache-2.0 to LICENSE perl: fix LICENSE to be more accurate libxml-simple-perl: fix LICENSE to be more accurate libxml-parser-perl: fix LICENSE to be more accurate Peter A. Bigot (1): bluez5: upgrade to 5.27 Randy Witt (1): xserver-xorg: Always disable systemd-logind. Richard Purdie (4): libxml2: Backport fix for CVE introduced entity issues cross-canadian/meta-environment: Allow modification of TARGET_OS to be optio lib/oe/rootfs.py: Fix reference to abiversion file location depmodwrapper-cross: Update to use STAGING_KERNEL_BUILDDIR Robert P. J. Day (1): BAD_RECOMMENDATIONS also works for RPM packaging. Robert Yang (41): guile: fixed installed-vs-shipped error parted: parted-ptest RDEPENDS on python pax-utils: RDEPENDS on python grub 2.0: several fixes python-git: upgrade to 0.3.3 python-gitdb: upgrade to 0.6.1 gnu-efi: upgrade to 3.0.1 libical: use BPN in SRC_URI cups: remove fakeroot from do_install() man: remove fakeroot from d
Re: [OE-core] Broken toolchain/SDK installation (master and dizzy)
On Wednesday 21 January 2015 11:18:18 Viguera, Javier wrote: > Seems that there is a problem with the toolchain installation script when > you try to install it in a path which is not the default one but is derived > from it (i.e. the default path is a prefix of the real installation path) > > To reproduce it I just used poky as layer, configured a project for qemuarm > and built a toolchain with: > > # bitbake -c populate_sdk core-image-minimal > > Once finished I installed the toolchain: > > $ ./poky-glibc-x86_64-core-image-minimal-armv5te-toolchain-1.7.sh > Enter target directory for SDK (default: /opt/poky/1.7): > /opt/poky/1.7-custom You are about to install the SDK to > "/opt/poky/1.7-custom". Proceed[Y/n]?Y ... > > If we now have a look at the environment file > (/opt/poky/1.7-custom/environment-setup-armv5te-poky-linux-gnueabi): > > export > SDKTARGETSYSROOT=/opt/poky/1.7-custom-custom/sysroots/armv5te-poky-linux-gn > ueabi export > PATH=/opt/poky/1.7-custom-custom/sysroots/x86_64-pokysdk-linux/usr/bin:/opt > /poky/1.7-custom-custom/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux > -gnueabi:$PATH export > CCACHE_PATH=/opt/poky/1.7-custom-custom/sysroots/x86_64-pokysdk-linux/usr/b > in:/opt/poky/1.7-custom-custom/sysroots/x86_64-pokysdk-linux/usr/bin/arm-pok > y-linux-gnueabi:$CCACHE_PATH export > CONFIG_SITE=/opt/poky/1.7-custom-custom/site-config-armv5te-poky-linux-gnue > abi export > OECORE_NATIVE_SYSROOT="/opt/poky/1.7-custom-custom/sysroots/x86_64-pokysdk- > linux" export OECORE_ACLOCAL_OPTS="-I > /opt/poky/1.7-custom-custom/sysroots/x86_64-pokysdk-linux/usr/share/aclocal > " export > PYTHONHOME=/opt/poky/1.7-custom-custom/sysroots/x86_64-pokysdk-linux/usr > > See the paths are wrong (/opt/poky/1.7-custom-custom) > > Digging into this I see the problem come from > 'poky/meta/files/toolchain-shar-template.sh' where there are two rounds > where the environment file is path-fixed. First: > > # fix environment paths > for env_setup_script in `ls $target_sdk_dir/environment-setup-*`; do > $SUDO_EXEC sed -e "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" -i > $env_setup_script done > > In my example this first step does the change: /opt/poky/1.7 -> > /opt/poky/1.7-custom > > But later in this script we have: > > for replace in "$target_sdk_dir -maxdepth 1" "$native_sysroot"; do > $SUDO_EXEC find $replace -type f -exec file '{}' \; | \ > grep ":.*\(ASCII\|script\|source\).*text" | \ > awk -F':' '{printf "\"%s\"\n", $1}' | \ > $SUDO_EXEC xargs -n32 sed -i -e > "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" done > > This loop finds *again* the 'environment-setup' file and because at this > point we have the correct path '/opt/poky/1.7-custom' in the environment > file it matches again against the default dir '/opt/poky/1.7' resulting in > the replacement: /opt/poky/1.7-custom -> /opt/poky/1.7-custom-custom that > we have at the end. > > A possible workaround is to filter out the environment file in the second > loop: > > for replace in "$target_sdk_dir -maxdepth 1" "$native_sysroot"; do > $SUDO_EXEC find $replace -type f -not -name 'environment-setup-*' > -exec file '{}' \; | \ grep ":.*\(ASCII\|script\|source\).*text" | \ > awk -F':' '{printf "\"%s\"\n", $1}' | \ > $SUDO_EXEC xargs -n32 sed -i -e > "s:$DEFAULT_INSTALL_DIR:$target_sdk_dir:g" done > > But I'm not sure if this is the proper fix or not. I can't necessarily comment on whether this is the best fix, but FWIW I had noticed this and filed a bug for it already: https://bugzilla.yoctoproject.org/show_bug.cgi?id=7032 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
[OE-core] [PATCH 1/1] gcc: ensure target gcc headers can be included
There are a few headers installed as part of gcc-runtime (omp.h, ssp/*.h). Being installed from a recipe built for the target architecture, these are within the target sysroot and not cross/nativesdk; thus they weren't able to be found by gcc with the existing search paths. Add support for picking up these headers under the sysroot supplied on the gcc command line in order to resolve this. Thanks to Richard Purdie for giving me a number of pointers during fixing this issue. Fixes [YOCTO #7141]. Signed-off-by: Paul Eggleton --- meta/recipes-devtools/gcc/gcc-4.9.inc | 1 + .../gcc/gcc-4.9/target-gcc-includedir.patch| 81 ++ 2 files changed, 82 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/target-gcc-includedir.patch diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc index 2568e99..0f407b7 100644 --- a/meta/recipes-devtools/gcc/gcc-4.9.inc +++ b/meta/recipes-devtools/gcc/gcc-4.9.inc @@ -74,6 +74,7 @@ SRC_URI = "\ file://0057-aarch64-config.patch \ file://0058-gcc-r212171.patch \ file://0059-gcc-PR-rtl-optimization-63348.patch \ +file://target-gcc-includedir.patch \ " SRC_URI[md5sum] = "fddf71348546af523353bd43d34919c1" SRC_URI[sha256sum] = "d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e" diff --git a/meta/recipes-devtools/gcc/gcc-4.9/target-gcc-includedir.patch b/meta/recipes-devtools/gcc/gcc-4.9/target-gcc-includedir.patch new file mode 100644 index 000..f48c66d --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/target-gcc-includedir.patch @@ -0,0 +1,81 @@ +Ensure target gcc headers can be included + +There are a few headers installed as part of the OpenEmbedded +gcc-runtime target (omp.h, ssp/*.h). Being installed from a recipe +built for the target architecture, these are within the target +sysroot and not cross/nativesdk; thus they weren't able to be +found by gcc with the existing search paths. Add support for +picking up these headers under the sysroot supplied on the gcc +command line in order to resolve this. + +Signed-off-by: Paul Eggleton + +Upstream-Status: Pending + +--- a/gcc/Makefile.in 2014-12-23 11:57:33.327873331 + b/gcc/Makefile.in 2015-01-21 11:32:35.447305394 + +@@ -587,6 +587,7 @@ + + # Directory in which the compiler finds libraries etc. + libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(version) ++libsubdir_target = gcc/$(target_noncanonical)/$(version) + # Directory in which the compiler finds executables + libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(version) + # Directory in which all plugin resources are installed +@@ -2534,6 +2535,7 @@ + + PREPROCESSOR_DEFINES = \ + -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ ++ -DGCC_INCLUDE_SUBDIR_TARGET=\"$(libsubdir_target)/include\" \ + -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \ + -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ + -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ +--- a/gcc/cppdefault.c 2015-01-13 17:40:26.131012725 + b/gcc/cppdefault.c 2015-01-21 11:30:08.928426492 + +@@ -59,6 +59,10 @@ + /* This is the dir for gcc's private headers. */ + { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, + #endif ++#ifdef GCC_INCLUDE_SUBDIR_TARGET ++/* This is the dir for gcc's private headers under the specified sysroot. */ ++{ STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0 }, ++#endif + #ifdef LOCAL_INCLUDE_DIR + /* /usr/local/include comes before the fixincluded header files. */ + { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, +diff --git a/gcc/defaults.h b/gcc/defaults.h +index f94ae17..d98b40b 100644 +--- a/gcc/defaults.h b/gcc/defaults.h +@@ -1390,4 +1390,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + + #endif /* GCC_INSN_FLAGS_H */ + ++/* Default prefixes to attach to command names. */ ++ ++#ifndef STANDARD_STARTFILE_PREFIX_1 ++#define STANDARD_STARTFILE_PREFIX_1 "/lib/" ++#endif ++#ifndef STANDARD_STARTFILE_PREFIX_2 ++#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" ++#endif ++ + #endif /* ! GCC_DEFAULTS_H */ +diff --git a/gcc/gcc.c b/gcc/gcc.c +index 9f0b781..174fca8 100644 +--- a/gcc/gcc.c b/gcc/gcc.c +@@ -1189,13 +1189,6 @@ static const char *gcc_libexec_prefix; + + /* Default prefixes to attach to command names. */ + +-#ifndef STANDARD_STARTFILE_PREFIX_1 +-#define STANDARD_STARTFILE_PREFIX_1 "/lib/" +-#endif +-#ifndef STANDARD_STARTFILE_PREFIX_2 +-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" +-#endif +- + #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */ + #undef MD_EXEC_PREFIX + #undef MD_STARTFILE_PREFIX -- 1.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] Fix gcc for including omp.h in target sysroot
The following change since commit eaea05c88661a88a89fa6b139f7e6b243155d492: depmodwrapper-cross: Update to use STAGING_KERNEL_BUILDDIR (2015-01-17 17:05:25 +) is available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/gcc-omp-fix http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/gcc-omp-fix Paul Eggleton (1): gcc: ensure target gcc headers can be included meta/recipes-devtools/gcc/gcc-4.9.inc | 1 + .../gcc/gcc-4.9/target-gcc-includedir.patch| 81 ++ 2 files changed, 82 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/target-gcc-includedir.patch -- 1.9.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] net-tools: Fix rerunning of do_patch task
Rerunning the do_patch task currently fails. The code is nearly correct but needs to remove the quilt ".pc" directory and move the secondary one into place in order to rerun, not move it into the .pc directory as the code currently does. [YOCTO #7128] Signed-off-by: Richard Purdie diff --git a/meta/recipes-extended/net-tools/net-tools_1.60-25.bb b/meta/recipes-extended/net-tools/net-tools_1.60-25.bb index 02826a0..0e4ee75 100644 --- a/meta/recipes-extended/net-tools/net-tools_1.60-25.bb +++ b/meta/recipes-extended/net-tools/net-tools_1.60-25.bb @@ -34,6 +34,7 @@ nettools_do_patch() { cd ${S} quilt pop -a || true if [ -d ${S}/.pc-nettools ]; then + rm -rf ${S}/.pc mv ${S}/.pc-nettools ${S}/.pc QUILT_PATCHES=${S}/debian/patches quilt pop -a rm -rf ${S}/.pc ${S}/debian -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] insane: add unknown-configure-option to default WARN_QA
Signed-off-by: Ross Burton --- meta/classes/insane.bbclass |1 + 1 file changed, 1 insertion(+) diff --git a/meta/classes/insane.bbclass b/meta/classes/insane.bbclass index 71e94a0..06246da 100644 --- a/meta/classes/insane.bbclass +++ b/meta/classes/insane.bbclass @@ -30,6 +30,7 @@ WARN_QA ?= "ldflags useless-rpaths rpaths staticdev libdir xorg-driver-abi \ textrel already-stripped incompatible-license files-invalid \ installed-vs-shipped compile-host-path install-host-path \ pn-overrides infodir build-deps file-rdeps pkgconfig-sysroot \ +unknown-configure-option \ " ERROR_QA ?= "dev-so debug-deps dev-deps debug-files arch pkgconfig la \ perms dep-cmp pkgvarcheck perm-config perm-line perm-link \ -- 1.7.10.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] base-files/profile: change EDITOR to not be busybox specific
Setting "EDITOR=/bin/vi" breaks on non-busybox systems, as vim will populate /usr/bin/vi instead, and you get stuff like: op3:~/poky/meta-builder$ git commit -s error: cannot run /bin/vi: No such file or directory error: unable to start editor '/bin/vi' Please supply the message using either -m or -F option. op3:~/poky/meta-builder$ which vi /usr/bin/vi op3:~/poky/meta-builder$ Since we've already specified a proper path above in the profile, we've no need to call out where in the path vi lives, and hence this will work with busybox and a full vim install w/o busybox. Signed-off-by: Paul Gortmaker --- meta/recipes-core/base-files/base-files/profile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/base-files/base-files/profile b/meta/recipes-core/base-files/base-files/profile index 88ab8d877b0d..53c2680409dd 100644 --- a/meta/recipes-core/base-files/base-files/profile +++ b/meta/recipes-core/base-files/base-files/profile @@ -2,7 +2,7 @@ # and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). PATH="/usr/local/bin:/usr/bin:/bin" -EDITOR="/bin/vi" # needed for packages like cron +EDITOR="vi"# needed for packages like cron, git-commit test -z "$TERM" && TERM="vt100"# Basic terminal capab. For screen etc. if [ ! -e /etc/localtime -a ! -e /etc/TZ ]; then -- 2.2.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] procps: disable fancy new top output mode
General consensus is that the new output format, with the all red colour and one line per core is too fugly to be left as the default. Use the configure option to switch it back to the sane default that we've all become used to seeing for decades. Signed-off-by: Paul Gortmaker --- meta/recipes-extended/procps/procps_3.3.10.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-extended/procps/procps_3.3.10.bb b/meta/recipes-extended/procps/procps_3.3.10.bb index d8b04dc204a0..621b6dd5786c 100644 --- a/meta/recipes-extended/procps/procps_3.3.10.bb +++ b/meta/recipes-extended/procps/procps_3.3.10.bb @@ -22,7 +22,7 @@ SRC_URI[sha256sum] = "a02e6f98974dfceab79884df902ca3df30b0e9bad6d76aee0fb5dce17f S = "${WORKDIR}/procps-ng-${PV}" -EXTRA_OECONF = "--enable-skill" +EXTRA_OECONF = "--enable-skill --disable-modern-top" CPPFLAGS += "-I${S}" -- 2.2.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: update to 2015.01
On Wed, Jan 21, 2015 at 11:17:19AM -0200, Otavio Salvador wrote: > On Tue, Jan 13, 2015 at 2:09 PM, Denys Dmytriyenko wrote: > > From: Denys Dmytriyenko > > > > Signed-off-by: Denys Dmytriyenko > ... > > +++ > > b/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch > > @@ -0,0 +1,36 @@ > > +From ee2d75513452aa6d5306fd380104adc8a2f6d8f2 Mon Sep 17 00:00:00 2001 > > +From: Masahiro Yamada > > +Date: Wed, 3 Dec 2014 10:22:50 +0900 > > +Subject: [PATCH] tools: env: fix build error > > + > > +Since CONFIG_SYS_ARCH, CONFIG_SYS_CPU, ... were moved to Kconfig, > > +tools/env/fw_printenv fails to build if CONFIG_ENV_VARS_UBOOT_CONFIG > > +is defined. > > +(I do not think this is the right way to fix the problem, but > > +for now I do not have enough time to take a close look.) > > + > > +Upstream-Status: Submitted [http://patchwork.ozlabs.org/patch/417192/] > > + > > +Signed-off-by: Masahiro Yamada > > +Reported-by: Denys Dmytriyenko > > Is it necessary? In meta-fsl-arm we don't have this patch and get the > tools built. Really? The patch above is rather self-explanatory. The issue was confirmed by U-boot maintainers and the workaround provided by one of the core developers. I'm not familiar with meta-fsl-arm, but I guess you can grep your platform's defconfig to see if CONFIG_ENV_VARS_UBOOT_CONFIG and others are defined and whether your platforms are affected or not. It does affect our platforms (among many others), including beaglebone. -- Denys -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v4 1/2] uboot-config.bbclass: Allow multiple U-Boot config for machine
On Thu, Dec 11, 2014 at 11:32:35AM +0800, Chunrong Guo wrote: > This adds support to build multiple U-Boot configs for a machine; this > is useful when we have support for different media boots which require > different U-Boot configuration (e.g: eMMC and NAND). Any examples how to use this? -- Denys > Signed-off-by: Chunrong Guo > --- > meta/classes/uboot-config.bbclass | 37 ++--- > 1 file changed, 14 insertions(+), 23 deletions(-) > > diff --git a/meta/classes/uboot-config.bbclass > b/meta/classes/uboot-config.bbclass > index b467659..cb061af 100644 > --- a/meta/classes/uboot-config.bbclass > +++ b/meta/classes/uboot-config.bbclass > @@ -31,28 +31,19 @@ python () { > return > > ubootconfig = (d.getVar('UBOOT_CONFIG', True) or "").split() > -if len(ubootconfig) > 1: > -raise bb.parse.SkipPackage('You can only have a single default for > UBOOT_CONFIG.') > +if len(ubootconfig) > 0: > +for config in ubootconfig: > +for f, v in ubootconfigflags.items(): > +if config == f: > +items = v.split(',') > +if items[0] and len(items) > 2: > +raise bb.parse.SkipPackage('Only config,images can > be specified!') > +d.appendVar('UBOOT_MACHINE', ' ' + items[0]) > +# IMAGE_FSTYPES appending > +if len(items) > 1 and items[1]: > +bb.debug(1, "Appending '%s' to IMAGE_FSTYPES." % > items[1]) > +d.appendVar('IMAGE_FSTYPES', ' ' + items[1]) > +break > elif len(ubootconfig) == 0: > -raise bb.parse.SkipPackage('You must set a default in UBOOT_CONFIG.') > -ubootconfig = ubootconfig[0] > - > -for f, v in ubootconfigflags.items(): > -items = v.split(',') > -if items[0] and len(items) > 2: > -raise bb.parse.SkipPackage('Only config,images can be > specified!') > - > -if ubootconfig == f: > -bb.debug(1, "Setting UBOOT_MACHINE to %s." % items[0]) > -d.setVar('UBOOT_MACHINE', items[0]) > - > -# IMAGE_FSTYPES appending > -if len(items) > 1 and items[1]: > -bb.debug(1, "Appending '%s' to IMAGE_FSTYPES." % items[1]) > -d.appendVar('IMAGE_FSTYPES', ' ' + items[1]) > - > -# Go out as we found a match! > -break > -else: > -raise bb.parse.SkipPackage("UBOOT_CONFIG %s is not supported" % > ubootconfig) > + raise bb.parse.SkipPackage('You must set a default in UBOOT_CONFIG.') > } > -- > 1.9.2 > > -- > ___ > 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
Re: [OE-core] [PATCH] base-files/profile: change EDITOR to not be busybox specific
On 21 January 2015 at 12:25, Paul Gortmaker wrote: > Setting "EDITOR=/bin/vi" breaks on non-busybox systems, as > vim will populate /usr/bin/vi instead, and you get stuff like: > > op3:~/poky/meta-builder$ git commit -s > error: cannot run /bin/vi: No such file or directory > error: unable to start editor '/bin/vi' > Please supply the message using either -m or -F option. > op3:~/poky/meta-builder$ which vi > /usr/bin/vi > op3:~/poky/meta-builder$ > > Since we've already specified a proper path above in the profile, > we've no need to call out where in the path vi lives, and hence > this will work with busybox and a full vim install w/o busybox. > > Signed-off-by: Paul Gortmaker > --- > meta/recipes-core/base-files/base-files/profile | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/recipes-core/base-files/base-files/profile > b/meta/recipes-core/base-files/base-files/profile > index 88ab8d877b0d..53c2680409dd 100644 > --- a/meta/recipes-core/base-files/base-files/profile > +++ b/meta/recipes-core/base-files/base-files/profile > @@ -2,7 +2,7 @@ > # and Bourne compatible shells (bash(1), ksh(1), ash(1), ...). > > PATH="/usr/local/bin:/usr/bin:/bin" > -EDITOR="/bin/vi" # needed for packages like cron > +EDITOR="vi"# needed for packages like cron, git-commit > test -z "$TERM" && TERM="vt100"# Basic terminal capab. For screen > etc. > > if [ ! -e /etc/localtime -a ! -e /etc/TZ ]; then While I agree with this change, arguably busybox should also be changed. Everywhere I look "vi" lives in /usr/bin. FreeBSD, NetBSD, Ubuntu, and Slackware all seem to put vi in /usr/bin. The same is true of getopt. What are other people's thoughs? -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] mkfontscale: Upgrade to 1.1.2
Signed-off-by: Saul Wold --- .../xorg-app/{mkfontscale_1.1.1.bb => mkfontscale_1.1.2.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-graphics/xorg-app/{mkfontscale_1.1.1.bb => mkfontscale_1.1.2.bb} (80%) diff --git a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb similarity index 80% rename from meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb rename to meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb index 65f74c2..31cf186 100644 --- a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb +++ b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb @@ -14,5 +14,5 @@ BBCLASSEXTEND = "native" LIC_FILES_CHKSUM = "file://COPYING;md5=2e0d129d05305176d1a790e0ac1acb7f" -SRC_URI[md5sum] = "03de3f15db678e277f5ef9c013aca1ad" -SRC_URI[sha256sum] = "244017992477ced2397a44fd0ddcfb0f1d9899128613f5c4db81471163b0b731" +SRC_URI[md5sum] = "9bdd6ebfa62b1bbd474906ac86a40fd8" +SRC_URI[sha256sum] = "8c6d5228af885477b9aec60ca6f172578e7d2de42234357af62fb00439453f20" -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] base-passwd: Don't replace $ variables in passwd and group files
From: Pascal Bach This allows the usage of "$type$salt$encrypted_password" passwords in the passwd file. Signed-off-by: Pascal Bach Signed-off-by: Saul Wold --- meta/recipes-core/base-passwd/base-passwd_3.5.29.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb index ec8f2af..a35ea9b 100644 --- a/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb +++ b/meta/recipes-core/base-passwd/base-passwd_3.5.29.bb @@ -75,11 +75,11 @@ python populate_packages_prepend() { preinst = """#!/bin/sh mkdir -p $D${sysconfdir} if [ ! -e $D${sysconfdir}/passwd ]; then -\tcat << EOF > $D${sysconfdir}/passwd +\tcat << 'EOF' > $D${sysconfdir}/passwd """ + passwd + """EOF fi if [ ! -e $D${sysconfdir}/group ]; then -\tcat << EOF > $D${sysconfdir}/group +\tcat << 'EOF' > $D${sysconfdir}/group """ + group + """EOF fi """ -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] build-appliance-image: Upgrade for 1.8 Master
Signed-off-by: Saul Wold --- .../{build-appliance-image_8.0.bb => build-appliance-image_12.0.1.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-core/images/{build-appliance-image_8.0.bb => build-appliance-image_12.0.1.bb} (96%) diff --git a/meta/recipes-core/images/build-appliance-image_8.0.bb b/meta/recipes-core/images/build-appliance-image_12.0.1.bb similarity index 96% rename from meta/recipes-core/images/build-appliance-image_8.0.bb rename to meta/recipes-core/images/build-appliance-image_12.0.1.bb index 7651ff8..3d632d6 100644 --- a/meta/recipes-core/images/build-appliance-image_8.0.bb +++ b/meta/recipes-core/images/build-appliance-image_12.0.1.bb @@ -21,8 +21,8 @@ IMAGE_FSTYPES = "vmdk" inherit core-image -SRCREV ?= "f0a2a2f44587f02fa7f434e82f91a6de2231f6b6" -SRC_URI = "git://git.yoctoproject.org/poky;branch=dizzy \ +SRCREV ?= "d9d5b8b499af3ae01a1e33d0d3969c54c2d4ab1b" +SRC_URI = "git://git.yoctoproject.org/poky \ file://Yocto_Build_Appliance.vmx \ file://Yocto_Build_Appliance.vmxf \ " -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] Updates and a bug fix
Richard, This has a couple of updates and a bugfix. Sau! Pascal Bach (1): base-passwd: Don't replace $ variables in passwd and group files Saul Wold (2): mkfontscale: Upgrade to 1.1.2 build-appliance-image: Upgrade for 1.8 Master meta/recipes-core/base-passwd/base-passwd_3.5.29.bb | 4 ++-- .../{build-appliance-image_8.0.bb => build-appliance-image_12.0.1.bb} | 4 ++-- .../xorg-app/{mkfontscale_1.1.1.bb => mkfontscale_1.1.2.bb} | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) rename meta/recipes-core/images/{build-appliance-image_8.0.bb => build-appliance-image_12.0.1.bb} (96%) rename meta/recipes-graphics/xorg-app/{mkfontscale_1.1.1.bb => mkfontscale_1.1.2.bb} (80%) -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Removing support for udev cdrom
Hello there, I'd like to remove "udev-rules-cdrom" support in our recipe. For some reasons this package is not needed at all. When I include the following in our recipe: PACKAGE_EXCLUDE = "udev-rules-cdrom" I receive the following error: Collected errors: * satisfy_dependencies_for: Cannot satisfy the following dependencies for packagegroup-core-boot: * udev-rules-cdrom * * opkg_install_cmd: Cannot install package packagegroup-core-boot So, I went to the packagegroup-core-boot.bb and I saw this dependencies: RDEPENDS_${PN} = "\ base-files \ base-passwd \ busybox \ ${@bb.utils.contains("DISTRO_FEATURES", "sysvinit", "${SYSVINIT_SCRIPTS}", "", d)} \ ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "${VIRTUAL-RUNTIME_keymaps}", "", d)} \ netbase \ ${VIRTUAL-RUNTIME_login_manager} \ ${VIRTUAL-RUNTIME_init_manager} \ ${VIRTUAL-RUNTIME_dev_manager} \ ${VIRTUAL-RUNTIME_update-alternatives} \ ${MACHINE_ESSENTIAL_EXTRA_RDEPENDS}" As you can see there is no udev-rules-cdrom, at least not explicitly. Is there any way that I could remove this cdrom support from udev ? Best Regards, Bruno Bottazzini -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] dbus: split tools package.
From: Gustavo Sverzut Barbieri Most tools are not required if one is launching a simple daemon. The user will be able to exclude dbus-tool and save some space in his build Signed-off-by: Bruno Bottazzini --- meta/recipes-core/dbus/dbus.inc | 13 +++-- 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/meta/recipes-core/dbus/dbus.inc b/meta/recipes-core/dbus/dbus.inc index d38ba7e..8b14647 100644 --- a/meta/recipes-core/dbus/dbus.inc +++ b/meta/recipes-core/dbus/dbus.inc @@ -39,7 +39,7 @@ CONFFILES_${PN} = "${sysconfdir}/dbus-1/system.conf ${sysconfdir}/dbus-1/session DEBIANNAME_${PN} = "dbus-1" -PACKAGES =+ "${PN}-lib" +PACKAGES =+ "${PN}-lib ${PN}-tools" OLDPKGNAME = "dbus-x11" OLDPKGNAME_class-nativesdk = "" @@ -49,12 +49,7 @@ RPROVIDES_${PN} = "${OLDPKGNAME}" RREPLACES_${PN} += "${OLDPKGNAME}" FILES_${PN} = "${bindir}/dbus-daemon* \ - ${bindir}/dbus-uuidgen \ - ${bindir}/dbus-cleanup-sockets \ ${bindir}/dbus-send \ - ${bindir}/dbus-monitor \ - ${bindir}/dbus-launch \ - ${bindir}/dbus-run-session \ ${libexecdir}/dbus* \ ${sysconfdir} \ ${localstatedir} \ @@ -64,6 +59,12 @@ FILES_${PN} = "${bindir}/dbus-daemon* \ FILES_${PN}-lib = "${libdir}/lib*.so.*" RRECOMMENDS_${PN}-lib = "${PN}" FILES_${PN}-dev += "${libdir}/dbus-1.0/include ${bindir}/dbus-glib-tool" +FILES_${PN}-tools += "${bindir}/dbus-uuidgen \ + ${bindir}/dbus-cleanup-sockets \ + ${bindir}/dbus-monitor \ + ${bindir}/dbus-launch \ + ${bindir}/dbus-run-session" +RRECOMMENDS_${PN} = "${PN}-tools" pkg_postinst_dbus() { # If both systemd and sysvinit are enabled, mask the dbus-1 init script -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] kmod: new PACKAGECONFIG debug and logging to help reduce binary size.
From: Gustavo Sverzut Barbieri debug and logging will make kmod and its library bigger than expected due many strings in the resulting binaries. While these are useful for development, they are of no use for deployment. With them enabled kmod is 154Kb, libkmod is 99Kb. Disabling reduces to kmod 139Kb (10%) and libkmod 83Kb (19%) on i586 stripped. Signed-off-by: Bruno Bottazzini --- meta/recipes-kernel/kmod/kmod.inc | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/meta/recipes-kernel/kmod/kmod.inc b/meta/recipes-kernel/kmod/kmod.inc index dda74c8..652c6f5 100644 --- a/meta/recipes-kernel/kmod/kmod.inc +++ b/meta/recipes-kernel/kmod/kmod.inc @@ -32,7 +32,10 @@ SRC_URI = "git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod.git \ S = "${WORKDIR}/git" EXTRA_AUTORECONF += "--install --symlink" -EXTRA_OECONF +="--enable-debug --enable-logging --enable-tools --disable-manpages --with-zlib" +EXTRA_OECONF +=" --enable-tools --disable-manpages --with-zlib" + +PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" +PACKAGECONFIG[logging] = " --enable-logging,--disable-logging" do_configure_prepend () { gtkdocize --docdir ${S}/libkmod/docs || touch ${S}/libkmod/docs/gtk-doc.make -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] kmod new packageconfig and dbus split package
In this patchset we include two changes: 1- kmod: new PACKAGECONFIG debug and logging to help reduce binary size. 2- dbus: split it into two package. We will be able to choose if we want the full version or a smaller one. Gustavo Sverzut Barbieri (2): kmod: new PACKAGECONFIG debug and logging to help reduce binary size. dbus: split tools package. meta/recipes-core/dbus/dbus.inc | 13 +++-- meta/recipes-kernel/kmod/kmod.inc | 5 - 2 files changed, 11 insertions(+), 7 deletions(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: update to 2015.01
On Wed, Jan 21, 2015 at 5:11 PM, Denys Dmytriyenko wrote: > On Wed, Jan 21, 2015 at 11:17:19AM -0200, Otavio Salvador wrote: >> On Tue, Jan 13, 2015 at 2:09 PM, Denys Dmytriyenko wrote: >> > From: Denys Dmytriyenko >> > >> > Signed-off-by: Denys Dmytriyenko >> ... >> > +++ >> > b/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch >> > @@ -0,0 +1,36 @@ >> > +From ee2d75513452aa6d5306fd380104adc8a2f6d8f2 Mon Sep 17 00:00:00 2001 >> > +From: Masahiro Yamada >> > +Date: Wed, 3 Dec 2014 10:22:50 +0900 >> > +Subject: [PATCH] tools: env: fix build error >> > + >> > +Since CONFIG_SYS_ARCH, CONFIG_SYS_CPU, ... were moved to Kconfig, >> > +tools/env/fw_printenv fails to build if CONFIG_ENV_VARS_UBOOT_CONFIG >> > +is defined. >> > +(I do not think this is the right way to fix the problem, but >> > +for now I do not have enough time to take a close look.) >> > + >> > +Upstream-Status: Submitted [http://patchwork.ozlabs.org/patch/417192/] >> > + >> > +Signed-off-by: Masahiro Yamada >> > +Reported-by: Denys Dmytriyenko >> >> Is it necessary? In meta-fsl-arm we don't have this patch and get the >> tools built. > > Really? The patch above is rather self-explanatory. The issue was confirmed by > U-boot maintainers and the workaround provided by one of the core developers. > I'm not familiar with meta-fsl-arm, but I guess you can grep your platform's > defconfig to see if CONFIG_ENV_VARS_UBOOT_CONFIG and others are defined and > whether your platforms are affected or not. It does affect our platforms > (among many others), including beaglebone. I think this is for the cross tool only. -- 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] [PATCH] u-boot: update to 2015.01
Denys, I tested your patch and It seems not to be working for u-boot-fw-utils-cross $ bitbake u-boot-fw-utils-cross Loading cache: 100% || ETA: 00:00:00 Loaded 1921 entries from dependency cache. Parsing recipes: 100% |##| Time: 00:00:00 Parsing of 1451 .bb files complete (1450 cached, 1 parsed). 1914 targets, 85 skipped, 0 masked, 0 errors. NOTE: Resolving any missing task queue dependencies Build Configuration: BB_VERSION= "1.25.0" BUILD_SYS = "x86_64-linux" NATIVELSBSTRING = "Ubuntu-14.04" TARGET_SYS= "arm-poky-linux-gnueabi" MACHINE = "beaglebone" DISTRO= "poky" DISTRO_VERSION= "1.7" TUNE_FEATURES = "arm armv7a vfp neon callconvention-hard cortexa8" TARGET_FPU= "vfp-neon" meta meta-yocto meta-yocto-bsp= "master:45d090024d7b88c434fef2e88317946449e32c2c" meta-oe = "mymaster:5b4413ccf329a981bee976c9fcde5d2872f0defb" NOTE: Preparing RunQueue NOTE: Executing SetScene Tasks NOTE: Executing RunQueue Tasks ERROR: Function failed: do_compile (log file is located at /home/rapphil/work/poky/build/tmp/work/beaglebone-poky-linux-gnueabi/u-boot-fw-utils-cross/v2015.01+gitAUTOINC+92fa7f53f1-r0/temp/log.do_compile.31549) ERROR: Logfile of failure stored in: /home/rapphil/work/poky/build/tmp/work/beaglebone-poky-linux-gnueabi/u-boot-fw-utils-cross/v2015.01+gitAUTOINC+92fa7f53f1-r0/temp/log.do_compile.31549 Log data follows: | DEBUG: Executing shell function do_compile | NOTE: make -j 4 CROSS_COMPILE=arm-poky-linux-gnueabi- CC=arm-poky-linux-gnueabi-gcc -march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a8 am335x_evm_config | HOSTCC scripts/basic/fixdep | HOSTCC scripts/kconfig/conf.o | HOSTCC scripts/kconfig/zconf.tab.o | HOSTLD scripts/kconfig/conf | # | # configuration written to .config | # | # | # configuration written to spl/.config | # | NOTE: make -j 4 CROSS_COMPILE=arm-poky-linux-gnueabi- CC=arm-poky-linux-gnueabi-gcc -march=armv7-a -mfloat-abi=hard -mfpu=neon -mtune=cortex-a8 env | scripts/kconfig/conf --silentoldconfig Kconfig | scripts/kconfig/conf --silentoldconfig Kconfig | CHK include/config.h | GEN include/autoconf.mk | GEN include/autoconf.mk.dep | GEN spl/include/autoconf.mk | HOSTCC tools/env/fw_env.o | HOSTCC tools/env/fw_env_main.o | HOSTCC tools/env/crc32.o | HOSTCC tools/env/ctype.o | tools/env/fw_env_main.c:30:19: fatal error: fcntl.h: No such file or directory | #include |^ | compilation terminated. | In file included from tools/env/crc32.c:1:0: | tools/env/../../lib/crc32.c:12:23: fatal error: arpa/inet.h: No such file or directory | #include |^ | compilation terminated. | make[1]: *** [tools/env/fw_env_main.o] Error 1 | make[1]: *** Waiting for unfinished jobs | make[1]: *** [tools/env/crc32.o] Error 1 | tools/env/fw_env.c:16:19: fatal error: fcntl.h: No such file or directory | #include |^ | compilation terminated. | make[1]: *** [tools/env/fw_env.o] Error 1 | make: *** [env] Error 2 | ERROR: oe_runmake failed | WARNING: exit code 1 from a shell command. | ERROR: Function failed: do_compile (log file is located at /home/rapphil/work/poky/build/tmp/work/beaglebone-poky-linux-gnueabi/u-boot-fw-utils-cross/v2015.01+gitAUTOINC+92fa7f53f1-r0/temp/log.do_compile.31549) ERROR: Task 6 (/home/rapphil/work/poky/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2015.01.bb, do_compile) failed with exit code '1' NOTE: Tasks Summary: Attempted 658 tasks of which 656 didn't need to be rerun and 1 failed. No currently running tasks (658 of 661) Summary: 1 task failed: /home/rapphil/work/poky/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2015.01.bb, do_compile On Wed, Jan 21, 2015 at 6:11 PM, Otavio Salvador wrote: > On Wed, Jan 21, 2015 at 5:11 PM, Denys Dmytriyenko wrote: >> On Wed, Jan 21, 2015 at 11:17:19AM -0200, Otavio Salvador wrote: >>> On Tue, Jan 13, 2015 at 2:09 PM, Denys Dmytriyenko wrote: >>> > From: Denys Dmytriyenko >>> > >>> > Signed-off-by: Denys Dmytriyenko >>> ... >>> > +++ >>> > b/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch >>> > @@ -0,0 +1,36 @@ >>> > +From ee2d75513452aa6d5306fd380104adc8a2f6d8f2 Mon Sep 17 00:00:00 2001 >>> > +From: Masahiro Yamada >>> > +Date: Wed, 3 Dec 2014 10:22:50 +0900 >>> > +Subject: [PATCH] tools: env: fix build error >>> > + >>> > +Since CONFIG_SYS_ARCH, CONFIG_SYS_CPU, ... were moved to Kconfig, >>> > +tools/env/fw_printenv fails to build if CONFIG_ENV_VARS_UBOOT_CONFIG >>> > +is defined. >>> > +(I do not think this is the right way to fix the problem, but >>> > +for now I do not hav
Re: [OE-core] [PATCH] u-boot: update to 2015.01
On Wed, Jan 21, 2015 at 06:25:35PM -0200, Raphael Philipe wrote: > Denys, I tested your patch and It seems not to be working for > u-boot-fw-utils-cross Did the old version work for you? > $ bitbake u-boot-fw-utils-cross > Loading cache: 100% > || > ETA: 00:00:00 > Loaded 1921 entries from dependency cache. > Parsing recipes: 100% > |##| > Time: 00:00:00 > Parsing of 1451 .bb files complete (1450 cached, 1 parsed). 1914 > targets, 85 skipped, 0 masked, 0 errors. > NOTE: Resolving any missing task queue dependencies > > Build Configuration: > BB_VERSION= "1.25.0" > BUILD_SYS = "x86_64-linux" > NATIVELSBSTRING = "Ubuntu-14.04" > TARGET_SYS= "arm-poky-linux-gnueabi" > MACHINE = "beaglebone" > DISTRO= "poky" > DISTRO_VERSION= "1.7" > TUNE_FEATURES = "arm armv7a vfp neon callconvention-hard cortexa8" > TARGET_FPU= "vfp-neon" > meta > meta-yocto > meta-yocto-bsp= "master:45d090024d7b88c434fef2e88317946449e32c2c" > meta-oe = "mymaster:5b4413ccf329a981bee976c9fcde5d2872f0defb" > > NOTE: Preparing RunQueue > NOTE: Executing SetScene Tasks > NOTE: Executing RunQueue Tasks > ERROR: Function failed: do_compile (log file is located at > /home/rapphil/work/poky/build/tmp/work/beaglebone-poky-linux-gnueabi/u-boot-fw-utils-cross/v2015.01+gitAUTOINC+92fa7f53f1-r0/temp/log.do_compile.31549) > ERROR: Logfile of failure stored in: > /home/rapphil/work/poky/build/tmp/work/beaglebone-poky-linux-gnueabi/u-boot-fw-utils-cross/v2015.01+gitAUTOINC+92fa7f53f1-r0/temp/log.do_compile.31549 > Log data follows: > | DEBUG: Executing shell function do_compile > | NOTE: make -j 4 CROSS_COMPILE=arm-poky-linux-gnueabi- > CC=arm-poky-linux-gnueabi-gcc -march=armv7-a -mfloat-abi=hard > -mfpu=neon -mtune=cortex-a8 am335x_evm_config > | HOSTCC scripts/basic/fixdep > | HOSTCC scripts/kconfig/conf.o > | HOSTCC scripts/kconfig/zconf.tab.o > | HOSTLD scripts/kconfig/conf > | # > | # configuration written to .config > | # > | # > | # configuration written to spl/.config > | # > | NOTE: make -j 4 CROSS_COMPILE=arm-poky-linux-gnueabi- > CC=arm-poky-linux-gnueabi-gcc -march=armv7-a -mfloat-abi=hard > -mfpu=neon -mtune=cortex-a8 env > | scripts/kconfig/conf --silentoldconfig Kconfig > | scripts/kconfig/conf --silentoldconfig Kconfig > | CHK include/config.h > | GEN include/autoconf.mk > | GEN include/autoconf.mk.dep > | GEN spl/include/autoconf.mk > | HOSTCC tools/env/fw_env.o > | HOSTCC tools/env/fw_env_main.o > | HOSTCC tools/env/crc32.o > | HOSTCC tools/env/ctype.o > | tools/env/fw_env_main.c:30:19: fatal error: fcntl.h: No such file or > directory > | #include > |^ > | compilation terminated. > | In file included from tools/env/crc32.c:1:0: > | tools/env/../../lib/crc32.c:12:23: fatal error: arpa/inet.h: No such > file or directory > | #include > |^ > | compilation terminated. > | make[1]: *** [tools/env/fw_env_main.o] Error 1 > | make[1]: *** Waiting for unfinished jobs > | make[1]: *** [tools/env/crc32.o] Error 1 > | tools/env/fw_env.c:16:19: fatal error: fcntl.h: No such file or directory > | #include > |^ > | compilation terminated. > | make[1]: *** [tools/env/fw_env.o] Error 1 > | make: *** [env] Error 2 > | ERROR: oe_runmake failed > | WARNING: exit code 1 from a shell command. > | ERROR: Function failed: do_compile (log file is located at > /home/rapphil/work/poky/build/tmp/work/beaglebone-poky-linux-gnueabi/u-boot-fw-utils-cross/v2015.01+gitAUTOINC+92fa7f53f1-r0/temp/log.do_compile.31549) > ERROR: Task 6 > (/home/rapphil/work/poky/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2015.01.bb, > do_compile) failed with exit code '1' > NOTE: Tasks Summary: Attempted 658 tasks of which 656 didn't need to > be rerun and 1 failed. > No currently running tasks (658 of 661) > > Summary: 1 task failed: > > /home/rapphil/work/poky/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2015.01.bb, > do_compile > > On Wed, Jan 21, 2015 at 6:11 PM, Otavio Salvador > wrote: > > On Wed, Jan 21, 2015 at 5:11 PM, Denys Dmytriyenko wrote: > >> On Wed, Jan 21, 2015 at 11:17:19AM -0200, Otavio Salvador wrote: > >>> On Tue, Jan 13, 2015 at 2:09 PM, Denys Dmytriyenko > >>> wrote: > >>> > From: Denys Dmytriyenko > >>> > > >>> > Signed-off-by: Denys Dmytriyenko > >>> ... > >>> > +++ > >>> > b/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch > >>> > @@ -0,0 +1,36 @@ > >>> > +From ee2d75513452aa6d5306fd380104adc8a2f6d8f2 Mon Sep 17 00:00:00 2001 > >>> > +From: Masahiro Yamada > >>> > +Date: Wed, 3 Dec 2014
Re: [OE-core] [PATCH] u-boot: update to 2015.01
I just checked 2014.07, and it does not work too. Same output. Sorry,am I missing something? On Wed, Jan 21, 2015 at 6:28 PM, Denys Dmytriyenko wrote: > On Wed, Jan 21, 2015 at 06:25:35PM -0200, Raphael Philipe wrote: >> Denys, I tested your patch and It seems not to be working for >> u-boot-fw-utils-cross > > Did the old version work for you? > > >> $ bitbake u-boot-fw-utils-cross >> Loading cache: 100% >> || >> ETA: 00:00:00 >> Loaded 1921 entries from dependency cache. >> Parsing recipes: 100% >> |##| >> Time: 00:00:00 >> Parsing of 1451 .bb files complete (1450 cached, 1 parsed). 1914 >> targets, 85 skipped, 0 masked, 0 errors. >> NOTE: Resolving any missing task queue dependencies >> >> Build Configuration: >> BB_VERSION= "1.25.0" >> BUILD_SYS = "x86_64-linux" >> NATIVELSBSTRING = "Ubuntu-14.04" >> TARGET_SYS= "arm-poky-linux-gnueabi" >> MACHINE = "beaglebone" >> DISTRO= "poky" >> DISTRO_VERSION= "1.7" >> TUNE_FEATURES = "arm armv7a vfp neon callconvention-hard cortexa8" >> TARGET_FPU= "vfp-neon" >> meta >> meta-yocto >> meta-yocto-bsp= "master:45d090024d7b88c434fef2e88317946449e32c2c" >> meta-oe = "mymaster:5b4413ccf329a981bee976c9fcde5d2872f0defb" >> >> NOTE: Preparing RunQueue >> NOTE: Executing SetScene Tasks >> NOTE: Executing RunQueue Tasks >> ERROR: Function failed: do_compile (log file is located at >> /home/rapphil/work/poky/build/tmp/work/beaglebone-poky-linux-gnueabi/u-boot-fw-utils-cross/v2015.01+gitAUTOINC+92fa7f53f1-r0/temp/log.do_compile.31549) >> ERROR: Logfile of failure stored in: >> /home/rapphil/work/poky/build/tmp/work/beaglebone-poky-linux-gnueabi/u-boot-fw-utils-cross/v2015.01+gitAUTOINC+92fa7f53f1-r0/temp/log.do_compile.31549 >> Log data follows: >> | DEBUG: Executing shell function do_compile >> | NOTE: make -j 4 CROSS_COMPILE=arm-poky-linux-gnueabi- >> CC=arm-poky-linux-gnueabi-gcc -march=armv7-a -mfloat-abi=hard >> -mfpu=neon -mtune=cortex-a8 am335x_evm_config >> | HOSTCC scripts/basic/fixdep >> | HOSTCC scripts/kconfig/conf.o >> | HOSTCC scripts/kconfig/zconf.tab.o >> | HOSTLD scripts/kconfig/conf >> | # >> | # configuration written to .config >> | # >> | # >> | # configuration written to spl/.config >> | # >> | NOTE: make -j 4 CROSS_COMPILE=arm-poky-linux-gnueabi- >> CC=arm-poky-linux-gnueabi-gcc -march=armv7-a -mfloat-abi=hard >> -mfpu=neon -mtune=cortex-a8 env >> | scripts/kconfig/conf --silentoldconfig Kconfig >> | scripts/kconfig/conf --silentoldconfig Kconfig >> | CHK include/config.h >> | GEN include/autoconf.mk >> | GEN include/autoconf.mk.dep >> | GEN spl/include/autoconf.mk >> | HOSTCC tools/env/fw_env.o >> | HOSTCC tools/env/fw_env_main.o >> | HOSTCC tools/env/crc32.o >> | HOSTCC tools/env/ctype.o >> | tools/env/fw_env_main.c:30:19: fatal error: fcntl.h: No such file or >> directory >> | #include >> |^ >> | compilation terminated. >> | In file included from tools/env/crc32.c:1:0: >> | tools/env/../../lib/crc32.c:12:23: fatal error: arpa/inet.h: No such >> file or directory >> | #include >> |^ >> | compilation terminated. >> | make[1]: *** [tools/env/fw_env_main.o] Error 1 >> | make[1]: *** Waiting for unfinished jobs >> | make[1]: *** [tools/env/crc32.o] Error 1 >> | tools/env/fw_env.c:16:19: fatal error: fcntl.h: No such file or directory >> | #include >> |^ >> | compilation terminated. >> | make[1]: *** [tools/env/fw_env.o] Error 1 >> | make: *** [env] Error 2 >> | ERROR: oe_runmake failed >> | WARNING: exit code 1 from a shell command. >> | ERROR: Function failed: do_compile (log file is located at >> /home/rapphil/work/poky/build/tmp/work/beaglebone-poky-linux-gnueabi/u-boot-fw-utils-cross/v2015.01+gitAUTOINC+92fa7f53f1-r0/temp/log.do_compile.31549) >> ERROR: Task 6 >> (/home/rapphil/work/poky/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2015.01.bb, >> do_compile) failed with exit code '1' >> NOTE: Tasks Summary: Attempted 658 tasks of which 656 didn't need to >> be rerun and 1 failed. >> No currently running tasks (658 of 661) >> >> Summary: 1 task failed: >> >> /home/rapphil/work/poky/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2015.01.bb, >> do_compile >> >> On Wed, Jan 21, 2015 at 6:11 PM, Otavio Salvador >> wrote: >> > On Wed, Jan 21, 2015 at 5:11 PM, Denys Dmytriyenko wrote: >> >> On Wed, Jan 21, 2015 at 11:17:19AM -0200, Otavio Salvador wrote: >> >>> On Tue, Jan 13, 2015 at 2:09 PM, Denys Dmytriyenko >> >>> wrote: >> >>> > From: Denys Dmytriyenko >> >>> > >> >>> > Signed-off-by: Denys Dmytriyenko >> >>> ... >
[OE-core] [PATCH] glibc: CVE-2014-9402 endless loop in getaddr_r
From: Armin Kuster The getnetbyname function in glibc 2.21 in earlier will enter an infinite loop if the DNS backend is activated in the system Name Service Switch configuration, and the DNS resolver receives a positive answer while processing the network name. Signed-off-by: Armin Kuster --- .../CVE-2014-9402_endless-loop-in-getaddr_r.patch | 65 ++ meta/recipes-core/glibc/glibc_2.20.bb | 1 + 2 files changed, 66 insertions(+) create mode 100644 meta/recipes-core/glibc/glibc/CVE-2014-9402_endless-loop-in-getaddr_r.patch diff --git a/meta/recipes-core/glibc/glibc/CVE-2014-9402_endless-loop-in-getaddr_r.patch b/meta/recipes-core/glibc/glibc/CVE-2014-9402_endless-loop-in-getaddr_r.patch new file mode 100644 index 000..ba1da67 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/CVE-2014-9402_endless-loop-in-getaddr_r.patch @@ -0,0 +1,65 @@ +CVE-2014-9402 endless loop in getaddr_r + + +https://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commit;h=11e3417af6e354f1942c68a271ae51e892b2814d + +Upstream-Status: Backport + +Signed-off-by: Armin Kuster + +From 11e3417af6e354f1942c68a271ae51e892b2814d Mon Sep 17 00:00:00 2001 +From: Florian Weimer +Date: Mon, 15 Dec 2014 17:41:13 +0100 +Subject: [PATCH] Avoid infinite loop in nss_dns getnetbyname [BZ #17630] + +--- + ChangeLog| 6 ++ + NEWS | 7 +-- + resolv/nss_dns/dns-network.c | 4 ++-- + 3 files changed, 13 insertions(+), 4 deletions(-) + +Index: git/NEWS +=== +--- git.orig/NEWS git/NEWS +@@ -24,7 +24,10 @@ Version 2.20 + 17031, 17042, 17048, 17050, 17058, 17061, 17062, 17069, 17075, 17078, + 17079, 17084, 17086, 17088, 17092, 17097, 17125, 17135, 17137, 17150, + 17153, 17187, 17213, 17259, 17261, 17262, 17263, 17319, 17325, 17354, +- 17625. ++ 17625, 17630. ++ ++* The nss_dns implementation of getnetbyname could run into an infinite loop ++ if the DNS response contained a PTR record of an unexpected format. + + * CVE-2104-7817 The wordexp function could ignore the WRDE_NOCMD flag + under certain input conditions resulting in the execution of a shell for +Index: git/resolv/nss_dns/dns-network.c +=== +--- git.orig/resolv/nss_dns/dns-network.c git/resolv/nss_dns/dns-network.c +@@ -398,8 +398,8 @@ getanswer_r (const querybuf *answer, int + + case BYNAME: + { +- char **ap = result->n_aliases++; +- while (*ap != NULL) ++ char **ap; ++ for (ap = result->n_aliases; *ap != NULL; ++ap) + { + /* Check each alias name for being of the forms: + 4.3.2.1.in-addr.arpa = net 1.2.3.4 +Index: git/ChangeLog +=== +--- git.orig/ChangeLog git/ChangeLog +@@ -1,3 +1,9 @@ ++2014-12-16 Florian Weimer ++ ++ [BZ #17630] ++ * resolv/nss_dns/dns-network.c (getanswer_r): Iterate over alias ++ names. ++ + 2014-12-15 Jeff Law + +[BZ #16617] diff --git a/meta/recipes-core/glibc/glibc_2.20.bb b/meta/recipes-core/glibc/glibc_2.20.bb index f67fbfd..8a8b296 100644 --- a/meta/recipes-core/glibc/glibc_2.20.bb +++ b/meta/recipes-core/glibc/glibc_2.20.bb @@ -44,6 +44,7 @@ EGLIBCPATCHES = "\ CVEPATCHES = "\ file://CVE-2014-7817-wordexp-fails-to-honour-WRDE_NOCMD.patch \ file://CVE-2012-3406-Stack-overflow-in-vfprintf-BZ-16617.patch \ +file://CVE-2014-9402_endless-loop-in-getaddr_r.patch \ " LIC_FILES_CHKSUM = "file://LICENSES;md5=e9a558e243b36d3209f380deb394b213 \ file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: update to 2015.01
Instead of HOSTCC, what is called in your log.do_compile ? Maybe it is a Yocto bug. My Linux distro is supported though. http://www.yoctoproject.org/docs/1.7/ref-manual/ref-manual.html#detailed-supported-distros. On Wed, Jan 21, 2015 at 6:35 PM, Denys Dmytriyenko wrote: > On Wed, Jan 21, 2015 at 06:31:32PM -0200, Raphael Philipe wrote: >> I just checked 2014.07, and it does not work too. Same output. >> >> Sorry,am I missing something? > > Looks like host-specific issue - it calls HOSTCC in there. > > >> On Wed, Jan 21, 2015 at 6:28 PM, Denys Dmytriyenko wrote: >> > On Wed, Jan 21, 2015 at 06:25:35PM -0200, Raphael Philipe wrote: >> >> Denys, I tested your patch and It seems not to be working for >> >> u-boot-fw-utils-cross >> > >> > Did the old version work for you? >> > >> > >> >> $ bitbake u-boot-fw-utils-cross >> >> Loading cache: 100% >> >> || >> >> ETA: 00:00:00 >> >> Loaded 1921 entries from dependency cache. >> >> Parsing recipes: 100% >> >> |##| >> >> Time: 00:00:00 >> >> Parsing of 1451 .bb files complete (1450 cached, 1 parsed). 1914 >> >> targets, 85 skipped, 0 masked, 0 errors. >> >> NOTE: Resolving any missing task queue dependencies >> >> >> >> Build Configuration: >> >> BB_VERSION= "1.25.0" >> >> BUILD_SYS = "x86_64-linux" >> >> NATIVELSBSTRING = "Ubuntu-14.04" >> >> TARGET_SYS= "arm-poky-linux-gnueabi" >> >> MACHINE = "beaglebone" >> >> DISTRO= "poky" >> >> DISTRO_VERSION= "1.7" >> >> TUNE_FEATURES = "arm armv7a vfp neon callconvention-hard cortexa8" >> >> TARGET_FPU= "vfp-neon" >> >> meta >> >> meta-yocto >> >> meta-yocto-bsp= "master:45d090024d7b88c434fef2e88317946449e32c2c" >> >> meta-oe = "mymaster:5b4413ccf329a981bee976c9fcde5d2872f0defb" >> >> >> >> NOTE: Preparing RunQueue >> >> NOTE: Executing SetScene Tasks >> >> NOTE: Executing RunQueue Tasks >> >> ERROR: Function failed: do_compile (log file is located at >> >> /home/rapphil/work/poky/build/tmp/work/beaglebone-poky-linux-gnueabi/u-boot-fw-utils-cross/v2015.01+gitAUTOINC+92fa7f53f1-r0/temp/log.do_compile.31549) >> >> ERROR: Logfile of failure stored in: >> >> /home/rapphil/work/poky/build/tmp/work/beaglebone-poky-linux-gnueabi/u-boot-fw-utils-cross/v2015.01+gitAUTOINC+92fa7f53f1-r0/temp/log.do_compile.31549 >> >> Log data follows: >> >> | DEBUG: Executing shell function do_compile >> >> | NOTE: make -j 4 CROSS_COMPILE=arm-poky-linux-gnueabi- >> >> CC=arm-poky-linux-gnueabi-gcc -march=armv7-a -mfloat-abi=hard >> >> -mfpu=neon -mtune=cortex-a8 am335x_evm_config >> >> | HOSTCC scripts/basic/fixdep >> >> | HOSTCC scripts/kconfig/conf.o >> >> | HOSTCC scripts/kconfig/zconf.tab.o >> >> | HOSTLD scripts/kconfig/conf >> >> | # >> >> | # configuration written to .config >> >> | # >> >> | # >> >> | # configuration written to spl/.config >> >> | # >> >> | NOTE: make -j 4 CROSS_COMPILE=arm-poky-linux-gnueabi- >> >> CC=arm-poky-linux-gnueabi-gcc -march=armv7-a -mfloat-abi=hard >> >> -mfpu=neon -mtune=cortex-a8 env >> >> | scripts/kconfig/conf --silentoldconfig Kconfig >> >> | scripts/kconfig/conf --silentoldconfig Kconfig >> >> | CHK include/config.h >> >> | GEN include/autoconf.mk >> >> | GEN include/autoconf.mk.dep >> >> | GEN spl/include/autoconf.mk >> >> | HOSTCC tools/env/fw_env.o >> >> | HOSTCC tools/env/fw_env_main.o >> >> | HOSTCC tools/env/crc32.o >> >> | HOSTCC tools/env/ctype.o >> >> | tools/env/fw_env_main.c:30:19: fatal error: fcntl.h: No such file or >> >> directory >> >> | #include >> >> |^ >> >> | compilation terminated. >> >> | In file included from tools/env/crc32.c:1:0: >> >> | tools/env/../../lib/crc32.c:12:23: fatal error: arpa/inet.h: No such >> >> file or directory >> >> | #include >> >> |^ >> >> | compilation terminated. >> >> | make[1]: *** [tools/env/fw_env_main.o] Error 1 >> >> | make[1]: *** Waiting for unfinished jobs >> >> | make[1]: *** [tools/env/crc32.o] Error 1 >> >> | tools/env/fw_env.c:16:19: fatal error: fcntl.h: No such file or >> >> directory >> >> | #include >> >> |^ >> >> | compilation terminated. >> >> | make[1]: *** [tools/env/fw_env.o] Error 1 >> >> | make: *** [env] Error 2 >> >> | ERROR: oe_runmake failed >> >> | WARNING: exit code 1 from a shell command. >> >> | ERROR: Function failed: do_compile (log file is located at >> >> /home/rapphil/work/poky/build/tmp/work/beaglebone-poky-linux-gnueabi/u-boot-fw-utils-cross/v2015.01+gitAUTOINC+92fa7f53f1-r0/temp/log.do_compile.31549) >> >> ERROR: Task 6 >> >> (/home/rapphil/work/poky/meta/recipes-bsp/u-boot/u-boot-fw
Re: [OE-core] [PATCH 1/1] gcc: ensure target gcc headers can be included
Is this needed for dizzy ? - Armin On 01/21/2015 09:14 AM, Paul Eggleton wrote: There are a few headers installed as part of gcc-runtime (omp.h, ssp/*.h). Being installed from a recipe built for the target architecture, these are within the target sysroot and not cross/nativesdk; thus they weren't able to be found by gcc with the existing search paths. Add support for picking up these headers under the sysroot supplied on the gcc command line in order to resolve this. Thanks to Richard Purdie for giving me a number of pointers during fixing this issue. Fixes [YOCTO #7141]. Signed-off-by: Paul Eggleton --- meta/recipes-devtools/gcc/gcc-4.9.inc | 1 + .../gcc/gcc-4.9/target-gcc-includedir.patch| 81 ++ 2 files changed, 82 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-4.9/target-gcc-includedir.patch diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc b/meta/recipes-devtools/gcc/gcc-4.9.inc index 2568e99..0f407b7 100644 --- a/meta/recipes-devtools/gcc/gcc-4.9.inc +++ b/meta/recipes-devtools/gcc/gcc-4.9.inc @@ -74,6 +74,7 @@ SRC_URI = "\ file://0057-aarch64-config.patch \ file://0058-gcc-r212171.patch \ file://0059-gcc-PR-rtl-optimization-63348.patch \ +file://target-gcc-includedir.patch \ " SRC_URI[md5sum] = "fddf71348546af523353bd43d34919c1" SRC_URI[sha256sum] = "d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e" diff --git a/meta/recipes-devtools/gcc/gcc-4.9/target-gcc-includedir.patch b/meta/recipes-devtools/gcc/gcc-4.9/target-gcc-includedir.patch new file mode 100644 index 000..f48c66d --- /dev/null +++ b/meta/recipes-devtools/gcc/gcc-4.9/target-gcc-includedir.patch @@ -0,0 +1,81 @@ +Ensure target gcc headers can be included + +There are a few headers installed as part of the OpenEmbedded +gcc-runtime target (omp.h, ssp/*.h). Being installed from a recipe +built for the target architecture, these are within the target +sysroot and not cross/nativesdk; thus they weren't able to be +found by gcc with the existing search paths. Add support for +picking up these headers under the sysroot supplied on the gcc +command line in order to resolve this. + +Signed-off-by: Paul Eggleton + +Upstream-Status: Pending + +--- a/gcc/Makefile.in 2014-12-23 11:57:33.327873331 + b/gcc/Makefile.in 2015-01-21 11:32:35.447305394 + +@@ -587,6 +587,7 @@ + + # Directory in which the compiler finds libraries etc. + libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(version) ++libsubdir_target = gcc/$(target_noncanonical)/$(version) + # Directory in which the compiler finds executables + libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(version) + # Directory in which all plugin resources are installed +@@ -2534,6 +2535,7 @@ + + PREPROCESSOR_DEFINES = \ + -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ ++ -DGCC_INCLUDE_SUBDIR_TARGET=\"$(libsubdir_target)/include\" \ + -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \ + -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ + -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ +--- a/gcc/cppdefault.c 2015-01-13 17:40:26.131012725 + b/gcc/cppdefault.c 2015-01-21 11:30:08.928426492 + +@@ -59,6 +59,10 @@ + /* This is the dir for gcc's private headers. */ + { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, + #endif ++#ifdef GCC_INCLUDE_SUBDIR_TARGET ++/* This is the dir for gcc's private headers under the specified sysroot. */ ++{ STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, 1, 0 }, ++#endif + #ifdef LOCAL_INCLUDE_DIR + /* /usr/local/include comes before the fixincluded header files. */ + { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, +diff --git a/gcc/defaults.h b/gcc/defaults.h +index f94ae17..d98b40b 100644 +--- a/gcc/defaults.h b/gcc/defaults.h +@@ -1390,4 +1390,13 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see + + #endif /* GCC_INSN_FLAGS_H */ + ++/* Default prefixes to attach to command names. */ ++ ++#ifndef STANDARD_STARTFILE_PREFIX_1 ++#define STANDARD_STARTFILE_PREFIX_1 "/lib/" ++#endif ++#ifndef STANDARD_STARTFILE_PREFIX_2 ++#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" ++#endif ++ + #endif /* ! GCC_DEFAULTS_H */ +diff --git a/gcc/gcc.c b/gcc/gcc.c +index 9f0b781..174fca8 100644 +--- a/gcc/gcc.c b/gcc/gcc.c +@@ -1189,13 +1189,6 @@ static const char *gcc_libexec_prefix; + + /* Default prefixes to attach to command names. */ + +-#ifndef STANDARD_STARTFILE_PREFIX_1 +-#define STANDARD_STARTFILE_PREFIX_1 "/lib/" +-#endif +-#ifndef STANDARD_STARTFILE_PREFIX_2 +-#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" +-#endif +- + #ifdef CROSS_DIRECTORY_STRUCTURE /* Don't use these prefixes for a cross compiler. */ + #undef MD_EXEC_PREFIX + #undef MD_STARTFILE_PREFIX -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/lis
Re: [OE-core] [PATCHv2 4/4] libpostproc: import from meta-oe
On 10 December 2014 at 14:17, Martin Jansa wrote: > +DEPENDS = "libav" > In a world build: ERROR: Nothing PROVIDES 'libav' (but /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-intel-gpl/build/meta/recipes-multimedia/libav/ libpostproc_git.bb DEPENDS on or otherwise requires it) ERROR: libav was skipped: because it has a restricted license not whitelisted in LICENSE_FLAGS_WHITELIST https://autobuilder.yoctoproject.org/main/builders/nightly-intel-gpl/builds/162/steps/BuildImages/logs/stdio Not sure what's best here: maybe add the commercial license to libpostproc with a comment explaining why? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: update to 2015.01
On Wed, Jan 21, 2015 at 06:11:23PM -0200, Otavio Salvador wrote: > On Wed, Jan 21, 2015 at 5:11 PM, Denys Dmytriyenko wrote: > > On Wed, Jan 21, 2015 at 11:17:19AM -0200, Otavio Salvador wrote: > >> On Tue, Jan 13, 2015 at 2:09 PM, Denys Dmytriyenko wrote: > >> > From: Denys Dmytriyenko > >> > > >> > Signed-off-by: Denys Dmytriyenko > >> ... > >> > +++ > >> > b/meta/recipes-bsp/u-boot/u-boot-fw-utils/0001-tools-env-fix-build-error.patch > >> > @@ -0,0 +1,36 @@ > >> > +From ee2d75513452aa6d5306fd380104adc8a2f6d8f2 Mon Sep 17 00:00:00 2001 > >> > +From: Masahiro Yamada > >> > +Date: Wed, 3 Dec 2014 10:22:50 +0900 > >> > +Subject: [PATCH] tools: env: fix build error > >> > + > >> > +Since CONFIG_SYS_ARCH, CONFIG_SYS_CPU, ... were moved to Kconfig, > >> > +tools/env/fw_printenv fails to build if CONFIG_ENV_VARS_UBOOT_CONFIG > >> > +is defined. > >> > +(I do not think this is the right way to fix the problem, but > >> > +for now I do not have enough time to take a close look.) > >> > + > >> > +Upstream-Status: Submitted [http://patchwork.ozlabs.org/patch/417192/] > >> > + > >> > +Signed-off-by: Masahiro Yamada > >> > +Reported-by: Denys Dmytriyenko > >> > >> Is it necessary? In meta-fsl-arm we don't have this patch and get the > >> tools built. > > > > Really? The patch above is rather self-explanatory. The issue was confirmed > > by > > U-boot maintainers and the workaround provided by one of the core > > developers. > > I'm not familiar with meta-fsl-arm, but I guess you can grep your platform's > > defconfig to see if CONFIG_ENV_VARS_UBOOT_CONFIG and others are defined and > > whether your platforms are affected or not. It does affect our platforms > > (among many others), including beaglebone. > > I think this is for the cross tool only. Versus what? -- Denys -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] u-boot: update to 2015.01
On Wed, Jan 21, 2015 at 06:31:32PM -0200, Raphael Philipe wrote: > I just checked 2014.07, and it does not work too. Same output. > > Sorry,am I missing something? Looks like host-specific issue - it calls HOSTCC in there. > On Wed, Jan 21, 2015 at 6:28 PM, Denys Dmytriyenko wrote: > > On Wed, Jan 21, 2015 at 06:25:35PM -0200, Raphael Philipe wrote: > >> Denys, I tested your patch and It seems not to be working for > >> u-boot-fw-utils-cross > > > > Did the old version work for you? > > > > > >> $ bitbake u-boot-fw-utils-cross > >> Loading cache: 100% > >> || > >> ETA: 00:00:00 > >> Loaded 1921 entries from dependency cache. > >> Parsing recipes: 100% > >> |##| > >> Time: 00:00:00 > >> Parsing of 1451 .bb files complete (1450 cached, 1 parsed). 1914 > >> targets, 85 skipped, 0 masked, 0 errors. > >> NOTE: Resolving any missing task queue dependencies > >> > >> Build Configuration: > >> BB_VERSION= "1.25.0" > >> BUILD_SYS = "x86_64-linux" > >> NATIVELSBSTRING = "Ubuntu-14.04" > >> TARGET_SYS= "arm-poky-linux-gnueabi" > >> MACHINE = "beaglebone" > >> DISTRO= "poky" > >> DISTRO_VERSION= "1.7" > >> TUNE_FEATURES = "arm armv7a vfp neon callconvention-hard cortexa8" > >> TARGET_FPU= "vfp-neon" > >> meta > >> meta-yocto > >> meta-yocto-bsp= "master:45d090024d7b88c434fef2e88317946449e32c2c" > >> meta-oe = "mymaster:5b4413ccf329a981bee976c9fcde5d2872f0defb" > >> > >> NOTE: Preparing RunQueue > >> NOTE: Executing SetScene Tasks > >> NOTE: Executing RunQueue Tasks > >> ERROR: Function failed: do_compile (log file is located at > >> /home/rapphil/work/poky/build/tmp/work/beaglebone-poky-linux-gnueabi/u-boot-fw-utils-cross/v2015.01+gitAUTOINC+92fa7f53f1-r0/temp/log.do_compile.31549) > >> ERROR: Logfile of failure stored in: > >> /home/rapphil/work/poky/build/tmp/work/beaglebone-poky-linux-gnueabi/u-boot-fw-utils-cross/v2015.01+gitAUTOINC+92fa7f53f1-r0/temp/log.do_compile.31549 > >> Log data follows: > >> | DEBUG: Executing shell function do_compile > >> | NOTE: make -j 4 CROSS_COMPILE=arm-poky-linux-gnueabi- > >> CC=arm-poky-linux-gnueabi-gcc -march=armv7-a -mfloat-abi=hard > >> -mfpu=neon -mtune=cortex-a8 am335x_evm_config > >> | HOSTCC scripts/basic/fixdep > >> | HOSTCC scripts/kconfig/conf.o > >> | HOSTCC scripts/kconfig/zconf.tab.o > >> | HOSTLD scripts/kconfig/conf > >> | # > >> | # configuration written to .config > >> | # > >> | # > >> | # configuration written to spl/.config > >> | # > >> | NOTE: make -j 4 CROSS_COMPILE=arm-poky-linux-gnueabi- > >> CC=arm-poky-linux-gnueabi-gcc -march=armv7-a -mfloat-abi=hard > >> -mfpu=neon -mtune=cortex-a8 env > >> | scripts/kconfig/conf --silentoldconfig Kconfig > >> | scripts/kconfig/conf --silentoldconfig Kconfig > >> | CHK include/config.h > >> | GEN include/autoconf.mk > >> | GEN include/autoconf.mk.dep > >> | GEN spl/include/autoconf.mk > >> | HOSTCC tools/env/fw_env.o > >> | HOSTCC tools/env/fw_env_main.o > >> | HOSTCC tools/env/crc32.o > >> | HOSTCC tools/env/ctype.o > >> | tools/env/fw_env_main.c:30:19: fatal error: fcntl.h: No such file or > >> directory > >> | #include > >> |^ > >> | compilation terminated. > >> | In file included from tools/env/crc32.c:1:0: > >> | tools/env/../../lib/crc32.c:12:23: fatal error: arpa/inet.h: No such > >> file or directory > >> | #include > >> |^ > >> | compilation terminated. > >> | make[1]: *** [tools/env/fw_env_main.o] Error 1 > >> | make[1]: *** Waiting for unfinished jobs > >> | make[1]: *** [tools/env/crc32.o] Error 1 > >> | tools/env/fw_env.c:16:19: fatal error: fcntl.h: No such file or directory > >> | #include > >> |^ > >> | compilation terminated. > >> | make[1]: *** [tools/env/fw_env.o] Error 1 > >> | make: *** [env] Error 2 > >> | ERROR: oe_runmake failed > >> | WARNING: exit code 1 from a shell command. > >> | ERROR: Function failed: do_compile (log file is located at > >> /home/rapphil/work/poky/build/tmp/work/beaglebone-poky-linux-gnueabi/u-boot-fw-utils-cross/v2015.01+gitAUTOINC+92fa7f53f1-r0/temp/log.do_compile.31549) > >> ERROR: Task 6 > >> (/home/rapphil/work/poky/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2015.01.bb, > >> do_compile) failed with exit code '1' > >> NOTE: Tasks Summary: Attempted 658 tasks of which 656 didn't need to > >> be rerun and 1 failed. > >> No currently running tasks (658 of 661) > >> > >> Summary: 1 task failed: > >> > >> /home/rapphil/work/poky/meta/recipes-bsp/u-boot/u-boot-fw-utils-cross_2015.01.bb, > >> do_compile > >> > >> On Wed, Jan 21, 2015
Re: [OE-core] [PATCH 1/1] gcc: ensure target gcc headers can be included
On 1/21/15 2:49 PM, akuster808 wrote: > Is this needed for dizzy ? Yes, please. Also the patches listed in bug 7143. --Mark > - Armin > > On 01/21/2015 09:14 AM, Paul Eggleton wrote: >> There are a few headers installed as part of gcc-runtime (omp.h, >> ssp/*.h). Being installed from a recipe built for the target >> architecture, these are within the target sysroot and not >> cross/nativesdk; thus they weren't able to be found by gcc with the >> existing search paths. Add support for picking up these headers >> under the sysroot supplied on the gcc command line in order to >> resolve this. >> >> Thanks to Richard Purdie for giving me a number of pointers during >> fixing this issue. >> >> Fixes [YOCTO #7141]. >> >> Signed-off-by: Paul Eggleton >> --- >> meta/recipes-devtools/gcc/gcc-4.9.inc | 1 + >> .../gcc/gcc-4.9/target-gcc-includedir.patch| 81 >> ++ >> 2 files changed, 82 insertions(+) >> create mode 100644 >> meta/recipes-devtools/gcc/gcc-4.9/target-gcc-includedir.patch >> >> diff --git a/meta/recipes-devtools/gcc/gcc-4.9.inc >> b/meta/recipes-devtools/gcc/gcc-4.9.inc >> index 2568e99..0f407b7 100644 >> --- a/meta/recipes-devtools/gcc/gcc-4.9.inc >> +++ b/meta/recipes-devtools/gcc/gcc-4.9.inc >> @@ -74,6 +74,7 @@ SRC_URI = "\ >> file://0057-aarch64-config.patch \ >> file://0058-gcc-r212171.patch \ >> file://0059-gcc-PR-rtl-optimization-63348.patch \ >> +file://target-gcc-includedir.patch \ >> " >> SRC_URI[md5sum] = "fddf71348546af523353bd43d34919c1" >> SRC_URI[sha256sum] = >> "d334781a124ada6f38e63b545e2a3b8c2183049515a1abab6d513f109f1d717e" >> diff --git a/meta/recipes-devtools/gcc/gcc-4.9/target-gcc-includedir.patch >> b/meta/recipes-devtools/gcc/gcc-4.9/target-gcc-includedir.patch >> new file mode 100644 >> index 000..f48c66d >> --- /dev/null >> +++ b/meta/recipes-devtools/gcc/gcc-4.9/target-gcc-includedir.patch >> @@ -0,0 +1,81 @@ >> +Ensure target gcc headers can be included >> + >> +There are a few headers installed as part of the OpenEmbedded >> +gcc-runtime target (omp.h, ssp/*.h). Being installed from a recipe >> +built for the target architecture, these are within the target >> +sysroot and not cross/nativesdk; thus they weren't able to be >> +found by gcc with the existing search paths. Add support for >> +picking up these headers under the sysroot supplied on the gcc >> +command line in order to resolve this. >> + >> +Signed-off-by: Paul Eggleton >> + >> +Upstream-Status: Pending >> + >> +--- a/gcc/Makefile.in 2014-12-23 11:57:33.327873331 + >> b/gcc/Makefile.in 2015-01-21 11:32:35.447305394 + >> +@@ -587,6 +587,7 @@ >> + >> + # Directory in which the compiler finds libraries etc. >> + libsubdir = $(libdir)/gcc/$(target_noncanonical)/$(version) >> ++libsubdir_target = gcc/$(target_noncanonical)/$(version) >> + # Directory in which the compiler finds executables >> + libexecsubdir = $(libexecdir)/gcc/$(target_noncanonical)/$(version) >> + # Directory in which all plugin resources are installed >> +@@ -2534,6 +2535,7 @@ >> + >> + PREPROCESSOR_DEFINES = \ >> + -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \ >> ++ -DGCC_INCLUDE_SUBDIR_TARGET=\"$(libsubdir_target)/include\" \ >> + -DFIXED_INCLUDE_DIR=\"$(libsubdir)/include-fixed\" \ >> + -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \ >> + -DGPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT=$(gcc_gxx_include_dir_add_sysroot) \ >> +--- a/gcc/cppdefault.c 2015-01-13 17:40:26.131012725 + >> b/gcc/cppdefault.c 2015-01-21 11:30:08.928426492 + >> +@@ -59,6 +59,10 @@ >> + /* This is the dir for gcc's private headers. */ >> + { GCC_INCLUDE_DIR, "GCC", 0, 0, 0, 0 }, >> + #endif >> ++#ifdef GCC_INCLUDE_SUBDIR_TARGET >> ++/* This is the dir for gcc's private headers under the specified >> sysroot. */ >> ++{ STANDARD_STARTFILE_PREFIX_2 GCC_INCLUDE_SUBDIR_TARGET, "GCC", 0, 0, >> 1, 0 }, >> ++#endif >> + #ifdef LOCAL_INCLUDE_DIR >> + /* /usr/local/include comes before the fixincluded header files. */ >> + { LOCAL_INCLUDE_DIR, 0, 0, 1, 1, 2 }, >> +diff --git a/gcc/defaults.h b/gcc/defaults.h >> +index f94ae17..d98b40b 100644 >> +--- a/gcc/defaults.h >> b/gcc/defaults.h >> +@@ -1390,4 +1390,13 @@ see the files COPYING3 and COPYING.RUNTIME >> respectively. If not, see >> + >> + #endif /* GCC_INSN_FLAGS_H */ >> + >> ++/* Default prefixes to attach to command names. */ >> ++ >> ++#ifndef STANDARD_STARTFILE_PREFIX_1 >> ++#define STANDARD_STARTFILE_PREFIX_1 "/lib/" >> ++#endif >> ++#ifndef STANDARD_STARTFILE_PREFIX_2 >> ++#define STANDARD_STARTFILE_PREFIX_2 "/usr/lib/" >> ++#endif >> ++ >> + #endif /* ! GCC_DEFAULTS_H */ >> +diff --git a/gcc/gcc.c b/gcc/gcc.c >> +index 9f0b781..174fca8 100644 >> +--- a/gcc/gcc.c >> b/gcc/gcc.c >> +@@ -1189,13 +1189,6 @@ static const char *gcc_libexec_prefix; >> + >> + /* Default prefixes to attach to command names. */ >> + >> +-#ifndef STANDARD_STARTFILE
[OE-core] [oe-core][PATCH] bind: fix typo chown->chmod
From: Ting Liu Signed-off-by: Ting Liu --- meta/recipes-connectivity/bind/bind/conf.patch | 2 +- meta/recipes-connectivity/bind/bind/generate-rndc-key.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-connectivity/bind/bind/conf.patch b/meta/recipes-connectivity/bind/bind/conf.patch index e8c24cd..10d617f 100644 --- a/meta/recipes-connectivity/bind/bind/conf.patch +++ b/meta/recipes-connectivity/bind/bind/conf.patch @@ -277,7 +277,7 @@ diff -urN bind-9.3.1.orig/init.d bind-9.3.1/init.d + modprobe capability >/dev/null 2>&1 || true + if [ ! -f /etc/bind/rndc.key ]; then + /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom -+ chown 0640 /etc/bind/rndc.key ++ chmod 0640 /etc/bind/rndc.key + fi + if [ -f /var/run/named/named.pid ]; then + ps `cat /var/run/named/named.pid` > /dev/null && exit 1 diff --git a/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh b/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh index c2e88bf..db20127 100644 --- a/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh +++ b/meta/recipes-connectivity/bind/bind/generate-rndc-key.sh @@ -3,5 +3,5 @@ if [ ! -s /etc/bind/rndc.key ]; then echo -n "Generating /etc/bind/rndc.key:" /usr/sbin/rndc-confgen -a -b 512 -r /dev/urandom -chown 0640 /etc/bind/rndc.key +chmod 0640 /etc/bind/rndc.key fi -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH V3 01/10] libxml-parser-perl: upgrade to 2.44
Signed-off-by: Hongxu Jia --- .../perl/{libxml-parser-perl_2.41.bb => libxml-parser-perl_2.44.bb} | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) rename meta/recipes-devtools/perl/{libxml-parser-perl_2.41.bb => libxml-parser-perl_2.44.bb} (87%) diff --git a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb b/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb similarity index 87% rename from meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb rename to meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb index 26241e8..b08e79a 100644 --- a/meta/recipes-devtools/perl/libxml-parser-perl_2.41.bb +++ b/meta/recipes-devtools/perl/libxml-parser-perl_2.44.bb @@ -5,11 +5,9 @@ LIC_FILES_CHKSUM = "file://README;beginline=2;endline=6;md5=c8767d7516229f07b26e DEPENDS += "expat expat-native" -PR = "r3" - SRC_URI = "http://www.cpan.org/modules/by-module/XML/XML-Parser-${PV}.tar.gz"; -SRC_URI[md5sum] = "c320d2ffa459e6cdc6f9f59c1185855e" -SRC_URI[sha256sum] = "b48197cd2265a26c5f016489f11a7b450d8833cb8b3d6a46ee15975740894de9" +SRC_URI[md5sum] = "af4813fe3952362451201ced6fbce379" +SRC_URI[sha256sum] = "1ae9d07ee9c35326b3d9aad56eae71a6730a73a116b9fe9e8a4758b7cc033216" S = "${WORKDIR}/XML-Parser-${PV}" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lighttpd: Enable openssl
Enabled openssl defalutly to use https, just like ubuntu do. Signed-off-by: Qian Lei --- meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb index 20d5c1c..b320486 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e4dac5c6ab169aa212feb5028853a579" PR = "r1" SECTION = "net" -DEPENDS = "zlib libpcre" +DEPENDS = "zlib libpcre openssl" RDEPENDS_${PN} += " \ lighttpd-module-access \ lighttpd-module-accesslog \ @@ -37,7 +37,7 @@ EXTRA_OECONF = " \ --with-pcre \ --without-webdav-props \ --without-webdav-locks \ - --without-openssl \ + --with-openssl \ --disable-static \ " -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] python-smartpm: Fix attemptonly builds when file conflicts occur
[YOCTO #7299] When file conflicts occur, the RPM transaction aborts. Instead of simply accepting the failure, we now identify capture, and remove the offending package(s) from the transaction and retry. Signed-off-by: Mark Hatle --- .../python/python-smartpm/smart-attempt.patch | 97 +++--- 1 file changed, 66 insertions(+), 31 deletions(-) diff --git a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch index 45f7947..648114a 100644 --- a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch +++ b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch @@ -9,40 +9,24 @@ failures (usually conflicts). This option only works for the install operation. +If a complementary install fails, an actual error occurred, one that +we can't ignore without losing the entire attempted transaction. Keep +this as an error so we that can can catch these cases in the futre. + Upstream-Status: Pending Signed-off-by: Mark Hatle Signed-off-by: Paul Eggleton - -For complementary and 'attemptonly' package processing, we should -make sure the warn rather than error reported. -Signed-off-by: Hongxu Jia --- smart.py | 5 +++- smart/commands/install.py | 5 smart/transaction.py | 65 +++ 3 files changed, 58 insertions(+), 17 deletions(-) -diff --git a/smart.py b/smart.py -index c5c7a02..7e7fd34 100755 a/smart.py -+++ b/smart.py -@@ -179,7 +179,10 @@ def main(argv): - if opts and opts.log_level == "debug": - import traceback - traceback.print_exc() --if iface.object: -+if iface.object and sysconf.has("attempt-install", soft=True): -+iface.warning(unicode(e)) -+exitcode = 0 -+elif iface.object: - iface.error(unicode(e)) - else: - sys.stderr.write(_("error: %s\n") % e) -diff --git a/smart/commands/install.py b/smart/commands/install.py -index 590222c..6ef9682 100644 a/smart/commands/install.py -+++ b/smart/commands/install.py +Index: smart-1.4.1/smart/commands/install.py +=== +--- smart-1.4.1.orig/smart/commands/install.py smart-1.4.1/smart/commands/install.py @@ -50,6 +50,8 @@ def option_parser(): parser = OptionParser(usage=USAGE, description=DESCRIPTION, @@ -62,10 +46,10 @@ index 590222c..6ef9682 100644 if opts.explain: sysconf.set("explain-changesets", True, soft=True) -diff --git a/smart/transaction.py b/smart/transaction.py -index 5730a42..e3e61c6 100644 a/smart/transaction.py -+++ b/smart/transaction.py +Index: smart-1.4.1/smart/transaction.py +=== +--- smart-1.4.1.orig/smart/transaction.py smart-1.4.1/smart/transaction.py @@ -555,6 +555,8 @@ class Transaction(object): changeset.set(pkg, INSTALL) isinst = changeset.installed @@ -183,6 +167,57 @@ index 5730a42..e3e61c6 100644 elif op is REMOVE: self._remove(pkg, changeset, locked, pending) elif op is UPGRADE: --- -1.9.1 - +Index: smart-1.4.1/smart/backends/rpm/pm.py +=== +--- smart-1.4.1.orig/smart/backends/rpm/pm.py smart-1.4.1/smart/backends/rpm/pm.py +@@ -243,15 +253,48 @@ class RPMPackageManager(PackageManager): + cb = RPMCallback(prog, upgradednames) + cb.grabOutput(True) + probs = None ++retry = 0 + try: + probs = ts.run(cb, None) + finally: + del getTS.ts + cb.grabOutput(False) ++if probs and sysconf.has("attempt-install", soft=True): ++def remove_conflict(pkgNEVR): ++for key in changeset.keys(): ++if pkgNEVR == str(key): ++del changeset[key] ++del pkgpaths[key] ++iface.warning("Removing %s due to file %s conflicting with %s" % (pkgNEVR, fname, altNEVR)) ++break ++ ++retry = 1 ++for prob in probs: ++if prob[1][0] == rpm.RPMPROB_NEW_FILE_CONFLICT: ++msg = prob[0].split() ++fname = msg[1] ++pkgNEVR = msg[7] ++altNEVR = msg[9] ++pkgNEVR = pkgNEVR.rsplit('.', 1)[0] + '@' + pkgNEVR.rsplit('.', 1)[1] ++altNEVR = altNEVR.rsplit('.', 1)[0] + '@' + altNEVR.rsplit('.', 1)[1] ++remove_conflict(pkgNEVR) ++elif prob[1][0] == rpm.RPMPROB_FILE_CONFLICT: ++msg = prob[0].split() ++
[OE-core] [PATCH v2] python-smartpm: Fix attemptonly builds when file conflicts occur
[YOCTO #7299] When file conflicts occur, the RPM transaction aborts. Instead of simply accepting the failure, we now identify, capture, and remove the offending package(s) from the transaction and retry. Signed-off-by: Mark Hatle --- .../python/python-smartpm/smart-attempt.patch | 97 +++--- 1 file changed, 66 insertions(+), 31 deletions(-) diff --git a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch index 45f7947..648114a 100644 --- a/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch +++ b/meta/recipes-devtools/python/python-smartpm/smart-attempt.patch @@ -9,40 +9,24 @@ failures (usually conflicts). This option only works for the install operation. +If a complementary install fails, an actual error occurred, one that +we can't ignore without losing the entire attempted transaction. Keep +this as an error so that we can catch these cases in the futre. + Upstream-Status: Pending Signed-off-by: Mark Hatle Signed-off-by: Paul Eggleton - -For complementary and 'attemptonly' package processing, we should -make sure the warn rather than error reported. -Signed-off-by: Hongxu Jia --- smart.py | 5 +++- smart/commands/install.py | 5 smart/transaction.py | 65 +++ 3 files changed, 58 insertions(+), 17 deletions(-) -diff --git a/smart.py b/smart.py -index c5c7a02..7e7fd34 100755 a/smart.py -+++ b/smart.py -@@ -179,7 +179,10 @@ def main(argv): - if opts and opts.log_level == "debug": - import traceback - traceback.print_exc() --if iface.object: -+if iface.object and sysconf.has("attempt-install", soft=True): -+iface.warning(unicode(e)) -+exitcode = 0 -+elif iface.object: - iface.error(unicode(e)) - else: - sys.stderr.write(_("error: %s\n") % e) -diff --git a/smart/commands/install.py b/smart/commands/install.py -index 590222c..6ef9682 100644 a/smart/commands/install.py -+++ b/smart/commands/install.py +Index: smart-1.4.1/smart/commands/install.py +=== +--- smart-1.4.1.orig/smart/commands/install.py smart-1.4.1/smart/commands/install.py @@ -50,6 +50,8 @@ def option_parser(): parser = OptionParser(usage=USAGE, description=DESCRIPTION, @@ -62,10 +46,10 @@ index 590222c..6ef9682 100644 if opts.explain: sysconf.set("explain-changesets", True, soft=True) -diff --git a/smart/transaction.py b/smart/transaction.py -index 5730a42..e3e61c6 100644 a/smart/transaction.py -+++ b/smart/transaction.py +Index: smart-1.4.1/smart/transaction.py +=== +--- smart-1.4.1.orig/smart/transaction.py smart-1.4.1/smart/transaction.py @@ -555,6 +555,8 @@ class Transaction(object): changeset.set(pkg, INSTALL) isinst = changeset.installed @@ -183,6 +167,57 @@ index 5730a42..e3e61c6 100644 elif op is REMOVE: self._remove(pkg, changeset, locked, pending) elif op is UPGRADE: --- -1.9.1 - +Index: smart-1.4.1/smart/backends/rpm/pm.py +=== +--- smart-1.4.1.orig/smart/backends/rpm/pm.py smart-1.4.1/smart/backends/rpm/pm.py +@@ -243,15 +253,48 @@ class RPMPackageManager(PackageManager): + cb = RPMCallback(prog, upgradednames) + cb.grabOutput(True) + probs = None ++retry = 0 + try: + probs = ts.run(cb, None) + finally: + del getTS.ts + cb.grabOutput(False) ++if probs and sysconf.has("attempt-install", soft=True): ++def remove_conflict(pkgNEVR): ++for key in changeset.keys(): ++if pkgNEVR == str(key): ++del changeset[key] ++del pkgpaths[key] ++iface.warning("Removing %s due to file %s conflicting with %s" % (pkgNEVR, fname, altNEVR)) ++break ++ ++retry = 1 ++for prob in probs: ++if prob[1][0] == rpm.RPMPROB_NEW_FILE_CONFLICT: ++msg = prob[0].split() ++fname = msg[1] ++pkgNEVR = msg[7] ++altNEVR = msg[9] ++pkgNEVR = pkgNEVR.rsplit('.', 1)[0] + '@' + pkgNEVR.rsplit('.', 1)[1] ++altNEVR = altNEVR.rsplit('.', 1)[0] + '@' + altNEVR.rsplit('.', 1)[1] ++remove_conflict(pkgNEVR) ++elif prob[1][0] == rpm.RPMPROB_FILE_CONFLICT: ++msg = prob[0].split() ++
[OE-core] [PATCH] curl: add ssl to PACKAGECONFIG
Enable openssl default, just like ubuntu do. Signed-off-by: Qian Lei --- meta/recipes-support/curl/curl_7.40.0.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-support/curl/curl_7.40.0.bb b/meta/recipes-support/curl/curl_7.40.0.bb index 209ed94..5081eb4 100644 --- a/meta/recipes-support/curl/curl_7.40.0.bb +++ b/meta/recipes-support/curl/curl_7.40.0.bb @@ -19,7 +19,7 @@ SRC_URI[sha256sum] = "899109eb3900fa6b8a2f995df7f449964292776a04763e94fae640700f inherit autotools pkgconfig binconfig multilib_header -PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)} gnutls zlib" +PACKAGECONFIG ??= "${@bb.utils.contains("DISTRO_FEATURES", "ipv6", "ipv6", "", d)} gnutls zlib ssl" PACKAGECONFIG_class-native = "ipv6 ssl zlib" PACKAGECONFIG_class-nativesdk = "ipv6 ssl zlib" -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v5 1/2] uboot-config.bbclass: Allow multiple U-Boot config for machine
This adds support to build multiple U-Boot configs for a machine; this is useful when we have support for different media boots which require different U-Boot configuration (e.g: eMMC and NAND). Below there's an usage example: ,[ i.MX6Q SABRE AUTO based example ] | UBOOT_CONFIG ??= "sd eimnor nand spinor" | UBOOT_CONFIG[sd] = "mx6qsabreauto_config,sdcard" | UBOOT_CONFIG[eimnor] = "mx6qsabreauto_eimnor_config" | UBOOT_CONFIG[nand] = "mx6qsabreauto_nand_config,ubifs" | UBOOT_CONFIG[spinor] = "mx6qsabreauto_spinor_config" ` Signed-off-by: Chunrong Guo --- meta/classes/uboot-config.bbclass | 37 ++--- 1 file changed, 14 insertions(+), 23 deletions(-) diff --git a/meta/classes/uboot-config.bbclass b/meta/classes/uboot-config.bbclass index b467659..cb061af 100644 --- a/meta/classes/uboot-config.bbclass +++ b/meta/classes/uboot-config.bbclass @@ -31,28 +31,19 @@ python () { return ubootconfig = (d.getVar('UBOOT_CONFIG', True) or "").split() -if len(ubootconfig) > 1: -raise bb.parse.SkipPackage('You can only have a single default for UBOOT_CONFIG.') +if len(ubootconfig) > 0: +for config in ubootconfig: +for f, v in ubootconfigflags.items(): +if config == f: +items = v.split(',') +if items[0] and len(items) > 2: +raise bb.parse.SkipPackage('Only config,images can be specified!') +d.appendVar('UBOOT_MACHINE', ' ' + items[0]) +# IMAGE_FSTYPES appending +if len(items) > 1 and items[1]: +bb.debug(1, "Appending '%s' to IMAGE_FSTYPES." % items[1]) +d.appendVar('IMAGE_FSTYPES', ' ' + items[1]) +break elif len(ubootconfig) == 0: -raise bb.parse.SkipPackage('You must set a default in UBOOT_CONFIG.') -ubootconfig = ubootconfig[0] - -for f, v in ubootconfigflags.items(): -items = v.split(',') -if items[0] and len(items) > 2: -raise bb.parse.SkipPackage('Only config,images can be specified!') - -if ubootconfig == f: -bb.debug(1, "Setting UBOOT_MACHINE to %s." % items[0]) -d.setVar('UBOOT_MACHINE', items[0]) - -# IMAGE_FSTYPES appending -if len(items) > 1 and items[1]: -bb.debug(1, "Appending '%s' to IMAGE_FSTYPES." % items[1]) -d.appendVar('IMAGE_FSTYPES', ' ' + items[1]) - -# Go out as we found a match! -break -else: -raise bb.parse.SkipPackage("UBOOT_CONFIG %s is not supported" % ubootconfig) + raise bb.parse.SkipPackage('You must set a default in UBOOT_CONFIG.') } -- 1.9.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] elfutils_0.148.bb: CVE-2014-9447 fix
Reference: http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-9447 Signed-off-by: Li Xin --- .../elf_begin.c-CVE-2014-9447-fix.patch| 36 ++ meta/recipes-devtools/elfutils/elfutils_0.148.bb | 23 +++--- 2 files changed, 48 insertions(+), 11 deletions(-) create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.148/elf_begin.c-CVE-2014-9447-fix.patch diff --git a/meta/recipes-devtools/elfutils/elfutils-0.148/elf_begin.c-CVE-2014-9447-fix.patch b/meta/recipes-devtools/elfutils/elfutils-0.148/elf_begin.c-CVE-2014-9447-fix.patch new file mode 100644 index 000..84e8ddc --- /dev/null +++ b/meta/recipes-devtools/elfutils/elfutils-0.148/elf_begin.c-CVE-2014-9447-fix.patch @@ -0,0 +1,36 @@ +From 323ca04a0c9189544075c19b49da67f6443a8950 Mon Sep 17 00:00:00 2001 +From: Li xin +Date: Wed, 21 Jan 2015 09:33:38 +0900 +Subject: [PATCH] elf_begin.c: CVE-2014-9447 fix + +this patch is from: + https://git.fedorahosted.org/cgit/elfutils.git/commit/?id=147018e729e7c22eeabf15b82d26e4bf68a0d18e + +Upstream-Status: Backport + +Signed-off-by: Li Xin +--- + libelf/elf_begin.c | 7 ++- + 1 file changed, 2 insertions(+), 5 deletions(-) + +diff --git a/libelf/elf_begin.c b/libelf/elf_begin.c +index e46add3..e83ba35 100644 +--- a/libelf/elf_begin.c b/libelf/elf_begin.c +@@ -736,11 +736,8 @@ read_long_names (Elf *elf) + break; + + /* NUL-terminate the string. */ +-*runp = '\0'; +- +-/* Skip the NUL byte and the \012. */ +-runp += 2; +- ++*runp++ = '\0'; ++ + /* A sanity check. Somebody might have generated invalid +archive. */ + if (runp >= newp + len) +-- +1.8.4.2 + diff --git a/meta/recipes-devtools/elfutils/elfutils_0.148.bb b/meta/recipes-devtools/elfutils/elfutils_0.148.bb index ab95639..5e75f12 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.148.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.148.bb @@ -8,7 +8,7 @@ DEPENDS = "libtool bzip2 zlib virtual/libintl" PR = "r11" -SRC_URI = "https://fedorahosted.org/releases/e/l/elfutils/elfutils-${PV}.tar.bz2"; +SRC_URI = "https://fedorahosted.org/releases/e/l/${PN}/${BP}.tar.bz2"; SRC_URI[md5sum] = "a0bed1130135f17ad27533b0034dba8d" SRC_URI[sha256sum] = "8aebfa4a745db21cf5429c9541fe482729b62efc7e53e9110151b4169fe887da" @@ -25,14 +25,15 @@ SRC_URI += "\ file://m68k_backend.diff \ file://testsuite-ignore-elflint.diff \ file://elf_additions.diff \ - file://elfutils-fsize.patch \ - file://remove-unused.patch \ - file://mempcpy.patch \ - file://fix_for_gcc-4.7.patch \ - file://dso-link-change.patch \ - file://nm-Fix-size-passed-to-snprintf-for-invalid-sh_name-case.patch \ - file://elfutils-ar-c-fix-num-passed-to-memset.patch \ - file://Fix_elf_cvt_gunhash.patch \ +file://elfutils-fsize.patch \ +file://remove-unused.patch \ +file://mempcpy.patch \ +file://fix_for_gcc-4.7.patch \ +file://dso-link-change.patch \ +file://nm-Fix-size-passed-to-snprintf-for-invalid-sh_name-case.patch \ +file://elfutils-ar-c-fix-num-passed-to-memset.patch \ +file://Fix_elf_cvt_gunhash.patch \ +file://elf_begin.c-CVE-2014-9447-fix.patch \ " # Only apply when building uclibc based target recipe SRC_URI_append_libc-uclibc = " file://uclibc-support.patch" @@ -52,9 +53,9 @@ EXTRA_OECONF_append_class-native = " --without-bzlib" EXTRA_OECONF_append_libc-uclibc = " --enable-uclibc" do_configure_prepend() { - sed -i '/^i386_dis.h:/,+4 {/.*/d}' ${S}/libcpu/Makefile.am +sed -i '/^i386_dis.h:/,+4 {/.*/d}' ${S}/libcpu/Makefile.am - cp ${WORKDIR}/*dis.h ${S}/libcpu +cp ${WORKDIR}/*dis.h ${S}/libcpu } # we can not build complete elfutils when using uclibc -- 1.8.4.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v5 2/2] u-boot.inc : add compile multiple u-boot feature
Signed-off-by: Chunrong Guo --- meta/recipes-bsp/u-boot/u-boot.inc | 150 +++-- 1 file changed, 129 insertions(+), 21 deletions(-) diff --git a/meta/recipes-bsp/u-boot/u-boot.inc b/meta/recipes-bsp/u-boot/u-boot.inc index c695b73..58725fa 100644 --- a/meta/recipes-bsp/u-boot/u-boot.inc +++ b/meta/recipes-bsp/u-boot/u-boot.inc @@ -62,15 +62,56 @@ do_compile () { echo ${UBOOT_LOCALVERSION} > ${B}/.scmversion echo ${UBOOT_LOCALVERSION} > ${S}/.scmversion fi + +if [ "x${UBOOT_CONFIG}" != "x" ] +then +for config in ${UBOOT_MACHINE}; do +for type in in ${UBOOT_CONFIG}; do +if [ "${type}"x = "in"x ] +then +continue +fi +if [ -d "${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX}"] +then +break +else +oe_runmake O=${config} ${config} +oe_runmake O=${config} ${UBOOT_MAKE_TARGET} +cp ${S}/${config}/${UBOOT_BINARY} ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} +fi +done +done +else +oe_runmake ${UBOOT_MACHINE} +oe_runmake ${UBOOT_MAKE_TARGET} +fi - oe_runmake ${UBOOT_MACHINE} - oe_runmake ${UBOOT_MAKE_TARGET} } do_install () { -install -d ${D}/boot -install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} -ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} +if [ "x${UBOOT_CONFIG}" != "x" ] +then +for config in ${UBOOT_MACHINE}; do +for type in in ${UBOOT_CONFIG}; do +if [ "${type}"x = "in"x ] +then +continue +fi +if [ -d "${D}/boot/u-boot-${type}.${UBOOT_SUFFIX}"] +then +break +else +install -d ${D}/boot +install ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ${D}/boot/u-boot-${type}.${UBOOT_SUFFIX} +ln -sf u-boot-${type}.${UBOOT_SUFFIX} ${D}/boot/${UBOOT_BINARY} +fi +done +done +else +install -d ${D}/boot +install ${S}/${UBOOT_BINARY} ${D}/boot/${UBOOT_IMAGE} +ln -sf ${UBOOT_IMAGE} ${D}/boot/${UBOOT_BINARY} +fi if [ -e ${WORKDIR}/fw_env.config ] ; then install -d ${D}${sysconfdir} @@ -79,8 +120,28 @@ do_install () { if [ "x${SPL_BINARY}" != "x" ] then -install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} -ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARY} +if [ "x${UBOOT_CONFIG}" != "x" ] +then +for config in ${UBOOT_MACHINE}; do +for type in in ${UBOOT_CONFIG}; do + if [ "${type}"x = "in"x ] + then + continue + fi + if [ -d "${D}/boot/${SPL_IMAGE}-${type}"] + then + break + else + install ${S}/${config}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE}-${type} + ln -sf ${SPL_IMAGE}-${type} ${D}/boot/${SPL_BINARY}-${type} + ln -sf ${SPL_IMAGE}-${type} ${D}/boot/${SPL_BINARY} + fi +done +done +else +install ${S}/${SPL_BINARY} ${D}/boot/${SPL_IMAGE} +ln -sf ${SPL_IMAGE} ${D}/boot/${SPL_BINARY} +fi fi if [ "x${UBOOT_ENV}" != "x" ] @@ -93,21 +154,68 @@ do_install () { FILES_${PN} = "/boot ${sysconfdir}" do_deploy () { -install -d ${DEPLOYDIR} -install ${S}/${UBOOT_BINARY} ${DEPLOYDIR}/${UBOOT_IMAGE} - -cd ${DEPLOYDIR} -rm -f ${UBOOT_BINARY} ${UBOOT_SYMLINK} -ln -sf ${UBOOT_IMAGE} ${UBOOT_SYMLINK} -ln -sf ${UBOOT_IMAGE} ${UBOOT_BINARY} - -if [ "x${SPL_BINARY}" != "x" ] +if [ "x${UBOOT_CONFIG}" != "x" ] then -install ${S}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_IMAGE} -rm -f ${DEPLOYDIR}/${SPL_BINARY} ${DEPLOYDIR}/${SPL_SYMLINK} -ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_BINARY} -ln -sf ${SPL_IMAGE} ${DEPLOYDIR}/${SPL_SYMLINK} -fi +for config in ${UBOOT_MACHINE}; do +for type in in ${UBOOT_CONFIG}; do +if [ "${type}"x = "in"x ] +then +continue +fi +if [ -d "${DEPLOYDIR}/u-boot-${type}.${UBOOT_SUFFIX}"] +then +break +else +install -d ${DEPLOYDIR} +install ${S}/${config}/u-boot-${type}.${UBOOT_SUFFIX} ${DEPLOYDIR}/u-boot-${type}.${UBOOT_SUFFIX} +cd ${DEPLOYDIR} +ln -sf u-boot-${type}.${UBOOT_SUFFIX} ${UBOOT_SYMLINK} +ln -sf u-boot-${ty
[OE-core] [PATCH v2] lighttpd: Use PACKAGECONFIG to enable openssl
Enabled openssl defalutly to use https, just like ubuntu do. Signed-off-by: Qian Lei --- meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb b/meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb index 20d5c1c..0cf5aa2 100644 --- a/meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb +++ b/meta/recipes-extended/lighttpd/lighttpd_1.4.35.bb @@ -29,6 +29,9 @@ SRC_URI = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${PV}.t SRC_URI[md5sum] = "f7a88130ee9984b421ad8aa80629750a" SRC_URI[sha256sum] = "4a71c1f6d8af41ed894b507720c4c17184dc320590013881d5170ca7f15c5bf7" +PACKAGECONFIG ??= "openssl" +PACKAGECONFIG[openssl] = "--with-openssl, --without-openssl, openssl" + EXTRA_OECONF = " \ --without-bzip2 \ --without-ldap \ @@ -37,7 +40,6 @@ EXTRA_OECONF = " \ --with-pcre \ --without-webdav-props \ --without-webdav-locks \ - --without-openssl \ --disable-static \ " -- 1.8.3.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] nss: update package to 3.17.3 and build fix
From: Armin Kuster Update includes: CVE-2014-1569 http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-1569 for changelog information see https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS/NSS_3.17.3_release_notes We had a build failure on 32 bit hosts so including a patch from: http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=mhatle/dora-misc Wenzong Fan (1): nss: workaround multilib build on 32bit host Signed-off-by: Armin Kuster --- meta/recipes-support/nss/nss.inc | 1 + .../nss/nss/nss-fix-nsinstall-build.patch | 35 ++ meta/recipes-support/nss/nss_3.17.2.bb | 8 - meta/recipes-support/nss/nss_3.17.3.bb | 7 + 4 files changed, 43 insertions(+), 8 deletions(-) create mode 100644 meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch delete mode 100644 meta/recipes-support/nss/nss_3.17.2.bb create mode 100644 meta/recipes-support/nss/nss_3.17.3.bb diff --git a/meta/recipes-support/nss/nss.inc b/meta/recipes-support/nss/nss.inc index e5e3096..6330f4e 100644 --- a/meta/recipes-support/nss/nss.inc +++ b/meta/recipes-support/nss/nss.inc @@ -16,6 +16,7 @@ SRC_URI = "\ file://nss-fix-support-cross-compiling.patch \ file://nss-no-rpath-for-cross-compiling.patch \ file://nss-fix-incorrect-shebang-of-perl.patch \ +file://nss-fix-nsinstall-build.patch \ " SRC_URI_append = "\ file://nss.pc.in \ diff --git a/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch b/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch new file mode 100644 index 000..866de07 --- /dev/null +++ b/meta/recipes-support/nss/nss/nss-fix-nsinstall-build.patch @@ -0,0 +1,35 @@ +Fix nss multilib build on openSUSE 11.x 32bit + +While building lib64-nss on openSUSE 11.x 32bit, the nsinstall will +fail with error: + +* nsinstall.c:1:0: sorry, unimplemented: 64-bit mode not compiled + +It caused by the '-m64' option which passed to host gcc. + +The nsinstall was built first while nss starting to build, it only runs +on host to install built files, it doesn't need any cross-compling or +multilib build options. Just clean the ARCHFLAG and LDFLAGS to fix this +error. + +Upstream-Status: Pending + +Signed-off-by: Wenzong Fan +=== +diff --git a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile +index 1850bcb..5aee84f 100644 +--- a/nss/coreconf/nsinstall/Makefile b/nss/coreconf/nsinstall/Makefile +@@ -18,6 +18,12 @@ INTERNAL_TOOLS = 1 + + include $(DEPTH)/coreconf/config.mk + ++# nsinstall is unfit for cross-compiling/multilib-build since it was ++# always run on local host to install built files. This change intends ++# to clean the '-m64' from ARCHFLAG and LDFLAGS. ++ARCHFLAG = ++LDFLAGS = ++ + ifeq (,$(filter-out OS2 WIN%,$(OS_TARGET))) + PROGRAM = + else diff --git a/meta/recipes-support/nss/nss_3.17.2.bb b/meta/recipes-support/nss/nss_3.17.2.bb deleted file mode 100644 index 039406f..000 --- a/meta/recipes-support/nss/nss_3.17.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require nss.inc - -SRC_URI += "\ - http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_2_RTM/src/${BPN}-${PV}.tar.gz \ -" - -SRC_URI[md5sum] = "d3edb6f6c3688b2fde67ec9c9a8c1214" -SRC_URI[sha256sum] = "134929e44e44b968a4883f4ee513a71ae45d55b486cee41ee8e26c3cc84dab8b" diff --git a/meta/recipes-support/nss/nss_3.17.3.bb b/meta/recipes-support/nss/nss_3.17.3.bb new file mode 100644 index 000..e7d0780 --- /dev/null +++ b/meta/recipes-support/nss/nss_3.17.3.bb @@ -0,0 +1,7 @@ +require nss.inc + +SRC_URI += "\ + http://ftp.mozilla.org/pub/mozilla.org/security/nss/releases/NSS_3_17_3_RTM/src/${BP}.tar.gz \ +" +SRC_URI[md5sum] = "fba7489e1b26f2a0bfe5527430fd61e1" +SRC_URI[sha256sum] = "f4d5e9035a2f84f25f35c283de3b0ff60d72e918748de25eaf017ed201fa21d5" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core