Re: [OE-core] [PATCH] gcc-shared-source: Add PV to PN
On Tue, Apr 28, 2015 at 3:49 AM, Richard Purdie richard.pur...@linuxfoundation.org wrote: This means you can have one gcc version for some gcc recipes (e.g. crosssdk/nativesdk) and another gcc version for target code which is useful for more obscure architecture toolchains. looks good. I had similar issue with angstrom recently with linaro gcc. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org diff --git a/meta/recipes-devtools/gcc/gcc-shared-source.inc b/meta/recipes-devtools/gcc/gcc-shared-source.inc index cb5d907..9acffb1 100644 --- a/meta/recipes-devtools/gcc/gcc-shared-source.inc +++ b/meta/recipes-devtools/gcc/gcc-shared-source.inc @@ -5,5 +5,5 @@ do_fetch[noexec] = 1 deltask do_unpack deltask do_patch -do_configure[depends] += gcc-source:do_preconfigure -do_populate_lic[depends] += gcc-source:do_unpack +do_configure[depends] += gcc-source-${PV}:do_preconfigure +do_populate_lic[depends] += gcc-source-${PV}:do_unpack diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc index 10e9285..a4b27c8 100644 --- a/meta/recipes-devtools/gcc/gcc-source.inc +++ b/meta/recipes-devtools/gcc/gcc-source.inc @@ -11,6 +11,7 @@ deltask do_package_qa deltask do_packagedata deltask do_rm_work +PN = gcc-source-${PV} WORKDIR = ${TMPDIR}/work-shared/gcc-${PV}-${PR} SSTATE_SWSPEC = sstate:gcc::${PV}:${PR}::${SSTATE_VERSION}: -- ___ 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] xserver-xorg: use GCC 5 patch from upstream
On Tue, Apr 28, 2015 at 3:58 AM, Ross Burton ross.bur...@intel.com wrote: Upstream has already fixed the GCC 5 problem, so use the patch from upstream. looks good. You need to remove the CPPFLAGS change from recipe now with this patch Signed-off-by: Ross Burton ross.bur...@intel.com --- ...sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch | 76 +++--- 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch index 215c044..9c9f595 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch @@ -1,50 +1,48 @@ -Upstream-Status: Pending +Upstream-Status: Backport +Signed-off-by: Ross Burton ross.bur...@intel.com -From 612eb45a2e7a0b35cc3790870e6d0cc42eb50c74 Mon Sep 17 00:00:00 2001 -From: Hans de Goede hdego...@redhat.com -Date: Wed, 11 Feb 2015 16:26:40 +0100 -Subject: [PATCH] sdksyms.sh: Make sdksyms.sh work with gcc5. +From 21b896939c5bb242f3aacc37baf12379e43254b6 Mon Sep 17 00:00:00 2001 +From: Egbert Eich e...@freedesktop.org +Date: Tue, 3 Mar 2015 16:27:05 +0100 +Subject: symbols: Fix sdksyms.sh to cope with gcc5 -gcc5's cpp inserts patterns like this: +Gcc5 adds additional lines stating line numbers before and +after __attribute__() which need to be skipped. -extern - __attribute__((visibility(default))) -int WaitForSomething(int * -); +Signed-off-by: Egbert Eich e...@freedesktop.org +Tested-by: Daniel Stone dani...@collabora.com +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net -This patch make sdksyms.sh work with this. Note my awk skills are weak, so -there likely is a better way to deal with this. - -Signed-off-by: Hans de Goede hdego...@redhat.com - hw/xfree86/sdksyms.sh | 17 + - 1 file changed, 17 insertions(+) - -Index: xorg-server-1.16.3/hw/xfree86/sdksyms.sh -=== xorg-server-1.16.3.orig/hw/xfree86/sdksyms.sh -+++ xorg-server-1.16.3/hw/xfree86/sdksyms.sh -@@ -353,6 +353,23 @@ BEGIN { +diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh +index 2305073..05ac410 100755 +--- a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh +@@ -350,13 +350,25 @@ BEGIN { if (sdk) { n = 3; -+ # detect the following gcc5 cpp pattern and skip it: -+ # extern -+ # # 320 ../../include/os.h 3 4 -+ # __attribute__((visibility(default))) -+ # # 320 ../../include/os.h -+ # Note in this case the extern or extern void always has -+ # a trailing space -+ if ($0 ~ ^extern.* $) { -+ getline; -+ getline; -+ getline; -+ getline; -+ n = 1; -+ while ($n == ) -+ n++; -+ } ++# skip line numbers GCC 5 adds before __attribute__ ++while ($n == || $0 ~ /^# [0-9]+ /) { ++ getline; ++ n = 1; ++} + # skip attribute, if any while ($n ~ /^(__attribute__|__global)/ || # skip modifiers, if any + $n ~ /^\*?(unsigned|const|volatile|struct|_X_EXPORT)$/ || + # skip pointer +- $n ~ /^[a-zA-Z0-9_]*\*$/) ++ $n ~ /^[a-zA-Z0-9_]*\*$/) { + n++; ++# skip line numbers GCC 5 adds after __attribute__ ++while ($n == || $0 ~ /^# [0-9]+ /) { ++ getline; ++ n = 1; ++} ++} + + # type specifier may not be set, as in + # extern _X_EXPORT unsigned name(...) +-- +cgit v0.10.2 -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] sstate: Use SSTATE_DIR for FILESPATH
FILESPATH was only being overridden in one fetch location, it should be equally handled in both. Also use SSTATE_DIR as FILESPATH so that mirror urls which do remapping can search the local SSTATE_DIR for other paths. Also ensure that MIRRORS is removed in both locations, previously it was only unset in one but both codepaths should be consistent. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 8350bb0..450b736 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -569,7 +569,7 @@ def pstaging_fetch(sstatefetch, sstatepkg, d): bb.utils.mkdirhier(dldir) localdata.delVar('MIRRORS') -localdata.delVar('FILESPATH') +localdata.setVar('FILESPATH', dldir) localdata.setVar('DL_DIR', dldir) localdata.setVar('PREMIRRORS', mirrors) @@ -700,6 +700,8 @@ def sstate_checkhashes(sq_fn, sq_task, sq_hash, sq_hashfn, d): bb.data.update_data(localdata) dldir = localdata.expand(${SSTATE_DIR}) +localdata.delVar('MIRRORS') +localdata.setVar('FILESPATH', dldir) localdata.setVar('DL_DIR', dldir) localdata.setVar('PREMIRRORS', mirrors) -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] testimage: Improve sdk handling of TEST_SUITES
Currently TEST_SUITES is used for both target image and sdk versions which can be confusing. This introduces TEST_SUITES_SDK for the sdk version of the code so that the different test sets can be specified independently. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org diff --git a/meta/classes/testimage.bbclass b/meta/classes/testimage.bbclass index 1557675..4074ff7 100644 --- a/meta/classes/testimage.bbclass +++ b/meta/classes/testimage.bbclass @@ -68,6 +68,8 @@ do_testsdk[lockfiles] += ${TESTIMAGELOCK} def get_tests_list(d, type=runtime): testsuites = d.getVar(TEST_SUITES, True).split() +if type == sdk: +testsuites = (d.getVar(TEST_SUITES_SDK, True) or auto).split() bbpath = d.getVar(BBPATH, True).split(':') # This relies on lib/ under each directory in BBPATH being added to sys.path @@ -261,7 +263,7 @@ def testsdk_main(d): # they won't be skipped even if they aren't suitable. # testslist is what we'll actually pass to the unittest loader testslist = get_tests_list(d, sdk) -testsrequired = [t for t in d.getVar(TEST_SUITES, True).split() if t != auto] +testsrequired = [t for t in (d.getVar(TEST_SUITES_SDK, True) or auto).split() if t != auto] sdktestdir = d.expand(${WORKDIR}/testimage-sdk/) bb.utils.remove(sdktestdir, True) -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] oeqa/targetbuild: Use DL_DIR for downloads if present
This isn't a test of wget so if the files we need are present in DL_DIR, use them from there and save a bit of speed/bandwidth and skip the wget. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org diff --git a/meta/lib/oeqa/utils/targetbuild.py b/meta/lib/oeqa/utils/targetbuild.py index eeb08ba..d499bb1 100644 --- a/meta/lib/oeqa/utils/targetbuild.py +++ b/meta/lib/oeqa/utils/targetbuild.py @@ -26,6 +26,11 @@ class BuildProject(): # Download self.archive to self.localarchive def _download_archive(self): +dl_dir = self.d.getVar(DL_DIR, True) +if dl_dir and os.path.exists(os.path.join(dl_dir, self.archive)): +bb.utils.copyfile(os.path.join(dl_dir, self.archive), self.localarchive) +return + exportvars = ['HTTP_PROXY', 'http_proxy', 'HTTPS_PROXY', 'https_proxy', 'FTP_PROXY', 'ftp_proxy', -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gcc-shared-source: Add PV to PN
This means you can have one gcc version for some gcc recipes (e.g. crosssdk/nativesdk) and another gcc version for target code which is useful for more obscure architecture toolchains. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org diff --git a/meta/recipes-devtools/gcc/gcc-shared-source.inc b/meta/recipes-devtools/gcc/gcc-shared-source.inc index cb5d907..9acffb1 100644 --- a/meta/recipes-devtools/gcc/gcc-shared-source.inc +++ b/meta/recipes-devtools/gcc/gcc-shared-source.inc @@ -5,5 +5,5 @@ do_fetch[noexec] = 1 deltask do_unpack deltask do_patch -do_configure[depends] += gcc-source:do_preconfigure -do_populate_lic[depends] += gcc-source:do_unpack +do_configure[depends] += gcc-source-${PV}:do_preconfigure +do_populate_lic[depends] += gcc-source-${PV}:do_unpack diff --git a/meta/recipes-devtools/gcc/gcc-source.inc b/meta/recipes-devtools/gcc/gcc-source.inc index 10e9285..a4b27c8 100644 --- a/meta/recipes-devtools/gcc/gcc-source.inc +++ b/meta/recipes-devtools/gcc/gcc-source.inc @@ -11,6 +11,7 @@ deltask do_package_qa deltask do_packagedata deltask do_rm_work +PN = gcc-source-${PV} WORKDIR = ${TMPDIR}/work-shared/gcc-${PV}-${PR} SSTATE_SWSPEC = sstate:gcc::${PV}:${PR}::${SSTATE_VERSION}: -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gpgme: Fix to use pkg-config in .m4 files
pkg-config is less error prone than -config files so switch to using it (we already do for most of the rest of the gpg stack). Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org diff --git a/meta/recipes-support/gpgme/gpgme-1.4.3/pkgconfig.patch b/meta/recipes-support/gpgme/gpgme-1.4.3/pkgconfig.patch new file mode 100644 index 000..b29cd70 --- /dev/null +++ b/meta/recipes-support/gpgme/gpgme-1.4.3/pkgconfig.patch @@ -0,0 +1,278 @@ +Update gpgme to use pkgconfig instead of -config files since its +simpler and less error prone when cross compiling. + +Upstream-Status: Rejected [Upstream not interested in pkg-config support] +RP 2015/4/17 + +Index: gpgme-1.4.3/configure.ac +=== +--- gpgme-1.4.3.orig/configure.ac gpgme-1.4.3/configure.ac +@@ -1058,6 +1058,7 @@ AC_CONFIG_FILES(Makefile src/Makefile + src/versioninfo.rc + src/gpgme.h) + AC_CONFIG_FILES(src/gpgme-config, chmod +x src/gpgme-config) ++AC_CONFIG_FILES(src/gpgme.pc src/gpgme-pthread.pc) + AC_CONFIG_FILES([lang/Makefile lang/cl/Makefile lang/cl/gpgme.asd]) + AC_OUTPUT + +Index: gpgme-1.4.3/src/Makefile.am +=== +--- gpgme-1.4.3.orig/src/Makefile.am gpgme-1.4.3/src/Makefile.am +@@ -20,11 +20,13 @@ + + # Note: moc_kdpipeiodevice should actually be a dependcy below. + EXTRA_DIST = gpgme-config.in gpgme.m4 libgpgme.vers ChangeLog-2011 \ +- gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp ++ gpgme.h.in versioninfo.rc.in gpgme.def moc_kdpipeiodevice.cpp gpgme.pc.in gpgme-pthread.pc.in + + bin_SCRIPTS = gpgme-config + m4datadir = $(datadir)/aclocal + m4data_DATA = gpgme.m4 ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = gpgme.pc gpgme-pthread.pc + nodist_include_HEADERS = gpgme.h + + if HAVE_PTHREAD +Index: gpgme-1.4.3/src/gpgme.pc.in +=== +--- /dev/null gpgme-1.4.3/src/gpgme.pc.in +@@ -0,0 +1,15 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++# API info ++api_version=@GPGME_CONFIG_API_VERSION@ ++host=@GPGME_CONFIG_HOST@ ++ ++Name: gpgme ++Description: GnuPG Made Easy (GPGME) is a C language library that allows to addsupport for cryptography to a program. ++Version: @VERSION@ ++Libs: -L${libdir} -lgpgme ++Cflags: -I${includedir} ++Requires: libassuan gpg-error +\ No newline at end of file +Index: gpgme-1.4.3/src/gpgme-pthread.pc.in +=== +--- /dev/null gpgme-1.4.3/src/gpgme-pthread.pc.in +@@ -0,0 +1,15 @@ ++prefix=@prefix@ ++exec_prefix=@exec_prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++# API info ++api_version=@GPGME_CONFIG_API_VERSION@ ++host=@GPGME_CONFIG_HOST@ ++ ++Name: gpgme ++Description: GnuPG Made Easy (GPGME) is a C language library that allows to addsupport for cryptography to a program (threaded version) ++Version: @VERSION@ ++Libs: -L${libdir} -lgpgme-pthread -lpthread ++Cflags: -I${includedir} ++Requires: libassuan gpg-error +Index: gpgme-1.4.3/src/gpgme.m4 +=== +--- gpgme-1.4.3.orig/src/gpgme.m4 gpgme-1.4.3/src/gpgme.m4 +@@ -36,7 +36,7 @@ dnl [ACTION-IF-FOUND [, AC + dnl Test for libgpgme and define GPGME_CFLAGS and GPGME_LIBS. + dnl + AC_DEFUN([AM_PATH_GPGME], +-[ AC_REQUIRE([_AM_PATH_GPGME_CONFIG])dnl ++[ + tmp=ifelse([$1], ,1:0.4.2,$1) + if echo $tmp | grep ':' /dev/null 2/dev/null ; then + req_gpgme_api=`echo $tmp | sed 's/\(.*\):\(.*\)/\1/'` +@@ -45,37 +45,12 @@ AC_DEFUN([AM_PATH_GPGME], + req_gpgme_api=0 + min_gpgme_version=$tmp + fi +- +- AC_MSG_CHECKING(for GPGME - version = $min_gpgme_version) +- ok=no +- if test $GPGME_CONFIG != no ; then +-req_major=`echo $min_gpgme_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\1/'` +-req_minor=`echo $min_gpgme_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\2/'` +-req_micro=`echo $min_gpgme_version | \ +- sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\)/\3/'` +-if test $gpgme_version_major -gt $req_major; then +-ok=yes +-else +-if test $gpgme_version_major -eq $req_major; then +-if test $gpgme_version_minor -gt $req_minor; then +- ok=yes +-else +- if test $gpgme_version_minor -eq $req_minor; then +- if test $gpgme_version_micro -ge $req_micro; then +- ok=yes +- fi +- fi +-fi +-fi +-fi +- fi ++ PKG_CHECK_MODULES(GPGME, [gpgme = $min_gpgme_version], [ok=yes], [ok=no]) + if test $ok = yes; then + # If we have a recent GPGME, we should also check that the + # API is compatible. + if test
[OE-core] [PATCH] autotools: Fix find races on source directory
In a similar way to http://git.yoctoproject.org/cgit.cgi/poky/commit/?id=aa1438b56f30515f9c31b306decef7f562dda81f there are more find races in the autotools class. For recipes with PACKAGES_remove = ${PN}, the find which removes .la files can race against deletion of other directories in WORKDIR e.g.: find: '/home/autobuilder/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/build/tmp/work/qemux86_64-poky-linux/init-ifupdown/1.0-r7/sstate-build-populate_lic': No such file or directory | WARNING: /home/autobuilder/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/build/tmp/work/qemux86_64-poky-linux/init-ifupdown/1.0-r7/temp/run.do_configure.6558:1 exit 1 from | find /home/autobuilder/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/build/tmp/work/qemux86_64-poky-linux/init-ifupdown/1.0-r7 -name \*.la -delete Fix the remaining races in the same way. [YOCTO #7522] Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org diff --git a/meta/classes/autotools.bbclass b/meta/classes/autotools.bbclass index 19c1091..24bc530 100644 --- a/meta/classes/autotools.bbclass +++ b/meta/classes/autotools.bbclass @@ -116,7 +116,7 @@ autotools_preconfigure() { echo Running \${MAKE} clean\ in ${S} ${MAKE} clean fi - find ${S} -name \*.la -delete + find ${S} -ignore_readdir_race -name \*.la -delete fi fi fi @@ -227,7 +227,7 @@ autotools_do_configure() { # for a package whose autotools are old, on an x86_64 machine, which the old # config.sub does not support. Work around this by installing them manually # regardless. - ( for ac in `find ${S} -name configure.in -o -name configure.ac`; do + ( for ac in `find ${S} -ignore_readdir_race -name configure.in -o -name configure.ac`; do rm -f `dirname $ac`/configure done ) if [ -e ${S}/configure.in -o -e ${S}/configure.ac ]; then @@ -236,7 +236,7 @@ autotools_do_configure() { ACLOCAL=aclocal --system-acdir=${ACLOCALDIR}/ if [ x${acpaths} = xdefault ]; then acpaths= - for i in `find ${S} -maxdepth 2 -name \*.m4|grep -v 'aclocal.m4'| \ + for i in `find ${S} -ignore_readdir_race -maxdepth 2 -name \*.m4|grep -v 'aclocal.m4'| \ grep -v 'acinclude.m4' | grep -v 'aclocal-copy' | sed -e 's,\(.*/\).*$,\1,'|sort -u`; do acpaths=$acpaths -I $i done @@ -277,7 +277,7 @@ autotools_do_configure() { fi fi for i in gettext.m4 iconv.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4; do - for j in `find ${S} -name $i | grep -v aclocal-copy`; do + for j in `find ${S} -ignore_readdir_race -name $i | grep -v aclocal-copy`; do rm $j done done -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lib/oeqa: Add sdk tests for gcc/perl/python
Enhance testing of the generated SDK tarballs by adding tests for gcc/perl/python based on the existing runtime tests. diff --git a/meta/lib/oeqa/oetest.py b/meta/lib/oeqa/oetest.py index da9556a..22d76b3 100644 --- a/meta/lib/oeqa/oetest.py +++ b/meta/lib/oeqa/oetest.py @@ -129,6 +129,16 @@ class oeSDKTest(oeTest): self.sdktestdir = oeSDKTest.tc.sdktestdir super(oeSDKTest, self).__init__(methodName) +@classmethod +def hasHostPackage(self, pkg): + +if re.search(pkg, oeTest.tc.hostpkgmanifest): +return True +return False + +def _run(self, cmd): +return subprocess.check_output(cmd, shell=True) + def getmodule(pos=2): # stack returns a list of tuples containg frame information # First element of the list the is current frame, caller is 1 diff --git a/meta/lib/oeqa/sdk/gcc.py b/meta/lib/oeqa/sdk/gcc.py new file mode 100644 index 000..67994b9 --- /dev/null +++ b/meta/lib/oeqa/sdk/gcc.py @@ -0,0 +1,36 @@ +import unittest +import os +import shutil +from oeqa.oetest import oeSDKTest, skipModule +from oeqa.utils.decorators import * + +def setUpModule(): +machine = oeSDKTest.tc.d.getVar(MACHINE, True) +if not oeSDKTest.hasHostPackage(packagegroup-cross-canadian- + machine): +skipModule(SDK doesn't contain a cross-canadian toolchain) + + +class GccCompileTest(oeSDKTest): + +@classmethod +def setUpClass(self): +for f in ['test.c', 'test.cpp', 'testmakefile']: +shutil.copyfile(os.path.join(self.tc.filesdir, f), self.tc.sdktestdir + f) + +def test_gcc_compile(self): +self._run('$CC %s/test.c -o %s/test -lm' % (self.tc.sdktestdir, self.tc.sdktestdir)) + +def test_gpp_compile(self): +self._run('$CXX %s/test.c -o %s/test -lm' % (self.tc.sdktestdir, self.tc.sdktestdir)) + +def test_gpp2_compile(self): +self._run('$CXX %s/test.cpp -o %s/test -lm' % (self.tc.sdktestdir, self.tc.sdktestdir)) + +def test_make(self): +self._run('cd %s; make -f testmakefile' % self.tc.sdktestdir) + +@classmethod +def tearDownClass(self): +files = [self.tc.sdktestdir + f for f in ['test.c', 'test.cpp', 'test.o', 'test', 'testmakefile']] +for f in files: +bb.utils.remove(f) diff --git a/meta/lib/oeqa/sdk/perl.py b/meta/lib/oeqa/sdk/perl.py new file mode 100644 index 000..45f422e --- /dev/null +++ b/meta/lib/oeqa/sdk/perl.py @@ -0,0 +1,28 @@ +import unittest +import os +import shutil +from oeqa.oetest import oeSDKTest, skipModule +from oeqa.utils.decorators import * + +def setUpModule(): +if not oeSDKTest.hasHostPackage(nativesdk-perl): +skipModule(No perl package in the SDK) + + +class PerlTest(oeSDKTest): + +@classmethod +def setUpClass(self): +for f in ['test.pl']: +shutil.copyfile(os.path.join(self.tc.filesdir, f), self.tc.sdktestdir + f) +self.testfile = self.tc.sdktestdir + test.pl + +def test_perl_exists(self): +self._run('which perl') + +def test_perl_works(self): +self._run('perl %s/test.pl' % self.tc.sdktestdir) + +@classmethod +def tearDownClass(self): +bb.utils.remove(%s/test.pl % self.tc.sdktestdir) diff --git a/meta/lib/oeqa/sdk/python.py b/meta/lib/oeqa/sdk/python.py new file mode 100644 index 000..896fab4 --- /dev/null +++ b/meta/lib/oeqa/sdk/python.py @@ -0,0 +1,32 @@ +import unittest +import os +import shutil +from oeqa.oetest import oeSDKTest, skipModule +from oeqa.utils.decorators import * + +def setUpModule(): +if not oeSDKTest.hasHostPackage(nativesdk-python): +skipModule(No python package in the SDK) + + +class PythonTest(oeSDKTest): + +@classmethod +def setUpClass(self): +for f in ['test.py']: +shutil.copyfile(os.path.join(self.tc.filesdir, f), self.tc.sdktestdir + f) + +def test_python_exists(self): +self._run('which python') + +def test_python_stdout(self): +output = self._run('python %s/test.py' % self.tc.sdktestdir) +self.assertEqual(output.strip(), the value of a is 0.01, msg=Incorrect output: %s % output) + +def test_python_testfile(self): +self._run('ls /tmp/testfile.python') + +@classmethod +def tearDownClass(self): +bb.utils.remove(%s/test.py % self.tc.sdktestdir) +bb.utils.remove(/tmp/testfile.python) -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] xserver-xorg: use GCC 5 patch from upstream
Upstream has already fixed the GCC 5 problem, so use the patch from upstream. Signed-off-by: Ross Burton ross.bur...@intel.com --- ...sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch | 76 +++--- 1 file changed, 37 insertions(+), 39 deletions(-) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch index 215c044..9c9f595 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch @@ -1,50 +1,48 @@ -Upstream-Status: Pending +Upstream-Status: Backport +Signed-off-by: Ross Burton ross.bur...@intel.com -From 612eb45a2e7a0b35cc3790870e6d0cc42eb50c74 Mon Sep 17 00:00:00 2001 -From: Hans de Goede hdego...@redhat.com -Date: Wed, 11 Feb 2015 16:26:40 +0100 -Subject: [PATCH] sdksyms.sh: Make sdksyms.sh work with gcc5. +From 21b896939c5bb242f3aacc37baf12379e43254b6 Mon Sep 17 00:00:00 2001 +From: Egbert Eich e...@freedesktop.org +Date: Tue, 3 Mar 2015 16:27:05 +0100 +Subject: symbols: Fix sdksyms.sh to cope with gcc5 -gcc5's cpp inserts patterns like this: +Gcc5 adds additional lines stating line numbers before and +after __attribute__() which need to be skipped. -extern - __attribute__((visibility(default))) -int WaitForSomething(int * -); +Signed-off-by: Egbert Eich e...@freedesktop.org +Tested-by: Daniel Stone dani...@collabora.com +Signed-off-by: Peter Hutterer peter.hutte...@who-t.net -This patch make sdksyms.sh work with this. Note my awk skills are weak, so -there likely is a better way to deal with this. - -Signed-off-by: Hans de Goede hdego...@redhat.com - hw/xfree86/sdksyms.sh | 17 + - 1 file changed, 17 insertions(+) - -Index: xorg-server-1.16.3/hw/xfree86/sdksyms.sh -=== xorg-server-1.16.3.orig/hw/xfree86/sdksyms.sh -+++ xorg-server-1.16.3/hw/xfree86/sdksyms.sh -@@ -353,6 +353,23 @@ BEGIN { +diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh +index 2305073..05ac410 100755 +--- a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh +@@ -350,13 +350,25 @@ BEGIN { if (sdk) { n = 3; -+ # detect the following gcc5 cpp pattern and skip it: -+ # extern -+ # # 320 ../../include/os.h 3 4 -+ # __attribute__((visibility(default))) -+ # # 320 ../../include/os.h -+ # Note in this case the extern or extern void always has -+ # a trailing space -+ if ($0 ~ ^extern.* $) { -+ getline; -+ getline; -+ getline; -+ getline; -+ n = 1; -+ while ($n == ) -+ n++; -+ } ++# skip line numbers GCC 5 adds before __attribute__ ++while ($n == || $0 ~ /^# [0-9]+ /) { ++ getline; ++ n = 1; ++} + # skip attribute, if any while ($n ~ /^(__attribute__|__global)/ || # skip modifiers, if any + $n ~ /^\*?(unsigned|const|volatile|struct|_X_EXPORT)$/ || + # skip pointer +- $n ~ /^[a-zA-Z0-9_]*\*$/) ++ $n ~ /^[a-zA-Z0-9_]*\*$/) { + n++; ++# skip line numbers GCC 5 adds after __attribute__ ++while ($n == || $0 ~ /^# [0-9]+ /) { ++ getline; ++ n = 1; ++} ++} + + # type specifier may not be set, as in + # extern _X_EXPORT unsigned name(...) +-- +cgit v0.10.2 -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] systemd: bring back the patch to customise root's $HOME
This patch appears to have been accidently dropped in the move to 219-stable, probably because it didn't apply. Update the patch and re-add it. Signed-off-by: Ross Burton ross.bur...@intel.com --- .../systemd/systemd/0010-Make-root-s-home-directory-configurable.patch | 3 ++- meta/recipes-core/systemd/systemd_219.bb | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch b/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch index 41b9039..b65fe42 100644 --- a/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch +++ b/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch @@ -26,10 +26,11 @@ diff --git a/Makefile.am b/Makefile.am index 0fb3f9f..4623963 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -199,6 +199,7 @@ AM_CPPFLAGS = \ +@@ -199,7 +199,8 @@ AM_CPPFLAGS = \ -DKEXEC=\$(KEXEC)\ \ -DLIBDIR=\$(libdir)\ \ -DROOTLIBDIR=\$(rootlibdir)\ \ + -DROOTLIBEXECDIR=\$(rootlibexecdir)\ \ + -DROOTHOMEDIR=\$(roothomedir)\ \ -DTEST_DIR=\$(abs_top_srcdir)/test\ \ -I $(top_srcdir)/src \ diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb index d1303f7..c196017 100644 --- a/meta/recipes-core/systemd/systemd_219.bb +++ b/meta/recipes-core/systemd/systemd_219.bb @@ -38,6 +38,7 @@ SRC_URI = git://anongit.freedesktop.org/systemd/systemd-stable;branch=v219-stab file://0007-util-Use-mkostemp-only-if-libc-supports-it.patch \ file://0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch \ file://0009-sysv-generator-add-support-for-executing-scripts-und.patch \ + file://0010-Make-root-s-home-directory-configurable.patch \ file://0011-systemd-user-avoid-using-system-auth.patch \ file://0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch \ file://0014-Revert-rules-remove-firmware-loading-rules.patch \ -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] unzip: Security Advisory -CVE-2014-9636 and CVE-2015-1315
From: Roy Li rongqing...@windriver.com http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-9636 unzip 6.0 allows remote attackers to cause a denial of service (out-of-bounds read or write and crash) via an extra field with an uncompressed size smaller than the compressed field size in a zip archive that advertises STORED method compression. http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-1315 Buffer overflow in the charset_to_intern function in unix/unix.c in Info-Zip UnZip 6.10b allows remote attackers to execute arbitrary code via a crafted string, as demonstrated by converting a string from CP866 to UTF-8. Signed-off-by: Roy Li rongqing...@windriver.com --- .../06-unzip60-alt-iconv-utf8_CVE-2015-1315.patch | 402 + .../unzip/unzip/unzip-6.0_overflow3.diff | 45 +++ meta/recipes-extended/unzip/unzip_6.0.bb | 5 +- 3 files changed, 451 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-extended/unzip/unzip/06-unzip60-alt-iconv-utf8_CVE-2015-1315.patch create mode 100644 meta/recipes-extended/unzip/unzip/unzip-6.0_overflow3.diff diff --git a/meta/recipes-extended/unzip/unzip/06-unzip60-alt-iconv-utf8_CVE-2015-1315.patch b/meta/recipes-extended/unzip/unzip/06-unzip60-alt-iconv-utf8_CVE-2015-1315.patch new file mode 100644 index 000..9ba3c1d --- /dev/null +++ b/meta/recipes-extended/unzip/unzip/06-unzip60-alt-iconv-utf8_CVE-2015-1315.patch @@ -0,0 +1,402 @@ +From: Giovanni Scafora giovanni.archlinux.org +Subject: unzip files encoded with non-latin, non-unicode file names +Last-Update: 2015-02-11 + +Upstream-Status: Backport + +Updated 2015-02-11 by Marc Deslauriers marc.deslauri...@canonical.com +to fix buffer overflow in charset_to_intern() + +Signed-off-by: Marc Deslauriers marc.deslauri...@canonical.com + +Index: unzip-6.0/unix/unix.c +=== +--- unzip-6.0.orig/unix/unix.c 2015-02-11 08:46:43.675324290 -0500 unzip-6.0/unix/unix.c 2015-02-11 09:18:04.902081319 -0500 +@@ -30,6 +30,9 @@ + #define UNZIP_INTERNAL + #include unzip.h + ++#include iconv.h ++#include langinfo.h ++ + #ifdef SCO_XENIX + # define SYSNDIR + #else /* SCO Unix, AIX, DNIX, TI SysV, Coherent 4.x, ... */ +@@ -1874,3 +1877,102 @@ + } + } + #endif /* QLZIP */ ++ ++ ++typedef struct { ++char *local_charset; ++char *archive_charset; ++} CHARSET_MAP; ++ ++/* A mapping of local - archive charsets used by default to convert filenames ++ * of DOS/Windows Zip archives. Currently very basic. */ ++static CHARSET_MAP dos_charset_map[] = { ++{ ANSI_X3.4-1968, CP850 }, ++{ ISO-8859-1, CP850 }, ++{ CP1252, CP850 }, ++{ UTF-8, CP866 }, ++{ KOI8-R, CP866 }, ++{ KOI8-U, CP866 }, ++{ ISO-8859-5, CP866 } ++}; ++ ++char OEM_CP[MAX_CP_NAME] = ; ++char ISO_CP[MAX_CP_NAME] = ; ++ ++/* Try to guess the default value of OEM_CP based on the current locale. ++ * ISO_CP is left alone for now. */ ++void init_conversion_charsets() ++{ ++const char *local_charset; ++int i; ++ ++/* Make a guess only if OEM_CP not already set. */ ++if(*OEM_CP == '\0') { ++ local_charset = nl_langinfo(CODESET); ++ for(i = 0; i sizeof(dos_charset_map)/sizeof(CHARSET_MAP); i++) ++ if(!strcasecmp(local_charset, dos_charset_map[i].local_charset)) { ++ strncpy(OEM_CP, dos_charset_map[i].archive_charset, ++ sizeof(OEM_CP)); ++ break; ++ } ++} ++} ++ ++/* Convert a string from one encoding to the current locale using iconv(). ++ * Be as non-intrusive as possible. If error is encountered during covertion ++ * just leave the string intact. */ ++static void charset_to_intern(char *string, char *from_charset) ++{ ++iconv_t cd; ++char *s,*d, *buf; ++size_t slen, dlen, buflen; ++const char *local_charset; ++ ++if(*from_charset == '\0') ++ return; ++ ++buf = NULL; ++local_charset = nl_langinfo(CODESET); ++ ++if((cd = iconv_open(local_charset, from_charset)) == (iconv_t)-1) ++return; ++ ++slen = strlen(string); ++s = string; ++ ++/* Make sure OUTBUFSIZ + 1 never ends up smaller than FILNAMSIZ ++ * as this function also gets called with G.outbuf in fileio.c ++ */ ++buflen = FILNAMSIZ; ++if (OUTBUFSIZ + 1 FILNAMSIZ) ++{ ++buflen = OUTBUFSIZ + 1; ++} ++ ++d = buf = malloc(buflen); ++if(!d) ++ goto cleanup; ++ ++bzero(buf,buflen); ++dlen = buflen - 1; ++ ++if(iconv(cd, s, slen, d, dlen) == (size_t)-1) ++ goto cleanup; ++strncpy(string, buf, buflen); ++ ++cleanup: ++free(buf); ++iconv_close(cd); ++} ++ ++/* Convert a string from OEM_CP to the current locale charset. */ ++inline void oem_intern(char *string) ++{ ++charset_to_intern(string, OEM_CP); ++} ++ ++/* Convert a string from ISO_CP to the current locale charset. */ ++inline void
Re: [OE-core] [PATCH] busybox: unbreak tar of uncompressed files
This is intended for Dizzy, will resend with the correct tag for tracking Sau! On 04/28/2015 03:04 PM, Saul Wold wrote: A patch was added to fix compressed tar files, but broke uncompressed tar files, this fix is from the busybox mailing list http://lists.busybox.net/pipermail/busybox/2014-January/080389.html [YOCTO #7645] Signed-off-by: Saul Wold s...@linux.intel.com --- .../busybox/unbreak_noncompressed_tar.patch| 23 ++ meta/recipes-core/busybox/busybox_1.22.1.bb| 1 + 2 files changed, 24 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox/unbreak_noncompressed_tar.patch diff --git a/meta/recipes-core/busybox/busybox/unbreak_noncompressed_tar.patch b/meta/recipes-core/busybox/busybox/unbreak_noncompressed_tar.patch new file mode 100644 index 000..3c3c23a --- /dev/null +++ b/meta/recipes-core/busybox/busybox/unbreak_noncompressed_tar.patch @@ -0,0 +1,23 @@ + +This patch allows tar to continue correctly when it does not detect +a compressed format. This allows tar to then untar a non-compressed +tar file. + +See this thread for details: http://lists.busybox.net/pipermail/busybox/2014-January/080389.html + +Upstream-Status: Inappropriate [Upstream has different fix with additional functionality] +Signed-off-by: Saul Wold s...@linux.intel.com + +Index: busybox-1.22.1/archival/libarchive/open_transformer.c +=== +--- busybox-1.22.1.orig/archival/libarchive/open_transformer.c busybox-1.22.1/archival/libarchive/open_transformer.c +@@ -200,7 +200,7 @@ int FAST_FUNC open_zipped(const char *fn +|| (ENABLE_FEATURE_SEAMLESS_BZ2) +|| (ENABLE_FEATURE_SEAMLESS_XZ) + ) { +- setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1); ++ setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 0); + } + + return fd; diff --git a/meta/recipes-core/busybox/busybox_1.22.1.bb b/meta/recipes-core/busybox/busybox_1.22.1.bb index ae8eca7..1b1eaf3 100644 --- a/meta/recipes-core/busybox/busybox_1.22.1.bb +++ b/meta/recipes-core/busybox/busybox_1.22.1.bb @@ -35,6 +35,7 @@ SRC_URI = http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://CVE-2014-9645_busybox_reject_module_names_with_slashes.patch \ file://lzop-add-overflow-check.patch \ file://libarchive-open_zipped-does-not-need-to-check-extens.patch \ + file://unbreak_noncompressed_tar.patch \ SRC_URI[tarball.md5sum] = 337d1a15ab1cb1d4ed423168b1eb7d7e -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] e2fsprogs: install populate-extfs.sh
* install populate-extfs.sh from contrib, be aware that in order to use it you need to set DEBUGFS shell variable, otherwise it will try to use debugfs from relative path which is almost always incorrect: CONTRIB_DIR=$(dirname $(readlink -f $0)) DEBUGFS=$CONTRIB_DIR/../debugfs/debugfs Signed-off-by: Martin Jansa martin.ja...@gmail.com --- meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb index 67a5ea7..be1db9e 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs_1.42.9.bb @@ -54,6 +54,8 @@ do_install () { oe_multilib_header ext2fs/ext2_types.h install -d ${D}${base_bindir} mv ${D}${bindir}/chattr ${D}${base_bindir}/chattr.e2fsprogs + + install -v -m 755 ${S}/contrib/populate-extfs.sh ${D}${base_sbindir}/ } do_install_append_class-target() { -- 2.3.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] license.bbclass: allow copying license not in common licenses
On 23 April 2015 at 10:38, jackie.hu...@windriver.com wrote: Some package like linux-firmware has many licenses that aren't in any way common, and new ones will be added from time to time, in order to avoid adding bunch of such common license files that are only applicable to a specific package, NO_GENERIC_LIC is added to allow copying license not in common licenses, it should be used in the recipe as: Why can't linux-firmware just put those licenses into a directory alongside the recipe and do something like LICENSE_PATH += ${THISDIR}/licenses? Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/3] license.bbclass: allow copying license not in common licenses
On Tuesday 28 April 2015 12:48:50 Burton, Ross wrote: On 23 April 2015 at 10:38, jackie.hu...@windriver.com wrote: Some package like linux-firmware has many licenses that aren't in any way common, and new ones will be added from time to time, in order to avoid adding bunch of such common license files that are only applicable to a specific package, NO_GENERIC_LIC is added to allow copying license not in common licenses, it should be used in the recipe as: Why can't linux-firmware just put those licenses into a directory alongside the recipe and do something like LICENSE_PATH += ${THISDIR}/licenses? I'd rather not have to extract those licenses and potentially have them drift from the ones fetched from the source; besides, that gives us almost no benefit over not doing this change at all. This is about (a) acknowledging that linux-firmware is a bit special with regard to licensing compared to other recipes and (b) keeping the additional maintenance required to a minimum. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] ldconfig-native: Add 64-bit flag for ELF64 entries
On Tue, 2015-04-28 at 15:46 +0800, Yuanjie Huang wrote: From: Yuanjie Huang yuanjie.hu...@windriver.com ldconfig-native was grepped from an old version of glibc, and its output lacks neccessary 64bit flag in entries. Due to this defect, ctypes.util.find_library() python function fails to detect any library due to the old file format that ldconfig-native creates. This fix sets architecture-dependent 64bit flags for 64-bit ELF. Since the host's elf.h may not have definition for new AArch64 machine type, a work-around is added to correctly flag 64-bit ARM libraries. Signed-off-by: Yuanjie Huang yuanjie.hu...@windriver.com --- .../add-64-bit-flag-for-ELF64-entries.patch| 103 + meta/recipes-core/glibc/ldconfig-native_2.12.1.bb | 1 + 2 files changed, 104 insertions(+) create mode 100644 meta/recipes-core/glibc/ldconfig-native-2.12.1/add-64-bit-flag-for-ELF64-entries.patch diff --git a/meta/recipes-core/glibc/ldconfig-native-2.12.1/add-64-bit-flag-for-ELF64-entries.patch b/meta/recipes-core/glibc/ldconfig-native-2.12.1/add-64-bit-flag-for-ELF64-entries.patch new file mode 100644 index 000..d42f7a1 --- /dev/null +++ b/meta/recipes-core/glibc/ldconfig-native-2.12.1/add-64-bit-flag-for-ELF64-entries.patch @@ -0,0 +1,103 @@ +From 9d62544090b08849218cd1fc52a36cdd5d90363e Mon Sep 17 00:00:00 2001 +From: Yuanjie Huang yuanjie.hu...@windriver.com +Date: Fri, 24 Apr 2015 03:29:31 + +Subject: [PATCH] Add 64-bit flag for ELF64 entries. + +ldconfig-native was grepped from an old version of glibc, and its output +lacks neccessary 64bit flag in entries. +Due to this defect, ctypes.util.find_library() python function fails to +detect any library due to the old file format that ldconfig-native +creates. This fix sets architecture-dependent 64bit flags for 64-bit ELF. + +Signed-off-by: Yuanjie Huang yuanjie.hu...@windriver.com +--- + cache.c | 4 + ldconfig.h | 4 + readelflib.c | 34 ++ + 3 files changed, 42 insertions(+) + +diff --git a/cache.c b/cache.c +index a904d44..c4f5411 100644 +--- a/cache.c b/cache.c +@@ -121,6 +121,10 @@ print_entry (const char *lib, int flag, unsigned int osversion, + break; + case FLAG_MIPS64_LIBN64: + fputs (,64bit, stdout); ++ break; ++case FLAG_AARCH64_LIB64: ++ fputs (,AArch64, stdout); ++ break; + case 0: + break; + default: +diff --git a/ldconfig.h b/ldconfig.h +index fadd5ec..6a8a750 100644 +--- a/ldconfig.h b/ldconfig.h +@@ -34,6 +34,10 @@ + #define FLAG_POWERPC_LIB64 0x0500 + #define FLAG_MIPS64_LIBN32 0x0600 + #define FLAG_MIPS64_LIBN64 0x0700 ++#define FLAG_X8664_LIBX32 0x0800 ++#define FLAG_ARM_LIBHF 0x0900 ++#define FLAG_AARCH64_LIB64 0x0a00 ++#define FLAG_ARM_LIBSF 0x0b00 + + /* Name of auxiliary cache. */ + #define _PATH_LDCONFIG_AUX_CACHE /var/cache/ldconfig/aux-cache +diff --git a/readelflib.c b/readelflib.c +index 0bf0de3..6e87afc 100644 +--- a/readelflib.c b/readelflib.c +@@ -28,6 +28,11 @@ + + #include endian_extra.h + ++/* Work-around for old host that does not have AArch64 defined in elf.h. */ ++#ifndef EM_AARCH64 ++#define EM_AARCH64 183 /* ARM AARCH64 */ ++#endif ++ + #undef check_ptr + #define check_ptr(ptr) \ + do \ +@@ -290,6 +295,35 @@ process_elf_file64 (const char *file_name, const char *lib, int *flag, + libc5/libc6. */ + *flag = FLAG_ELF; + ++ /* Set flags according to information in ELF header to align with target ++ ldconfig */ ++ switch (elf_header-e_machine) ++{ ++case EM_IA_64: ++ *flag |= FLAG_IA64_LIB64; ++ break; ++case EM_X86_64: ++ *flag |= FLAG_X8664_LIB64; ++ break; ++case EM_S390: ++ *flag |= FLAG_S390_LIB64; ++ break; ++case EM_PPC64: ++ *flag |= FLAG_POWERPC_LIB64; ++ break; ++case EM_MIPS: ++case EM_MIPS_RS3_LE: ++ *flag |= FLAG_MIPS64_LIBN64; ++ break; ++case EM_AARCH64: ++ *flag |= FLAG_AARCH64_LIB64; ++ break; ++default: ++ error(0, 0, %s is a 64-bit ELF for unknown machine %lx\n, ++file_name, (long)elf_header-e_machine); ++ break; ++} ++ + loadaddr = -1; + dynamic_addr = 0; + dynamic_size = 0; +-- +1.8.5.2.233.g932f7e4 + diff --git a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb index 7c34635..8a2ea90 100644 --- a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb +++ b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb @@ -12,6 +12,7 @@ SRC_URI = file://ldconfig-native-2.12.1.tar.bz2 \ file://flag_fix.patch \ file://endianess-header.patch \
Re: [OE-core] [PATCH] xkeyboard-config: modified the license
On 27 April 2015 at 07:53, Lei Maohui leimao...@cn.fujitsu.com wrote: Because usr/share/X11/xkb/symbols/eu and usr/share/X11/xkb/symbols/ph are GPLv3. So add GPLv3 in the license. A friendly upstream maintainer I know was surprised at this and has requested that the files are relicensed to MIT, so we may be able to take a patch from upstream to change the licenses instead of adding GPLv3. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][dizzy] busybox: unbreak tar of uncompressed files
A patch was added to fix compressed tar files, but broke uncompressed tar files, this fix is from the busybox mailing list http://lists.busybox.net/pipermail/busybox/2014-January/080389.html [YOCTO #7645] Signed-off-by: Saul Wold s...@linux.intel.com --- .../busybox/unbreak_noncompressed_tar.patch| 23 ++ meta/recipes-core/busybox/busybox_1.22.1.bb| 1 + 2 files changed, 24 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox/unbreak_noncompressed_tar.patch diff --git a/meta/recipes-core/busybox/busybox/unbreak_noncompressed_tar.patch b/meta/recipes-core/busybox/busybox/unbreak_noncompressed_tar.patch new file mode 100644 index 000..3c3c23a --- /dev/null +++ b/meta/recipes-core/busybox/busybox/unbreak_noncompressed_tar.patch @@ -0,0 +1,23 @@ + +This patch allows tar to continue correctly when it does not detect +a compressed format. This allows tar to then untar a non-compressed +tar file. + +See this thread for details: http://lists.busybox.net/pipermail/busybox/2014-January/080389.html + +Upstream-Status: Inappropriate [Upstream has different fix with additional functionality] +Signed-off-by: Saul Wold s...@linux.intel.com + +Index: busybox-1.22.1/archival/libarchive/open_transformer.c +=== +--- busybox-1.22.1.orig/archival/libarchive/open_transformer.c busybox-1.22.1/archival/libarchive/open_transformer.c +@@ -200,7 +200,7 @@ int FAST_FUNC open_zipped(const char *fn +|| (ENABLE_FEATURE_SEAMLESS_BZ2) +|| (ENABLE_FEATURE_SEAMLESS_XZ) + ) { +- setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1); ++ setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 0); + } + + return fd; diff --git a/meta/recipes-core/busybox/busybox_1.22.1.bb b/meta/recipes-core/busybox/busybox_1.22.1.bb index ae8eca7..1b1eaf3 100644 --- a/meta/recipes-core/busybox/busybox_1.22.1.bb +++ b/meta/recipes-core/busybox/busybox_1.22.1.bb @@ -35,6 +35,7 @@ SRC_URI = http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://CVE-2014-9645_busybox_reject_module_names_with_slashes.patch \ file://lzop-add-overflow-check.patch \ file://libarchive-open_zipped-does-not-need-to-check-extens.patch \ + file://unbreak_noncompressed_tar.patch \ SRC_URI[tarball.md5sum] = 337d1a15ab1cb1d4ed423168b1eb7d7e -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [WIP][RFT] cogl/clutter/libinput/wayland/weston updates
On Apr 28, 2015, at 8:25 AM, Tim Orling ticot...@gmail.com wrote: The following branch includes updates to the latest releases for cogl, clutter, wayland, weston and libinput: http://git.openembedded.org/openembedded-core-contrib/log/?h=timo/cogl-clutter-wayland-weston-updates http://git.openembedded.org/openembedded-core-contrib/log/?h=timo/cogl-clutter-wayland-weston-updates wayland and weston appear to be fine as tested on nuc. I have had wayland/weston updates lying on my tree for some time now http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/masterid=eb52e9e6756641cd5b1ebbff0e82dcf6f1aa5c9b http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/masterid=eb52e9e6756641cd5b1ebbff0e82dcf6f1aa5c9b tried git versions too http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/masterid=992c13dcd4b79fe64f4f9b8122627f918257ccef http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/masterid=992c13dcd4b79fe64f4f9b8122627f918257ccef There are problem with emulator with 1.7 and libinput I guess where the mouse does not work in qemux86 as well as qemux86-64, it works fine with 1.6, I have tested all versions 0.8 and newer of lib input for no success. That was the reason I did not propose those patches. clutter ptests pass, but all examples segfault...possibly a problem in cogl. I would appreciate tests on other platforms and any insight into the segfaults. --Tim -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [WIP][RFT] cogl/clutter/libinput/wayland/weston updates
The following branch includes updates to the latest releases for cogl, clutter, wayland, weston and libinput: http://git.openembedded.org/openembedded-core-contrib/log/?h=timo/cogl-clutter-wayland-weston-updates wayland and weston appear to be fine as tested on nuc. clutter ptests pass, but all examples segfault...possibly a problem in cogl. I would appreciate tests on other platforms and any insight into the segfaults. --Tim -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] split_and_strip_files: regroup hardlinks to make build deterministic
Reverted 7c0fd561bad0250a00cef63e3d787573112a59cf Created separate group of hardlinks for the files inside the same package. This should prevent stripped files to be populated outside of package directories. [YOCTO #7586] Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com --- meta/classes/package.bbclass | 12 meta/lib/oe/package.py | 3 +-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index f1b966d..4019f12 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -877,6 +877,7 @@ python split_and_strip_files () { symlinks = {} hardlinks = {} kernmods = [] +inodes = {} libdir = os.path.abspath(dvar + os.sep + d.getVar(libdir, True)) baselibdir = os.path.abspath(dvar + os.sep + d.getVar(base_libdir, True)) if (d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1'): @@ -914,6 +915,17 @@ python split_and_strip_files () { #bb.note(Sym: %s (%d) % (ltarget, isELF(ltarget))) symlinks[file] = target continue + +if s.st_ino in inodes: +os.unlink(file) +os.link(inodes[s.st_ino], file) +cpath.updatecache(file) +elif s.st_nlink 1: +inodes[s.st_ino] = file +# break hardlink +bb.utils.copyfile(file, file) +cpath.updatecache(file) + # It's a file (or hardlink), not a link # ...but is it ELF, and is it already stripped? elf_file = isELF(file) diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index 8bc56c6..ea6feaa 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -30,8 +30,7 @@ def runstrip(arg): elif elftype 8 or elftype 4: extraflags = --remove-section=.comment --remove-section=.note -# Use mv to break hardlinks -stripcmd = '%s' %s '%s' -o '%s.tmp' chown --reference='%s' '%s.tmp' mv '%s.tmp' '%s' % (strip, extraflags, file, file, file, file, file, file) +stripcmd = '%s' %s '%s' % (strip, extraflags, file) bb.debug(1, runstrip: %s % stripcmd) ret = subprocess.call(stripcmd, shell=True) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] glibc: ignore for musl/uclibc but only for target recipes
we still need nativesdk or native recipes for libc to come from glibc, but only be ignored for target recipes types Change-Id: Ibaf8114f2aef63f1eadf493b264e78cd928535a0 Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/recipes-core/glibc/glibc-collateral.inc | 3 +++ meta/recipes-core/glibc/glibc_2.21.bb| 9 +++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/recipes-core/glibc/glibc-collateral.inc b/meta/recipes-core/glibc/glibc-collateral.inc index f82db06..60655eb 100644 --- a/meta/recipes-core/glibc/glibc-collateral.inc +++ b/meta/recipes-core/glibc/glibc-collateral.inc @@ -17,3 +17,6 @@ do_compile[noexec] = 1 do_install[depends] += virtual/${MLPREFIX}libc:do_populate_sysroot +COMPATIBLE_HOST_libc-musl_class-target = null +COMPATIBLE_HOST_libc-uclibc_class-target = null + diff --git a/meta/recipes-core/glibc/glibc_2.21.bb b/meta/recipes-core/glibc/glibc_2.21.bb index 58a9601..5295ddd 100644 --- a/meta/recipes-core/glibc/glibc_2.21.bb +++ b/meta/recipes-core/glibc/glibc_2.21.bb @@ -64,14 +64,11 @@ TARGET_CPPFLAGS = -I${STAGING_DIR_TARGET}${includedir} GLIBC_BROKEN_LOCALES = _ER _ET so_ET yn_ER sid_ET tr_TR mn_MN gez_ET gez_ER bn_BD te_IN es_CR.ISO-8859-1 # -# We will skip parsing glibc when system C library selection is not glibc +# We will skip parsing glibc when target system C library selection is not glibc # this helps in easing out parsing for non-glibc system libraries # -python __anonymous () { -if d.getVar('TCLIBC', True) != glibc: -raise bb.parse.SkipPackage(incompatible with %s C library % - d.getVar('TCLIBC', True)) -} +COMPATIBLE_HOST_libc-musl_class-target = null +COMPATIBLE_HOST_libc-uclibc_class-target = null EXTRA_OECONF = --enable-kernel=${OLDEST_KERNEL} \ --without-cvs --disable-profile \ -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] curl: Fix wrong assumption about sizeof off_t on largefile systems
This issue was reported on poky ml as well see https://lists.yoctoproject.org/pipermail/poky/2013-December/009435.html Change-Id: Iedf22467889893111fde0433e411fd0546a38546 Signed-off-by: Khem Raj raj.k...@gmail.com --- meta/recipes-support/curl/curl_7.42.0.bb | 4 1 file changed, 4 insertions(+) diff --git a/meta/recipes-support/curl/curl_7.42.0.bb b/meta/recipes-support/curl/curl_7.42.0.bb index d4445ff..d698fcb 100644 --- a/meta/recipes-support/curl/curl_7.42.0.bb +++ b/meta/recipes-support/curl/curl_7.42.0.bb @@ -20,6 +20,7 @@ SRC_URI[sha256sum] = 32557d68542f5c6cc8437b5b8a945857b4c5c6b6276da909e35b783d1d inherit autotools pkgconfig binconfig multilib_header PACKAGECONFIG ??= ${@bb.utils.contains(DISTRO_FEATURES, ipv6, ipv6, , d)} gnutls zlib + PACKAGECONFIG_class-native = ipv6 ssl zlib PACKAGECONFIG_class-nativesdk = ipv6 ssl zlib @@ -37,6 +38,9 @@ EXTRA_OECONF = --without-libidn \ --disable-ldaps \ --with-ca-bundle=${sysconfdir}/ssl/certs/ca-certificates.crt \ +# see https://lists.yoctoproject.org/pipermail/poky/2013-December/009435.html +# We should ideally drop ac_cv_sizeof_off_t from site files but until then +EXTRA_OECONF += ${@bb.utils.contains('DISTRO_FEATURES', 'largefile', 'ac_cv_sizeof_off_t=8', '', d)} do_install_append() { oe_multilib_header curl/curlbuild.h -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] gcc-5 and fixes for curl and non-glibc C libraries
Add recipes for gcc-5, its not default _yet_ enable it in local.conf as described in patch header to use it Fix curl build on 32bit arches with largefile support Let glibc provide nativesdk versions for musl and uclibc bases systems The following changes since commit 4dd4b96b6d60246338bb30ede9f3ab1b2e757be9: libxfont: Security Advisory - libxfont - CVE-2015-1804 (2015-04-28 07:56:01 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib kraj/for-master http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/for-master Khem Raj (3): gcc: Add 5 recipes curl: Fix wrong assumption about sizeof off_t on largefile systems glibc: ignore for musl/uclibc but only for target recipes meta/recipes-core/glibc/glibc-collateral.inc |3 + meta/recipes-core/glibc/glibc_2.21.bb |9 +- meta/recipes-devtools/gcc/gcc-5.1.inc | 123 + .../0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch | 42 + .../gcc/gcc-5.1/0002-uclibc-conf.patch | 53 + .../0003-gcc-uclibc-locale-ctype_touplow_t.patch | 87 + .../gcc/gcc-5.1/0004-uclibc-locale.patch | 2862 .../gcc/gcc-5.1/0005-uclibc-locale-no__x.patch | 257 ++ .../gcc/gcc-5.1/0006-uclibc-locale-wchar_fix.patch | 68 + .../gcc/gcc-5.1/0007-uclibc-locale-update.patch| 542 .../gcc/gcc-5.1/0008-missing-execinfo_h.patch | 28 + .../gcc/gcc-5.1/0009-c99-snprintf.patch| 28 + .../0010-gcc-poison-system-directories.patch | 192 ++ .../gcc/gcc-5.1/0011-gcc-poison-dir-extend.patch | 39 + .../0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch | 73 + .../gcc/gcc-5.1/0013-64-bit-multilib-hack.patch| 85 + .../gcc/gcc-5.1/0014-optional-libstdc.patch| 101 + ...0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch | 59 + .../gcc/gcc-5.1/0016-COLLECT_GCC_OPTIONS.patch | 38 + ...efaults.h-in-B-instead-of-S-and-t-oe-in-B.patch | 96 + .../gcc-5.1/0018-fortran-cross-compile-hack.patch | 46 + .../gcc/gcc-5.1/0019-libgcc-sjlj-check.patch | 74 + .../gcc/gcc-5.1/0020-cpp-honor-sysroot.patch | 54 + .../gcc-5.1/0021-MIPS64-Default-to-N64-ABI.patch | 57 + ...C_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 216 ++ ...0023-gcc-Fix-argument-list-too-long-error.patch | 40 + .../gcc/gcc-5.1/0024-Disable-sdt.patch | 113 + .../gcc/gcc-5.1/0025-libtool.patch | 42 + ...4-pass-fix-v4bx-to-linker-to-support-EABI.patch | 43 + ...tilib-config-files-from-B-instead-of-usin.patch | 102 + ...-libdir-from-.la-which-usually-points-to-.patch | 31 + .../gcc/gcc-5.1/0029-export-CPP.patch | 53 + ...AltiVec-generation-on-powepc-linux-target.patch | 44 + ...-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch | 42 + ...Ensure-target-gcc-headers-can-be-included.patch | 98 + ...-t-build-with-disable-dependency-tracking.patch | 54 + ...h-host-directory-during-relink-if-inst_pr.patch | 38 + ...-link-the-plugins-with-libgomp-explicitly.patch | 83 + .../recipes-devtools/gcc/gcc-cross-canadian_5.1.bb |5 + meta/recipes-devtools/gcc/gcc-cross-initial_5.1.bb |2 + meta/recipes-devtools/gcc/gcc-cross_5.1.bb |3 + .../gcc/gcc-crosssdk-initial_5.1.bb|3 + meta/recipes-devtools/gcc/gcc-crosssdk_5.1.bb |2 + meta/recipes-devtools/gcc/gcc-runtime_5.1.bb |7 + meta/recipes-devtools/gcc/gcc-sanitizers_5.1.bb|2 + meta/recipes-devtools/gcc/gcc-source_5.1.bb|2 + meta/recipes-devtools/gcc/gcc_5.1.bb |7 + meta/recipes-devtools/gcc/libgcc-initial_5.1.bb|2 + meta/recipes-devtools/gcc/libgcc_5.1.bb|2 + meta/recipes-devtools/gcc/libgfortran_5.1.bb |3 + meta/recipes-support/curl/curl_7.42.0.bb |4 + 51 files changed, 6053 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-devtools/gcc/gcc-5.1.inc create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0002-uclibc-conf.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0003-gcc-uclibc-locale-ctype_touplow_t.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0004-uclibc-locale.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0005-uclibc-locale-no__x.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0006-uclibc-locale-wchar_fix.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0007-uclibc-locale-update.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0008-missing-execinfo_h.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0009-c99-snprintf.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0010-gcc-poison-system-directories.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0011-gcc-poison-dir-extend.patch create mode
[OE-core] [PATCH 1/2] bison: fix parallel issue
Fixed: rm -f src/yacc src/yacc.tmp echo '#! /bin/sh' src/yacc.tmp /bin/bash: src/yacc.tmp: No such file or directory Makefile:6670: recipe for target 'src/yacc' failed Signed-off-by: Robert Yang liezhi.y...@windriver.com --- .../0001-src-local.mk-fix-parallel-issue.patch | 33 meta/recipes-devtools/bison/bison_3.0.4.bb |1 + 2 files changed, 34 insertions(+) create mode 100644 meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch diff --git a/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch b/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch new file mode 100644 index 000..9543a56 --- /dev/null +++ b/meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch @@ -0,0 +1,33 @@ +From 3a15f7c9ace6c0294edc313a1848cafcc31b2a92 Mon Sep 17 00:00:00 2001 +From: Robert Yang liezhi.y...@windriver.com +Date: Fri, 24 Apr 2015 00:38:32 -0700 +Subject: [PATCH] src/local.mk: fix parallel issue + +Fixed: +rm -f src/yacc src/yacc.tmp +echo '#! /bin/sh' src/yacc.tmp +/bin/bash: src/yacc.tmp: No such file or directory +Makefile:6670: recipe for target 'src/yacc' failed + +Upstream-Status: Pending + +Signed-off-by: Robert Yang liezhi.y...@windriver.com +--- + src/local.mk |1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/local.mk b/src/local.mk +index 573ad00..28bfae4 100644 +--- a/src/local.mk b/src/local.mk +@@ -119,6 +119,7 @@ MOSTLYCLEANFILES += src/yacc + + src/yacc: + $(AM_V_GEN)rm -f $@ $@.tmp ++ $(AM_V_at)$(MKDIR_P) src + $(AM_V_at)echo '#! /bin/sh' $@.tmp + $(AM_V_at)echo exec '$(bindir)/bison' -y '$$@' $@.tmp + $(AM_V_at)chmod a+x $@.tmp +-- +1.7.9.5 + diff --git a/meta/recipes-devtools/bison/bison_3.0.4.bb b/meta/recipes-devtools/bison/bison_3.0.4.bb index de29506..708e9a3 100644 --- a/meta/recipes-devtools/bison/bison_3.0.4.bb +++ b/meta/recipes-devtools/bison/bison_3.0.4.bb @@ -13,6 +13,7 @@ SRC_URI = ${GNU_MIRROR}/bison/bison-${PV}.tar.xz \ file://m4.patch \ file://0001-Unset-need_charset_alias-when-building-for-musl.patch \ file://dont-depend-on-help2man.patch.patch \ + file://0001-src-local.mk-fix-parallel-issue.patch \ # No point in hardcoding path to m4, just use PATH -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] 2 fixes for parallel build
The following changes since commit 4dd4b96b6d60246338bb30ede9f3ab1b2e757be9: libxfont: Security Advisory - libxfont - CVE-2015-1804 (2015-04-28 07:56:01 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/parallel http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/parallel Robert Yang (2): bison: fix parallel issue pcmciautils: fix for parallel build .../Makefile-fix-for-parallel-build.patch | 12 +++ .../0001-src-local.mk-fix-parallel-issue.patch | 33 meta/recipes-devtools/bison/bison_3.0.4.bb |1 + 3 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 meta/recipes-devtools/bison/bison/0001-src-local.mk-fix-parallel-issue.patch -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] pcmciautils: fix for parallel build
Fixed: Compiling lex_config.c. src/lex_config.l:34:25: fatal error: yacc_config.h: No such file or directory There was a patch for fixing the paralle issue before, so modify the patch again. Signed-off-by: Robert Yang liezhi.y...@windriver.com --- .../Makefile-fix-for-parallel-build.patch | 12 ++-- 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch b/meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch index c9a7ada..d0bb3d6 100644 --- a/meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch +++ b/meta/recipes-bsp/pcmciautils/pcmciautils-018/Makefile-fix-for-parallel-build.patch @@ -18,11 +18,11 @@ Upstream-Status: Pending Signed-off-by: Robert Yang liezhi.y...@windriver.com --- - Makefile |2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + Makefile |4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile -index d45fdc3..d4ffd7e 100644 +index d45fdc3..963453a 100644 --- a/Makefile +++ b/Makefile @@ -246,7 +246,9 @@ $(PCMCIA_SOCKET_STARTUP): $(LIBC) src/startup.o src/yacc_config.o src/lex_config @@ -30,9 +30,9 @@ index d45fdc3..d4ffd7e 100644 $(QUIET) $(STRIPCMD) $@ -yacc_config.o lex_config.o: %.o: %.c -+lex_config.o: yacc_config.h -+ -+yacc_config.o lex_config.o: %.o: %.c: %.h ++lex_config.o: lex_config.c yacc_config.h ++ $(CC) -c -MD -O -pipe $(CPPFLAGS) $ ++yacc_config.o: yacc_config.c $(CC) -c -MD -O -pipe $(CPPFLAGS) $ debugtools: ccdv $(CBDUMP) $(CISDUMP) -- 1.7.9.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/8] kernel: Build DTBs early
Pull out the compilation of the DTB blobs right after the kernel's own do_compile function finishes. This makes them available just in time for the kernel image construction functions. Signed-off-by: Marek Vasut ma...@denx.de Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Koen Kooi k...@dominion.thruhere.net Cc: Paul Eggleton paul.eggle...@linux.intel.com Cc: Ross Burton ross.bur...@intel.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/recipes-kernel/linux/linux-dtb.inc | 14 -- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/meta/recipes-kernel/linux/linux-dtb.inc b/meta/recipes-kernel/linux/linux-dtb.inc index 6b8f1a5..ee3a5e1 100644 --- a/meta/recipes-kernel/linux/linux-dtb.inc +++ b/meta/recipes-kernel/linux/linux-dtb.inc @@ -5,6 +5,18 @@ python __anonymous () { d.appendVar(PACKAGES, kernel-devicetree) } +do_compile_append() { + if test -n ${KERNEL_DEVICETREE}; then + for DTB in ${KERNEL_DEVICETREE}; do + if echo ${DTB} | grep -q '/dts/'; then + bbwarn ${DTB} contains the full path to the the dts file, but only the dtb name should be used. + DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'` + fi + oe_runmake ${DTB} + done + fi +} + do_install_append() { if test -n ${KERNEL_DEVICETREE}; then for DTB in ${KERNEL_DEVICETREE}; do @@ -13,10 +25,8 @@ do_install_append() { DTB=`basename ${DTB} | sed 's,\.dts$,.dtb,g'` fi DTB_BASE_NAME=`basename ${DTB} .dtb` - DTB_NAME=`echo ${KERNEL_IMAGE_BASE_NAME} | sed s/${MACHINE}/${DTB_BASE_NAME}/g` DTB_SYMLINK_NAME=`echo ${KERNEL_IMAGE_SYMLINK_NAME} | sed s/${MACHINE}/${DTB_BASE_NAME}/g` DTB_PATH=${B}/arch/${ARCH}/boot/dts/${DTB} - oe_runmake ${DTB} if [ ! -e ${DTB_PATH} ]; then DTB_PATH=${B}/arch/${ARCH}/boot/${DTB} fi -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/8] kernel: Separate out uboot_prep_kimage
Separate the function which prepares the kernel for packing into uImage into separate class, so this function can be reused by the fitImage class. Signed-off-by: Marek Vasut ma...@denx.de Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Koen Kooi k...@dominion.thruhere.net Cc: Paul Eggleton paul.eggle...@linux.intel.com Cc: Ross Burton ross.bur...@intel.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/classes/kernel-uboot.bbclass | 21 + meta/classes/kernel-uimage.bbclass | 24 ++-- 2 files changed, 23 insertions(+), 22 deletions(-) create mode 100644 meta/classes/kernel-uboot.bbclass diff --git a/meta/classes/kernel-uboot.bbclass b/meta/classes/kernel-uboot.bbclass new file mode 100644 index 000..8ab30b8 --- /dev/null +++ b/meta/classes/kernel-uboot.bbclass @@ -0,0 +1,21 @@ +uboot_prep_kimage() { + if test -e arch/${ARCH}/boot/compressed/vmlinux ; then + vmlinux_path=arch/${ARCH}/boot/compressed/vmlinux + linux_suffix= + linux_comp=none + else + vmlinux_path=vmlinux + linux_suffix=.gz + linux_comp=gzip + fi + + ${OBJCOPY} -O binary -R .note -R .comment -S ${vmlinux_path} linux.bin + + if [ ${linux_comp} != none ] ; then + rm -f linux.bin + gzip -9 linux.bin + mv -f linux.bin${linux_suffix} linux.bin + fi + + echo ${linux_comp} +} diff --git a/meta/classes/kernel-uimage.bbclass b/meta/classes/kernel-uimage.bbclass index 8a3efc6..ce8f96f 100644 --- a/meta/classes/kernel-uimage.bbclass +++ b/meta/classes/kernel-uimage.bbclass @@ -1,3 +1,5 @@ +inherit kernel-uboot + python __anonymous () { kerneltype = d.getVar('KERNEL_IMAGETYPE', True) if kerneltype == 'uImage': @@ -6,28 +8,6 @@ python __anonymous () { d.setVar(DEPENDS, depends) } -uboot_prep_kimage() { - if test -e arch/${ARCH}/boot/compressed/vmlinux ; then - vmlinux_path=arch/${ARCH}/boot/compressed/vmlinux - linux_suffix= - linux_comp=none - else - vmlinux_path=vmlinux - linux_suffix=.gz - linux_comp=gzip - fi - - ${OBJCOPY} -O binary -R .note -R .comment -S ${vmlinux_path} linux.bin - - if [ ${linux_comp} != none ] ; then - rm -f linux.bin - gzip -9 linux.bin - mv -f linux.bin${linux_suffix} linux.bin - fi - - echo ${linux_comp} -} - do_uboot_mkimage() { if test x${KERNEL_IMAGETYPE} = xuImage ; then if test x${KEEPUIMAGE} != xyes ; then -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/8] kernel: Clean up KERNEL_IMAGETYPE_FOR_MAKE
Remove the lambda function setting KERNEL_IMAGETYPE_FOR_MAKE and instead set it in the anonymous python function. This also allows us to handle image types which are not supported directly by kernel, but require some other kernel target to be built. This is the case for example with the fitImage, which is the uImage successor. There is no functional change. Signed-off-by: Marek Vasut ma...@denx.de Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Koen Kooi k...@dominion.thruhere.net Cc: Paul Eggleton paul.eggle...@linux.intel.com Cc: Ross Burton ross.bur...@intel.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/classes/kernel.bbclass | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 125ed88..75bfd76 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -17,12 +17,16 @@ INITRAMFS_TASK ?= INITRAMFS_IMAGE_BUNDLE ?= python __anonymous () { +import re + kerneltype = d.getVar('KERNEL_IMAGETYPE', True) if kerneltype == 'uImage': depends = d.getVar(DEPENDS, True) depends = %s u-boot-mkimage-native % depends d.setVar(DEPENDS, depends) +d.setVar(KERNEL_IMAGETYPE_FOR_MAKE, re.sub(r'\.gz$', '', kerneltype)) + image = d.getVar('INITRAMFS_IMAGE', True) if image: d.appendVarFlag('do_bundle_initramfs', 'depends', ' ${INITRAMFS_IMAGE}:do_rootfs') @@ -104,8 +108,6 @@ KERNEL_ALT_IMAGETYPE ??= # they are staged. KERNEL_SRC_PATH = /usr/src/kernel -KERNEL_IMAGETYPE_FOR_MAKE = ${@(lambda s: s[:-3] if s[-3:] == .gz else s)(d.getVar('KERNEL_IMAGETYPE', True))} - copy_initramfs() { echo Copying initramfs into ./usr ... # In case the directory is not created yet from the first pass compile: -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] split_and_strip_files: regroup hardlinks to make build deterministic
Reverted 7c0fd561bad0250a00cef63e3d787573112a59cf Created separate group of hardlinks for the files inside the same package. This should prevent stripped files to be populated outside of package directories. [YOCTO #7586] Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com --- meta/classes/package.bbclass | 12 meta/lib/oe/package.py | 3 +-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index f1b966d..dc87206 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -877,6 +877,7 @@ python split_and_strip_files () { symlinks = {} hardlinks = {} kernmods = [] +inodes = {} libdir = os.path.abspath(dvar + os.sep + d.getVar(libdir, True)) baselibdir = os.path.abspath(dvar + os.sep + d.getVar(base_libdir, True)) if (d.getVar('INHIBIT_PACKAGE_STRIP', True) != '1'): @@ -914,6 +915,17 @@ python split_and_strip_files () { #bb.note(Sym: %s (%d) % (ltarget, isELF(ltarget))) symlinks[file] = target continue +if s.st_nlink 1: +if s.st_ino in inodes: +os.unlink(file) +os.link(inodes[s.st_ino], file) +elif s.st_nlink 1: +inodes[s.st_ino] = file +# break hardlink +bb.utils.copyfile(file, file) +cpath.updatecache(file) +s = cpath.lstat(file) + # It's a file (or hardlink), not a link # ...but is it ELF, and is it already stripped? elf_file = isELF(file) diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index 8bc56c6..ea6feaa 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -30,8 +30,7 @@ def runstrip(arg): elif elftype 8 or elftype 4: extraflags = --remove-section=.comment --remove-section=.note -# Use mv to break hardlinks -stripcmd = '%s' %s '%s' -o '%s.tmp' chown --reference='%s' '%s.tmp' mv '%s.tmp' '%s' % (strip, extraflags, file, file, file, file, file, file) +stripcmd = '%s' %s '%s' % (strip, extraflags, file) bb.debug(1, runstrip: %s % stripcmd) ret = subprocess.call(stripcmd, shell=True) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] lib/oe/package: Improve strip subprocess handling
Currently if the strip process fails, we get a message but don't know why. This adds code to show the return value and any error output. Signed-off-by: Richard Purdie richard.pur...@linuxfoundation.org diff --git a/meta/lib/oe/package.py b/meta/lib/oe/package.py index ea6feaa..f176446 100644 --- a/meta/lib/oe/package.py +++ b/meta/lib/oe/package.py @@ -33,14 +33,14 @@ def runstrip(arg): stripcmd = '%s' %s '%s' % (strip, extraflags, file) bb.debug(1, runstrip: %s % stripcmd) -ret = subprocess.call(stripcmd, shell=True) +try: +output = subprocess.check_output(stripcmd, stderr=subprocess.STDOUT, shell=True) +except subprocess.CalledProcessError as e: +bb.error(runstrip: '%s' strip command failed with %s (%s) % (stripcmd, e.returncode, e.output)) if newmode: os.chmod(file, origmode) -if ret: -bb.error(runstrip: '%s' strip command failed % stripcmd) - return -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 7/8] kernel: Add basic fitImage support
This patch adds support for generating a kernel fitImage, which is a a successor to the uImage format. Unlike uImage, which could only contain the kernel image itself, the fitImage can contain all kinds of artifacts, like the kernel image, device tree blobs, initramfs images, binary firmwares etc. Furthermore, the fitImage supports different kinds of checksums, not only CRC32 like the uImage did. Last, but not least, fitImage supports signatures such that either the whole image or it's parts can be signed and then in turn can be verified by the bootloader. So far we only add support for wrapping the kernel image and DTB into the fitImage. The fitImage uses the sha1 checksum, which is the default. Signed-off-by: Marek Vasut ma...@denx.de Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Koen Kooi k...@dominion.thruhere.net Cc: Paul Eggleton paul.eggle...@linux.intel.com Cc: Ross Burton ross.bur...@intel.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/classes/kernel-fitimage.bbclass | 234 +++ meta/classes/kernel.bbclass | 1 + 2 files changed, 235 insertions(+) create mode 100644 meta/classes/kernel-fitimage.bbclass diff --git a/meta/classes/kernel-fitimage.bbclass b/meta/classes/kernel-fitimage.bbclass new file mode 100644 index 000..2a56a54 --- /dev/null +++ b/meta/classes/kernel-fitimage.bbclass @@ -0,0 +1,234 @@ +inherit kernel-uboot + +python __anonymous () { +kerneltype = d.getVar('KERNEL_IMAGETYPE', True) +if kerneltype == 'fitImage': +depends = d.getVar(DEPENDS, True) +depends = %s u-boot-mkimage-native dtc-native % depends +d.setVar(DEPENDS, depends) + + # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal + # to kernel.bbclass . We have to override it, since we pack zImage + # (at least for now) into the fitImage . +d.setVar(KERNEL_IMAGETYPE_FOR_MAKE, zImage) + +image = d.getVar('INITRAMFS_IMAGE', True) +if image: +d.appendVarFlag('do_assemble_fitimage', 'depends', ' ${INITRAMFS_IMAGE}:do_rootfs') +} + +# +# Emit the fitImage ITS header +# +fitimage_emit_fit_header() { + cat EOF fit-image.its +/dts-v1/; + +/ { +description = U-Boot fitImage for ${DISTRO_NAME}/${PV}/${MACHINE}; +#address-cells = 1; +EOF +} + +# +# Emit the fitImage section bits +# +# $1 ... Section bit type: imagestart - image section start +# confstart - configuration section start +# sectend- section end +# fitend - fitimage end +# +fitimage_emit_section_maint() { + case $1 in + imagestart) + cat EOF fit-image.its + +images { +EOF + ;; + confstart) + cat EOF fit-image.its + +configurations { +EOF + ;; + sectend) + cat EOF fit-image.its + }; +EOF + ;; + fitend) + cat EOF fit-image.its +}; +EOF + ;; + esac +} + +# +# Emit the fitImage ITS kernel section +# +# $1 ... Image counter +# $2 ... Path to kernel image +# $3 ... Compression type +fitimage_emit_section_kernel() { + + kernel_csum=sha1 + + ENTRYPOINT=${UBOOT_ENTRYPOINT} + if test -n ${UBOOT_ENTRYSYMBOL}; then + ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \ + awk '$3==${UBOOT_ENTRYSYMBOL} {print $1}'` + fi + + cat EOF fit-image.its +kernel@${1} { +description = Linux kernel; +data = /incbin/(${2}); +type = kernel; +arch = ${UBOOT_ARCH}; +os = linux; +compression = ${3}; +load = ${UBOOT_LOADADDRESS}; +entry = ${ENTRYPOINT}; +hash@1 { +algo = ${kernel_csum}; +}; +}; +EOF +} + +# +# Emit the fitImage ITS DTB section +# +# $1 ... Image counter +# $2 ... Path to DTB image +fitimage_emit_section_dtb() { + + dtb_csum=sha1 + + cat EOF fit-image.its +fdt@${1} { +description = Flattened Device Tree blob; +data = /incbin/(${2}); +type = flat_dt; +arch = ${UBOOT_ARCH}; +compression = none; +hash@1 { +algo = ${dtb_csum}; +}; +}; +EOF +} + +# +# Emit the fitImage ITS configuration section +# +# $1 ... Linux kernel ID +# $2 ... DTB image ID +fitimage_emit_section_config() { + + conf_csum=sha1 + + # Test if we have any DTBs at all + if [ -z ${2} ] ; then + conf_desc=Boot Linux kernel + fdt_line= + else +
[OE-core] [PATCH 8/8] kernel: Build uImage only when really needed
Build the uImage file using the kernel build system only when it is really required, which is only in case KEEPUIMAGE == yes. Otherwise, just build zImage, since the Yocto build system will handle the uImage generation for us. Signed-off-by: Marek Vasut ma...@denx.de Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Koen Kooi k...@dominion.thruhere.net Cc: Paul Eggleton paul.eggle...@linux.intel.com Cc: Ross Burton ross.bur...@intel.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/classes/kernel-uimage.bbclass | 8 1 file changed, 8 insertions(+) diff --git a/meta/classes/kernel-uimage.bbclass b/meta/classes/kernel-uimage.bbclass index ce8f96f..acde9ae 100644 --- a/meta/classes/kernel-uimage.bbclass +++ b/meta/classes/kernel-uimage.bbclass @@ -6,6 +6,14 @@ python __anonymous () { depends = d.getVar(DEPENDS, True) depends = %s u-boot-mkimage-native % depends d.setVar(DEPENDS, depends) + + # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal + # to kernel.bbclass . We override the variable here, since we need + # to build uImage using the kernel build system if and only if + # KEEPUIMAGE != yes. Otherwise, we pack compressed vmlinux into + # the uImage . + if d.getVar(KEEPUIMAGE, True) == 'yes': +d.setVar(KERNEL_IMAGETYPE_FOR_MAKE, zImage) } do_uboot_mkimage() { -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/8] kernel: Rework do_uboot_mkimage
Rework the function so part it's internals can be re-used by fitImage image type. The name of the temporary file , linux.bin , is recycled a little more as it's now used for both the case where it is gzip compressed and where it is not. This should be fine, since the file is temporary and removed after the uImage was created anyway. There is no functional change here. Signed-off-by: Marek Vasut ma...@denx.de Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Koen Kooi k...@dominion.thruhere.net Cc: Paul Eggleton paul.eggle...@linux.intel.com Cc: Ross Burton ross.bur...@intel.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/classes/kernel.bbclass | 32 +--- 1 file changed, 21 insertions(+), 11 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 75bfd76..e85e73b 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -435,22 +435,32 @@ MODULE_TARBALL_DEPLOY ?= 1 do_uboot_mkimage() { if test x${KERNEL_IMAGETYPE} = xuImage ; then if test x${KEEPUIMAGE} != xyes ; then + if test -e arch/${ARCH}/boot/compressed/vmlinux ; then + vmlinux_path=arch/${ARCH}/boot/compressed/vmlinux + linux_suffix= + linux_comp=none + else + vmlinux_path=vmlinux + linux_suffix=.gz + linux_comp=gzip + fi + + ${OBJCOPY} -O binary -R .note -R .comment -S ${vmlinux_path} linux.bin + + if [ ${linux_comp} != none ] ; then + rm -f linux.bin + gzip -9 linux.bin + mv -f linux.bin${linux_suffix} linux.bin + fi + ENTRYPOINT=${UBOOT_ENTRYPOINT} if test -n ${UBOOT_ENTRYSYMBOL}; then ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \ awk '$3==${UBOOT_ENTRYSYMBOL} {print $1}'` fi - if test -e arch/${ARCH}/boot/compressed/vmlinux ; then - ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin - uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n ${DISTRO_NAME}/${PV}/${MACHINE} -d linux.bin arch/${ARCH}/boot/uImage - rm -f linux.bin - else - ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin - rm -f linux.bin.gz - gzip -9 linux.bin - uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n ${DISTRO_NAME}/${PV}/${MACHINE} -d linux.bin.gz arch/${ARCH}/boot/uImage - rm -f linux.bin.gz - fi + + uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C ${linux_comp} -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n ${DISTRO_NAME}/${PV}/${MACHINE} -d linux.bin arch/${ARCH}/boot/uImage + rm -f linux.bin fi fi } -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/8] Add basic fitImage support
This series cleans up the code in kernel.bbclass and separates out the uImage generation. The 7th patch in this series then adds support for generation of the advanced successor of the uImage, the fitImage. This series adds only very rudimentary support for generation of fitImage. The advanced features might be added in subsequent patches. I would also like to thank Richard for explaining to me how to properly do the implementation and I hope this series is at least close to that. Marek Vasut (8): kernel: Clean up KERNEL_IMAGETYPE_FOR_MAKE kernel: Rework do_uboot_mkimage kernel: Pull out the linux.bin generation kernel: Pull uImage generation into separate class kernel: Separate out uboot_prep_kimage kernel: Build DTBs early kernel: Add basic fitImage support kernel: Build uImage only when really needed meta/classes/kernel-fitimage.bbclass| 234 meta/classes/kernel-uboot.bbclass | 21 +++ meta/classes/kernel-uimage.bbclass | 36 + meta/classes/kernel.bbclass | 46 ++- meta/recipes-kernel/linux/linux-dtb.inc | 14 +- 5 files changed, 318 insertions(+), 33 deletions(-) create mode 100644 meta/classes/kernel-fitimage.bbclass create mode 100644 meta/classes/kernel-uboot.bbclass create mode 100644 meta/classes/kernel-uimage.bbclass Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Koen Kooi k...@dominion.thruhere.net Cc: Paul Eggleton paul.eggle...@linux.intel.com Cc: Ross Burton ross.bur...@intel.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/8] kernel: Pull uImage generation into separate class
Pull the uImage image format generation from kernel.bbclass into a separate kernel-uimage.bbclass. The recipes which now need to generate an uImage will have to inherit kernel-uimage instead of kernel class. Signed-off-by: Marek Vasut ma...@denx.de Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Koen Kooi k...@dominion.thruhere.net Cc: Paul Eggleton paul.eggle...@linux.intel.com Cc: Ross Burton ross.bur...@intel.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/classes/kernel-uimage.bbclass | 48 + meta/classes/kernel.bbclass| 55 +++--- 2 files changed, 58 insertions(+), 45 deletions(-) create mode 100644 meta/classes/kernel-uimage.bbclass NOTE: The inherit kernel-uimage in kernel.bbclass should be changed to something like inherit kernel-${@d.getVar(KERNEL_IMAGETYPE, True).lower()} but the problem is that I only want to perform the inheritance for uimage and fitimage, the other image types don't need to inherit any additional special stuff. Paul suggested I can do inherit empty here. This would at least let me implement a python function which returns either kernel-uimage, kernel-fitimage or and based on that, I could inherit the particular image type specifics into kernel.bbclass. What I don't know how to implement well is this function which returns those three strings based on the KERNEL_IMAGETYPE. What I would like to avoid is encoding those strings explicitly into the function, since that would force each new kernel image format to also edit this function in kernel.bbclass . Apparently, checking whether class exists and inheriting it only if it does is also not a simple task. The conditional inheritance here would also allow me to remove all those if [ $KERNEL_IMAGETYPE = uImage ] checks from kernel-uimage.bbclass and kernel-fitimage.bbclass, since those classes would be inherited only if the matching imagetype would be selected. diff --git a/meta/classes/kernel-uimage.bbclass b/meta/classes/kernel-uimage.bbclass new file mode 100644 index 000..8a3efc6 --- /dev/null +++ b/meta/classes/kernel-uimage.bbclass @@ -0,0 +1,48 @@ +python __anonymous () { +kerneltype = d.getVar('KERNEL_IMAGETYPE', True) +if kerneltype == 'uImage': +depends = d.getVar(DEPENDS, True) +depends = %s u-boot-mkimage-native % depends +d.setVar(DEPENDS, depends) +} + +uboot_prep_kimage() { + if test -e arch/${ARCH}/boot/compressed/vmlinux ; then + vmlinux_path=arch/${ARCH}/boot/compressed/vmlinux + linux_suffix= + linux_comp=none + else + vmlinux_path=vmlinux + linux_suffix=.gz + linux_comp=gzip + fi + + ${OBJCOPY} -O binary -R .note -R .comment -S ${vmlinux_path} linux.bin + + if [ ${linux_comp} != none ] ; then + rm -f linux.bin + gzip -9 linux.bin + mv -f linux.bin${linux_suffix} linux.bin + fi + + echo ${linux_comp} +} + +do_uboot_mkimage() { + if test x${KERNEL_IMAGETYPE} = xuImage ; then + if test x${KEEPUIMAGE} != xyes ; then + uboot_prep_kimage + + ENTRYPOINT=${UBOOT_ENTRYPOINT} + if test -n ${UBOOT_ENTRYSYMBOL}; then + ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \ + awk '$3==${UBOOT_ENTRYSYMBOL} {print $1}'` + fi + + uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C ${linux_comp} -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n ${DISTRO_NAME}/${PV}/${MACHINE} -d linux.bin arch/${ARCH}/boot/uImage + rm -f linux.bin + fi + fi +} + +addtask uboot_mkimage before do_install after do_compile diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 2895e5e..9723be2 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -20,10 +20,6 @@ python __anonymous () { import re kerneltype = d.getVar('KERNEL_IMAGETYPE', True) -if kerneltype == 'uImage': -depends = d.getVar(DEPENDS, True) -depends = %s u-boot-mkimage-native % depends -d.setVar(DEPENDS, depends) d.setVar(KERNEL_IMAGETYPE_FOR_MAKE, re.sub(r'\.gz$', '', kerneltype)) @@ -40,6 +36,16 @@ python __anonymous () { d.appendVarFlag('do_configure', 'depends', ' ${INITRAMFS_TASK}') } +# Here we pull in all various kernel image types which we support. +# +# In case you're wondering why kernel.bbclass inherits the other image +# types instead of the other way around, the reason for that is to +# maintain compatibility with various currently existing meta-layers. +# By pulling in the various kernel image types here, we retain the +# original
[OE-core] [PATCH 3/8] kernel: Pull out the linux.bin generation
Pull the generation of linux.bin image, which is then packed into uImage, into a separate function. No functional change. Signed-off-by: Marek Vasut ma...@denx.de Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Koen Kooi k...@dominion.thruhere.net Cc: Paul Eggleton paul.eggle...@linux.intel.com Cc: Ross Burton ross.bur...@intel.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/classes/kernel.bbclass | 40 +++- 1 file changed, 23 insertions(+), 17 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index e85e73b..2895e5e 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -432,26 +432,32 @@ MODULE_TARBALL_BASE_NAME ?= ${MODULE_IMAGE_BASE_NAME}.tgz MODULE_TARBALL_SYMLINK_NAME ?= modules-${MACHINE}.tgz MODULE_TARBALL_DEPLOY ?= 1 +uboot_prep_kimage() { + if test -e arch/${ARCH}/boot/compressed/vmlinux ; then + vmlinux_path=arch/${ARCH}/boot/compressed/vmlinux + linux_suffix= + linux_comp=none + else + vmlinux_path=vmlinux + linux_suffix=.gz + linux_comp=gzip + fi + + ${OBJCOPY} -O binary -R .note -R .comment -S ${vmlinux_path} linux.bin + + if [ ${linux_comp} != none ] ; then + rm -f linux.bin + gzip -9 linux.bin + mv -f linux.bin${linux_suffix} linux.bin + fi + + echo ${linux_comp} +} + do_uboot_mkimage() { if test x${KERNEL_IMAGETYPE} = xuImage ; then if test x${KEEPUIMAGE} != xyes ; then - if test -e arch/${ARCH}/boot/compressed/vmlinux ; then - vmlinux_path=arch/${ARCH}/boot/compressed/vmlinux - linux_suffix= - linux_comp=none - else - vmlinux_path=vmlinux - linux_suffix=.gz - linux_comp=gzip - fi - - ${OBJCOPY} -O binary -R .note -R .comment -S ${vmlinux_path} linux.bin - - if [ ${linux_comp} != none ] ; then - rm -f linux.bin - gzip -9 linux.bin - mv -f linux.bin${linux_suffix} linux.bin - fi + uboot_prep_kimage ENTRYPOINT=${UBOOT_ENTRYPOINT} if test -n ${UBOOT_ENTRYSYMBOL}; then -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] systemd: bring back the patch to customise root's $HOME
On Tue, Apr 28, 2015 at 09:12:02PM +0100, Ross Burton wrote: This patch appears to have been accidently dropped in the move to 219-stable, probably because it didn't apply. Update the patch and re-add it. what about the unused .patch files reported in: http://lists.openembedded.org/pipermail/openembedded-core/2015-April/104197.html ? Signed-off-by: Ross Burton ross.bur...@intel.com --- .../systemd/systemd/0010-Make-root-s-home-directory-configurable.patch | 3 ++- meta/recipes-core/systemd/systemd_219.bb | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch b/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch index 41b9039..b65fe42 100644 --- a/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch +++ b/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch @@ -26,10 +26,11 @@ diff --git a/Makefile.am b/Makefile.am index 0fb3f9f..4623963 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -199,6 +199,7 @@ AM_CPPFLAGS = \ +@@ -199,7 +199,8 @@ AM_CPPFLAGS = \ -DKEXEC=\$(KEXEC)\ \ -DLIBDIR=\$(libdir)\ \ -DROOTLIBDIR=\$(rootlibdir)\ \ + -DROOTLIBEXECDIR=\$(rootlibexecdir)\ \ +-DROOTHOMEDIR=\$(roothomedir)\ \ -DTEST_DIR=\$(abs_top_srcdir)/test\ \ -I $(top_srcdir)/src \ diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb index d1303f7..c196017 100644 --- a/meta/recipes-core/systemd/systemd_219.bb +++ b/meta/recipes-core/systemd/systemd_219.bb @@ -38,6 +38,7 @@ SRC_URI = git://anongit.freedesktop.org/systemd/systemd-stable;branch=v219-stab file://0007-util-Use-mkostemp-only-if-libc-supports-it.patch \ file://0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch \ file://0009-sysv-generator-add-support-for-executing-scripts-und.patch \ + file://0010-Make-root-s-home-directory-configurable.patch \ file://0011-systemd-user-avoid-using-system-auth.patch \ file://0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch \ file://0014-Revert-rules-remove-firmware-loading-rules.patch \ -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] systemd: bring back the patch to customise root's $HOME
On Tue, Apr 28, 2015 at 1:12 PM, Ross Burton ross.bur...@intel.com wrote: This patch appears to have been accidently dropped in the move to 219-stable, probably because it didn't apply. Update the patch and re-add it. Thanks for doing it. Acked Signed-off-by: Ross Burton ross.bur...@intel.com --- .../systemd/systemd/0010-Make-root-s-home-directory-configurable.patch | 3 ++- meta/recipes-core/systemd/systemd_219.bb | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch b/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch index 41b9039..b65fe42 100644 --- a/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch +++ b/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch @@ -26,10 +26,11 @@ diff --git a/Makefile.am b/Makefile.am index 0fb3f9f..4623963 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -199,6 +199,7 @@ AM_CPPFLAGS = \ +@@ -199,7 +199,8 @@ AM_CPPFLAGS = \ -DKEXEC=\$(KEXEC)\ \ -DLIBDIR=\$(libdir)\ \ -DROOTLIBDIR=\$(rootlibdir)\ \ + -DROOTLIBEXECDIR=\$(rootlibexecdir)\ \ + -DROOTHOMEDIR=\$(roothomedir)\ \ -DTEST_DIR=\$(abs_top_srcdir)/test\ \ -I $(top_srcdir)/src \ diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb index d1303f7..c196017 100644 --- a/meta/recipes-core/systemd/systemd_219.bb +++ b/meta/recipes-core/systemd/systemd_219.bb @@ -38,6 +38,7 @@ SRC_URI = git://anongit.freedesktop.org/systemd/systemd-stable;branch=v219-stab file://0007-util-Use-mkostemp-only-if-libc-supports-it.patch \ file://0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch \ file://0009-sysv-generator-add-support-for-executing-scripts-und.patch \ + file://0010-Make-root-s-home-directory-configurable.patch \ file://0011-systemd-user-avoid-using-system-auth.patch \ file://0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch \ file://0014-Revert-rules-remove-firmware-loading-rules.patch \ -- 2.1.4 -- ___ 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 0/8] Add basic fitImage support
On Tuesday, April 28, 2015 at 08:45:59 PM, Bruce Ashfield wrote: On 2015-04-28 12:38 PM, Marek Vasut wrote: This series cleans up the code in kernel.bbclass and separates out the uImage generation. The 7th patch in this series then adds support for generation of the advanced successor of the uImage, the fitImage. This series adds only very rudimentary support for generation of fitImage. The advanced features might be added in subsequent patches. I read the series, and nothing fundamentally wrong jumps out. Just one comment and one question from me. Wow, thanks! Best regards, Marek Vasut -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 8/8] kernel: Build uImage only when really needed
On Tuesday, April 28, 2015 at 08:43:48 PM, Bruce Ashfield wrote: On 2015-04-28 12:38 PM, Marek Vasut wrote: Build the uImage file using the kernel build system only when it is really required, which is only in case KEEPUIMAGE == yes. Otherwise, just build zImage, since the Yocto build system will handle the uImage generation for us. Signed-off-by: Marek Vasut ma...@denx.de Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Koen Kooi k...@dominion.thruhere.net Cc: Paul Eggleton paul.eggle...@linux.intel.com Cc: Ross Burton ross.bur...@intel.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/classes/kernel-uimage.bbclass | 8 1 file changed, 8 insertions(+) diff --git a/meta/classes/kernel-uimage.bbclass b/meta/classes/kernel-uimage.bbclass index ce8f96f..acde9ae 100644 --- a/meta/classes/kernel-uimage.bbclass +++ b/meta/classes/kernel-uimage.bbclass @@ -6,6 +6,14 @@ python __anonymous () { depends = d.getVar(DEPENDS, True) depends = %s u-boot-mkimage-native % depends d.setVar(DEPENDS, depends) + + # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal + # to kernel.bbclass . We override the variable here, since we need + # to build uImage using the kernel build system if and only if + # KEEPUIMAGE != yes. Otherwise, we pack compressed vmlinux into + # the uImage . I keep reading this, and must be inverting the logic in my head. If we've set KEEPUIMAGE = yes, that means we just want to let the kernel build the uImage and perform no extra generation steps. When I read this, it looks like if I set the keep flag, I'll be overriden to build a zImage. Is that intentional ? I'd think we would have just left it alone or set it to uImage (unless we are saying that everyone should be building zImage now .. but I know some old ppc targets that do want to build uImages). Uhhh, you're obviously right. The logic in the __anonymous function is clearly inverted. Thanks for spotting this! Best regards, Marek Vasut -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/8] kernel: Pull uImage generation into separate class
On Tuesday, April 28, 2015 at 08:44:54 PM, Bruce Ashfield wrote: On 2015-04-28 12:38 PM, Marek Vasut wrote: Pull the uImage image format generation from kernel.bbclass into a separate kernel-uimage.bbclass. The recipes which now need to generate an uImage will have to inherit kernel-uimage instead of kernel class. Signed-off-by: Marek Vasut ma...@denx.de Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Koen Kooi k...@dominion.thruhere.net Cc: Paul Eggleton paul.eggle...@linux.intel.com Cc: Ross Burton ross.bur...@intel.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/classes/kernel-uimage.bbclass | 48 + meta/classes/kernel.bbclass| 55 +++--- 2 files changed, 58 insertions(+), 45 deletions(-) create mode 100644 meta/classes/kernel-uimage.bbclass NOTE: The inherit kernel-uimage in kernel.bbclass should be changed to something like inherit kernel-${@d.getVar(KERNEL_IMAGETYPE, True).lower()} but the problem is that I only want to perform the inheritance for uimage and fitimage, the other image types don't need to inherit any additional special stuff. Paul suggested I can do inherit empty here. This would at least let me implement a python function which returns either kernel-uimage, kernel-fitimage or and based on that, I could inherit the particular image type specifics into kernel.bbclass. What I don't know how to implement well is this function which returns those three strings based on the KERNEL_IMAGETYPE. What I would like to avoid is encoding those strings explicitly into the function, since that would force each new kernel image format to also edit this function in kernel.bbclass . Apparently, checking whether class exists and inheriting it only if it does is also not a simple task. Agreed that this would be better. It would remove a lot of the checks in the other tasks for the image type. Hi! Yes, that's indeed true. All the image type checks would disappear from kernel-uimage and kernel-fitimage bbclasses. I'm not aware of the exact details on how to make this work, but hopefully others have the foo. Thank you! -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] systemd: bring back the patch to customise root's $HOME
On Tue, 2015-04-28 at 18:37 -0300, Bottazzini, Bruno wrote: Thanks Ross! This slipped trough my fingers when I have remade the first version to use the stable branch. Martin, The patch removed will be applied automatically because they are upstreamed on the stable branch. We have a load of unused orphan patch files left in the tree though? These need to be removed. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] busybox: unbreak tar of uncompressed files
A patch was added to fix compressed tar files, but broke uncompressed tar files, this fix is from the busybox mailing list http://lists.busybox.net/pipermail/busybox/2014-January/080389.html [YOCTO #7645] Signed-off-by: Saul Wold s...@linux.intel.com --- .../busybox/unbreak_noncompressed_tar.patch| 23 ++ meta/recipes-core/busybox/busybox_1.22.1.bb| 1 + 2 files changed, 24 insertions(+) create mode 100644 meta/recipes-core/busybox/busybox/unbreak_noncompressed_tar.patch diff --git a/meta/recipes-core/busybox/busybox/unbreak_noncompressed_tar.patch b/meta/recipes-core/busybox/busybox/unbreak_noncompressed_tar.patch new file mode 100644 index 000..3c3c23a --- /dev/null +++ b/meta/recipes-core/busybox/busybox/unbreak_noncompressed_tar.patch @@ -0,0 +1,23 @@ + +This patch allows tar to continue correctly when it does not detect +a compressed format. This allows tar to then untar a non-compressed +tar file. + +See this thread for details: http://lists.busybox.net/pipermail/busybox/2014-January/080389.html + +Upstream-Status: Inappropriate [Upstream has different fix with additional functionality] +Signed-off-by: Saul Wold s...@linux.intel.com + +Index: busybox-1.22.1/archival/libarchive/open_transformer.c +=== +--- busybox-1.22.1.orig/archival/libarchive/open_transformer.c busybox-1.22.1/archival/libarchive/open_transformer.c +@@ -200,7 +200,7 @@ int FAST_FUNC open_zipped(const char *fn +|| (ENABLE_FEATURE_SEAMLESS_BZ2) +|| (ENABLE_FEATURE_SEAMLESS_XZ) + ) { +- setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 1); ++ setup_unzip_on_fd(fd, /*fail_if_not_detected:*/ 0); + } + + return fd; diff --git a/meta/recipes-core/busybox/busybox_1.22.1.bb b/meta/recipes-core/busybox/busybox_1.22.1.bb index ae8eca7..1b1eaf3 100644 --- a/meta/recipes-core/busybox/busybox_1.22.1.bb +++ b/meta/recipes-core/busybox/busybox_1.22.1.bb @@ -35,6 +35,7 @@ SRC_URI = http://www.busybox.net/downloads/busybox-${PV}.tar.bz2;name=tarball \ file://CVE-2014-9645_busybox_reject_module_names_with_slashes.patch \ file://lzop-add-overflow-check.patch \ file://libarchive-open_zipped-does-not-need-to-check-extens.patch \ + file://unbreak_noncompressed_tar.patch \ SRC_URI[tarball.md5sum] = 337d1a15ab1cb1d4ed423168b1eb7d7e -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] systemd: bring back the patch to customise root's $HOME
Thanks Ross! This slipped trough my fingers when I have remade the first version to use the stable branch. Martin, The patch removed will be applied automatically because they are upstreamed on the stable branch. Best Regards, On Ter, 2015-04-28 at 23:30 +0200, Martin Jansa wrote: On Tue, Apr 28, 2015 at 09:12:02PM +0100, Ross Burton wrote: This patch appears to have been accidently dropped in the move to 219-stable, probably because it didn't apply. Update the patch and re-add it. what about the unused .patch files reported in: http://lists.openembedded.org/pipermail/openembedded-core/2015-April/104197.html ? Signed-off-by: Ross Burton ross.bur...@intel.com --- .../systemd/systemd/0010-Make-root-s-home-directory-configurable.patch | 3 ++- meta/recipes-core/systemd/systemd_219.bb | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch b/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch index 41b9039..b65fe42 100644 --- a/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch +++ b/meta/recipes-core/systemd/systemd/0010-Make-root-s-home-directory-configurable.patch @@ -26,10 +26,11 @@ diff --git a/Makefile.am b/Makefile.am index 0fb3f9f..4623963 100644 --- a/Makefile.am +++ b/Makefile.am -@@ -199,6 +199,7 @@ AM_CPPFLAGS = \ +@@ -199,7 +199,8 @@ AM_CPPFLAGS = \ -DKEXEC=\$(KEXEC)\ \ -DLIBDIR=\$(libdir)\ \ -DROOTLIBDIR=\$(rootlibdir)\ \ + -DROOTLIBEXECDIR=\$(rootlibexecdir)\ \ + -DROOTHOMEDIR=\$(roothomedir)\ \ -DTEST_DIR=\$(abs_top_srcdir)/test\ \ -I $(top_srcdir)/src \ diff --git a/meta/recipes-core/systemd/systemd_219.bb b/meta/recipes-core/systemd/systemd_219.bb index d1303f7..c196017 100644 --- a/meta/recipes-core/systemd/systemd_219.bb +++ b/meta/recipes-core/systemd/systemd_219.bb @@ -38,6 +38,7 @@ SRC_URI = git://anongit.freedesktop.org/systemd/systemd-stable;branch=v219-stab file://0007-util-Use-mkostemp-only-if-libc-supports-it.patch \ file://0008-util-bypass-unimplemented-_SC_PHYS_PAGES-system-conf.patch \ file://0009-sysv-generator-add-support-for-executing-scripts-und.patch \ + file://0010-Make-root-s-home-directory-configurable.patch \ file://0011-systemd-user-avoid-using-system-auth.patch \ file://0012-systemd-tmpfiles.c-Honor-ordering-within-files-as-th.patch \ file://0014-Revert-rules-remove-firmware-loading-rules.patch \ -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- Martin 'JaMa' Jansa jabber: martin.ja...@gmail.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [WIP][RFT] cogl/clutter/libinput/wayland/weston updates
On Tue, Apr 28, 2015 at 8:46 AM, Khem Raj raj.k...@gmail.com wrote: On Apr 28, 2015, at 8:25 AM, Tim Orling ticot...@gmail.com wrote: The following branch includes updates to the latest releases for cogl, clutter, wayland, weston and libinput: http://git.openembedded.org/openembedded-core-contrib/log/?h=timo/cogl-clutter-wayland-weston-updates wayland and weston appear to be fine as tested on nuc. I have had wayland/weston updates lying on my tree for some time now http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/masterid=eb52e9e6756641cd5b1ebbff0e82dcf6f1aa5c9b tried git versions too http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/masterid=992c13dcd4b79fe64f4f9b8122627f918257ccef There are problem with emulator with 1.7 and libinput I guess where the mouse does not work in qemux86 as well as qemux86-64, it works fine with 1.6, I have tested all versions 0.8 and newer of lib input for no success. That was the reason I did not propose those patches. Khem -- I was not aware that 1.6 worked with qemux86 and qemux86-64. I thought qemu had continued to be a non-starter :) I was also not aware that you had them in a tree... I was assuming nobody had looked at the updates. Jussi -- I will take your suggestion for the udev location into account for v2 if this goes any further. --Tim snip -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [WIP][RFT] cogl/clutter/libinput/wayland/weston updates
On Apr 28, 2015 2:53 PM, Tim Orling ticot...@gmail.com wrote: On Tue, Apr 28, 2015 at 8:46 AM, Khem Raj raj.k...@gmail.com wrote: On Apr 28, 2015, at 8:25 AM, Tim Orling ticot...@gmail.com wrote: The following branch includes updates to the latest releases for cogl, clutter, wayland, weston and libinput: http://git.openembedded.org/openembedded-core-contrib/log/?h=timo/cogl-clutter-wayland-weston-updates wayland and weston appear to be fine as tested on nuc. I have had wayland/weston updates lying on my tree for some time now http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/masterid=eb52e9e6756641cd5b1ebbff0e82dcf6f1aa5c9b tried git versions too http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/masterid=992c13dcd4b79fe64f4f9b8122627f918257ccef There are problem with emulator with 1.7 and libinput I guess where the mouse does not work in qemux86 as well as qemux86-64, it works fine with 1.6, I have tested all versions 0.8 and newer of lib input for no success. That was the reason I did not propose those patches. Khem -- I was not aware that 1.6 worked with qemux86 and qemux86-64. I thought qemu had continued to be a non-starter :) There is a hunk in my patches that enable needed backend for it to work on qemux86 Please try it out I was also not aware that you had them in a tree... I was assuming nobody had looked at the updates. Jussi -- I will take your suggestion for the udev location into account for v2 if this goes any further. --Tim snip -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] systemd: bring back the patch to customise root's $HOME
On Apr 28, 2015 2:42 PM, Richard Purdie richard.pur...@linuxfoundation.org wrote: On Tue, 2015-04-28 at 18:37 -0300, Bottazzini, Bruno wrote: Thanks Ross! This slipped trough my fingers when I have remade the first version to use the stable branch. Martin, The patch removed will be applied automatically because they are upstreamed on the stable branch. We have a load of unused orphan patch files left in the tree though? These need to be removed. I was wondering if there was a script or may be bitbake option to warn about this case whole Metadata wide Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [fido][PATCH] groff: add runtime dependency on sed
This is to suppress the following QA warning: groff-1.22.2: groff requires /bin/sed, but no providers in its RDEPENDS [file-rdeps] Signed-off-by: Chunrong Guo b40...@freescale.com --- meta/recipes-extended/groff/groff_1.22.2.bb | 1 + 1 file changed, 1 insertion(+) diff --git a/meta/recipes-extended/groff/groff_1.22.2.bb b/meta/recipes-extended/groff/groff_1.22.2.bb index 6e84587..dd345b7 100644 --- a/meta/recipes-extended/groff/groff_1.22.2.bb +++ b/meta/recipes-extended/groff/groff_1.22.2.bb @@ -17,6 +17,7 @@ SRC_URI[sha256sum] = 380864dac4772e0c0d7b1282d25d0c5fd7f63baf45c87c4657afed22a1 DEPENDS = groff-native DEPENDS_class-native = +RDEPENDS_${PN} += sed inherit autotools texinfo -- 1.9.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v6 3/3] bitbake.conf: backfill bluez5 feature
If bluez4 is not explicitly passed as a distro feature, bluez5 should be used as the default, so backfill it. Signed-off-by: Cristian Iorga cristian.io...@intel.com --- meta/conf/bitbake.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 2b3c110..f544a71 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -733,7 +733,7 @@ MACHINE_ESSENTIAL_EXTRA_RRECOMMENDS ?= EXTRA_IMAGE_FEATURES ??= IMAGE_FEATURES += ${EXTRA_IMAGE_FEATURES} -DISTRO_FEATURES_BACKFILL = pulseaudio sysvinit +DISTRO_FEATURES_BACKFILL = pulseaudio sysvinit bluez5 MACHINE_FEATURES_BACKFILL = rtc COMBINED_FEATURES = \ -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v6 2/3] bluez: remove bluez4 recipes
BlueZ 4.x and associated recipes are now obsolete. (bluez4,bluez-hcidump, gst-plugin-bluetooth). Will be moved into recipes-connectivity collection of meta-openembedded. BlueZ 4.x is still usable in poky/YP. Signed-off-by: Cristian Iorga cristian.io...@intel.com Conflicts: meta/recipes-connectivity/bluez/bluez4.inc meta/recipes-connectivity/bluez/bluez4_4.101.bb --- .../obsolete_automake_macros.patch | 14 --- .../bluez/bluez-hcidump_2.5.bb | 22 - .../bluez/bluez4-4.101/bluetooth.conf | 16 --- .../bluez/bluez4-4.101/fix-udev-paths.patch| 37 --- .../bluez/bluez4-4.101/fix_encrypt_collision.patch | 110 - .../bluez/bluez4-4.101/install-test-script.patch | 26 - ...ork-fix-network-Connect-method-parameters.patch | 30 -- .../bluez4-4.101/obsolete_automake_macros.patch| 14 --- .../bluez/bluez4-4.101/sbc_mmx.patch | 24 - ...pygobject-instead-ofgobject-introspection.patch | 27 - meta/recipes-connectivity/bluez/bluez4.inc | 48 - meta/recipes-connectivity/bluez/bluez4_4.101.bb| 49 - .../bluez/gst-plugin-bluetooth_4.101.bb| 39 13 files changed, 456 deletions(-) delete mode 100644 meta/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4.inc delete mode 100644 meta/recipes-connectivity/bluez/bluez4_4.101.bb delete mode 100644 meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb diff --git a/meta/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch b/meta/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch deleted file mode 100644 index 0c77f1a..000 --- a/meta/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Pending [package obsolete/not maintained by upstream] - -Signed-off-by: Marko Lindqvist cazf...@gmail.com -diff -Nurd bluez-hcidump-2.5/configure.ac bluez-hcidump-2.5/configure.ac bluez-hcidump-2.5/configure.ac 2012-11-30 10:29:41.0 +0200 -+++ bluez-hcidump-2.5/configure.ac 2013-01-12 10:02:10.609511463 +0200 -@@ -2,7 +2,7 @@ - AC_INIT(bluez-hcidump, 2.5) - - AM_INIT_AUTOMAKE([foreign subdir-objects]) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff --git a/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb b/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb deleted file mode 100644 index 3950630..000 --- a/meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = Linux Bluetooth Stack HCI Debugger Tool -DESCRIPTION = The hcidump tool reads raw HCI data coming from and going to a Bluetooth device \ -and displays the commands, events and data in a human-readable form. - -SECTION = console -# hcidump was integrated into bluez5 -DEPENDS = bluez4 -RCONFLICTS_${PN} = bluez5 -LICENSE = GPLv2+ -LIC_FILES_CHKSUM = file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ - file://src/hcidump.c;beginline=1;endline=23;md5=3bee3a162dff43a5be7470710b99fbcf -PR = r1 - -SRC_URI = http://www.kernel.org/pub/linux/bluetooth/bluez-hcidump-${PV}.tar.gz \ - file://obsolete_automake_macros.patch \ - - -SRC_URI[md5sum] = 2eab54bbd2b59a2ed4274ebb9390cf18 -SRC_URI[sha256sum] = 9b7c52b375081883738cf049ecabc103b97d094b19c6544fb241267905d1 -S = ${WORKDIR}/bluez-hcidump-${PV} - -inherit autotools diff --git a/meta/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf b/meta/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf deleted file mode 100644 index ca5e9e4..000 --- a/meta/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf +++ /dev/null @@ -1,16 +0,0 @@ -!-- This configuration file specifies the required security policies - for Bluetooth core daemon to work. -- - -!DOCTYPE busconfig PUBLIC -//freedesktop//DTD D-BUS Bus Configuration 1.0//EN -
[OE-core] [PATCH v6 0/3] Switch to BlueZ 5.x as default Bluetooth stack
BlueZ 5.x is now the default Bluetooth stack. BlueZ 4.x is moved to recipes-connectivity in meta-oe layer and still supported in poky/YP. The following changes since commit ae736dbdd140975ba43f06e635b461dbf36a117e: libxfont: Security Advisory - libxfont - CVE-2015-1804 (2015-04-28 07:56:57 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib Ciorga/YB7479_v5 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=Ciorga/YB7479_v5 Cristian Iorga (3): bluez4: add proper systemd support bluez: remove bluez4 recipes bitbake.conf: backfill bluez5 feature meta/conf/bitbake.conf | 2 +- .../obsolete_automake_macros.patch | 14 --- .../bluez/bluez-hcidump_2.5.bb | 22 - .../bluez/bluez4-4.101/bluetooth.conf | 16 --- .../bluez/bluez4-4.101/fix-udev-paths.patch| 37 --- .../bluez/bluez4-4.101/fix_encrypt_collision.patch | 110 - .../bluez/bluez4-4.101/install-test-script.patch | 26 - ...ork-fix-network-Connect-method-parameters.patch | 30 -- .../bluez4-4.101/obsolete_automake_macros.patch| 14 --- .../bluez/bluez4-4.101/sbc_mmx.patch | 24 - ...pygobject-instead-ofgobject-introspection.patch | 27 - meta/recipes-connectivity/bluez/bluez4.inc | 46 - meta/recipes-connectivity/bluez/bluez4_4.101.bb| 47 - .../bluez/gst-plugin-bluetooth_4.101.bb| 39 14 files changed, 1 insertion(+), 453 deletions(-) delete mode 100644 meta/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4.inc delete mode 100644 meta/recipes-connectivity/bluez/bluez4_4.101.bb delete mode 100644 meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v6 1/3] bluez4: add proper systemd support
Signed-off-by: Cristian Iorga cristian.io...@intel.com --- meta/recipes-connectivity/bluez/bluez4.inc | 4 +++- meta/recipes-connectivity/bluez/bluez4_4.101.bb | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/meta/recipes-connectivity/bluez/bluez4.inc b/meta/recipes-connectivity/bluez/bluez4.inc index 11c9616..9429d0a 100644 --- a/meta/recipes-connectivity/bluez/bluez4.inc +++ b/meta/recipes-connectivity/bluez/bluez4.inc @@ -13,9 +13,11 @@ RDEPENDS_${PN}-dev = bluez-hcidump PACKAGECONFIG ??= \ ${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}\ ${@bb.utils.contains('DISTRO_FEATURES', 'pie', 'pie', '', d)}\ +${@bb.utils.contains('DISTRO_FEATURES', 'systemd','systemd', '', d)} \ PACKAGECONFIG[alsa] = --enable-alsa,--disable-alsa,alsa-lib PACKAGECONFIG[pie] = --enable-pie,--disable-pie, +PACKAGECONFIG[systemd] = --with-systemdunitdir=${systemd_unitdir}/system/,--with-systemdunitdir= ASNEEDED = @@ -24,7 +26,7 @@ SRC_URI = \ S = ${WORKDIR}/bluez-${PV} -inherit autotools-brokensep pkgconfig +inherit autotools-brokensep pkgconfig systemd EXTRA_OECONF = \ --disable-gstreamer \ diff --git a/meta/recipes-connectivity/bluez/bluez4_4.101.bb b/meta/recipes-connectivity/bluez/bluez4_4.101.bb index f900c7c..1023923 100644 --- a/meta/recipes-connectivity/bluez/bluez4_4.101.bb +++ b/meta/recipes-connectivity/bluez/bluez4_4.101.bb @@ -45,3 +45,5 @@ FILES_${PN}-dbg += \ ${libdir}/*/.debug \ */udev/.debug \ + +SYSTEMD_SERVICE_${PN} = bluetooth.service -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] ldconfig-native: Add 64-bit flag for ELF64 entries
From: Yuanjie Huang yuanjie.hu...@windriver.com ldconfig-native was grepped from an old version of glibc, and its output lacks neccessary 64bit flag in entries. Due to this defect, ctypes.util.find_library() python function fails to detect any library due to the old file format that ldconfig-native creates. This fix sets architecture-dependent 64bit flags for 64-bit ELF. Since the host's elf.h may not have definition for new AArch64 machine type, a work-around is added to correctly flag 64-bit ARM libraries. Signed-off-by: Yuanjie Huang yuanjie.hu...@windriver.com --- .../add-64-bit-flag-for-ELF64-entries.patch| 103 + meta/recipes-core/glibc/ldconfig-native_2.12.1.bb | 1 + 2 files changed, 104 insertions(+) create mode 100644 meta/recipes-core/glibc/ldconfig-native-2.12.1/add-64-bit-flag-for-ELF64-entries.patch diff --git a/meta/recipes-core/glibc/ldconfig-native-2.12.1/add-64-bit-flag-for-ELF64-entries.patch b/meta/recipes-core/glibc/ldconfig-native-2.12.1/add-64-bit-flag-for-ELF64-entries.patch new file mode 100644 index 000..d42f7a1 --- /dev/null +++ b/meta/recipes-core/glibc/ldconfig-native-2.12.1/add-64-bit-flag-for-ELF64-entries.patch @@ -0,0 +1,103 @@ +From 9d62544090b08849218cd1fc52a36cdd5d90363e Mon Sep 17 00:00:00 2001 +From: Yuanjie Huang yuanjie.hu...@windriver.com +Date: Fri, 24 Apr 2015 03:29:31 + +Subject: [PATCH] Add 64-bit flag for ELF64 entries. + +ldconfig-native was grepped from an old version of glibc, and its output +lacks neccessary 64bit flag in entries. +Due to this defect, ctypes.util.find_library() python function fails to +detect any library due to the old file format that ldconfig-native +creates. This fix sets architecture-dependent 64bit flags for 64-bit ELF. + +Signed-off-by: Yuanjie Huang yuanjie.hu...@windriver.com +--- + cache.c | 4 + ldconfig.h | 4 + readelflib.c | 34 ++ + 3 files changed, 42 insertions(+) + +diff --git a/cache.c b/cache.c +index a904d44..c4f5411 100644 +--- a/cache.c b/cache.c +@@ -121,6 +121,10 @@ print_entry (const char *lib, int flag, unsigned int osversion, + break; + case FLAG_MIPS64_LIBN64: + fputs (,64bit, stdout); ++ break; ++case FLAG_AARCH64_LIB64: ++ fputs (,AArch64, stdout); ++ break; + case 0: + break; + default: +diff --git a/ldconfig.h b/ldconfig.h +index fadd5ec..6a8a750 100644 +--- a/ldconfig.h b/ldconfig.h +@@ -34,6 +34,10 @@ + #define FLAG_POWERPC_LIB640x0500 + #define FLAG_MIPS64_LIBN320x0600 + #define FLAG_MIPS64_LIBN640x0700 ++#define FLAG_X8664_LIBX32 0x0800 ++#define FLAG_ARM_LIBHF0x0900 ++#define FLAG_AARCH64_LIB640x0a00 ++#define FLAG_ARM_LIBSF0x0b00 + + /* Name of auxiliary cache. */ + #define _PATH_LDCONFIG_AUX_CACHE /var/cache/ldconfig/aux-cache +diff --git a/readelflib.c b/readelflib.c +index 0bf0de3..6e87afc 100644 +--- a/readelflib.c b/readelflib.c +@@ -28,6 +28,11 @@ + + #include endian_extra.h + ++/* Work-around for old host that does not have AArch64 defined in elf.h. */ ++#ifndef EM_AARCH64 ++#define EM_AARCH64183 /* ARM AARCH64 */ ++#endif ++ + #undef check_ptr + #define check_ptr(ptr)\ + do\ +@@ -290,6 +295,35 @@ process_elf_file64 (const char *file_name, const char *lib, int *flag, + libc5/libc6. */ + *flag = FLAG_ELF; + ++ /* Set flags according to information in ELF header to align with target ++ ldconfig */ ++ switch (elf_header-e_machine) ++{ ++case EM_IA_64: ++ *flag |= FLAG_IA64_LIB64; ++ break; ++case EM_X86_64: ++ *flag |= FLAG_X8664_LIB64; ++ break; ++case EM_S390: ++ *flag |= FLAG_S390_LIB64; ++ break; ++case EM_PPC64: ++ *flag |= FLAG_POWERPC_LIB64; ++ break; ++case EM_MIPS: ++case EM_MIPS_RS3_LE: ++ *flag |= FLAG_MIPS64_LIBN64; ++ break; ++case EM_AARCH64: ++ *flag |= FLAG_AARCH64_LIB64; ++ break; ++default: ++ error(0, 0, %s is a 64-bit ELF for unknown machine %lx\n, ++file_name, (long)elf_header-e_machine); ++ break; ++} ++ + loadaddr = -1; + dynamic_addr = 0; + dynamic_size = 0; +-- +1.8.5.2.233.g932f7e4 + diff --git a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb index 7c34635..8a2ea90 100644 --- a/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb +++ b/meta/recipes-core/glibc/ldconfig-native_2.12.1.bb @@ -12,6 +12,7 @@ SRC_URI = file://ldconfig-native-2.12.1.tar.bz2 \ file://flag_fix.patch \ file://endianess-header.patch \ file://ldconfig-default-to-all-multilib-dirs.patch \ + file://add-64-bit-flag-for-ELF64-entries.patch \ PR = r2 -- 1.8.5.2.233.g932f7e4 --
Re: [OE-core] [PATCH 4/7] kernel: Pull uImage generation into separate class
Hi Marek, On Tuesday 28 April 2015 04:39:32 Marek Vasut wrote: On Monday, October 27, 2014 at 07:59:42 AM, Koen Kooi wrote: So uh, what exactly would you propose then? Ask the BSPs to cater for the change ? I don't quite like that option, since it's like breaking an API (or similar interface, I'm not sure what the local equivalent of that would be). Personally, I'd try to keep the kernel_foo() methods the same since those are very popular, a lot of BSPs append the configure one. So maybe something like: kernel.bbclass: do_configure do_install addtask etc inherit kernel-${KERNEL_IMAGETYPE.bbclass} kernel-${KERNEL_IMAGETYPE.bbclass} do_install (overrides the one in kernel.bbclass) Someone more familiar with bbclass method (re)naming and scoping should weigh in on the method override above, but I think it should work. I wonder, is it possible to inherit bbclass if it exists as a file and inherit nothing otherwise ? In case I do: inherit kernel-${@d.getVar(KERNEL_IMAGETYPE, True).lower()} I get a nasty spit from bitbake in case I'm building with zImage KERNEL_IMAGETYPE . The reason is obvious, the file kernel-zimage.bbclass doesn't exist. So I wonder if there's some easy way to check if the class actually exists. FYI, one way to handle this is to make the item being inherited an empty string if you don't want to inherit anything. You'd probably need to define a python function with def... and then call that from the inherit line. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [master-next][PATCHv3] wic: Add plugin for single partition disk
On Mon, Apr 27, 2015 at 03:00:23PM +0200, Adrian Freihofer wrote: The wic plugin creates a disk image containig one ext2/3/4 partition. No additional boot partition is required. Syslinux is installed into the image. The target device is a legacy BIOS PC. Purpose of this plugin: Other avaliable plugins create a fat partition for /boot and an ext partition for rootfs. Current linux-yocto kernel packages are not compatible with this disk layout. The boot partition is not mounted by default, hence the kernel is installed into rootfs and not into boot partition. A kernel update ends up in a bricked device. The old kernel which is still in boot likely does not even boot with updated kernel modules from /. Even if the boot partition is mounted during the kernel update the update will fail. The kernel package installs a symbolic link which is not supported by the fat partition. Creating just one ext partition for boot and rootfs solves all issues related to package based kernel updates on the device. The plugin depends on syslinux-nomtools a user space installer for syslinux on ext filesystems. Thanks to Robert Yang who implemented syslinux-nomtools and supported the implementation of this plugin. Signed-off-by: Adrian Freihofer adrian.freiho...@gmail.com --- .../lib/wic/plugins/source/rootfs_pcbios_ext.py| 182 + scripts/lib/wic/utils/syslinux.py | 58 +++ 2 files changed, 240 insertions(+) create mode 100644 scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py create mode 100644 scripts/lib/wic/utils/syslinux.py diff --git a/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py new file mode 100644 index 000..ebf95ae --- /dev/null +++ b/scripts/lib/wic/plugins/source/rootfs_pcbios_ext.py @@ -0,0 +1,182 @@ +# ex:ts=4:sw=4:sts=4:et +# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- +# +# This program is free software; you can distribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for mo details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# AUTHOR +# Adrian Freihofer adrian.freihofer (at] neratec.com +# + +import os +from wic import kickstart +from wic import msger +from wic.utils import syslinux +from wic.utils import runner +from wic.utils.oe import misc +from wic.utils.errors import ImageError +from wic.pluginbase import SourcePlugin + + +# pylint: disable=no-init +class RootfsPlugin(SourcePlugin): + +Create root partition and install syslinux bootloader + +This plugin creates a disk image containing a bootable root partition with +syslinux installed. The filesystem is ext2/3/4, no extra boot partition is +required. + +Example kickstart file: +part / --source rootfs-pcbios-ext --ondisk sda --fstype=ext4 --label rootfs --align 1024 +bootloader --source rootfs-pcbios-ext --timeout=0 --append=rootwait rootfstype=ext4 + +The first line generates a root file system including a syslinux.cfg file +The --source rootfs-pcbios-ext in the second line triggers the installation +of ldlinux.sys into the image. + + +name = 'rootfs-pcbios-ext' + +@staticmethod +def _get_rootfs_dir(rootfs_dir): + +Find rootfs pseudo dir + +If rootfs_dir is a directory consider it as rootfs directory. +Otherwise ask bitbake about the IMAGE_ROOTFS directory. + +if os.path.isdir(rootfs_dir): +return rootfs_dir + +bitbake_env_lines = misc.find_bitbake_env_lines(rootfs_dir) +if not bitbake_env_lines: +msger.error(Couldn't get bitbake environment, exiting.) + +image_rootfs_dir = misc.find_artifact(bitbake_env_lines, IMAGE_ROOTFS) +if not os.path.isdir(image_rootfs_dir): +msg = No valid artifact IMAGE_ROOTFS from image named +msg += %s has been found at %s, exiting.\n % \ +(rootfs_dir, image_rootfs_dir) +msger.error(msg) + +return image_rootfs_dir + +# pylint: disable=unused-argument +@classmethod +def do_configure_partition(cls, part, source_params, image_creator, + image_creator_workdir, oe_builddir, bootimg_dir, + kernel_dir, native_sysroot): + +Creates syslinux config in rootfs directory + +
[OE-core] 4/28/2015 6:28:23 PM
http://sipenglipurlara.com/ictr/uwsrzpblmmrv.jvfpioabnsjljrkquvyvcjlwsiv 4/28/2015 6:28:23 PM-- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/8] Add basic fitImage support
On 2015-04-28 12:38 PM, Marek Vasut wrote: This series cleans up the code in kernel.bbclass and separates out the uImage generation. The 7th patch in this series then adds support for generation of the advanced successor of the uImage, the fitImage. This series adds only very rudimentary support for generation of fitImage. The advanced features might be added in subsequent patches. I read the series, and nothing fundamentally wrong jumps out. Just one comment and one question from me. Cheers, Bruce I would also like to thank Richard for explaining to me how to properly do the implementation and I hope this series is at least close to that. Marek Vasut (8): kernel: Clean up KERNEL_IMAGETYPE_FOR_MAKE kernel: Rework do_uboot_mkimage kernel: Pull out the linux.bin generation kernel: Pull uImage generation into separate class kernel: Separate out uboot_prep_kimage kernel: Build DTBs early kernel: Add basic fitImage support kernel: Build uImage only when really needed meta/classes/kernel-fitimage.bbclass| 234 meta/classes/kernel-uboot.bbclass | 21 +++ meta/classes/kernel-uimage.bbclass | 36 + meta/classes/kernel.bbclass | 46 ++- meta/recipes-kernel/linux/linux-dtb.inc | 14 +- 5 files changed, 318 insertions(+), 33 deletions(-) create mode 100644 meta/classes/kernel-fitimage.bbclass create mode 100644 meta/classes/kernel-uboot.bbclass create mode 100644 meta/classes/kernel-uimage.bbclass Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Koen Kooi k...@dominion.thruhere.net Cc: Paul Eggleton paul.eggle...@linux.intel.com Cc: Ross Burton ross.bur...@intel.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 4/8] kernel: Pull uImage generation into separate class
On 2015-04-28 12:38 PM, Marek Vasut wrote: Pull the uImage image format generation from kernel.bbclass into a separate kernel-uimage.bbclass. The recipes which now need to generate an uImage will have to inherit kernel-uimage instead of kernel class. Signed-off-by: Marek Vasut ma...@denx.de Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Koen Kooi k...@dominion.thruhere.net Cc: Paul Eggleton paul.eggle...@linux.intel.com Cc: Ross Burton ross.bur...@intel.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/classes/kernel-uimage.bbclass | 48 + meta/classes/kernel.bbclass| 55 +++--- 2 files changed, 58 insertions(+), 45 deletions(-) create mode 100644 meta/classes/kernel-uimage.bbclass NOTE: The inherit kernel-uimage in kernel.bbclass should be changed to something like inherit kernel-${@d.getVar(KERNEL_IMAGETYPE, True).lower()} but the problem is that I only want to perform the inheritance for uimage and fitimage, the other image types don't need to inherit any additional special stuff. Paul suggested I can do inherit empty here. This would at least let me implement a python function which returns either kernel-uimage, kernel-fitimage or and based on that, I could inherit the particular image type specifics into kernel.bbclass. What I don't know how to implement well is this function which returns those three strings based on the KERNEL_IMAGETYPE. What I would like to avoid is encoding those strings explicitly into the function, since that would force each new kernel image format to also edit this function in kernel.bbclass . Apparently, checking whether class exists and inheriting it only if it does is also not a simple task. Agreed that this would be better. It would remove a lot of the checks in the other tasks for the image type. I'm not aware of the exact details on how to make this work, but hopefully others have the foo. Bruce The conditional inheritance here would also allow me to remove all those if [ $KERNEL_IMAGETYPE = uImage ] checks from kernel-uimage.bbclass and kernel-fitimage.bbclass, since those classes would be inherited only if the matching imagetype would be selected. diff --git a/meta/classes/kernel-uimage.bbclass b/meta/classes/kernel-uimage.bbclass new file mode 100644 index 000..8a3efc6 --- /dev/null +++ b/meta/classes/kernel-uimage.bbclass @@ -0,0 +1,48 @@ +python __anonymous () { +kerneltype = d.getVar('KERNEL_IMAGETYPE', True) +if kerneltype == 'uImage': +depends = d.getVar(DEPENDS, True) +depends = %s u-boot-mkimage-native % depends +d.setVar(DEPENDS, depends) +} + +uboot_prep_kimage() { + if test -e arch/${ARCH}/boot/compressed/vmlinux ; then + vmlinux_path=arch/${ARCH}/boot/compressed/vmlinux + linux_suffix= + linux_comp=none + else + vmlinux_path=vmlinux + linux_suffix=.gz + linux_comp=gzip + fi + + ${OBJCOPY} -O binary -R .note -R .comment -S ${vmlinux_path} linux.bin + + if [ ${linux_comp} != none ] ; then + rm -f linux.bin + gzip -9 linux.bin + mv -f linux.bin${linux_suffix} linux.bin + fi + + echo ${linux_comp} +} + +do_uboot_mkimage() { + if test x${KERNEL_IMAGETYPE} = xuImage ; then + if test x${KEEPUIMAGE} != xyes ; then + uboot_prep_kimage + + ENTRYPOINT=${UBOOT_ENTRYPOINT} + if test -n ${UBOOT_ENTRYSYMBOL}; then + ENTRYPOINT=`${HOST_PREFIX}nm ${S}/vmlinux | \ + awk '$3==${UBOOT_ENTRYSYMBOL} {print $1}'` + fi + + uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C ${linux_comp} -a ${UBOOT_LOADADDRESS} -e $ENTRYPOINT -n ${DISTRO_NAME}/${PV}/${MACHINE} -d linux.bin arch/${ARCH}/boot/uImage + rm -f linux.bin + fi + fi +} + +addtask uboot_mkimage before do_install after do_compile diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 2895e5e..9723be2 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -20,10 +20,6 @@ python __anonymous () { import re kerneltype = d.getVar('KERNEL_IMAGETYPE', True) -if kerneltype == 'uImage': -depends = d.getVar(DEPENDS, True) -depends = %s u-boot-mkimage-native % depends -d.setVar(DEPENDS, depends) d.setVar(KERNEL_IMAGETYPE_FOR_MAKE, re.sub(r'\.gz$', '', kerneltype)) @@ -40,6 +36,16 @@ python __anonymous () { d.appendVarFlag('do_configure', 'depends', ' ${INITRAMFS_TASK}') } +# Here we pull in all various kernel image types which we support. +# +# In case
Re: [OE-core] [PATCH 8/8] kernel: Build uImage only when really needed
On 2015-04-28 12:38 PM, Marek Vasut wrote: Build the uImage file using the kernel build system only when it is really required, which is only in case KEEPUIMAGE == yes. Otherwise, just build zImage, since the Yocto build system will handle the uImage generation for us. Signed-off-by: Marek Vasut ma...@denx.de Cc: Richard Purdie richard.pur...@linuxfoundation.org Cc: Koen Kooi k...@dominion.thruhere.net Cc: Paul Eggleton paul.eggle...@linux.intel.com Cc: Ross Burton ross.bur...@intel.com Cc: Bruce Ashfield bruce.ashfi...@windriver.com --- meta/classes/kernel-uimage.bbclass | 8 1 file changed, 8 insertions(+) diff --git a/meta/classes/kernel-uimage.bbclass b/meta/classes/kernel-uimage.bbclass index ce8f96f..acde9ae 100644 --- a/meta/classes/kernel-uimage.bbclass +++ b/meta/classes/kernel-uimage.bbclass @@ -6,6 +6,14 @@ python __anonymous () { depends = d.getVar(DEPENDS, True) depends = %s u-boot-mkimage-native % depends d.setVar(DEPENDS, depends) + + # Override KERNEL_IMAGETYPE_FOR_MAKE variable, which is internal + # to kernel.bbclass . We override the variable here, since we need + # to build uImage using the kernel build system if and only if + # KEEPUIMAGE != yes. Otherwise, we pack compressed vmlinux into + # the uImage . I keep reading this, and must be inverting the logic in my head. If we've set KEEPUIMAGE = yes, that means we just want to let the kernel build the uImage and perform no extra generation steps. When I read this, it looks like if I set the keep flag, I'll be overriden to build a zImage. Is that intentional ? I'd think we would have just left it alone or set it to uImage (unless we are saying that everyone should be building zImage now .. but I know some old ppc targets that do want to build uImages). Bruce + if d.getVar(KEEPUIMAGE, True) == 'yes': +d.setVar(KERNEL_IMAGETYPE_FOR_MAKE, zImage) } do_uboot_mkimage() { -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 3/3] linux-firmware: add NO_GENERIC_LICENSE for all licenses
From: Jackie Huang jackie.hu...@windriver.com An alternative approach with NO_GENERIC_LICENSE has been added in license.bbclass to allow copying non-generic license, add it for all firmware licenses. Signed-off-by: Jackie Huang jackie.hu...@windriver.com --- .../linux-firmware/linux-firmware_git.bb | 39 ++ 1 file changed, 39 insertions(+) diff --git a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb index 52c6825..af3205f 100644 --- a/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb +++ b/meta/recipes-kernel/linux-firmware/linux-firmware_git.bb @@ -79,6 +79,45 @@ LIC_FILES_CHKSUM = \ file://LICENSE.radeon;md5=07b0c31777bd686d8e1609c6940b5e74 \ +# These are not common licenses, set NO_GENERIC_LICENSE for them +# so that the license files will be copied from fetched source +NO_GENERIC_LICENSE[Firmware-Abilis] = LICENCE.Abilis +NO_GENERIC_LICENSE[Firmware-agere] = LICENCE.agere +NO_GENERIC_LICENSE[Firmware-atheros_firmware] = LICENCE.atheros_firmware +NO_GENERIC_LICENSE[Firmware-broadcom_bcm43xx] = LICENCE.broadcom_bcm43xx +NO_GENERIC_LICENSE[Firmware-ca0132] = LICENCE.ca0132 +NO_GENERIC_LICENSE[Firmware-chelsio_firmware] = LICENCE.chelsio_firmware +NO_GENERIC_LICENSE[Firmware-cw1200] = LICENCE.cw1200 +NO_GENERIC_LICENSE[Firmware-ene_firmware] = LICENCE.ene_firmware +NO_GENERIC_LICENSE[Firmware-fw_sst_0f28] = LICENCE.fw_sst_0f28 +NO_GENERIC_LICENSE[Firmware-go7007] = LICENCE.go7007 +NO_GENERIC_LICENSE[Firmware-i2400m] = LICENCE.i2400m +NO_GENERIC_LICENSE[Firmware-ibt_firmware] = LICENCE.ibt_firmware +NO_GENERIC_LICENSE[Firmware-it913x] = LICENCE.it913x +NO_GENERIC_LICENSE[Firmware-iwlwifi_firmware] = LICENCE.iwlwifi_firmware +NO_GENERIC_LICENSE[Firmware-Marvell] = LICENCE.Marvell +NO_GENERIC_LICENSE[Firmware-mwl8335] = LICENCE.mwl8335 +NO_GENERIC_LICENSE[Firmware-myri10ge_firmware] = LICENCE.myri10ge_firmware +NO_GENERIC_LICENSE[Firmware-OLPC] = LICENCE.OLPC +NO_GENERIC_LICENSE[Firmware-phanfw] = LICENCE.phanfw +NO_GENERIC_LICENSE[Firmware-qat_dh895xcc_firmware] = LICENCE.qat_dh895xcc_firmware +NO_GENERIC_LICENSE[Firmware-qla2xxx] = LICENCE.qla2xxx +NO_GENERIC_LICENSE[Firmware-r8a779x_usb3] = LICENCE.r8a779x_usb3 +NO_GENERIC_LICENSE[Firmware-ralink_a_mediatek_company_firmware] = LICENCE.ralink_a_mediatek_company_firmware +NO_GENERIC_LICENSE[Firmware-ralink-firmware] = LICENCE.ralink-firmware.txt +NO_GENERIC_LICENSE[Firmware-rtlwifi_firmware] = LICENCE.rtlwifi_firmware.txt +NO_GENERIC_LICENSE[Firmware-tda7706-firmware] = LICENCE.tda7706-firmware.txt +NO_GENERIC_LICENSE[Firmware-ti-connectivity] = LICENCE.ti-connectivity +NO_GENERIC_LICENSE[Firmware-ueagle-atm4-firmware] = LICENCE.ueagle-atm4-firmware +NO_GENERIC_LICENSE[Firmware-via_vt6656] = LICENCE.via_vt6656 +NO_GENERIC_LICENSE[Firmware-wl1251] = LICENCE.wl1251 +NO_GENERIC_LICENSE[Firmware-xc4000] = LICENCE.xc4000 +NO_GENERIC_LICENSE[Firmware-xc5000] = LICENCE.xc5000 +NO_GENERIC_LICENSE[Firmware-xc5000c] = LICENCE.xc5000c +NO_GENERIC_LICENSE[Firmware-amd-ucode] = LICENSE.amd-ucode +NO_GENERIC_LICENSE[Firmware-dib0700] = LICENSE.dib0700 +NO_GENERIC_LICENSE[Firmware-radeon] = LICENSE.radeon + SRCREV = 0e5f63771d0df6d7859f7c4100a74d737c62ac88 PE = 1 PV = 0.0+git${SRCPV} -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 2/3] Revert common-licenses: Add common license files for linux-firmware
From: Jackie Huang jackie.hu...@windriver.com This reverts commit 9021ee03e0f9bd36b0ce63fa29dd010e07241fdb --- meta/files/common-licenses/Firmware-Abilis | 22 - meta/files/common-licenses/Firmware-Marvell| 18 - meta/files/common-licenses/Firmware-OLPC | 33 -- meta/files/common-licenses/Firmware-agere | 77 meta/files/common-licenses/Firmware-amd-ucode | 64 --- .../common-licenses/Firmware-atheros_firmware | 38 -- .../common-licenses/Firmware-broadcom_bcm43xx | 65 --- meta/files/common-licenses/Firmware-ca0132 | 47 --- .../common-licenses/Firmware-chelsio_firmware | 27 -- meta/files/common-licenses/Firmware-cw1200 | 35 -- meta/files/common-licenses/Firmware-dib0700| 22 - meta/files/common-licenses/Firmware-ene_firmware | 14 - meta/files/common-licenses/Firmware-fw_sst_0f28| 40 -- meta/files/common-licenses/Firmware-go7007 | 457 - meta/files/common-licenses/Firmware-i2400m | 43 -- meta/files/common-licenses/Firmware-ibt_firmware | 39 -- meta/files/common-licenses/Firmware-it913x | 17 - .../common-licenses/Firmware-iwlwifi_firmware | 39 -- meta/files/common-licenses/Firmware-mwl8335| 52 --- .../common-licenses/Firmware-myri10ge_firmware | 28 -- meta/files/common-licenses/Firmware-phanfw | 32 -- .../common-licenses/Firmware-qat_dh895xcc_firmware | 39 -- meta/files/common-licenses/Firmware-qla2xxx| 31 -- meta/files/common-licenses/Firmware-r8a779x_usb3 | 26 -- meta/files/common-licenses/Firmware-radeon | 51 --- .../files/common-licenses/Firmware-ralink-firmware | 39 -- .../Firmware-ralink_a_mediatek_company_firmware| 39 -- .../common-licenses/Firmware-rtlwifi_firmware | 39 -- .../common-licenses/Firmware-tda7706-firmware | 48 --- .../files/common-licenses/Firmware-ti-connectivity | 46 --- .../common-licenses/Firmware-ueagle-atm4-firmware | 39 -- meta/files/common-licenses/Firmware-via_vt6656 | 25 -- meta/files/common-licenses/Firmware-wl1251 | 59 --- meta/files/common-licenses/Firmware-xc4000 | 23 -- meta/files/common-licenses/Firmware-xc5000 | 23 -- meta/files/common-licenses/Firmware-xc5000c| 23 -- 36 files changed, 1759 deletions(-) delete mode 100644 meta/files/common-licenses/Firmware-Abilis delete mode 100644 meta/files/common-licenses/Firmware-Marvell delete mode 100644 meta/files/common-licenses/Firmware-OLPC delete mode 100644 meta/files/common-licenses/Firmware-agere delete mode 100644 meta/files/common-licenses/Firmware-amd-ucode delete mode 100644 meta/files/common-licenses/Firmware-atheros_firmware delete mode 100644 meta/files/common-licenses/Firmware-broadcom_bcm43xx delete mode 100644 meta/files/common-licenses/Firmware-ca0132 delete mode 100644 meta/files/common-licenses/Firmware-chelsio_firmware delete mode 100644 meta/files/common-licenses/Firmware-cw1200 delete mode 100644 meta/files/common-licenses/Firmware-dib0700 delete mode 100644 meta/files/common-licenses/Firmware-ene_firmware delete mode 100644 meta/files/common-licenses/Firmware-fw_sst_0f28 delete mode 100644 meta/files/common-licenses/Firmware-go7007 delete mode 100644 meta/files/common-licenses/Firmware-i2400m delete mode 100644 meta/files/common-licenses/Firmware-ibt_firmware delete mode 100644 meta/files/common-licenses/Firmware-it913x delete mode 100644 meta/files/common-licenses/Firmware-iwlwifi_firmware delete mode 100644 meta/files/common-licenses/Firmware-mwl8335 delete mode 100644 meta/files/common-licenses/Firmware-myri10ge_firmware delete mode 100644 meta/files/common-licenses/Firmware-phanfw delete mode 100644 meta/files/common-licenses/Firmware-qat_dh895xcc_firmware delete mode 100644 meta/files/common-licenses/Firmware-qla2xxx delete mode 100644 meta/files/common-licenses/Firmware-r8a779x_usb3 delete mode 100644 meta/files/common-licenses/Firmware-radeon delete mode 100644 meta/files/common-licenses/Firmware-ralink-firmware delete mode 100644 meta/files/common-licenses/Firmware-ralink_a_mediatek_company_firmware delete mode 100644 meta/files/common-licenses/Firmware-rtlwifi_firmware delete mode 100644 meta/files/common-licenses/Firmware-tda7706-firmware delete mode 100644 meta/files/common-licenses/Firmware-ti-connectivity delete mode 100644 meta/files/common-licenses/Firmware-ueagle-atm4-firmware delete mode 100644 meta/files/common-licenses/Firmware-via_vt6656 delete mode 100644 meta/files/common-licenses/Firmware-wl1251 delete mode 100644 meta/files/common-licenses/Firmware-xc4000 delete mode 100644 meta/files/common-licenses/Firmware-xc5000 delete mode 100644 meta/files/common-licenses/Firmware-xc5000c diff --git a/meta/files/common-licenses/Firmware-Abilis b/meta/files/common-licenses/Firmware-Abilis deleted file mode 100644 index 9050d2b..000 ---
[OE-core] [PATCH v2 1/3] license.bbclass: allow copying license not in common licenses
From: Jackie Huang jackie.hu...@windriver.com Some package like linux-firmware has many licenses that aren't in any way common, and new ones will be added from time to time, in order to avoid adding bunch of such common license files that are only applicable to a specific package, NO_GENERIC_LICENSE is added to allow copying license not in common licenses, it should be used in the recipe as: NO_GENERIC_LICENSE[license_name] = license file in fetched source e.g. NO_GENERIC_LICENSE[Firmware-Abilis] = LICENCE.Abilis.txt Signed-off-by: Jackie Huang jackie.hu...@windriver.com --- meta/classes/license.bbclass | 17 - 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/meta/classes/license.bbclass b/meta/classes/license.bbclass index 73a0e97..d9409a9 100644 --- a/meta/classes/license.bbclass +++ b/meta/classes/license.bbclass @@ -222,7 +222,9 @@ def find_license_files(d): pass spdx_generic = None license_source = None -# If the generic does not exist we need to check to see if there is an SPDX mapping to it +# If the generic does not exist we need to check to see if there is an SPDX mapping to it, +# unless NO_GENERIC_LICENSE is set. + for lic_dir in license_source_dirs: if not os.path.isfile(os.path.join(lic_dir, license_type)): if d.getVarFlag('SPDXLICENSEMAP', license_type) != None: @@ -241,6 +243,19 @@ def find_license_files(d): # audit up. This should be fixed in emit_pkgdata (or, we actually got and fix all the recipes) lic_files_paths.append((generic_ + license_type, os.path.join(license_source, spdx_generic))) + +# The user may attempt to use NO_GENERIC_LICENSE for a generic license which doesn't make sense +# and should not be allowed, warn the user in this case. +if d.getVarFlag('NO_GENERIC_LICENSE', license_type): +bb.warn(%s: %s is a generic license, please don't use NO_GENERIC_LICENSE for it. % (pn, license_type)) + +elif d.getVarFlag('NO_GENERIC_LICENSE', license_type): +# if NO_GENERIC_LICENSE is set, we copy the license files from the fetched source +# of the package rather than the license_source_dirs. +for (basename, path) in lic_files_paths: +if d.getVarFlag('NO_GENERIC_LICENSE', license_type) == basename: +lic_files_paths.append((generic_ + license_type, path)) +break else: # And here is where we warn people that their licenses are lousy bb.warn(%s: No generic license file exists for: %s in any provider % (pn, license_type)) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/1] toolchain-shar-extract.sh: fix typo
On Tue, 2015-04-28 at 14:45 +0800, Chen Qi wrote: Fix typo: overwritten - overridden Signed-off-by: Chen Qi qi.c...@windriver.com I don't think this is a typo, it really does mean overwritten... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] pigz: set ALTERNATIVE for nativesdk package to empty
Set ALTERNATIVE for nativesdk package to empty to avoid warnings like below. WARNING: pigz: NOT adding alternative provide xxx/bin/gunzip: xxx/bin/pigz does not exist Signed-off-by: Chen Qi qi.c...@windriver.com --- meta/recipes-extended/pigz/pigz.inc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta/recipes-extended/pigz/pigz.inc b/meta/recipes-extended/pigz/pigz.inc index c271f70..6a6a553 100644 --- a/meta/recipes-extended/pigz/pigz.inc +++ b/meta/recipes-extended/pigz/pigz.inc @@ -15,6 +15,7 @@ DEPENDS = zlib inherit update-alternatives +# do_install for target do_install_class-target() { # Install files into /bin (FHS), which is typical place for gzip install -d ${D}${base_bindir} @@ -23,6 +24,7 @@ do_install_class-target() { ln -nsf pigz ${D}${base_bindir}/pigzcat } +# do_install for native and nativesdk package do_install() { install -d ${D}${bindir} install ${B}/pigz ${D}${bindir}/gzip @@ -32,6 +34,7 @@ do_install() { ALTERNATIVE_PRIORITY = 80 ALTERNATIVE_${PN} = gunzip gzip zcat +ALTERNATIVE_${PN}_class-nativesdk = ALTERNATIVE_LINK_NAME[gunzip] = ${base_bindir}/gunzip ALTERNATIVE_LINK_NAME[gzip] = ${base_bindir}/gzip ALTERNATIVE_LINK_NAME[zcat] = ${base_bindir}/zcat -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] pigz: set ALTERNATIVE for nativesdk package to empty
The following changes since commit a9eededcb33b2ee41a061298610126436dfc2c11: ptest: add recommends to ptest-runner (2015-04-27 15:26:15 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib ChenQi/nativesdk-pigz-alternative http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/nativesdk-pigz-alternative Chen Qi (1): pigz: set ALTERNATIVE for nativesdk package to empty meta/recipes-extended/pigz/pigz.inc | 3 +++ 1 file changed, 3 insertions(+) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] wic: remove intermediate partitions
Is there a reason to write exec_cmd(rm -f %s % rootfs) instead of using python functions such as os.remove(), os.rmdir() or shutil.rmtree()? I know, there are a lot of similar lines in the existing code... On Tuesday 28 April 2015 01.36:42 Alexandre Belloni wrote: Hi, On 28/04/2015 at 01:29:07 +0200, Alexandre Belloni wrote : Remove intermediate partitions that may have been created by a previous wic invocation. Those partitions are causing issues on some systems. In particular vfat partition creation is hanging on mcopy execution on Fedora. I forgot to add that this fixes #7573. Signed-off-by: Alexandre Belloni alexandre.bell...@free-electrons.com --- scripts/lib/wic/kickstart/custom_commands/partition.py | 8 1 file changed, 8 insertions(+) diff --git a/scripts/lib/wic/kickstart/custom_commands/partition.py b/scripts/lib/wic/kickstart/custom_commands/partition.py index ff906010b8bf..b228b0d73902 100644 --- a/scripts/lib/wic/kickstart/custom_commands/partition.py +++ b/scripts/lib/wic/kickstart/custom_commands/partition.py @@ -230,6 +230,7 @@ class Wic_PartData(Mic_PartData): image_rootfs = rootfs_dir rootfs = %s/rootfs_%s.%s % (cr_workdir, self.label ,self.fstype) +exec_cmd(rm -f %s % rootfs) du_cmd = du -ks %s % image_rootfs out = exec_cmd(du_cmd) actual_rootfs_size = int(out.split()[0]) @@ -281,6 +282,7 @@ class Wic_PartData(Mic_PartData): image_rootfs = rootfs_dir rootfs = %s/rootfs_%s.%s % (cr_workdir, self.label, self.fstype) +exec_cmd(rm -f %s % rootfs) du_cmd = du -ks %s % image_rootfs out = exec_cmd(du_cmd) actual_rootfs_size = int(out.split()[0]) @@ -325,6 +327,7 @@ class Wic_PartData(Mic_PartData): image_rootfs = rootfs_dir rootfs = %s/rootfs_%s.%s % (cr_workdir, self.label, self.fstype) +exec_cmd(rm -f %s % rootfs) du_cmd = du -bks %s % image_rootfs out = exec_cmd(du_cmd) blocks = int(out.split()[0]) @@ -377,6 +380,7 @@ class Wic_PartData(Mic_PartData): image_rootfs = rootfs_dir rootfs = %s/rootfs_%s.%s % (cr_workdir, self.label ,self.fstype) +exec_cmd(rm -f %s % rootfs) squashfs_cmd = mksquashfs %s %s -noappend % \ (image_rootfs, rootfs) exec_native_cmd(pseudo + squashfs_cmd, native_sysroot) @@ -415,6 +419,7 @@ class Wic_PartData(Mic_PartData): fs = %s/fs_%s.%s % (cr_workdir, self.label, self.fstype) +exec_cmd(rm -f %s % fs) dd_cmd = dd if=/dev/zero of=%s bs=1k seek=%d count=0 % \ (fs, self.size) exec_cmd(dd_cmd) @@ -442,6 +447,7 @@ class Wic_PartData(Mic_PartData): fs = %s/fs_%s.%s % (cr_workdir, self.label, self.fstype) +exec_cmd(rm -f %s % fs) dd_cmd = dd if=/dev/zero of=%s bs=1k seek=%d count=0 % \ (fs, self.size) exec_cmd(dd_cmd) @@ -466,6 +472,7 @@ class Wic_PartData(Mic_PartData): Prepare an empty vfat partition. fs = %s/fs_%s.%s % (cr_workdir, self.label, self.fstype) +exec_cmd(rm -f %s % fs) blocks = self.size @@ -492,6 +499,7 @@ class Wic_PartData(Mic_PartData): Proceeding as requested. % self.mountpoint) fs = %s/fs_%s.%s % (cr_workdir, self.label, self.fstype) +exec_cmd(rm -f %s % fs) # it is not possible to create a squashfs without source data, # thus prepare an empty temp dir that is used as source -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] elfutils: Security Advisory - CVE-2015-0255
From: Roy Li rongqing...@windriver.com Directory traversal vulnerability in the read_long_names function in libelf/elf_begin.c in elfutils 0.152 and 0.161 allows remote attackers to write to arbitrary files to the root directory via a / (slash) in a crafted archive, as demonstrated using the ar program. https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2014-9447 Signed-off-by: Roy Li rongqing...@windriver.com --- ...f-Fix-dir-traversal-vuln-in-ar-extraction.patch | 59 ++ meta/recipes-devtools/elfutils/elfutils_0.161.bb | 1 + 2 files changed, 60 insertions(+) create mode 100644 meta/recipes-devtools/elfutils/elfutils-0.161/0001-libelf-Fix-dir-traversal-vuln-in-ar-extraction.patch diff --git a/meta/recipes-devtools/elfutils/elfutils-0.161/0001-libelf-Fix-dir-traversal-vuln-in-ar-extraction.patch b/meta/recipes-devtools/elfutils/elfutils-0.161/0001-libelf-Fix-dir-traversal-vuln-in-ar-extraction.patch new file mode 100644 index 000..7e4e492 --- /dev/null +++ b/meta/recipes-devtools/elfutils/elfutils-0.161/0001-libelf-Fix-dir-traversal-vuln-in-ar-extraction.patch @@ -0,0 +1,59 @@ +From 147018e729e7c22eeabf15b82d26e4bf68a0d18e Mon Sep 17 00:00:00 2001 +From: Alexander Cherepanov chere...@mccme.ru +Date: Sun, 28 Dec 2014 19:57:19 +0300 +Subject: [PATCH] libelf: Fix dir traversal vuln in ar extraction. + +Upstream-Status: Backport + +read_long_names terminates names at the first '/' found but then skips +one character without checking (it's supposed to be '\n'). Hence the +next name could start with any character including '/'. This leads to +a directory traversal vulnerability at the time the contents of the +archive is extracted. + +The danger is mitigated by the fact that only one '/' is possible in a +resulting filename and only in the leading position. Hence only files +in the root directory can be written via this vuln and only when ar is +executed as root. + +The fix for the vuln is to not skip any characters while looking +for '/'. + +Signed-off-by: Alexander Cherepanov chere...@mccme.ru +--- + libelf/ChangeLog | 5 + + libelf/elf_begin.c | 5 + + 2 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/libelf/ChangeLog b/libelf/ChangeLog +index 3b88d03..447c354 100644 +--- a/libelf/ChangeLog b/libelf/ChangeLog +@@ -1,3 +1,8 @@ ++2014-12-28 Alexander Cherepanov chere...@mccme.ru ++ ++ * elf_begin.c (read_long_names): Don't miss '/' right after ++ another '/'. Fixes a dir traversal vuln in ar extraction. ++ + 2014-12-18 Ulrich Drepper drep...@gmail.com + + * Makefile.am: Suppress output of textrel_check command. +diff --git a/libelf/elf_begin.c b/libelf/elf_begin.c +index 30abe0b..cd3756c 100644 +--- a/libelf/elf_begin.c b/libelf/elf_begin.c +@@ -749,10 +749,7 @@ read_long_names (Elf *elf) + } + + /* 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. */ +-- +1.9.1 + diff --git a/meta/recipes-devtools/elfutils/elfutils_0.161.bb b/meta/recipes-devtools/elfutils/elfutils_0.161.bb index 0dbe9f9..e111b34 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.161.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.161.bb @@ -16,6 +16,7 @@ SRC_URI += \ file://Fix_elf_cvt_gunhash.patch \ file://fixheadercheck.patch \ file://0001-elf_getarsym-Silence-Werror-maybe-uninitialized-fals.patch \ +file://0001-libelf-Fix-dir-traversal-vuln-in-ar-extraction.patch \ # pick the patch from debian -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2 0/3] license.bbclass/linux-firmware: add an approach for non-generic license
From: Jackie Huang jackie.hu...@windriver.com v2 comments: - Rename NO_GENERIC_LIC to NO_GENERIC_LICENSE. - Detect and warn when the user is attempting to use this mechanism for a common license. -- The following changes since commit 87de892d682d15ba2cbbee6bfd63a4644e0f517a: ptest: add recommends to ptest-runner (2015-04-27 15:34:59 +0100) are available in the git repository at: git://git.pokylinux.org/poky-contrib jhuang0/y_firmware_license_150428_0 http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=jhuang0/y_firmware_license_150428_0 Jackie Huang (3): license.bbclass: allow copying license not in common licenses Revert common-licenses: Add common license files for linux-firmware linux-firmware: add NO_GENERIC_LICENSE for all licenses meta/classes/license.bbclass | 17 +- meta/files/common-licenses/Firmware-Abilis | 22 - meta/files/common-licenses/Firmware-Marvell| 18 - meta/files/common-licenses/Firmware-OLPC | 33 -- meta/files/common-licenses/Firmware-agere | 77 meta/files/common-licenses/Firmware-amd-ucode | 64 --- .../common-licenses/Firmware-atheros_firmware | 38 -- .../common-licenses/Firmware-broadcom_bcm43xx | 65 --- meta/files/common-licenses/Firmware-ca0132 | 47 --- .../common-licenses/Firmware-chelsio_firmware | 27 -- meta/files/common-licenses/Firmware-cw1200 | 35 -- meta/files/common-licenses/Firmware-dib0700| 22 - meta/files/common-licenses/Firmware-ene_firmware | 14 - meta/files/common-licenses/Firmware-fw_sst_0f28| 40 -- meta/files/common-licenses/Firmware-go7007 | 457 - meta/files/common-licenses/Firmware-i2400m | 43 -- meta/files/common-licenses/Firmware-ibt_firmware | 39 -- meta/files/common-licenses/Firmware-it913x | 17 - .../common-licenses/Firmware-iwlwifi_firmware | 39 -- meta/files/common-licenses/Firmware-mwl8335| 52 --- .../common-licenses/Firmware-myri10ge_firmware | 28 -- meta/files/common-licenses/Firmware-phanfw | 32 -- .../common-licenses/Firmware-qat_dh895xcc_firmware | 39 -- meta/files/common-licenses/Firmware-qla2xxx| 31 -- meta/files/common-licenses/Firmware-r8a779x_usb3 | 26 -- meta/files/common-licenses/Firmware-radeon | 51 --- .../files/common-licenses/Firmware-ralink-firmware | 39 -- .../Firmware-ralink_a_mediatek_company_firmware| 39 -- .../common-licenses/Firmware-rtlwifi_firmware | 39 -- .../common-licenses/Firmware-tda7706-firmware | 48 --- .../files/common-licenses/Firmware-ti-connectivity | 46 --- .../common-licenses/Firmware-ueagle-atm4-firmware | 39 -- meta/files/common-licenses/Firmware-via_vt6656 | 25 -- meta/files/common-licenses/Firmware-wl1251 | 59 --- meta/files/common-licenses/Firmware-xc4000 | 23 -- meta/files/common-licenses/Firmware-xc5000 | 23 -- meta/files/common-licenses/Firmware-xc5000c| 23 -- .../linux-firmware/linux-firmware_git.bb | 39 ++ 38 files changed, 55 insertions(+), 1760 deletions(-) delete mode 100644 meta/files/common-licenses/Firmware-Abilis delete mode 100644 meta/files/common-licenses/Firmware-Marvell delete mode 100644 meta/files/common-licenses/Firmware-OLPC delete mode 100644 meta/files/common-licenses/Firmware-agere delete mode 100644 meta/files/common-licenses/Firmware-amd-ucode delete mode 100644 meta/files/common-licenses/Firmware-atheros_firmware delete mode 100644 meta/files/common-licenses/Firmware-broadcom_bcm43xx delete mode 100644 meta/files/common-licenses/Firmware-ca0132 delete mode 100644 meta/files/common-licenses/Firmware-chelsio_firmware delete mode 100644 meta/files/common-licenses/Firmware-cw1200 delete mode 100644 meta/files/common-licenses/Firmware-dib0700 delete mode 100644 meta/files/common-licenses/Firmware-ene_firmware delete mode 100644 meta/files/common-licenses/Firmware-fw_sst_0f28 delete mode 100644 meta/files/common-licenses/Firmware-go7007 delete mode 100644 meta/files/common-licenses/Firmware-i2400m delete mode 100644 meta/files/common-licenses/Firmware-ibt_firmware delete mode 100644 meta/files/common-licenses/Firmware-it913x delete mode 100644 meta/files/common-licenses/Firmware-iwlwifi_firmware delete mode 100644 meta/files/common-licenses/Firmware-mwl8335 delete mode 100644 meta/files/common-licenses/Firmware-myri10ge_firmware delete mode 100644 meta/files/common-licenses/Firmware-phanfw delete mode 100644 meta/files/common-licenses/Firmware-qat_dh895xcc_firmware delete mode 100644 meta/files/common-licenses/Firmware-qla2xxx delete mode 100644 meta/files/common-licenses/Firmware-r8a779x_usb3 delete mode 100644 meta/files/common-licenses/Firmware-radeon delete mode 100644 meta/files/common-licenses/Firmware-ralink-firmware delete mode 100644 meta/files/common-licenses/Firmware-ralink_a_mediatek_company_firmware
[OE-core] [PATCH 0/1] gcc-5
Add recipes for gcc-5, its not default _yet_ enable it in local.conf as described in patch header to use it The following changes since commit a9eededcb33b2ee41a061298610126436dfc2c11: ptest: add recommends to ptest-runner (2015-04-27 15:26:15 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib kraj/for-master http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=kraj/for-master Khem Raj (1): gcc: Add 5 recipes meta/recipes-devtools/gcc/gcc-5.1.inc | 123 + .../0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch | 42 + .../gcc/gcc-5.1/0002-uclibc-conf.patch | 53 + .../0003-gcc-uclibc-locale-ctype_touplow_t.patch | 87 + .../gcc/gcc-5.1/0004-uclibc-locale.patch | 2862 .../gcc/gcc-5.1/0005-uclibc-locale-no__x.patch | 257 ++ .../gcc/gcc-5.1/0006-uclibc-locale-wchar_fix.patch | 68 + .../gcc/gcc-5.1/0007-uclibc-locale-update.patch| 542 .../gcc/gcc-5.1/0008-missing-execinfo_h.patch | 28 + .../gcc/gcc-5.1/0009-c99-snprintf.patch| 28 + .../0010-gcc-poison-system-directories.patch | 192 ++ .../gcc/gcc-5.1/0011-gcc-poison-dir-extend.patch | 39 + .../0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch | 73 + .../gcc/gcc-5.1/0013-64-bit-multilib-hack.patch| 85 + .../gcc/gcc-5.1/0014-optional-libstdc.patch| 101 + ...0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch | 59 + .../gcc/gcc-5.1/0016-COLLECT_GCC_OPTIONS.patch | 38 + ...efaults.h-in-B-instead-of-S-and-t-oe-in-B.patch | 96 + .../gcc-5.1/0018-fortran-cross-compile-hack.patch | 46 + .../gcc/gcc-5.1/0019-libgcc-sjlj-check.patch | 74 + .../gcc/gcc-5.1/0020-cpp-honor-sysroot.patch | 54 + .../gcc-5.1/0021-MIPS64-Default-to-N64-ABI.patch | 57 + ...C_DYNAMIC_LINKER-and-UCLIBC_DYNAMIC_LINKE.patch | 216 ++ ...0023-gcc-Fix-argument-list-too-long-error.patch | 40 + .../gcc/gcc-5.1/0024-Disable-sdt.patch | 113 + .../gcc/gcc-5.1/0025-libtool.patch | 42 + ...4-pass-fix-v4bx-to-linker-to-support-EABI.patch | 43 + ...tilib-config-files-from-B-instead-of-usin.patch | 102 + ...-libdir-from-.la-which-usually-points-to-.patch | 31 + .../gcc/gcc-5.1/0029-export-CPP.patch | 53 + ...AltiVec-generation-on-powepc-linux-target.patch | 44 + ...-MULTILIB_OSDIRNAMES-and-other-multilib-o.patch | 42 + ...Ensure-target-gcc-headers-can-be-included.patch | 98 + ...-t-build-with-disable-dependency-tracking.patch | 54 + ...h-host-directory-during-relink-if-inst_pr.patch | 38 + ...-link-the-plugins-with-libgomp-explicitly.patch | 83 + .../recipes-devtools/gcc/gcc-cross-canadian_5.1.bb |5 + meta/recipes-devtools/gcc/gcc-cross-initial_5.1.bb |2 + meta/recipes-devtools/gcc/gcc-cross_5.1.bb |3 + .../gcc/gcc-crosssdk-initial_5.1.bb|3 + meta/recipes-devtools/gcc/gcc-crosssdk_5.1.bb |2 + meta/recipes-devtools/gcc/gcc-runtime_5.1.bb |7 + meta/recipes-devtools/gcc/gcc-sanitizers_5.1.bb|2 + meta/recipes-devtools/gcc/gcc-source_5.1.bb|2 + meta/recipes-devtools/gcc/gcc_5.1.bb |7 + meta/recipes-devtools/gcc/libgcc-initial_5.1.bb|2 + meta/recipes-devtools/gcc/libgcc_5.1.bb|2 + meta/recipes-devtools/gcc/libgfortran_5.1.bb |3 + 48 files changed, 6043 insertions(+) create mode 100644 meta/recipes-devtools/gcc/gcc-5.1.inc create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0001-gcc-4.3.1-ARCH_FLAGS_FOR_TARGET.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0002-uclibc-conf.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0003-gcc-uclibc-locale-ctype_touplow_t.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0004-uclibc-locale.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0005-uclibc-locale-no__x.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0006-uclibc-locale-wchar_fix.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0007-uclibc-locale-update.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0008-missing-execinfo_h.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0009-c99-snprintf.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0010-gcc-poison-system-directories.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0011-gcc-poison-dir-extend.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0012-gcc-4.3.3-SYSROOT_CFLAGS_FOR_TARGET.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0013-64-bit-multilib-hack.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0014-optional-libstdc.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0015-gcc-disable-MASK_RELAX_PIC_CALLS-bit.patch create mode 100644 meta/recipes-devtools/gcc/gcc-5.1/0016-COLLECT_GCC_OPTIONS.patch create mode 100644
Re: [OE-core] [wic][PATCH] wic tests: Add functional tests for directdisk
Hi Ed, On Thursday 23 April 2015 23:25:40 Ed Bartosh wrote: Added 2 simple functional test cases to check if wic is able to produce images using directdisk.wks Signed-off-by: Ed Bartosh ed.bart...@linux.intel.com --- scripts/setup.cfg | 2 +- scripts/tests/02_wic_test_directdisk.py | 61 + 2 files changed, 62 insertions(+), 1 deletion(-) create mode 100644 scripts/tests/02_wic_test_directdisk.py diff --git a/scripts/setup.cfg b/scripts/setup.cfg index 48a0bb2..f378efa 100644 --- a/scripts/setup.cfg +++ b/scripts/setup.cfg @@ -3,4 +3,4 @@ verbosity=2 exe=1 with-coverage=1 cover-erase=1 -cover-package=wic,image +cover-package=wic,image,wic.imager diff --git a/scripts/tests/02_wic_test_directdisk.py b/scripts/tests/02_wic_test_directdisk.py new file mode 100644 index 000..9108621 --- /dev/null +++ b/scripts/tests/02_wic_test_directdisk.py @@ -0,0 +1,61 @@ +#!/usr/bin/env python +# ex:ts=4:sw=4:sts=4:et +# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*- +# +# Copyright (c) 2015, Intel Corporation. +# All rights reserved. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License version 2 as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write to the Free Software Foundation, Inc., +# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. +# +# AUTHORS +# Ed Bartosh ed.bart...@linux.intel.com + +Test directdisk builds. + +import imp +import unittest +import os +import shutil +import glob + +class TestWicDirectdisk(unittest.TestCase): +Test build of directdisk image +def __init__(self, methodName='runTest'): +unittest.TestCase.__init__(self, methodName) +self.main = imp.load_source(wic, wic).main +self.resultdir = /var/tmp/wic/build/ + +def setUp(self): +This code executes before each test method. +shutil.rmtree(self.resultdir) +os.chdir(os.getenv(BUILDDIR)) + +def _build(self, cmdline): +Call self.main with provided commandline. +self.assertIsNone(self.main(cmdline)) +self.assertEqual(1, len(glob.glob(self.resultdir + \ +directdisk-*.direct))) + +def testbuild_image_name(self): +self._build([create, directdisk, + --image-name, core-image-minimal]) + +def testbuild_artifacts(self): +self._build([create, directdisk, + -b, tmp/sysroots/qemux86/usr/share, + -k, tmp/deploy/images/qemux86, + -n, tmp/sysroots/x86_64-linux, + -r, tmp/work/qemux86-poky-linux/ + core-image-minimal/1.0-r0/rootfs]) + So I appreciate what you're trying to do here, but I really think we ought to be running wic as users would run it or we're not really testing the same thing. Additionally, we should have these tests as part of the existing oe-selftest framework (tests in meta/lib/oeqa/selftest) rather than a new framework that has to be run separately. (I should have mentioned this when you sent the first patch earlier, sorry about that.) Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v6 0/3] Switch to BlueZ 5.x as default Bluetooth stack
In v6: 1. fix systemd crash for gst-plugin-bluetooth; 2. dropped patch that removed exclusion from world build. /Cristian -Original Message- From: openembedded-core-boun...@lists.openembedded.org [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of Cristian Iorga Sent: Tuesday, April 28, 2015 12:03 PM To: openembedded-core@lists.openembedded.org Subject: [OE-core] [PATCH v6 0/3] Switch to BlueZ 5.x as default Bluetooth stack BlueZ 5.x is now the default Bluetooth stack. BlueZ 4.x is moved to recipes-connectivity in meta-oe layer and still supported in poky/YP. The following changes since commit ae736dbdd140975ba43f06e635b461dbf36a117e: libxfont: Security Advisory - libxfont - CVE-2015-1804 (2015-04-28 07:56:57 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib Ciorga/YB7479_v5 http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=Ciorga/YB7479_v5 Cristian Iorga (3): bluez4: add proper systemd support bluez: remove bluez4 recipes bitbake.conf: backfill bluez5 feature meta/conf/bitbake.conf | 2 +- .../obsolete_automake_macros.patch | 14 --- .../bluez/bluez-hcidump_2.5.bb | 22 - .../bluez/bluez4-4.101/bluetooth.conf | 16 --- .../bluez/bluez4-4.101/fix-udev-paths.patch| 37 --- .../bluez/bluez4-4.101/fix_encrypt_collision.patch | 110 - .../bluez/bluez4-4.101/install-test-script.patch | 26 - ...ork-fix-network-Connect-method-parameters.patch | 30 -- .../bluez4-4.101/obsolete_automake_macros.patch| 14 --- .../bluez/bluez4-4.101/sbc_mmx.patch | 24 - ...pygobject-instead-ofgobject-introspection.patch | 27 - meta/recipes-connectivity/bluez/bluez4.inc | 46 - meta/recipes-connectivity/bluez/bluez4_4.101.bb| 47 - .../bluez/gst-plugin-bluetooth_4.101.bb| 39 14 files changed, 1 insertion(+), 453 deletions(-) delete mode 100644 meta/recipes-connectivity/bluez/bluez-hcidump-2.5/obsolete_automake_macros.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez-hcidump_2.5.bb delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/bluetooth.conf delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/fix-udev-paths.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/fix_encrypt_collision.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/install-test-script.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/network-fix-network-Connect-method-parameters.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/obsolete_automake_macros.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/sbc_mmx.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4-4.101/use-legacy-pygobject-instead-ofgobject-introspection.patch delete mode 100644 meta/recipes-connectivity/bluez/bluez4.inc delete mode 100644 meta/recipes-connectivity/bluez/bluez4_4.101.bb delete mode 100644 meta/recipes-connectivity/bluez/gst-plugin-bluetooth_4.101.bb -- 2.1.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] Moving GStreamer 0.10 to meta-multimedia
Hi all, This is basically a heads-up that we're working on moving GStreamer 0.10 out of oe-core[1] and into meta-multimedia, where anyone who still needs 0.10 can use and maintain them. In case anyone out there using GStreamer 0.10 isn't aware, it's been unmaintained since March 2013[2] and upstream there really mean that: Last gstreamer commit on 0.10 branch: September 2013 gst-plugins-base: May 2013 gst-plugins-good: August 2013 gst-plugins-bad: August 2013 gst-plugins-ugly: July 2013 If your BSP vendor only ships GStreamer 0.10 plugins now is the time to harass them about upgrading. Ross [1] https://bugzilla.yoctoproject.org/show_bug.cgi?id=6294 [2] http://lists.freedesktop.org/archives/gstreamer-announce/2013-March/000273.html -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] toolchain-shar-extract.sh: fix typo
Fix typo: overwritten - overridden Signed-off-by: Chen Qi qi.c...@windriver.com --- meta/files/toolchain-shar-extract.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/files/toolchain-shar-extract.sh b/meta/files/toolchain-shar-extract.sh index 8cb8783..c8a1f51 100644 --- a/meta/files/toolchain-shar-extract.sh +++ b/meta/files/toolchain-shar-extract.sh @@ -90,7 +90,7 @@ fi if [ -e $target_sdk_dir/environment-setup-@REAL_MULTIMACH_TARGET_SYS@ ]; then echo The directory \$target_sdk_dir\ already contains a SDK for this architecture. - printf If you continue, existing files will be overwritten! Proceed[y/N]? + printf If you continue, existing files will be overridden! Proceed[y/N]? default_answer=n else -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] toolchain-shar-extract.sh: fix typo
The following changes since commit a9eededcb33b2ee41a061298610126436dfc2c11: ptest: add recommends to ptest-runner (2015-04-27 15:26:15 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib ChenQi/typo-fix http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=ChenQi/typo-fix Chen Qi (1): toolchain-shar-extract.sh: fix typo meta/files/toolchain-shar-extract.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [fido][PATCH 1/4] elfutils: fix build with -Os
On Mon, 2015-04-27 at 15:04 +0100, Richard Purdie wrote: On Mon, 2015-04-27 at 13:04 +0200, Martin Jansa wrote: On Tue, Apr 21, 2015 at 12:53:37PM +0200, Martin Jansa wrote: Signed-off-by: Martin Jansa martin.ja...@gmail.com ping for all 4 changes I had hoped the fido maintainer would look at this but evidently not. Apologies, I had looked and even pulled the 3 changes from master into my local testing branch but hadn't completed a test build yet. I shall endeavour to respond more quickly in future. If you are going to propose patches which aren't in master, please mention that. Yes, please do. Cheers, Joshua -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [WIP][RFT] cogl/clutter/libinput/wayland/weston updates
On 28 April 2015 at 18:25, Tim Orling ticot...@gmail.com wrote: The following branch includes updates to the latest releases for cogl, clutter, wayland, weston and libinput: http://git.openembedded.org/openembedded-core-contrib/log/?h=timo/cogl-clutter-wayland-weston-updates wayland and weston appear to be fine as tested on nuc. clutter ptests pass, but all examples segfault...possibly a problem in cogl. I would appreciate tests on other platforms and any insight into the segfaults. No comments on that yet but I think the libinput udev files end up in the wrong place: +FILES_${PN} += ${libdir}/udev/libinput-device-group + +FILES_${PN}-dbg += ${libdir}/udev/.debug/* maybe something like this: +EXTRA_OECONF = --with-udev-dir=`pkg-config --variable=udevdir udev` + +FILES_${PN} += */udev/libinput-device-group +FILES_${PN}-dbg += */udev/.debug/libinput-device-group The FILES_* lines are a bit of a hack but it's the same hack that pulseaudio and a few others use for this same situation. br, Jussi -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core