Re: [OE-core] [PATCH 0/6] remove unneeded python2 recipes
On 05/24/2016 11:53 AM, Paul Eggleton wrote: On Tue, 24 May 2016 11:38:24 Robert Yang wrote: On 05/24/2016 11:34 AM, Paul Eggleton wrote: On Mon, 23 May 2016 20:25:36 Robert Yang wrote: They were required by buildtools-tarball, now replaced by python3 ones. It's not so much that they are required by buildtools-tarball, they are required by various scripts that we have. When you say unneeded, I assume only on the python3 branch? In master python-git very definitely is still needed. I'm afraid no, my previous patch had been merged on master branch, so I think that python-git and others are not needed any more ? I had missed that change; that puts us into a bit of an interesting situation. buildtools-tarball is provided in order to support bitbake builds on hosts that don't have the required tools, but the changes required to support python 3 in the build system itself haven't been merged to master yet. So unless I'm missing something at the moment have a version of buildtools that doesn't actually support running the build system? At the moment, I think yes. // Robert Cheers, Paul -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 00/72] Krogoth-next V2, pull request
Rebased, removed per feedback and add a few new ones. Please consider this for krogoth-next. The following changes since commit da4bfbef46e52d2b647a837a47d0f5cb813ba8b2: gdb: Backport patch to changes with AVX and MPX (2016-05-22 08:43:01 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib akuster/krogoth-next http://git.yoctoproject.org/cgit.cgi//log/?h=akuster/krogoth-next Alexander D. Kanevskiy (1): image.bbclass: don't execute compression commands multiple times Alexander Kanavin (1): arch-powerpc64.inc: disable the use of qemu usermode on ppc64 Anders Darander (1): lib/oe/rootfs: Fix DEBUGFS generation, without openssl Andre McCurdy (1): image.bbclass: don't emit redundant IMAGE_CMD_xxx functions André Draszik (2): gdb: fix QA warning (uClibc) feature-arm-neon.inc: restore vfpv3-d16 support Aníbal Limón (1): classes/base: get_lic_checksum_file_list imporve validaton of url's Armin Kuster (2): librsvg: Security fixes via update to 2.40.15 python-numpy: fix build failure with python-matplotlib Awais Belal (1): mesa-demos: remove demos using obsolete screen surface Christopher Clark (1): linux-firmware: break out bnx2 mips firmware and WHENCE license Dengke Du (3): bash: fixed ptest run-builtins failed lttng-tools: filter random filename of ptest output coreutils: fix for native and nativesdk Denys Dmytriyenko (1): arch-armv7ve: inherit armv7a tunes file Diego Rondini (1): base-files: add some safety checks in profile Felipe F. Tonello (1): packagegroup-core-tools-profile: Enable valgrind on ARMv7a and above George McCollister (1): wic: fix path parsing, use last occurrence Ian Reinhart Geiser (1): classes/image_vm: allow different filesystems to be used for VM images. Ioan-Adrian Ratiu (2): wic: isoimage-isohybrid: add grubefi configfile support wic: isoimage-isohybrid: fix splash file paths Ismo Puustinen (1): libpcre: Fix CVE-2016-3191 Joshua Lock (2): packagegroup-core-lsb: fix whitespace in meta-qt* warnings openssl: prevent ABI break from earlier krogoth releases Jussi Kukkonen (1): gcc-sanitizers: Depend on target gcc Klauer, Daniel (1): python-smartpm: Fix channel command --remove-all option (again) Leonardo Sandoval (2): scripts/lib/bsp/kernel.py: force patching when branch is machine branch is re-use populate_sdk_ext.bbclass : Show logfile in case the SDK EXT installation failed Maxin B. John (3): popt: fix dependencies and QA Issue bash: fix dependencies and QA Issue libxml2: fix dependencies and QA Issues Paul Eggleton (2): recipetool: create: fix picking up false npm package directories recipetool: create: fix falling back to declared license for npm packages Peter Kjellerstedt (1): metadata_scm.bbclass: Do not assume ${COREBASE} is a Git repo Randy Witt (1): populate_sdk_ext: Change lockedsigs task mismatch to a warning Raymond Tan (1): mkefidisk.sh: mount images as read-only Robert Yang (5): grub_git: set COMPATIBLE_HOST_armv7a to null insane.bbclass: remove workdir from package_qa_check_license() libxsettings-client: fix COPYING file cogl-1.0: set COMPATIBLE_HOST_armv4 to null gnu-efi: set COMPATIBLE_HOST_armv4 to null Ross Burton (25): package: ensure do_split_packages doesn't return duplicates busybox: don't build ar meta: add comments to explain autotools-brokensep use mx-1.0: inherit gtk-doc mx: move to autotools instead of autotools-brokensep bluez5: enable out-of-tree builds oeqa/sstatetests: add http_proxy to no-op hash test oeqa/sstatetests: remove temporary DL_DIRs in noop_samesigs autotools: add default for CACHED_CONFIGUREVARS python-pygobject: remove redundant gnome-common dependency gnome-desktop3: remove redundant gnome-common dependency webkitgtk: remove gnome-common dependency qemu: remove explicit but redundant native build dependencies mesa-gl: add missing MESA_CRYPTO to PACKAGECONFIG oeqa/selftest/buildoptions: remove buildhistory signature test eudev: add PACKAGECONFIG for hwdb dbus-test: install executables not libtool wrapper scripts mesa: add PACKAGECONFIG for gbm bitbake.conf: change APACHE_MIRROR to point at archive.apache.org image_types: fix image/compression dependency collection bitbake.conf: add default for IMAGE_FSTYPES_DEBUGFS bitbake: fetch2: export DBUS_SESSION_BUS_ADDRESS to support authentication agents unzip: update SRC_URI openssh: change URI to http: zip: update SRC_URI Ruslan Bilovol (2): kernel-uimage: change target image to vmlinux libunwind: backport aarch64_be support Stephano Cetola (2): toolchain-scripts: replace source built-in call sysvinit-inittab: restrict labels to 4 chars Tristan Van Berkom (1): cross-localedef-native_2.22.bb: Use autotools configure Yuqing Zhu (1): alsa-lib: Fix incorrect appl pointer when mmap_commit() returns error. bitbake/lib/bb/fetch2/__init__.py |5 +-
[OE-core] [PATCH 3/3] devtool: upgrade: clarify help text for --srcrev option
The -S / --srcrev option must be specified if fetching from a git repository, so spell that out in the help text. Signed-off-by: Paul Eggleton--- scripts/lib/devtool/upgrade.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index 7e6aa42..07a9018 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py @@ -385,7 +385,7 @@ def register_commands(subparsers, context): parser_upgrade.add_argument('recipename', help='Name of recipe to upgrade (just name - no version, path or extension)') parser_upgrade.add_argument('srctree', nargs='?', help='Path to where to extract the source tree. If not specified, a subdirectory of %s will be used.' % defsrctree) parser_upgrade.add_argument('--version', '-V', help='Version to upgrade to (PV)') -parser_upgrade.add_argument('--srcrev', '-S', help='Source revision to upgrade to (if fetching from an SCM such as git)') +parser_upgrade.add_argument('--srcrev', '-S', help='Source revision to upgrade to (required if fetching from an SCM such as git)') parser_upgrade.add_argument('--srcbranch', '-B', help='Branch in source repository containing the revision to use (if fetching from an SCM such as git)') parser_upgrade.add_argument('--branch', '-b', default="devtool", help='Name for new development branch to checkout (default "%(default)s")') parser_upgrade.add_argument('--no-patch', action="store_true", help='Do not apply patches from the recipe to the new source code') -- 2.5.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] devtool: upgrade: tweak conflict handling
Make a couple of changes to the rebase operation: 1) Only wrap the actual rebase command in try...except since a failure in any of the other commands should be an error, not a warning 2) If it's a conflict (which unfortunately we can only tell by checking for the keyword "conflict" since git doesn't return error codes based on the type of error) then print a message clarifying that the user needs to resolve the issue themselves to finish the upgrade. Signed-off-by: Paul Eggleton--- scripts/lib/devtool/upgrade.py | 12 +--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index e34234a..7e6aa42 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py @@ -236,16 +236,22 @@ def _extract_new_source(newpv, srctree, no_patch, srcrev, branch, keep_temp, tin for patch in patches: logger.warn("%s" % os.path.basename(patch)) else: +__run('git checkout devtool-patched -b %s' % branch) +skiptag = False try: -__run('git checkout devtool-patched -b %s' % branch) __run('git rebase %s' % rev) +except bb.process.ExecutionError as e: +skiptag = True +if 'conflict' in e.stdout: +logger.warn('Command \'%s\' failed:\n%s\n\nYou will need to resolve conflicts in order to complete the upgrade.' % (e.command, e.stdout.rstrip())) +else: +logger.warn('Command \'%s\' failed:\n%s' % (e.command, e.stdout)) +if not skiptag: if uri.startswith('git://'): suffix = 'new' else: suffix = newpv __run('git tag -f devtool-patched-%s' % suffix) -except bb.process.ExecutionError as e: -logger.warn('Command \'%s\' failed:\n%s' % (e.command, e.stdout)) if tmpsrctree: if keep_temp: -- 2.5.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] Fixes for devtool upgrade
The following changes since commit d6241e4c94a0a72acfc57e96a59918c0b2146d65: useradd: Fix infinite build loop (2016-05-23 10:33:39 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/devtool-upgrade-fixes http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/devtool-upgrade-fixes Paul Eggleton (3): devtool: upgrade: handle upgrading recipes with a versioned inc file devtool: upgrade: tweak conflict handling devtool: upgrade: clarify help text for --srcrev option scripts/lib/devtool/upgrade.py | 22 ++ 1 file changed, 18 insertions(+), 4 deletions(-) -- 2.5.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] devtool: upgrade: handle upgrading recipes with a versioned inc file
The gdb recipe in OE-Core has an inc file with the version in it; since the inc file is pulled in with a "require ${PV}.inc", when upgrading the recipe we need to also rename the inc file it will fail to parse and the upgrade itself will fail. Fixes [YOCTO #9574]. Signed-off-by: Paul Eggleton--- scripts/lib/devtool/upgrade.py | 8 1 file changed, 8 insertions(+) diff --git a/scripts/lib/devtool/upgrade.py b/scripts/lib/devtool/upgrade.py index a085f78..e34234a 100644 --- a/scripts/lib/devtool/upgrade.py +++ b/scripts/lib/devtool/upgrade.py @@ -77,11 +77,19 @@ def _recipe_contains(rd, var): def _rename_recipe_dirs(oldpv, newpv, path): for root, dirs, files in os.walk(path): +# Rename directories with the version in their name for olddir in dirs: if olddir.find(oldpv) != -1: newdir = olddir.replace(oldpv, newpv) if olddir != newdir: shutil.move(os.path.join(path, olddir), os.path.join(path, newdir)) +# Rename any inc files with the version in their name (unusual, but possible) +for oldfile in files: +if oldfile.endswith('.inc'): +if oldfile.find(oldpv) != -1: +newfile = oldfile.replace(oldpv, newpv) +if oldfile != newfile: +os.rename(os.path.join(path, oldfile), os.path.join(path, newfile)) def _rename_recipe_file(oldrecipe, bpn, oldpv, newpv, path): oldrecipe = os.path.basename(oldrecipe) -- 2.5.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/6] remove unneeded python2 recipes
On Tue, 24 May 2016 11:38:24 Robert Yang wrote: > On 05/24/2016 11:34 AM, Paul Eggleton wrote: > > On Mon, 23 May 2016 20:25:36 Robert Yang wrote: > >> They were required by buildtools-tarball, now replaced by python3 ones. > > > > It's not so much that they are required by buildtools-tarball, they are > > required by various scripts that we have. When you say unneeded, I assume > > only on the python3 branch? In master python-git very definitely is still > > needed. > > I'm afraid no, my previous patch had been merged on master branch, > so I think that python-git and others are not needed any more ? I had missed that change; that puts us into a bit of an interesting situation. buildtools-tarball is provided in order to support bitbake builds on hosts that don't have the required tools, but the changes required to support python 3 in the build system itself haven't been merged to master yet. So unless I'm missing something at the moment have a version of buildtools that doesn't actually support running the build system? 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 0/6] remove unneeded python2 recipes
Hi Paul, On 05/24/2016 11:34 AM, Paul Eggleton wrote: Hi Robert, On Mon, 23 May 2016 20:25:36 Robert Yang wrote: They were required by buildtools-tarball, now replaced by python3 ones. It's not so much that they are required by buildtools-tarball, they are required by various scripts that we have. When you say unneeded, I assume only on the python3 branch? In master python-git very definitely is still needed. I'm afraid no, my previous patch had been merged on master branch, so I think that python-git and others are not needed any more ? commit 9f921676a7cfac93117788b8dfeff652dfd65134 Author: Robert YangDate: Wed May 18 00:43:44 2016 -0700 buildtools-tarball: replace nativesdk-python with nativesdk-python3 (From OE-Core rev: 97b5b150b3d3e82a5a42c1ea4351eed60aba7906) // Robert Cheers, Paul -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/6] remove unneeded python2 recipes
Hi Robert, On Mon, 23 May 2016 20:25:36 Robert Yang wrote: > They were required by buildtools-tarball, now replaced by python3 ones. It's not so much that they are required by buildtools-tarball, they are required by various scripts that we have. When you say unneeded, I assume only on the python3 branch? In master python-git very definitely is still needed. Cheers, Paul -- Paul Eggleton Intel Open Source Technology Centre -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/6] packagegroup-self-hosted.bb: python-git -> python3-git
Signed-off-by: Robert Yang--- meta/recipes-core/packagegroups/packagegroup-self-hosted.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb index aa88cf9..829ed23 100644 --- a/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb +++ b/meta/recipes-core/packagegroups/packagegroup-self-hosted.bb @@ -153,7 +153,7 @@ RDEPENDS_packagegroup-self-hosted-extended = "\ perl-pod \ python \ python-compiler \ -python-git \ +python3-git \ python-misc \ python-modules \ python-rpm \ -- 2.8.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 6/6] python-git: remove it
It was needed by buildtools-tarball and packagegroup-self-hosted, no one requires it any more now. Signed-off-by: Robert Yang--- meta/recipes-devtools/python/python-git.inc | 21 - meta/recipes-devtools/python/python-git_1.0.2.bb | 8 meta/recipes-devtools/python/python3-git_1.0.2.bb | 21 - 3 files changed, 20 insertions(+), 30 deletions(-) delete mode 100644 meta/recipes-devtools/python/python-git.inc delete mode 100644 meta/recipes-devtools/python/python-git_1.0.2.bb diff --git a/meta/recipes-devtools/python/python-git.inc b/meta/recipes-devtools/python/python-git.inc deleted file mode 100644 index 72632b7..000 --- a/meta/recipes-devtools/python/python-git.inc +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Python library used to interact with Git repositories" -DESCRIPTION = "GitPython provides object model read and write access to \ -a git repository. Access repository information conveniently, alter the \ -index directly, handle remotes, or go down to low-level object database \ -access with big-files support." -HOMEPAGE = "http://github.com/gitpython-developers/GitPython; -SECTION = "devel/python" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=8b8d26c37c1d5a04f9b0186edbebc183" - -SRC_URI = "http://pypi.python.org/packages/source/G/GitPython/GitPython-${PV}.tar.gz; - -SRC_URI[md5sum] = "d92d96a8da0fc77cf141d3e16084e094" -SRC_URI[sha256sum] = "85de72556781480a38897a77de5b458ae3838b0fd589593679a1b5f34d181d84" - -UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/GitPython/; -UPSTREAM_CHECK_REGEX = "/GitPython/(?P(\d+[\.\-_]*)+)" - -S = "${WORKDIR}/GitPython-${PV}" - -BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-devtools/python/python-git_1.0.2.bb b/meta/recipes-devtools/python/python-git_1.0.2.bb deleted file mode 100644 index 5ca7713..000 --- a/meta/recipes-devtools/python/python-git_1.0.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require python-git.inc - -DEPENDS = "python-gitdb" - -inherit setuptools - -RDEPENDS_${PN} += "python-gitdb python-lang python-io python-shell python-math python-re python-subprocess python-stringold python-unixadmin" - diff --git a/meta/recipes-devtools/python/python3-git_1.0.2.bb b/meta/recipes-devtools/python/python3-git_1.0.2.bb index 6620444..2eef462 100644 --- a/meta/recipes-devtools/python/python3-git_1.0.2.bb +++ b/meta/recipes-devtools/python/python3-git_1.0.2.bb @@ -1,5 +1,24 @@ -require python-git.inc +SUMMARY = "Python library used to interact with Git repositories" +DESCRIPTION = "GitPython provides object model read and write access to \ +a git repository. Access repository information conveniently, alter the \ +index directly, handle remotes, or go down to low-level object database \ +access with big-files support." +HOMEPAGE = "http://github.com/gitpython-developers/GitPython; +SECTION = "devel/python" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8b8d26c37c1d5a04f9b0186edbebc183" +SRC_URI = "http://pypi.python.org/packages/source/G/GitPython/GitPython-${PV}.tar.gz; + +SRC_URI[md5sum] = "d92d96a8da0fc77cf141d3e16084e094" +SRC_URI[sha256sum] = "85de72556781480a38897a77de5b458ae3838b0fd589593679a1b5f34d181d84" + +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/GitPython/; +UPSTREAM_CHECK_REGEX = "/GitPython/(?P(\d+[\.\-_]*)+)" + +S = "${WORKDIR}/GitPython-${PV}" + +BBCLASSEXTEND = "nativesdk" DEPENDS = "python3-gitdb" inherit setuptools3 -- 2.8.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/6] remove unneeded python2 recipes
They were required by buildtools-tarball, now replaced by python3 ones. // Robert The following changes since commit d6241e4c94a0a72acfc57e96a59918c0b2146d65: useradd: Fix infinite build loop (2016-05-23 10:33:39 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/py3 http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/py3 Robert Yang (6): packagegroup-self-hosted.bb: python-git -> python3-git python-pexpect: remove it python-async: remove it python-smmap: remove it python-gitdb: remove it python-git: remove it .../packagegroups/packagegroup-self-hosted.bb | 2 +- meta/recipes-devtools/python/python-async.inc | 15 - meta/recipes-devtools/python/python-async_0.6.2.bb | 5 - meta/recipes-devtools/python/python-git.inc| 21 -- meta/recipes-devtools/python/python-git_1.0.2.bb | 8 --- meta/recipes-devtools/python/python-gitdb.inc | 16 -- meta/recipes-devtools/python/python-gitdb_0.6.4.bb | 7 -- .../python/python-pexpect_4.0.1.bb | 25 -- meta/recipes-devtools/python/python-smmap.inc | 19 meta/recipes-devtools/python/python-smmap_0.9.0.bb | 5 - .../recipes-devtools/python/python3-async_0.6.2.bb | 16 +- meta/recipes-devtools/python/python3-git_1.0.2.bb | 21 +- .../recipes-devtools/python/python3-gitdb_0.6.4.bb | 17 ++- .../recipes-devtools/python/python3-smmap_0.9.0.bb | 20 - 14 files changed, 71 insertions(+), 126 deletions(-) delete mode 100644 meta/recipes-devtools/python/python-async.inc delete mode 100644 meta/recipes-devtools/python/python-async_0.6.2.bb delete mode 100644 meta/recipes-devtools/python/python-git.inc delete mode 100644 meta/recipes-devtools/python/python-git_1.0.2.bb delete mode 100644 meta/recipes-devtools/python/python-gitdb.inc delete mode 100644 meta/recipes-devtools/python/python-gitdb_0.6.4.bb delete mode 100644 meta/recipes-devtools/python/python-pexpect_4.0.1.bb delete mode 100644 meta/recipes-devtools/python/python-smmap.inc delete mode 100644 meta/recipes-devtools/python/python-smmap_0.9.0.bb -- 2.8.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 5/6] python-gitdb: remove it
It was needed by python-git, no one requires it any more now. Signed-off-by: Robert Yang--- meta/recipes-devtools/python/python-gitdb.inc | 16 meta/recipes-devtools/python/python-gitdb_0.6.4.bb | 7 --- meta/recipes-devtools/python/python3-gitdb_0.6.4.bb | 17 - 3 files changed, 16 insertions(+), 24 deletions(-) delete mode 100644 meta/recipes-devtools/python/python-gitdb.inc delete mode 100644 meta/recipes-devtools/python/python-gitdb_0.6.4.bb diff --git a/meta/recipes-devtools/python/python-gitdb.inc b/meta/recipes-devtools/python/python-gitdb.inc deleted file mode 100644 index 6467bd2..000 --- a/meta/recipes-devtools/python/python-gitdb.inc +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "A pure-Python git object database" -HOMEPAGE = "http://github.com/gitpython-developers/gitdb; -SECTION = "devel/python" -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=59e5ecb13339a936eedf83282eaf4528" - -SRC_URI = "https://pypi.python.org/packages/source/g/gitdb/gitdb-${PV}.tar.gz; - -SRC_URI[md5sum] = "44e4366b8bdfd306b075c3a52c96ae1a" -SRC_URI[sha256sum] = "a3ebbc27be035a2e874ed904df516e35f4a29a778a764385de09de9e0f139658" - -UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/gitdb/; - -S = "${WORKDIR}/gitdb-${PV}" - -BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-devtools/python/python-gitdb_0.6.4.bb b/meta/recipes-devtools/python/python-gitdb_0.6.4.bb deleted file mode 100644 index 1777395..000 --- a/meta/recipes-devtools/python/python-gitdb_0.6.4.bb +++ /dev/null @@ -1,7 +0,0 @@ -require python-gitdb.inc - -DEPENDS = "python-async python-smmap" - -inherit distutils - -RDEPENDS_${PN} += "python-smmap python-async python-mmap python-lang python-zlib python-io python-shell" diff --git a/meta/recipes-devtools/python/python3-gitdb_0.6.4.bb b/meta/recipes-devtools/python/python3-gitdb_0.6.4.bb index 9927658..0e6508f 100644 --- a/meta/recipes-devtools/python/python3-gitdb_0.6.4.bb +++ b/meta/recipes-devtools/python/python3-gitdb_0.6.4.bb @@ -1,4 +1,19 @@ -require python-gitdb.inc +SUMMARY = "A pure-Python git object database" +HOMEPAGE = "http://github.com/gitpython-developers/gitdb; +SECTION = "devel/python" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=59e5ecb13339a936eedf83282eaf4528" + +SRC_URI = "https://pypi.python.org/packages/source/g/gitdb/gitdb-${PV}.tar.gz; + +SRC_URI[md5sum] = "44e4366b8bdfd306b075c3a52c96ae1a" +SRC_URI[sha256sum] = "a3ebbc27be035a2e874ed904df516e35f4a29a778a764385de09de9e0f139658" + +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/gitdb/; + +S = "${WORKDIR}/gitdb-${PV}" + +BBCLASSEXTEND = "nativesdk" DEPENDS = "python3-async python3-smmap" -- 2.8.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/6] python-async: remove it
It was needed by python-git, no one requires it any more now. Signed-off-by: Robert Yang--- meta/recipes-devtools/python/python-async.inc | 15 --- meta/recipes-devtools/python/python-async_0.6.2.bb | 5 - meta/recipes-devtools/python/python3-async_0.6.2.bb | 16 +++- 3 files changed, 15 insertions(+), 21 deletions(-) delete mode 100644 meta/recipes-devtools/python/python-async.inc delete mode 100644 meta/recipes-devtools/python/python-async_0.6.2.bb diff --git a/meta/recipes-devtools/python/python-async.inc b/meta/recipes-devtools/python/python-async.inc deleted file mode 100644 index d80606a..000 --- a/meta/recipes-devtools/python/python-async.inc +++ /dev/null @@ -1,15 +0,0 @@ -SUMMARY = "Python framework to process interdependent tasks in a pool of workers" -HOMEPAGE = "http://github.com/gitpython-developers/async; -SECTION = "devel/python" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=88df8e78b9edfd744953862179f2d14e" - -SRC_URI = "http://pypi.python.org/packages/source/a/async/async-${PV}.tar.gz; -SRC_URI[md5sum] = "9b06b5997de2154f3bc0273f80bcef6b" -SRC_URI[sha256sum] = "ac6894d876e45878faae493b0cf61d0e28ec417334448ac0a6ea2229d8343051" - -UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/async/; - -S = "${WORKDIR}/async-${PV}" - -BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-devtools/python/python-async_0.6.2.bb b/meta/recipes-devtools/python/python-async_0.6.2.bb deleted file mode 100644 index d855e42..000 --- a/meta/recipes-devtools/python/python-async_0.6.2.bb +++ /dev/null @@ -1,5 +0,0 @@ -require python-async.inc - -inherit setuptools - -RDEPENDS_${PN} += "python-threading python-lang" diff --git a/meta/recipes-devtools/python/python3-async_0.6.2.bb b/meta/recipes-devtools/python/python3-async_0.6.2.bb index 54a30f5..6c1ac39 100644 --- a/meta/recipes-devtools/python/python3-async_0.6.2.bb +++ b/meta/recipes-devtools/python/python3-async_0.6.2.bb @@ -1,4 +1,18 @@ -require python-async.inc +SUMMARY = "Python framework to process interdependent tasks in a pool of workers" +HOMEPAGE = "http://github.com/gitpython-developers/async; +SECTION = "devel/python" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=88df8e78b9edfd744953862179f2d14e" + +SRC_URI = "http://pypi.python.org/packages/source/a/async/async-${PV}.tar.gz; +SRC_URI[md5sum] = "9b06b5997de2154f3bc0273f80bcef6b" +SRC_URI[sha256sum] = "ac6894d876e45878faae493b0cf61d0e28ec417334448ac0a6ea2229d8343051" + +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/async/; + +S = "${WORKDIR}/async-${PV}" + +BBCLASSEXTEND = "nativesdk" inherit setuptools3 -- 2.8.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/6] python-smmap: remove it
It was needed by python-gitdb, no one requires it any more now. Signed-off-by: Robert Yang--- meta/recipes-devtools/python/python-smmap.inc | 19 --- meta/recipes-devtools/python/python-smmap_0.9.0.bb | 5 - meta/recipes-devtools/python/python3-smmap_0.9.0.bb | 20 +++- 3 files changed, 19 insertions(+), 25 deletions(-) delete mode 100644 meta/recipes-devtools/python/python-smmap.inc delete mode 100644 meta/recipes-devtools/python/python-smmap_0.9.0.bb diff --git a/meta/recipes-devtools/python/python-smmap.inc b/meta/recipes-devtools/python/python-smmap.inc deleted file mode 100644 index 5b2ac74..000 --- a/meta/recipes-devtools/python/python-smmap.inc +++ /dev/null @@ -1,19 +0,0 @@ -SUMMARY = "Python implementation of a sliding window memory map manager" -DESCRIPTION = "A pure Python implementation of a sliding memory map to \ -help unifying memory mapped access on 32 and 64 bit systems and to help \ -managing resources more efficiently." -HOMEPAGE = "http://github.com/gitpython-developers/GitPython; -SECTION = "devel/python" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709" - -SRC_URI = "http://pypi.python.org/packages/source/s/smmap/smmap-${PV}.tar.gz; -SRC_URI[md5sum] = "d7932d5ace206bf4ae15198cf36fb6ab" -SRC_URI[sha256sum] = "0e2b62b497bd5f0afebc002eda4d90df9d209c30ef257e8673c90a6b5c119d62" - -UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/smmap/; -UPSTREAM_CHECK_REGEX = "/smmap/(?P(\d+[\.\-_]*)+)" - -S = "${WORKDIR}/smmap-${PV}" - -BBCLASSEXTEND = "nativesdk" diff --git a/meta/recipes-devtools/python/python-smmap_0.9.0.bb b/meta/recipes-devtools/python/python-smmap_0.9.0.bb deleted file mode 100644 index c118dd8..000 --- a/meta/recipes-devtools/python/python-smmap_0.9.0.bb +++ /dev/null @@ -1,5 +0,0 @@ -require python-smmap.inc - -inherit setuptools - -RDEPENDS_${PN} += "python-codecs python-mmap python-lang" diff --git a/meta/recipes-devtools/python/python3-smmap_0.9.0.bb b/meta/recipes-devtools/python/python3-smmap_0.9.0.bb index 9f8a26d..c6b0755 100644 --- a/meta/recipes-devtools/python/python3-smmap_0.9.0.bb +++ b/meta/recipes-devtools/python/python3-smmap_0.9.0.bb @@ -1,4 +1,22 @@ -require python-smmap.inc +SUMMARY = "Python implementation of a sliding window memory map manager" +DESCRIPTION = "A pure Python implementation of a sliding memory map to \ +help unifying memory mapped access on 32 and 64 bit systems and to help \ +managing resources more efficiently." +HOMEPAGE = "http://github.com/gitpython-developers/GitPython; +SECTION = "devel/python" +LICENSE = "BSD" +LIC_FILES_CHKSUM = "file://PKG-INFO;beginline=8;endline=8;md5=e910b35b0ef4e1f665b9a75d6afb7709" + +SRC_URI = "http://pypi.python.org/packages/source/s/smmap/smmap-${PV}.tar.gz; +SRC_URI[md5sum] = "d7932d5ace206bf4ae15198cf36fb6ab" +SRC_URI[sha256sum] = "0e2b62b497bd5f0afebc002eda4d90df9d209c30ef257e8673c90a6b5c119d62" + +UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/smmap/; +UPSTREAM_CHECK_REGEX = "/smmap/(?P(\d+[\.\-_]*)+)" + +S = "${WORKDIR}/smmap-${PV}" + +BBCLASSEXTEND = "nativesdk" inherit setuptools3 -- 2.8.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/6] python-pexpect: remove it
It was needed by buildtools-tarball, no one requires it any more now. Signed-off-by: Robert Yang--- .../python/python-pexpect_4.0.1.bb | 25 -- 1 file changed, 25 deletions(-) delete mode 100644 meta/recipes-devtools/python/python-pexpect_4.0.1.bb diff --git a/meta/recipes-devtools/python/python-pexpect_4.0.1.bb b/meta/recipes-devtools/python/python-pexpect_4.0.1.bb deleted file mode 100644 index 7f142a3..000 --- a/meta/recipes-devtools/python/python-pexpect_4.0.1.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "A Pure Python Expect like Module for Python" -HOMEPAGE = "http://pexpect.readthedocs.org/; -SECTION = "devel/python" -LICENSE = "ISC" -LIC_FILES_CHKSUM = "file://LICENSE;md5=66c2378a96b307d56bfb3a9e58edafa8" - -SRC_URI = "https://pypi.python.org/packages/source/p/pexpect/pexpect-${PV}.tar.gz; -SRC_URI[md5sum] = "056df81e6ca7081f1015b4b147b977b7" -SRC_URI[sha256sum] = "232795ebcaaf2e120396dbbaa3a129eda51757eeaae1911558f4ef8ee414fc6c" - -UPSTREAM_CHECK_URI = "https://pypi.python.org/pypi/pexpect; - -S = "${WORKDIR}/pexpect-${PV}" - -inherit distutils - -RDEPENDS_${PN} = "\ -python-core \ -python-io \ -python-terminal \ -python-resource \ -python-fcntl \ -" - -BBCLASSEXTEND = "nativesdk" -- 2.8.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] tcl: fix sed command in do_install
The following changes since commit d6241e4c94a0a72acfc57e96a59918c0b2146d65: useradd: Fix infinite build loop (2016-05-23 10:33:39 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/tcl http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/tcl Robert Yang (1): tcl: fix sed command in do_install meta/recipes-devtools/tcltk/tcl_8.6.4.bb | 2 -- 1 file changed, 2 deletions(-) -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] tcl: fix sed command in do_install
The -I= and -L= is used for cross compile, target doesn't need, and binconfig.class can handle usr/bin/crossscripts/tclConfig.sh. Fix do_configure error for the recipe which uses tclConfig.sh, for example, postgresql.do_configure: configure: error: header file is required for Tcl Signed-off-by: Robert Yang--- meta/recipes-devtools/tcltk/tcl_8.6.4.bb | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta/recipes-devtools/tcltk/tcl_8.6.4.bb b/meta/recipes-devtools/tcltk/tcl_8.6.4.bb index 61be81d..14ca9ba 100644 --- a/meta/recipes-devtools/tcltk/tcl_8.6.4.bb +++ b/meta/recipes-devtools/tcltk/tcl_8.6.4.bb @@ -56,8 +56,6 @@ do_install() { ln -sf tclsh8.6 ${D}${bindir}/tclsh${VER} sed -i "s+-L${B}+-L${STAGING_LIBDIR}+g" tclConfig.sh sed -i "s+${WORKDIR}+${STAGING_INCDIR}+g" tclConfig.sh - sed -i "s,-L${libdir},-L=${libdir},g" tclConfig.sh - sed -i "s,-I${includedir},-I=${includedir},g" tclConfig.sh install -d ${D}${bindir_crossscripts} install -m 0755 tclConfig.sh ${D}${bindir_crossscripts} install -m 0755 tclConfig.sh ${D}${libdir} -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] oe-init-build-env: allow GIT_SSL_CAINFO from external environment
buildtools-tarball sets GIT_SSL_CAINFO so that the included ca-certificates can be used by git; that can't work however unless the GIT_SSL_CAINFO is still set in the environment in which git gets run by the fetcher, so allow it through from the external environment. Fixes [YOCTO #9666]. Signed-off-by: Paul Eggleton--- scripts/oe-buildenv-internal | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/oe-buildenv-internal b/scripts/oe-buildenv-internal index 81ee784..3441b49 100755 --- a/scripts/oe-buildenv-internal +++ b/scripts/oe-buildenv-internal @@ -114,7 +114,7 @@ BB_ENV_EXTRAWHITE_OE="MACHINE DISTRO TCMODE TCLIBC HTTP_PROXY http_proxy \ HTTPS_PROXY https_proxy FTP_PROXY ftp_proxy FTPS_PROXY ftps_proxy ALL_PROXY \ all_proxy NO_PROXY no_proxy SSH_AGENT_PID SSH_AUTH_SOCK BB_SRCREV_POLICY \ SDKMACHINE BB_NUMBER_THREADS BB_NO_NETWORK PARALLEL_MAKE GIT_PROXY_COMMAND \ -SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR BBPATH_EXTRA" +SOCKS5_PASSWD SOCKS5_USER SCREENDIR STAMPS_DIR BBPATH_EXTRA GIT_SSL_CAINFO" BB_ENV_EXTRAWHITE="$(echo $BB_ENV_EXTRAWHITE $BB_ENV_EXTRAWHITE_OE | tr ' ' '\n' | LC_ALL=C sort --unique | tr '\n' ' ')" -- 2.5.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] conf/bitbake.conf: whitelist GIT_SSL_CAINFO
Just as with the proxy variables, we don't need to reparse everything if the value of this variable changes. Signed-off-by: Paul Eggleton--- meta/conf/bitbake.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index acef30b..d85e806 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf @@ -815,7 +815,8 @@ BB_HASHCONFIG_WHITELIST ?= "${BB_HASHBASE_WHITELIST} DATE TIME SSH_AGENT_PID \ SSH_AUTH_SOCK PSEUDO_BUILD BB_ENV_EXTRAWHITE DISABLE_SANITY_CHECKS \ PARALLEL_MAKE BB_NUMBER_THREADS BB_ORIGENV BB_INVALIDCONF BBINCLUDED \ GIT_PROXY_COMMAND ALL_PROXY all_proxy NO_PROXY no_proxy FTP_PROXY ftp_proxy \ -HTTP_PROXY http_proxy HTTPS_PROXY https_proxy SOCKS5_USER SOCKS5_PASSWD" +HTTP_PROXY http_proxy HTTPS_PROXY https_proxy SOCKS5_USER SOCKS5_PASSWD \ +GIT_SSL_CAINFO" BB_SIGNATURE_EXCLUDE_FLAGS ?= "doc deps depends \ lockfiles type vardepsexclude vardeps vardepvalue vardepvalueexclude \ file-checksums python func task export unexport noexec nostamp dirs cleandirs \ -- 2.5.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/2] Allow GIT_SSL_CAINFO set by buildtools-tarball to work
The following changes since commit d6241e4c94a0a72acfc57e96a59918c0b2146d65: useradd: Fix infinite build loop (2016-05-23 10:33:39 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/git-ssl-cainfo http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=paule/git-ssl-cainfo Paul Eggleton (2): oe-init-build-env: allow GIT_SSL_CAINFO from external environment conf/bitbake.conf: whitelist GIT_SSL_CAINFO meta/conf/bitbake.conf | 3 ++- scripts/oe-buildenv-internal | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) -- 2.5.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] OE Changelog since 2016-05-15 until 2016-05-22
Changelog since 2016-05-15 until 2016-05-22. Projects included in this report: bitbake: git://git.openembedded.org/bitbake openembedded-core: git://git.openembedded.org/openembedded-core meta-openembedded: git://git.openembedded.org/meta-openembedded meta-angstrom: git://github.com/Angstrom-distribution/meta-angstrom.git meta-arago: git://arago-project.org/git/meta-arago.git meta-atmel: https://github.com/linux4sam/meta-atmel.git meta-beagleboard: git://github.com/beagleboard/meta-beagleboard.git meta-browser: git://github.com/OSSystems/meta-browser.git meta-bug: git://github.com/buglabs/meta-bug.git meta-chicken: git://github.com/OSSystems/meta-chicken meta-efikamx: git://github.com/kraj/meta-efikamx.git meta-ettus: http://github.com/koenkooi/meta-ettus.git meta-fsl-arm: git://git.yoctoproject.org/meta-fsl-arm meta-fsl-arm-extra: git://github.com/Freescale/meta-fsl-arm-extra.git meta-fsl-ppc: git://git.yoctoproject.org/meta-fsl-ppc meta-guacamayo: git://github.com/Guacamayo/meta-guacamayo.git meta-gumstix: git://github.com/gumstix/meta-gumstix.git meta-gumstix-community: https://github.com/schnitzeltony/meta-gumstix-community.git meta-handheld: git://git.openembedded.org/meta-handheld meta-igep: http://github.com/ebutera/meta-igep.git meta-intel: git://git.yoctoproject.org/meta-intel meta-ivi: git://git.yoctoproject.org/meta-ivi meta-java: git://github.com/woglinde/meta-java meta-jetson-tk1: https://github.com/cubicool/meta-jetson-tk1.git meta-kde: git://gitorious.org/openembedded-core-layers/meta-kde.git meta-micro: git://git.openembedded.org/meta-micro meta-mono: git://git.yoctoproject.org/meta-mono.git meta-netbookpro: git://github.com/tworaz/meta-netbookpro meta-nodejs: https://github.com/imyller/meta-nodejs.git meta-nslu2: git://github.com/kraj/meta-nslu2 meta-opie: git://git.openembedded.org/meta-opie meta-qt3: git://git.yoctoproject.org/meta-qt3 meta-qt5: git://github.com/meta-qt5/meta-qt5.git meta-slugos: git://github.com/kraj/meta-slugos meta-systemd: git://git.yoctoproject.org/meta-systemd meta-raspberrypi: git://github.com/djwillis/meta-raspberrypi.git meta-smartphone: http://git.shr-project.org/repo/meta-smartphone.git meta-ti: git://git.yoctoproject.org/meta-ti meta-webos: git://github.com/openwebos/meta-webos.git meta-xilinx: git://git.yoctoproject.org/meta-xilinx meta-yocto: git://git.yoctoproject.org/meta-yocto openembedded: git://git.openembedded.org/openembedded Changelog for bitbake: Belen Barros Pena (1): toaster: projectconf Small tweaks to IMAGE_FSTYPES form Christopher Larson (5): bitbake-layers: convert to plugin-based bb.cooker: show limited traceback for parsing ExpansionError Implement support for per-task exports Provide LAYERDIR_RE for layer.conf bb.codeparser: track variable flag references Elliot Smith (3): buildinfohelper: add method to set current build as CANCELLED toasterui: capture keyboard interrupts the same way as knotty toaster: don't show "Rebuild" button for cancelled cli builds Michael Wood (8): toaster: toastertables: Clean up and fix up a number of items toaster: toastergui tests Fix toastertable tests toaster: Remove DATABASE_URL being passed around as an environment var toaster: runbuilds move the execution sequence out of the poll loop toaster: Add a specific test settings file toaster: tests Add a BuildTest helper class toaster: tests build Add a test for a build of core-image-minimal toaster: tests builds Add SSTATE_MISS as a valid condition for tc=833 Richard Purdie (6): siggen: Fixes to handle sigdata/siginfo files only containing basehash data knotty: Fix output buffering issues cache: Increase cache version after task checksum calculation changes codeparser: Increase cache version after code parser dependency changes cooker: Improve taskgraph file handling cooker: Fix parse progress for python3 Sujith H (2): toaster: handle multiple imagefs types toaster-tests: tests for project config Changelog for openembedded-core: Anders Darander (1): lib/oe/rootfs: Fix DEBUGFS generation, without openssl Andrew Bradford (1): lttng-modules: Upgrade to 2.7.3 release Aníbal Limón (2): classes/base: get_lic_checksum_file_list imporve validaton of url's qemu: Upgrade to 2.5.1.1 for fix CVE-2016-3710 and CVE-2016-3712 Armin Kuster (5): gcc: Security fix CVE-2016-4488 gcc: Security fix CVE-2016-4489 gcc: Security fix CVE-2016-2226 gcc: Security fix CVE-2016-4490 python-numpy: fix build failure with python-matplotlib Awais Belal (1): mesa-demos: provide option for disabling GLX demos Christian Ege (1): bluez5: fixed path to bluetoothd in sysvinit script Christopher Larson (1): mkelfimage: obey LDFLAGS, sort out HOST_ flags Dai Caiyun (3): shadow: Fix rootfs creation errors net-tools: Fix rootfs creation errors coreutils: Fix rootfs creation errors Dengke Du (1):
Re: [OE-core] [PATCH 1/1] sstate.bbclass: Don't create symlinks, download to the correct location
On Mon, May 23, 2016 at 2:57 PM, Randy Wittwrote: > Previously the sstate was all downloaded to the same directory and then > symlinks were added in the directories that pointed to the siginfo and > sstate in the parent directory. > > This change makes it so that now the files are just downloaded to the > correct location without the need for symlinks. > > Signed-off-by: Randy Witt > --- > meta/classes/sstate.bbclass | 12 +++- > 1 file changed, 3 insertions(+), 9 deletions(-) > > diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass > index 22ce1ee..6d5411f 100644 > --- a/meta/classes/sstate.bbclass > +++ b/meta/classes/sstate.bbclass > @@ -623,10 +623,10 @@ def pstaging_fetch(sstatefetch, sstatepkg, d): > > # Try a fetch from the sstate mirror, if it fails just return and > # we will build the package > -uris = ['file://{0}'.format(sstatefetch), > -'file://{0}.siginfo'.format(sstatefetch)] > +uris = ['file://{0};downloadfilename={1}'.format(sstatefetch, > sstatefetch), > + > 'file://{0}.siginfo;downloadfilename={1}.siginfo'.format(sstatefetch, > sstatefetch)] > if bb.utils.to_boolean(d.getVar("SSTATE_VERIFY_SIG", True), False): > -uris += ['file://{0}.sig'.format(sstatefetch)] > +uris += > ['file://{0}.sig;downloadfilename={1}.sig'.format(sstatefetch, sstatefetch)] > The use of {1} and passing the argument a second time is not needed. This isn't the old style formatting with %s. Just use the existing argument: file://{0};downloadfilename={0}'.format(sstatefetch) -- Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v1] runqemu: Add suport for qemuzynqmp
On Mon, May 23, 2016 at 2:37 PM, Alistair Franciswrote: > On Sat, May 21, 2016 at 2:33 PM, Burton, Ross wrote: >> >> On 19 May 2016 at 17:40, Alistair Francis >> wrote: >>> >>> On Thu, May 12, 2016 at 2:37 PM, Alistair Francis >>> wrote: >>> > Signed-off-by: Alistair Francis >>> >>> Ping! >> >> >> Sorry meant to reply to this a lot earlier. There's a RFC from Robert Yang >> which proposes a series of patches to completely rewrite how runqemu works, > > Are you talking about the 'runqemu/runqemu-internal: refactor it' patch > series? > > I talked to him about that and I'm happy to help convert the Xilinx > machines to the new method. > >> so the machine-specific knowledge is contained in the BSP itself. As a BSP >> maintainer who is working on runqemu, would you be able to have a look at >> see if it should solve all of your needs? > > I haven't looked into it too much yet, but I can't see why it wouldn't > work for us. > >> >> (this is now marked for my staging branch too) Just to double check, you mean this patch is in your staging branch right? Thanks, Alistair > > Thanks! > > Alistair > >> >> Ross >> >> -- >> ___ >> 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 0/1] sstate fetch symlink removal
This change removes the clutter of symlinks when sstate comes from a mirror rather than being created on the host. The following changes since commit c7e614c438706fb3ed7520b4990ebb3973366942: useradd: Fix infinite build loop (2016-05-23 10:33:45 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib rewitt/sstate-symlink http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=rewitt/sstate-symlink Randy Witt (1): sstate.bbclass: Don't create symlinks, download to the correct location meta/classes/sstate.bbclass | 12 +++- 1 file changed, 3 insertions(+), 9 deletions(-) -- 2.5.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] sstate.bbclass: Don't create symlinks, download to the correct location
Previously the sstate was all downloaded to the same directory and then symlinks were added in the directories that pointed to the siginfo and sstate in the parent directory. This change makes it so that now the files are just downloaded to the correct location without the need for symlinks. Signed-off-by: Randy Witt--- meta/classes/sstate.bbclass | 12 +++- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/meta/classes/sstate.bbclass b/meta/classes/sstate.bbclass index 22ce1ee..6d5411f 100644 --- a/meta/classes/sstate.bbclass +++ b/meta/classes/sstate.bbclass @@ -623,10 +623,10 @@ def pstaging_fetch(sstatefetch, sstatepkg, d): # Try a fetch from the sstate mirror, if it fails just return and # we will build the package -uris = ['file://{0}'.format(sstatefetch), -'file://{0}.siginfo'.format(sstatefetch)] +uris = ['file://{0};downloadfilename={1}'.format(sstatefetch, sstatefetch), + 'file://{0}.siginfo;downloadfilename={1}.siginfo'.format(sstatefetch, sstatefetch)] if bb.utils.to_boolean(d.getVar("SSTATE_VERIFY_SIG", True), False): -uris += ['file://{0}.sig'.format(sstatefetch)] +uris += ['file://{0}.sig;downloadfilename={1}.sig'.format(sstatefetch, sstatefetch)] for srcuri in uris: localdata.setVar('SRC_URI', srcuri) @@ -634,12 +634,6 @@ def pstaging_fetch(sstatefetch, sstatepkg, d): fetcher = bb.fetch2.Fetch([srcuri], localdata, cache=False) fetcher.download() -# Need to optimise this, if using file:// urls, the fetcher just changes the local path -# For now work around by symlinking -localpath = bb.data.expand(fetcher.localpath(srcuri), localdata) -if localpath != sstatepkg and os.path.exists(localpath) and not os.path.exists(sstatepkg): -os.symlink(localpath, sstatepkg) - except bb.fetch2.BBFetchException: break -- 2.5.5 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v1] runqemu: Add suport for qemuzynqmp
On Sat, May 21, 2016 at 2:33 PM, Burton, Rosswrote: > > On 19 May 2016 at 17:40, Alistair Francis > wrote: >> >> On Thu, May 12, 2016 at 2:37 PM, Alistair Francis >> wrote: >> > Signed-off-by: Alistair Francis >> >> Ping! > > > Sorry meant to reply to this a lot earlier. There's a RFC from Robert Yang > which proposes a series of patches to completely rewrite how runqemu works, Are you talking about the 'runqemu/runqemu-internal: refactor it' patch series? I talked to him about that and I'm happy to help convert the Xilinx machines to the new method. > so the machine-specific knowledge is contained in the BSP itself. As a BSP > maintainer who is working on runqemu, would you be able to have a look at > see if it should solve all of your needs? I haven't looked into it too much yet, but I can't see why it wouldn't work for us. > > (this is now marked for my staging branch too) Thanks! Alistair > > Ross > > -- > ___ > 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] mkelfimage: fix compile issues
From: Christopher LarsonThis fixes a couple issues introduced by the previous patch. There were a couple spots where HOST_CFLAGS needed changing to CFLAGS. This fixes builds with security_flags. Signed-off-by: Christopher Larson --- meta/recipes-devtools/mkelfimage/mkelfimage/cross-compile.patch | 4 ++-- meta/recipes-devtools/mkelfimage/mkelfimage_git.bb | 7 +-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/meta/recipes-devtools/mkelfimage/mkelfimage/cross-compile.patch b/meta/recipes-devtools/mkelfimage/mkelfimage/cross-compile.patch index 2ae9fb5..a162eb7 100644 --- a/meta/recipes-devtools/mkelfimage/mkelfimage/cross-compile.patch +++ b/meta/recipes-devtools/mkelfimage/mkelfimage/cross-compile.patch @@ -67,7 +67,7 @@ index 51531d6..7e8aa3c 100644 $(LI386_OBJ)/mkelf-linux-i386.o: $(LI386_DIR)/mkelf-linux-i386.c $(LI386_DIR)/convert.bin.c $(LI386_DEP) $(MKDIR) -p $(@D) - $(HOST_CC) $(HOST_CFLAGS) -c -g $< -o $@ -+ $(CC) $(HOST_CFLAGS) -c -g $< -o $@ ++ $(CC) $(CFLAGS) -c -g $< -o $@ ifdef I386_CC @@ -80,7 +80,7 @@ index 38f5d8c..5df8870 100644 $(LIA64_OBJ)/mkelf-linux-ia64.o: $(LIA64_DIR)/mkelf-linux-ia64.c $(LIA64_DIR)/convert.bin.c $(LIA64_DEP) $(MKDIR) -p $(@D) - $(HOST_CC) $(HOST_CFLAGS) -c -g $< -o $@ -+ $(CC) $(HOST_CFLAGS) -c -g $< -o $@ ++ $(CC) $(CFLAGS) -c -g $< -o $@ ifdef IA64_CC diff --git a/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb b/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb index d7a4429..2bcc8d7 100644 --- a/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb +++ b/meta/recipes-devtools/mkelfimage/mkelfimage_git.bb @@ -24,8 +24,11 @@ CLEANBROKEN = "1" S = "${WORKDIR}/git/util/mkelfImage" CFLAGS += "-fno-stack-protector" -CACHED_CONFIGUREVARS += "HOST_CC='${BUILD_CC}'" -EXTRA_OEMAKE += "HOST_CPPFLAGS='${BUILD_CPPFLAGS}'" +CACHED_CONFIGUREVARS += "\ +HOST_CC='${BUILD_CC}' \ +HOST_CFLAGS='${BUILD_CFLAGS}' \ +HOST_CPPFLAGS='${BUILD_CPPFLAGS}' \ +" inherit autotools-brokensep -- 2.8.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] openssl: Ensure SSL certificates are stored on sysconfdir
Debian and other generic distributions has moved the certificates for sysconfdir (/etc/ssl) and made the libdir content to link for it. This provides several advantages specially for read-only rootfs. Another benefit is that it ensures foreign implementations (e.g: BoringSSL, from Chromium, when running with OpenSSL backend for the certificates) to find the content correctly. Signed-off-by: Otavio Salvador--- meta/recipes-connectivity/openssl/openssl.inc | 17 ++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index 668e34e..3412c66 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -43,8 +43,8 @@ RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', # package RRECOMMENDS on this package. This will enable the configuration # file to be installed for both the base openssl package and the libcrypto # package since the base openssl package depends on the libcrypto package. -FILES_openssl-conf = "${libdir}/ssl/openssl.cnf" -CONFFILES_openssl-conf = "${libdir}/ssl/openssl.cnf" +FILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf" +CONFFILES_openssl-conf = "${sysconfdir}/ssl/openssl.cnf" RRECOMMENDS_libcrypto += "openssl-conf" RDEPENDS_${PN}-ptest += "${PN}-misc make perl perl-module-filehandle bc" @@ -178,6 +178,17 @@ do_install () { else rm -f ${D}${libdir}/ssl/misc/CA.pl ${D}${libdir}/ssl/misc/tsget fi + + # Create SSL structure + install -d ${D}${sysconfdir}/ssl/ + mv ${D}${libdir}/ssl/openssl.cnf \ + ${D}${libdir}/ssl/certs \ + ${D}${libdir}/ssl/private \ + \ + ${D}${sysconfdir}/ssl/ + ln -sf ${sysconfdir}/ssl/certs ${D}${libdir}/ssl/certs + ln -sf ${sysconfdir}/ssl/private ${D}${libdir}/ssl/private + ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${libdir}/ssl/openssl.cnf } do_install_ptest () { @@ -191,7 +202,7 @@ do_install_ptest () { cp -r certs ${D}${PTEST_PATH} mkdir -p ${D}${PTEST_PATH}/apps ln -sf ${libdir}/ssl/misc/CA.sh ${D}${PTEST_PATH}/apps - ln -sf ${libdir}/ssl/openssl.cnf ${D}${PTEST_PATH}/apps + ln -sf ${sysconfdir}/ssl/openssl.cnf ${D}${PTEST_PATH}/apps ln -sf ${bindir}/openssl ${D}${PTEST_PATH}/apps cp apps/server2.pem ${D}${PTEST_PATH}/apps mkdir -p ${D}${PTEST_PATH}/util -- 2.8.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] ca-certificates: Use c_rehash utility
As now the c_rehash utility is available, we can use it. This removes the patch to disable its usage allowing for a standard SSL behaviour. Signed-off-by: Otavio Salvador--- ...01-update-ca-certificates-remove-c-rehash.patch | 46 -- .../ca-certificates/ca-certificates_20160104.bb| 1 - 2 files changed, 47 deletions(-) delete mode 100644 meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch diff --git a/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch b/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch deleted file mode 100644 index bf02723..000 --- a/meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch +++ /dev/null @@ -1,46 +0,0 @@ -Upstream-Status: Pending - -From 111e905fe931da1a3800accfc675cc01c8ee080c Mon Sep 17 00:00:00 2001 -From: Ulf Samuelsson -Date: Tue, 28 Feb 2012 06:42:58 +0100 -Subject: [PATCH] update-ca-certificates: remove c rehash - -Updated earlier patch to apply clean on 2012-02-12 -Signed-off-by: Ulf Samuelsson - sbin/update-ca-certificates | 20 ++-- - 1 files changed, 10 insertions(+), 10 deletions(-) - -diff --git a/sbin/update-ca-certificates b/sbin/update-ca-certificates -index 5375950..c567e3d 100755 a/sbin/update-ca-certificates -+++ b/sbin/update-ca-certificates -@@ -132,16 +132,16 @@ rm -f "$CERTBUNDLE" - ADDED_CNT=$(wc -l < "$ADDED") - REMOVED_CNT=$(wc -l < "$REMOVED") - --if [ "$ADDED_CNT" -gt 0 ] || [ "$REMOVED_CNT" -gt 0 ] --then -- # only run if set of files has changed -- if [ "$verbose" = 0 ] -- then --c_rehash . > /dev/null -- else --c_rehash . -- fi --fi -+#if [ "$ADDED_CNT" -gt 0 ] || [ "$REMOVED_CNT" -gt 0 ] -+#then -+# # only run if set of files has changed -+# if [ "$verbose" = 0 ] -+# then -+#c_rehash . > /dev/null -+# else -+#c_rehash . -+# fi -+#fi - - chmod 0644 "$TEMPBUNDLE" - mv -f "$TEMPBUNDLE" "$CERTBUNDLE" --- -1.7.4.1 diff --git a/meta/recipes-support/ca-certificates/ca-certificates_20160104.bb b/meta/recipes-support/ca-certificates/ca-certificates_20160104.bb index e0f1939..871bc2e 100644 --- a/meta/recipes-support/ca-certificates/ca-certificates_20160104.bb +++ b/meta/recipes-support/ca-certificates/ca-certificates_20160104.bb @@ -14,7 +14,6 @@ DEPENDS_class-native = "" SRCREV = "f54715702c5c0581c9461f78fd84e2c8d2ec243c" SRC_URI = "git://anonscm.debian.org/collab-maint/ca-certificates.git \ - file://0001-update-ca-certificates-remove-c-rehash.patch \ file://0002-update-ca-certificates-use-SYSROOT.patch \ file://0001-update-ca-certificates-don-t-use-Debianisms-in-run-p.patch \ file://update-ca-certificates-support-Toybox.patch \ -- 2.8.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] openssl: Add Shell-Script based c_rehash utility
The PLD Linux distribution has ported the c_rehash[1] utility from Perl to Shell-Script, allowing it to be shipped by default. 1. https://git.pld-linux.org/?p=packages/openssl.git;a=blob;f=openssl-c_rehash.sh;h=0ea22637ee6dbce845a9e2caf62540aaaf5d0761 The OpenSSL upstream intends[2] to convert the utility for C however did not yet finished the conversion. 2. https://rt.openssl.org/Ticket/Display.html?id=2324 This patch adds this script and thus removed the Perl requirement for it. Signed-off-by: Otavio Salvador--- meta/recipes-connectivity/openssl/openssl.inc | 9 +- .../openssl/openssl/openssl-c_rehash.sh| 210 + .../recipes-connectivity/openssl/openssl_1.0.2h.bb | 1 + 3 files changed, 215 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index a5ddf4d..668e34e 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -36,7 +36,7 @@ PACKAGES =+ "libcrypto libssl ${PN}-misc openssl-conf" FILES_libcrypto = "${libdir}/libcrypto${SOLIBS}" FILES_libssl = "${libdir}/libssl${SOLIBS}" FILES_${PN} =+ " ${libdir}/ssl/*" -FILES_${PN}-misc = "${libdir}/ssl/misc ${bindir}/c_rehash" +FILES_${PN}-misc = "${libdir}/ssl/misc" RDEPENDS_${PN}-misc = "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" # Add the openssl.cnf file to the openssl-conf package. Make the libcrypto @@ -168,15 +168,14 @@ do_install () { install -d ${D}${includedir} cp --dereference -R include/openssl ${D}${includedir} + install -Dm 0755 ${WORKDIR}/openssl-c_rehash.sh ${D}${bindir}/c_rehash + sed -i -e 's,/etc/openssl,${sysconfdir}/ssl,g' ${D}${bindir}/c_rehash + oe_multilib_header openssl/opensslconf.h if [ "${@bb.utils.contains('PACKAGECONFIG', 'perl', 'perl', '', d)}" = "perl" ]; then - install -m 0755 ${S}/tools/c_rehash ${D}${bindir} - sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${bindir}/c_rehash sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/CA.pl sed -i -e '1s,.*,#!${bindir}/env perl,' ${D}${libdir}/ssl/misc/tsget - # The c_rehash utility isn't installed by the normal installation process. else - rm -f ${D}${bindir}/c_rehash rm -f ${D}${libdir}/ssl/misc/CA.pl ${D}${libdir}/ssl/misc/tsget fi } diff --git a/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh b/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh new file mode 100644 index 000..0ea2263 --- /dev/null +++ b/meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh @@ -0,0 +1,210 @@ +#!/bin/sh +# +# Ben Secrest +# +# sh c_rehash script, scan all files in a directory +# and add symbolic links to their hash values. +# +# based on the c_rehash perl script distributed with openssl +# +# LICENSE: See OpenSSL license +# ^^acceptable?^^ +# + +# default certificate location +DIR=/etc/openssl + +# for filetype bitfield +IS_CERT=$(( 1 << 0 )) +IS_CRL=$(( 1 << 1 )) + + +# check to see if a file is a certificate file or a CRL file +# arguments: +# 1. the filename to be scanned +# returns: +# bitfield of file type; uses ${IS_CERT} and ${IS_CRL} +# +check_file() +{ +local IS_TYPE=0 + +# make IFS a newline so we can process grep output line by line +local OLDIFS=${IFS} +IFS=$( printf "\n" ) + +# XXX: could be more efficient to have two 'grep -m' but is -m portable? +for LINE in $( grep '^-BEGIN .*-' ${1} ) +do + if echo ${LINE} \ + | grep -q -E '^-BEGIN (X509 |TRUSTED )?CERTIFICATE-' + then + IS_TYPE=$(( ${IS_TYPE} | ${IS_CERT} )) + + if [ $(( ${IS_TYPE} & ${IS_CRL} )) -ne 0 ] + then + break + fi + elif echo ${LINE} | grep -q '^-BEGIN X509 CRL-' + then + IS_TYPE=$(( ${IS_TYPE} | ${IS_CRL} )) + + if [ $(( ${IS_TYPE} & ${IS_CERT} )) -ne 0 ] + then + break + fi + fi +done + +# restore IFS +IFS=${OLDIFS} + +return ${IS_TYPE} +} + + +# +# use openssl to fingerprint a file +#arguments: +# 1. the filename to fingerprint +# 2. the method to use (x509, crl) +#returns: +# none +#assumptions: +# user will capture output from last stage of pipeline +# +fingerprint() +{ +${SSL_CMD} ${2} -fingerprint -noout -in ${1} | sed 's/^.*=//' | tr -d ':' +} + + +# +# link_hash - create links to certificate files +#arguments: +# 1. the filename to create a link for +# 2. the type of certificate being linked (x509, crl) +#returns: +# 0 on success, 1 otherwise +# +link_hash() +{ +
[OE-core] [PATCH 0/3] Improve SSL certificate handling
This patchset leverage the OpenSSL certificate handling so it works aligned with Debian and other generic distributions regarding where the certificates are stored and how they are installed. This all started when debugging why SSL certificates were not working properly for a customer which was using QtWebEngine. It turned out to be the integration which was not complete so this patch addresses it. Otavio Salvador (3): openssl: Add Shell-Script based c_rehash utility ca-certificates: Use c_rehash utility openssl: Ensure SSL certificates are stored on sysconfdir meta/recipes-connectivity/openssl/openssl.inc | 26 ++- .../openssl/openssl/openssl-c_rehash.sh| 210 + .../recipes-connectivity/openssl/openssl_1.0.2h.bb | 1 + ...01-update-ca-certificates-remove-c-rehash.patch | 46 - .../ca-certificates/ca-certificates_20160104.bb| 1 - 5 files changed, 229 insertions(+), 55 deletions(-) create mode 100644 meta/recipes-connectivity/openssl/openssl/openssl-c_rehash.sh delete mode 100644 meta/recipes-support/ca-certificates/ca-certificates/0001-update-ca-certificates-remove-c-rehash.patch -- 2.8.2 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] image_types.bbclass: add intermediate var for WKS_FILE_CHECKSUM
From: Christopher LarsonThis is a bit nicer to work with, and easier to override. Signed-off-by: Christopher Larson --- meta/classes/image_types.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index ea45809..dc681ae 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -208,7 +208,8 @@ IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES" # Rebuild when the wks file or vars in WICVARS change USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${COMPRESSIONTYPES}'.split()), '1', '', d)}" -do_image_wic[file-checksums] += "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}" +WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}" +do_image_wic[file-checksums] += "${WKS_FILE_CHECKSUM}" EXTRA_IMAGECMD = "" -- 2.8.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] image.bbclass: append to prefuncs/postfuncs for do_image_*
From: Christopher LarsonThese are list style variables, so append to them rather than blowing away any existing value. Signed-off-by: Christopher Larson --- meta/classes/image.bbclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 6b9f979..95dbb82 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -436,9 +436,9 @@ python () { d.setVar('do_image_%s' % t, '\n'.join(cmds)) d.setVarFlag('do_image_%s' % t, 'func', '1') d.setVarFlag('do_image_%s' % t, 'fakeroot', '1') -d.setVarFlag('do_image_%s' % t, 'prefuncs', debug + 'set_image_size') -d.setVarFlag('do_image_%s' % t, 'postfuncs', 'create_symlinks') d.setVarFlag('do_image_%s' % t, 'subimages', ' '.join(subimages)) +d.appendVarFlag('do_image_%s' % t, 'prefuncs', ' ' + debug + 'set_image_size') +d.appendVarFlag('do_image_%s' % t, 'postfuncs', ' create_symlinks') d.appendVarFlag('do_image_%s' % t, 'vardeps', ' '.join(vardeps)) d.appendVarFlag('do_image_%s' % t, 'vardepsexclude', 'DATETIME') -- 2.8.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] image_types.bbclass: support template .wks.in files for wic
From: Christopher LarsonThese files are treated as the contents of a bitbake variable, so usual bitbake variable references are supported. I considered using another templating mechanism, for example the one used by yocto-layer, but then we'd end up largely mapping metadata variables to template fields anyway, which is a pointless indirection. Let bitbake expand the variables directly instead. This feature lets us, for example, reference ${APPEND} in --append, and avoid hardcoding the serial console tty in the wks file, and let the user's changes to APPEND affect wic the way they do the other image construction mechanisms. The template is read in and set in a variable at parse time, so changes to the variables referenced by the template will result in rebuilding the image. Signed-off-by: Christopher Larson --- meta/classes/image_types.bbclass | 35 +++ 1 file changed, 35 insertions(+) diff --git a/meta/classes/image_types.bbclass b/meta/classes/image_types.bbclass index dc681ae..caf8757 100644 --- a/meta/classes/image_types.bbclass +++ b/meta/classes/image_types.bbclass @@ -206,6 +206,16 @@ IMAGE_CMD_wic () { } IMAGE_CMD_wic[vardepsexclude] = "WKS_FULL_PATH WKS_FILES" +python process_wks_template () { +"""Write out expanded template contents to WKS_FULL_PATH.""" +template_body = d.getVar('_WKS_TEMPLATE', True) +if template_body: +wks_file = d.getVar('WKS_FULL_PATH', True) +with open(wks_file, 'w') as f: +f.write(template_body) +} +do_image_wic[prefuncs] += 'process_wks_template' + # Rebuild when the wks file or vars in WICVARS change USING_WIC = "${@bb.utils.contains_any('IMAGE_FSTYPES', 'wic ' + ' '.join('wic.%s' % c for c in '${COMPRESSIONTYPES}'.split()), '1', '', d)}" WKS_FILE_CHECKSUM = "${@'${WKS_FULL_PATH}:%s' % os.path.exists('${WKS_FULL_PATH}') if '${USING_WIC}' else ''}" @@ -302,3 +312,28 @@ IMAGE_TYPES_MASKED ?= "" # The WICVARS variable is used to define list of bitbake variables used in wic code # variables from this list is written to .env file WICVARS ?= "BBLAYERS DEPLOY_DIR_IMAGE HDDDIR IMAGE_BASENAME IMAGE_BOOT_FILES IMAGE_LINK_NAME IMAGE_ROOTFS INITRAMFS_FSTYPES INITRD ISODIR MACHINE_ARCH ROOTFS_SIZE STAGING_DATADIR STAGING_DIR_NATIVE STAGING_LIBDIR TARGET_SYS" + +python () { +"""Read in and set up wks file template for wic.""" +if d.getVar('USING_WIC', True): +wks_file_u = d.getVar('WKS_FULL_PATH', False) +wks_file = d.expand(wks_file_u) +base, ext = os.path.splitext(wks_file) +if ext == '.in' and os.path.exists(wks_file): +wks_out_file = os.path.join(d.getVar('WORKDIR', True), os.path.basename(base)) +d.setVar('WKS_FULL_PATH', wks_out_file) +d.setVar('WKS_TEMPLATE_PATH', wks_file_u) +d.setVar('WKS_FILE_CHECKSUM', '${WKS_TEMPLATE_PATH}:True') + +try: +with open(wks_file, 'r') as f: +body = f.read() +except (IOError, OSError) as exc: +pass +else: +# Previously, I used expandWithRefs to get the dependency list +# and add it to WICVARS, but there's no point re-parsing the +# file in process_wks_template as well, so just put it in +# a variable and let the metadata deal with the deps. +d.setVar('_WKS_TEMPLATE', body) +} -- 2.8.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/3] Support template files for wic
From: Christopher LarsonThis adds support for .wks.in files as WKS_FILE. This is a re-send of the RFC PATCH series as a regular PATCH series, to attempt to get the feature merged. There's a clear value-add, there were no major objections to the RFC series, and further improvements can be added on from here. These files are treated as the contents of a bitbake variable, so usual bitbake variable references are supported. I considered using another templating mechanism, for example the one used by yocto-layer, but then we'd end up largely mapping metadata variables to template fields anyway, which is a pointless indirection. Let bitbake expand the variables directly instead. This feature lets us, for example, reference ${APPEND} in --append, and avoid hardcoding the serial console tty in the wks file, and let the user's changes to APPEND affect wic the way they do the other image construction mechanisms. The template is read in and set in a variable at parse time, so changes to the variables referenced by the template will result in rebuilding the image. It's been suggested that the name should better reflect how its contents are used, i.e. .bbin or so. I've also considered including something like 'bbv' or similar, to indicate its contents are that of a bitbake value. I think this should be discussed. I'd love to hear questions or comments on this. I think the value is clear, and it's something we need to solve, but I'd like to hear if others agree or disagree on that, and whether this implementation is appropriate. The following changes since commit f6b0b260ce18a30d04edfb0afb7942b9f9a5480b: lib/oe/rootfs: Fix DEBUGFS generation, without openssl (2016-05-20 10:20:42 +0100) are available in the git repository at: git://github.com/kergoth/openembedded-core wks.in https://github.com/kergoth/openembedded-core/tree/wks.in Christopher Larson (3): image.bbclass: append to prefuncs/postfuncs for do_image_* image_types.bbclass: add intermediate var for WKS_FILE_CHECKSUM image_types.bbclass: support template .wks.in files for wic meta/classes/image.bbclass | 4 ++-- meta/classes/image_types.bbclass | 38 +- 2 files changed, 39 insertions(+), 3 deletions(-) -- 2.8.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv3] mkelfimage: obey LDFLAGS, sort out HOST_ flags
On 23 May 2016 at 20:59, Christopher Larsonwrote: > I'm not opposed to reverting this, as the issue being fixed was clearly > not as bad as this result, but I'm completely unable to repro this for > beaglebone with meta-ti, either with the internal toolchain or the external > sourcery toolchain. Was this with clang, or some specific toolchain > version? Or perhaps ostro is doing something special there? > Ostro enables the security flags, which impacts the linking. Ross -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv3] mkelfimage: obey LDFLAGS, sort out HOST_ flags
On Mon, May 23, 2016 at 6:31 AM, Patrick Ohlywrote: > On Mon, 2016-05-23 at 04:52 +, Khem Raj wrote: > > I am getting these errors with clang now > > > > > > http://errors.yoctoproject.org/Errors/Details/64935/ > > And I am getting the same link error also during normal builds for > Beaglebone (but not other platforms): > > https://ostroproject.org/jenkins/job/build_beaglebone/1663/console > ... > arm-ostro-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard > -mcpu=cortex-a8 > --sysroot=/var/lib/jenkins/ostro-worker-17-slot-1-JopZL/ostro-os/build/tmp-glibc/sysroots/beaglebone > -O2 -pipe -g -feliminate-unused-debug-types > -fdebug-prefix-map=/var/lib/jenkins/ostro-worker-17-slot-1-JopZL/ostro-os/build/tmp-glibc/work/cortexa8hf-neon-ostro-linux-gnueabi/mkelfimage/4.0+gitAUTOINC+686a48a339-r0=/usr/src/debug/mkelfimage/4.0+gitAUTOINC+686a48a339-r0 > -fdebug-prefix-map=/var/lib/jenkins/ostro-worker-17-slot-1-JopZL/ostro-os/build/tmp-glibc/sysroots/x86_64-linux= > -fdebug-prefix-map=/var/lib/jenkins/ostro-worker-17-slot-1-JopZL/ostro-os/build/tmp-glibc/sysroots/beaglebone= > -fstack-protector-strong -pie -fpie -D_FORTIFY_SOURCE=2 -Wformat > -Wformat-security -Werror=format-security -fno-stack-protector -Wall > -DVERSION='"2.7"' -DRELEASE_DATE='"27 March 2006"' -I include > -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" > -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" > -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 > -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 > -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_ZLIB_H=1 -Wl,-O1 > -Wl,--hash-style=gnu -Wl,--as-needed -fstack-protector-strong > -Wl,-z,relro,-z,now objdir/main/mkelfImage.o > objdir/linux-i386/mkelf-linux-i386.o objdir/linux-ia64/mkelf-linux-ia64.o > -o objdir/sbin/mkelfImage -lz > /var/lib/jenkins/ostro-worker-17-slot-1-JopZL/ostro-os/build/tmp-glibc/sysroots/x86_64-linux/usr/bin/arm-ostro-linux-gnueabi/../../libexec/arm-ostro-linux-gnueabi/gcc/arm-ostro-linux-gnueabi/5.3.0/ld: > objdir/linux-i386/mkelf-linux-i386.o: relocation R_ARM_MOVW_ABS_NC against > `a local symbol' can not be used when making a shared object; recompile > with -fPIC > objdir/linux-i386/mkelf-linux-i386.o: error adding symbols: Bad value > collect2: error: ld returned 1 exit status > main/Makefile:6: recipe for target 'objdir/sbin/mkelfImage' failed > ... > > Reverting the commit fixes that, so can we just do that in OE-core > master while the problem gets sorted out? I'll submit a revert patch to the list for now, unless someone gets to it sooner. Thanks for the feedback. -- Christopher Larson kergoth at gmail dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv3] mkelfimage: obey LDFLAGS, sort out HOST_ flags
On Mon, May 23, 2016 at 6:31 AM, Patrick Ohlywrote: > On Mon, 2016-05-23 at 04:52 +, Khem Raj wrote: > > I am getting these errors with clang now > > > > > > http://errors.yoctoproject.org/Errors/Details/64935/ > > And I am getting the same link error also during normal builds for > Beaglebone (but not other platforms): > > https://ostroproject.org/jenkins/job/build_beaglebone/1663/console > ... > arm-ostro-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard > -mcpu=cortex-a8 > --sysroot=/var/lib/jenkins/ostro-worker-17-slot-1-JopZL/ostro-os/build/tmp-glibc/sysroots/beaglebone > -O2 -pipe -g -feliminate-unused-debug-types > -fdebug-prefix-map=/var/lib/jenkins/ostro-worker-17-slot-1-JopZL/ostro-os/build/tmp-glibc/work/cortexa8hf-neon-ostro-linux-gnueabi/mkelfimage/4.0+gitAUTOINC+686a48a339-r0=/usr/src/debug/mkelfimage/4.0+gitAUTOINC+686a48a339-r0 > -fdebug-prefix-map=/var/lib/jenkins/ostro-worker-17-slot-1-JopZL/ostro-os/build/tmp-glibc/sysroots/x86_64-linux= > -fdebug-prefix-map=/var/lib/jenkins/ostro-worker-17-slot-1-JopZL/ostro-os/build/tmp-glibc/sysroots/beaglebone= > -fstack-protector-strong -pie -fpie -D_FORTIFY_SOURCE=2 -Wformat > -Wformat-security -Werror=format-security -fno-stack-protector -Wall > -DVERSION='"2.7"' -DRELEASE_DATE='"27 March 2006"' -I include > -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" > -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\"\" -DPACKAGE_URL=\"\" > -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 > -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 > -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_ZLIB_H=1 -Wl,-O1 > -Wl,--hash-style=gnu -Wl,--as-needed -fstack-protector-strong > -Wl,-z,relro,-z,now objdir/main/mkelfImage.o > objdir/linux-i386/mkelf-linux-i386.o objdir/linux-ia64/mkelf-linux-ia64.o > -o objdir/sbin/mkelfImage -lz > /var/lib/jenkins/ostro-worker-17-slot-1-JopZL/ostro-os/build/tmp-glibc/sysroots/x86_64-linux/usr/bin/arm-ostro-linux-gnueabi/../../libexec/arm-ostro-linux-gnueabi/gcc/arm-ostro-linux-gnueabi/5.3.0/ld: > objdir/linux-i386/mkelf-linux-i386.o: relocation R_ARM_MOVW_ABS_NC against > `a local symbol' can not be used when making a shared object; recompile > with -fPIC > objdir/linux-i386/mkelf-linux-i386.o: error adding symbols: Bad value > collect2: error: ld returned 1 exit status > main/Makefile:6: recipe for target 'objdir/sbin/mkelfImage' failed > ... > > Reverting the commit fixes that, so can we just do that in OE-core > master while the problem gets sorted out? I'm not opposed to reverting this, as the issue being fixed was clearly not as bad as this result, but I'm completely unable to repro this for beaglebone with meta-ti, either with the internal toolchain or the external sourcery toolchain. Was this with clang, or some specific toolchain version? Or perhaps ostro is doing something special there? -- Christopher Larson kergoth at gmail dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 5/8] gstreamer1.0-plugins-bad: upgrade to version 1.8.1
Quoting Ross Burton from an earlier posting where I wanted to remove the gst-player recipe because gst-player is now part of -bad: > gst-player the API is, but not the applications gtk-player or gst-player which is the main reason this recipe exists in oe-core. > > Current gst-player HEAD is now using non-trivial parts of GTK+ 3, so I started to backport the API changes to gst-player so we could ship a GTK+ 2 gtk-player that links to the API in -bad 1.8, but didn't finish the work. We > plan on merging the GTK+ 3 Sato patches fairly soon so it may be that the -bad 1.8 upgrade waits for that, then gst-player can switch to git HEAD with GTK+ 3, and everything works again. On 2016-05-23 20:37, Christopher Larson wrote: On Mon, May 23, 2016 at 11:36 AM, Christopher Larson> wrote: On Thu, Apr 28, 2016 at 12:06 PM, Carlos Rafael Giani > wrote: 0002-glplugin-glwindow-fix-memory-leak-of-navigation-thre.patch is a backport, and is no longer needed. configure-allow-to-disable-libssh2.patch got replaced by a patch that does the same thing but has been submitted. Vulkan is disabled for now since libxcb alone is not enough - the Vulkan headers and libraries are needed as well. Signed-off-by: Carlos Rafael Giani > It seems this series was applied to oe-core, but incompletely. This patch specifically wasn't applied, so gstreamer1.0-plugins-bad is still 1.6.3 in oe-core. Would you mind checking to see which patches in this series were actually applied? Thanks! https://bugzilla.yoctoproject.org/show_bug.cgi?id=9664 has been opened for this issue. -- Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 5/8] gstreamer1.0-plugins-bad: upgrade to version 1.8.1
On Mon, May 23, 2016 at 11:36 AM, Christopher Larsonwrote: > On Thu, Apr 28, 2016 at 12:06 PM, Carlos Rafael Giani < > d...@pseudoterminal.org> wrote: > >> 0002-glplugin-glwindow-fix-memory-leak-of-navigation-thre.patch is a >> backport, and is no longer needed. >> >> configure-allow-to-disable-libssh2.patch got replaced by a patch that does >> the same thing but has been submitted. >> >> Vulkan is disabled for now since libxcb alone is not enough - the Vulkan >> headers and libraries are needed as well. >> >> Signed-off-by: Carlos Rafael Giani >> > > It seems this series was applied to oe-core, but incompletely. This patch > specifically wasn't applied, so gstreamer1.0-plugins-bad is still 1.6.3 > in oe-core. Would you mind checking to see which patches in this series > were actually applied? Thanks! > https://bugzilla.yoctoproject.org/show_bug.cgi?id=9664 has been opened for this issue. -- Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH v2 5/8] gstreamer1.0-plugins-bad: upgrade to version 1.8.1
On Thu, Apr 28, 2016 at 12:06 PM, Carlos Rafael Gianiwrote: > 0002-glplugin-glwindow-fix-memory-leak-of-navigation-thre.patch is a > backport, and is no longer needed. > > configure-allow-to-disable-libssh2.patch got replaced by a patch that does > the same thing but has been submitted. > > Vulkan is disabled for now since libxcb alone is not enough - the Vulkan > headers and libraries are needed as well. > > Signed-off-by: Carlos Rafael Giani > It seems this series was applied to oe-core, but incompletely. This patch specifically wasn't applied, so gstreamer1.0-plugins-bad is still 1.6.3 in oe-core. Would you mind checking to see which patches in this series were actually applied? Thanks! -- Christopher Larson clarson at kergoth dot com Founder - BitBake, OpenEmbedded, OpenZaurus Maintainer - Tslib Senior Software Engineer, Mentor Graphics -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] coreutils: revert upstream commit causing havoc with ls output
[Re: [OE-core] [PATCH] coreutils: revert upstream commit causing havoc with ls output] On 21/05/2016 (Sat 12:18) Olof Johansson wrote: > On 16-05-20 20:02 -0400, Paul Gortmaker wrote: > > Several large distros are voting with their feet and actively > > reverting the change, as per what can be seen above for Debian. > > To me, it sounds like you're saying that the Debian maintainer is > actively taking a stand against upstream, but the changelog makes > it sound more like a temporary thing. I did write "... it doesn't appear that the coreutils folks are going to change the default back to the old way..." > > From the changelog entry: > > * Disable default ls quoting for now to get the rest of 8.25 > > into testing. (Closes: #813164) > > Could you add something in the commit message to make this > clearer? I suppose I can resend with "..coreutils folks are _ever_ going to..." if you think that extra word clarifies things in the OE log I wrote. The log of the actual patch is as-is from Debian, aside from me adding the Upstream-Status, the http source and my SOB line. Is that the log you were hoping to have added to/clarified? Paul. -- > > -- > olofjn -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] image.bbclass: don't execute compression commands multiple times
> Op 21 apr. 2016, om 11:47 heeft Alexander D. Kanevskiyhet > volgende geschreven: > > In case of chained conversion methods are used via COMPRESS_CMD_* > there is chance that some of steps would be executed multiple times. And this breaks image_types_uboot.bbclass: ERROR: Logfile of failure stored in: /build/linaro/build/build/tmp-glibc/work/genericarmv8-oe-linux/linaro-image-minimal-initramfs/1.0-r0/temp/log.do_image_cpio.16506 Log data follows: | DEBUG: Executing python function set_image_size | DEBUG: Python function set_image_size finished | DEBUG: Executing shell function do_image_cpio | 31373 blocks | Image Name: linaro-image-minimal-initramfs-g | Created: Mon May 23 19:38:56 2016 | Image Type: ARM Linux RAMDisk Image (gzip compressed) | Data Size:7326620 Bytes = 7154.90 kB = 6.99 MB | Load Address: | Entry Point: | mkimage: Can't open /build/linaro/build/build/tmp-glibc/deploy/images/genericarmv8/linaro-image-minimal-initramfs-genericarmv8-20160523173835.rootfs.cpio.gz: No such file or directory And I suspect this problem is better fixed with https://github.com/openembedded/openembedded-core/commit/85855af359c2c3bfc1eaa942c95f1f7d7cc6698e > > [YOCTO #9482] > > Signed-off-by: Alexander D. Kanevskiy > --- > meta/classes/image.bbclass | 8 ++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass > index 8bfd241..5d6f4a3 100644 > --- a/meta/classes/image.bbclass > +++ b/meta/classes/image.bbclass > @@ -398,9 +398,13 @@ python () { > # Create input image first. > gen_conversion_cmds(type) > localdata.setVar('type', type) > -cmds.append("\t" + localdata.getVar("COMPRESS_CMD_" + > ctype, True)) > +cmd = "\t" + localdata.getVar("COMPRESS_CMD_" + ctype, > True) > +if cmd not in cmds: > +cmds.append(cmd) > vardeps.add('COMPRESS_CMD_' + ctype) > -subimages.append(type + "." + ctype) > +subimage = type + "." + ctype > +if subimage not in subimages: > +subimages.append(subimage) > if type not in alltypes: > > rm_tmp_images.add(localdata.expand("${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}")) > > -- > 2.8.1 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] Revert "image.bbclass: don't execute compression commands multiple times"
The commit breaks image_types_uboot.bbclass: ERROR: Logfile of failure stored in: /build/linaro/build/build/tmp-glibc/work/genericarmv8-oe-linux/linaro-image-minimal-initramfs/1.0-r0/temp/log.do_image_cpio.16506 Log data follows: | DEBUG: Executing python function set_image_size | DEBUG: Python function set_image_size finished | DEBUG: Executing shell function do_image_cpio | 31373 blocks | Image Name: linaro-image-minimal-initramfs-g | Created: Mon May 23 19:38:56 2016 | Image Type: ARM Linux RAMDisk Image (gzip compressed) | Data Size:7326620 Bytes = 7154.90 kB = 6.99 MB | Load Address: | Entry Point: | mkimage: Can't open /build/linaro/build/build/tmp-glibc/deploy/images/genericarmv8/linaro-image-minimal-initramfs-genericarmv8-20160523173835.rootfs.cpio.gz: No such file or directory This reverts commit 94f61c2682e5cfd819ac84535650c3e0a654415a. Signed-off-by: Koen Kooi--- meta/classes/image.bbclass | 8 ++-- 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 9f4c83f..df3bd3a 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -410,13 +410,9 @@ python () { # Create input image first. gen_conversion_cmds(type) localdata.setVar('type', type) -cmd = "\t" + localdata.getVar("COMPRESS_CMD_" + ctype, True) -if cmd not in cmds: -cmds.append(cmd) +cmds.append("\t" + localdata.getVar("COMPRESS_CMD_" + ctype, True)) vardeps.add('COMPRESS_CMD_' + ctype) -subimage = type + "." + ctype -if subimage not in subimages: -subimages.append(subimage) +subimages.append(type + "." + ctype) if type not in alltypes: rm_tmp_images.add(localdata.expand("${IMAGE_NAME}${IMAGE_NAME_SUFFIX}.${type}")) -- 2.4.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 5/5] matchbox-keyboard: Upgrade
On Mon, 2016-05-23 at 16:36 +0300, Alexander Kanavin wrote: > On 05/23/2016 04:10 PM, Richard Purdie wrote: > > > > -SRCREV = "ebc330eac8b9d38e9aef9f01e7241c904bd01073" > > > > +SRCREV = "69d03e2aceb79cf7a616c07f8e0be4e1f9f7976b" > > > >PV = "0.0+git${SRCPV}" > > > > > > This is a good moment to start using git version tags instead of > > > just > > > updating commit ids. > > > > > > Let's bring down the amount of 'unknown' upstream versions to > > > zero or > > > close to it: > > > > > > http://recipes.yoctoproject.org/rrs/recipes/2.2/M1/?upstream_stat > > > us=U > > > nknown# > > > > Sadly, "tags" need a network to resolve them and hence using them > > means > > the metadata doesn't work standalone. We can't do that. > > I need to clarify: I would like the version number in PV to match an > existing upstream version tag. So that the upstream version check > works > correctly. > > The actual git revision for builds will continue to be determined by > commit ids in SRCREV. That does indeed make sense. I'd be happy to see some release tarballs for some of these things and some upstream version tags... Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] ghostscript: Update URL_SRI considered as 'old release'
Actually, the same 9.18 tarball is available here: https://github.com/ArtifexSoftware/ghostpdl-downloads/releases so why not switch SRC_URI to that? You are right. Sending v2 now. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] ghostscript: Update URL_SRI_BASE to point to github
From: Leonardo SandovalStarting at 9.18, latest releases (current and previous release) are placed on github [1]. [1] https://github.com/ArtifexSoftware/ghostpdl-downloads/releases [YOCTO #9573] Signed-off-by: Leonardo Sandoval --- meta/recipes-extended/ghostscript/ghostscript_9.18.bb | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/meta/recipes-extended/ghostscript/ghostscript_9.18.bb b/meta/recipes-extended/ghostscript/ghostscript_9.18.bb index d4222c7..1d76013 100644 --- a/meta/recipes-extended/ghostscript/ghostscript_9.18.bb +++ b/meta/recipes-extended/ghostscript/ghostscript_9.18.bb @@ -16,7 +16,13 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=b17cea54743435ab2a581c237bea294a" DEPENDS = "ghostscript-native tiff jpeg fontconfig cups libpng" DEPENDS_class-native = "libpng-native" -SRC_URI_BASE = "http://downloads.ghostscript.com/public/ghostscript-${PV}.tar.gz \ +# remove dots on PV, used on SRC_URI_BASE +python () { + version = d.getVar('PV', True).split('.') + d.setVar('PV_NODOTS', ''.join(version)) +} + +SRC_URI_BASE = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs${PV_NODOTS}/ghostscript-${PV}.tar.gz \ file://ghostscript-9.15-parallel-make.patch \ file://ghostscript-9.16-Werror-return-type.patch \ file://png_mak.patch \ -- 2.6.6 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] iproute2: upgrade to 4.6.0
1. Refreshed musl build fix patch for 4.6.0 2. Use the bash-completion class to package the completion files. Signed-off-by: Maxin B. John--- meta/recipes-connectivity/iproute2/iproute2.inc| 2 +- .../iproute2/iproute2/iproute2-4.3.0-musl.patch| 45 ++ .../{iproute2_4.5.0.bb => iproute2_4.6.0.bb} | 4 +- 3 files changed, 31 insertions(+), 20 deletions(-) rename meta/recipes-connectivity/iproute2/{iproute2_4.5.0.bb => iproute2_4.6.0.bb} (71%) diff --git a/meta/recipes-connectivity/iproute2/iproute2.inc b/meta/recipes-connectivity/iproute2/iproute2.inc index 86e9310..63e7ca9 100644 --- a/meta/recipes-connectivity/iproute2/iproute2.inc +++ b/meta/recipes-connectivity/iproute2/iproute2.inc @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=eb723b61539feef013de476e68b5c50a \ DEPENDS = "flex-native bison-native iptables elfutils" -inherit update-alternatives +inherit update-alternatives bash-completion EXTRA_OEMAKE = "CC='${CC}' KERNEL_INCLUDE=${STAGING_INCDIR} DOCDIR=${docdir}/iproute2 SUBDIRS='lib tc ip bridge misc genl' SBINDIR='${base_sbindir}' LIBDIR='${libdir}'" diff --git a/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch b/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch index bbe0242..8c078f6 100644 --- a/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch +++ b/meta/recipes-connectivity/iproute2/iproute2/iproute2-4.3.0-musl.patch @@ -9,16 +9,16 @@ In order to fix this, use just the C library header . Original patch taken from http://git.alpinelinux.org/cgit/aports/tree/main/iproute2/musl-fixes.patch. -(Refreshed the patch for 4.5 release) +(Refreshed the patch for 4.6 release) Upstream-Status: Pending Signed-off-by: Thomas Petazzoni Signed-off-by: Maxin B. John -diff -Naur iproute2-4.5.0-orig/include/libiptc/ipt_kernel_headers.h iproute2-4.5.0/include/libiptc/ipt_kernel_headers.h iproute2-4.5.0-orig/include/libiptc/ipt_kernel_headers.h 2016-03-15 01:02:31.0 +0200 -+++ iproute2-4.5.0/include/libiptc/ipt_kernel_headers.h2016-03-23 18:33:38.579062567 +0200 + +diff -Naur iproute2-4.6.0-orig/include/libiptc/ipt_kernel_headers.h iproute2-4.6.0/include/libiptc/ipt_kernel_headers.h +--- iproute2-4.6.0-orig/include/libiptc/ipt_kernel_headers.h 2016-05-23 12:03:23.821826910 +0300 iproute2-4.6.0/include/libiptc/ipt_kernel_headers.h2016-05-23 12:04:23.714078154 +0300 @@ -6,7 +6,6 @@ #include @@ -27,9 +27,9 @@ diff -Naur iproute2-4.5.0-orig/include/libiptc/ipt_kernel_headers.h iproute2-4.5 #include #include #include -diff -Naur iproute2-4.5.0-orig/include/linux/if_bridge.h iproute2-4.5.0/include/linux/if_bridge.h iproute2-4.5.0-orig/include/linux/if_bridge.h 2016-03-15 01:02:31.0 +0200 -+++ iproute2-4.5.0/include/linux/if_bridge.h 2016-03-23 18:33:58.569812648 +0200 +diff -Naur iproute2-4.6.0-orig/include/linux/if_bridge.h iproute2-4.6.0/include/linux/if_bridge.h +--- iproute2-4.6.0-orig/include/linux/if_bridge.h 2016-05-23 12:03:23.821826910 +0300 iproute2-4.6.0/include/linux/if_bridge.h 2016-05-23 12:04:23.716078129 +0300 @@ -15,7 +15,6 @@ #include @@ -38,9 +38,9 @@ diff -Naur iproute2-4.5.0-orig/include/linux/if_bridge.h iproute2-4.5.0/include/ #define SYSFS_BRIDGE_ATTR "bridge" #define SYSFS_BRIDGE_FDB "brforward" -diff -Naur iproute2-4.5.0-orig/include/linux/netfilter.h iproute2-4.5.0/include/linux/netfilter.h iproute2-4.5.0-orig/include/linux/netfilter.h 2016-03-15 01:02:31.0 +0200 -+++ iproute2-4.5.0/include/linux/netfilter.h 2016-03-23 18:34:38.138317974 +0200 +diff -Naur iproute2-4.6.0-orig/include/linux/netfilter.h iproute2-4.6.0/include/linux/netfilter.h +--- iproute2-4.6.0-orig/include/linux/netfilter.h 2016-05-23 12:03:23.821826910 +0300 iproute2-4.6.0/include/linux/netfilter.h 2016-05-23 12:04:23.717078117 +0300 @@ -4,8 +4,6 @@ #include @@ -50,9 +50,20 @@ diff -Naur iproute2-4.5.0-orig/include/linux/netfilter.h iproute2-4.5.0/include/ /* Responses from hook functions. */ #define NF_DROP 0 -diff -Naur iproute2-4.5.0-orig/include/linux/xfrm.h iproute2-4.5.0/include/linux/xfrm.h iproute2-4.5.0-orig/include/linux/xfrm.h 2016-03-15 01:02:31.0 +0200 -+++ iproute2-4.5.0/include/linux/xfrm.h2016-03-23 18:34:57.539075431 +0200 +diff -Naur iproute2-4.6.0-orig/include/linux/netfilter_ipv4/ip_tables.h iproute2-4.6.0/include/linux/netfilter_ipv4/ip_tables.h +--- iproute2-4.6.0-orig/include/linux/netfilter_ipv4/ip_tables.h 2016-05-18 21:56:02.0 +0300 iproute2-4.6.0/include/linux/netfilter_ipv4/ip_tables.h2016-05-23 12:09:22.888337961 +0300 +@@ -17,7 +17,6 @@ + + #include + +-#include + #include + + #include +diff -Naur iproute2-4.6.0-orig/include/linux/xfrm.h
[OE-core] [PATCH 2/2] sqlite3: update to 3.13.0
3.12.2 -> 3.13.0 Signed-off-by: Maxin B. John--- meta/recipes-support/sqlite/{sqlite3_3.12.2.bb => sqlite3_3.13.0.bb} | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) rename meta/recipes-support/sqlite/{sqlite3_3.12.2.bb => sqlite3_3.13.0.bb} (58%) diff --git a/meta/recipes-support/sqlite/sqlite3_3.12.2.bb b/meta/recipes-support/sqlite/sqlite3_3.13.0.bb similarity index 58% rename from meta/recipes-support/sqlite/sqlite3_3.12.2.bb rename to meta/recipes-support/sqlite/sqlite3_3.13.0.bb index 9c073b3..883c72d 100644 --- a/meta/recipes-support/sqlite/sqlite3_3.12.2.bb +++ b/meta/recipes-support/sqlite/sqlite3_3.13.0.bb @@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://sqlite3.h;endline=11;md5=65f0a57ca6928710b418c094b357 SRC_URI = "http://www.sqlite.org/2016/sqlite-autoconf-${SQLITE_PV}.tar.gz; -SRC_URI[md5sum] = "c552a133aca1ce1d647163d9e43bbcb1" -SRC_URI[sha256sum] = "fd00770c9afd39db555c78400e52f55e8bd6568c78be23561abb472a22d09abb" +SRC_URI[md5sum] = "4e83f39fa2ffb610ac5ecd36865da6a2" +SRC_URI[sha256sum] = "e2797026b3310c9d08bd472f6d430058c6dd139ff9d4e30289884ccd9744086b" -- 2.4.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] systemd: support systemd-boot as a stand-alone EFI bootloader
Ping? Issues? On Thu, 2016-05-05 at 11:20 -0700, Jianxun Zhang wrote: > The "systemd-boot" is gummiboot now included into systemd project. > The old gummiboot project supported in OE is dead. > > Our intention is to get a gummiboot-like EFI bootloader without > much dependency on systemd and its features. > > This work is largely derived from the existing bbclass and recipes > of gummiboot and systemd. > (commit tip: ee25d0e3987d7732a2e46e1640693b4cf419a9fc) > > Please refer to the history up to the tip for authorship and > credit information for the original works. > > To enable the systemd-boot in build, add this line > EFI_PROVIDER = "systemd-boot" in your machine conf file. > > Signed-off-by: Jianxun Zhang> --- > meta/classes/systemd-boot.bbclass | 124 > ++ > meta/recipes-bsp/systemd-boot/systemd-boot.bb | 35 > meta/recipes-core/systemd/systemd.inc | 25 ++ > meta/recipes-core/systemd/systemd_229.bb | 26 +- > 4 files changed, 186 insertions(+), 24 deletions(-) > create mode 100644 meta/classes/systemd-boot.bbclass > create mode 100644 meta/recipes-bsp/systemd-boot/systemd-boot.bb > create mode 100644 meta/recipes-core/systemd/systemd.inc > > diff --git a/meta/classes/systemd-boot.bbclass > b/meta/classes/systemd-boot.bbclass > new file mode 100644 > index 000..9e9398a > --- /dev/null > +++ b/meta/classes/systemd-boot.bbclass > @@ -0,0 +1,124 @@ > +# Copyright (C) 2016 Intel Corporation > +# > +# Released under the MIT license (see COPYING.MIT) > + > +# systemd-boot.bbclass - The "systemd-boot" is essentially the > gummiboot merged into systemd. > +#The original standalone gummiboot project > is dead without any more > +#maintenance. As a start point, we replace > all gummitboot occurrences > +#with systemd-boot in gummiboot.bbclass to > have a base version of this > +#systemd-boot.bbclass. > +# > +# Set EFI_PROVIDER = "systemd-boot" to use systemd-boot on your live > images instead of grub-efi > +# (images built by image-live.bbclass or image-vm.bbclass) > + > +do_bootimg[depends] += "${MLPREFIX}systemd-boot:do_deploy" > +do_bootdirectdisk[depends] += "${MLPREFIX}systemd-boot:do_deploy" > + > +EFIDIR = "/EFI/BOOT" > + > +SYSTEMD_BOOT_CFG ?= "${S}/loader.conf" > +SYSTEMD_BOOT_ENTRIES ?= "" > +SYSTEMD_BOOT_TIMEOUT ?= "10" > + > +# Need UUID utility code. > +inherit fs-uuid > + > +efi_populate() { > +DEST=$1 > + > +EFI_IMAGE="systemd-bootia32.efi" > +DEST_EFI_IMAGE="bootia32.efi" > +if [ "${TARGET_ARCH}" = "x86_64" ]; then > +EFI_IMAGE="systemd-bootx64.efi" > +DEST_EFI_IMAGE="bootx64.efi" > +fi > + > +install -d ${DEST}${EFIDIR} > +# systemd-boot requires these paths for configuration files > +# they are not customizable so no point in new vars > +install -d ${DEST}/loader > +install -d ${DEST}/loader/entries > +install -m 0644 ${DEPLOY_DIR_IMAGE}/${EFI_IMAGE} > ${DEST}${EFIDIR}/${DEST_EFI_IMAGE} > +install -m 0644 ${SYSTEMD_BOOT_CFG} > ${DEST}/loader/loader.conf > +for i in ${SYSTEMD_BOOT_ENTRIES}; do > +install -m 0644 ${i} ${DEST}/loader/entries > +done > +} > + > +efi_iso_populate() { > +iso_dir=$1 > +efi_populate $iso_dir > +mkdir -p ${EFIIMGDIR}/${EFIDIR} > +cp $iso_dir/${EFIDIR}/* ${EFIIMGDIR}${EFIDIR} > +cp $iso_dir/vmlinuz ${EFIIMGDIR} > +EFIPATH=$(echo "${EFIDIR}" | sed 's/\//\\/g') > +echo "fs0:${EFIPATH}\\${DEST_EFI_IMAGE}" > > ${EFIIMGDIR}/startup.nsh > +if [ -f "$iso_dir/initrd" ] ; then > +cp $iso_dir/initrd ${EFIIMGDIR} > +fi > +} > + > +efi_hddimg_populate() { > +efi_populate $1 > +} > + > +python build_efi_cfg() { > +s = d.getVar("S", True) > +labels = d.getVar('LABELS', True) > +if not labels: > +bb.debug(1, "LABELS not defined, nothing to do") > +return > + > +if labels == []: > +bb.debug(1, "No labels, nothing to do") > +return > + > +cfile = d.getVar('SYSTEMD_BOOT_CFG', True) > +try: > + cfgfile = open(cfile, 'w') > +except OSError: > +raise bb.build.funcFailed('Unable to open %s' % (cfile)) > + > +cfgfile.write('# Automatically created by OE\n') > +cfgfile.write('default %s\n' % (labels.split()[0])) > +timeout = d.getVar('SYSTEMD_BOOT_TIMEOUT', True) > +if timeout: > +cfgfile.write('timeout %s\n' % timeout) > +else: > +cfgfile.write('timeout 10\n') > +cfgfile.close() > + > +for label in labels.split(): > +localdata = d.createCopy() > + > +overrides = localdata.getVar('OVERRIDES', True) > +if not overrides: > +raise bb.build.FuncFailed('OVERRIDES not defined') > + > +
Re: [OE-core] [PATCH] useradd: Fix infinite build loop
Thanks Richard On May 23, 2016 2:33 AM, "Richard Purdie" < richard.pur...@linuxfoundation.org> wrote: > > http://git.openembedded.org/openembedded-core-contrib/commit/?id=642c6cf0b6a0371de476513162bd0cefa9c438b3 > introduces a problem if the USERADD_PARAM variable has trailing > whitespace as the code infinitely loops causing build hangs. > > Add a similar sed expression to $remaining to avoid this. > > Signed-off-by: Richard Purdie> > diff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass > index 67dae88..28dd341 100644 > --- a/meta/classes/useradd.bbclass > +++ b/meta/classes/useradd.bbclass > @@ -55,14 +55,14 @@ if test "x`echo $GROUPADD_PARAM | tr -d '[:space:]'`" > != "x"; then > # Invoke multiple instances of groupadd for parameter lists > # separated by ';' > opts=`echo "$GROUPADD_PARAM" | cut -d ';' -f 1 | sed -e 's#[ > \t]*$##'` > - remaining=`echo "$GROUPADD_PARAM" | cut -d ';' -f 2-` > + remaining=`echo "$GROUPADD_PARAM" | cut -d ';' -f 2- | sed -e 's#[ > \t]*$##'` > while test "x$opts" != "x"; do > perform_groupadd "$SYSROOT" "$OPT $opts" > if test "x$opts" = "x$remaining"; then > break > fi > opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ > \t]*$##'` > - remaining=`echo "$remaining" | cut -d ';' -f 2-` > + remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e > 's#[ \t]*$##'` > done > fi > > @@ -71,14 +71,14 @@ if test "x`echo $USERADD_PARAM | tr -d '[:space:]'`" > != "x"; then > # Invoke multiple instances of useradd for parameter lists > # separated by ';' > opts=`echo "$USERADD_PARAM" | cut -d ';' -f 1 | sed -e 's#[ > \t]*$##'` > - remaining=`echo "$USERADD_PARAM" | cut -d ';' -f 2-` > + remaining=`echo "$USERADD_PARAM" | cut -d ';' -f 2- | sed -e 's#[ > \t]*$##'` > while test "x$opts" != "x"; do > perform_useradd "$SYSROOT" "$OPT $opts" > if test "x$opts" = "x$remaining"; then > break > fi > opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ > \t]*$##'` > - remaining=`echo "$remaining" | cut -d ';' -f 2-` > + remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e > 's#[ \t]*$##'` > done > fi > > @@ -87,14 +87,14 @@ if test "x`echo $GROUPMEMS_PARAM | tr -d '[:space:]'`" > != "x"; then > # Invoke multiple instances of groupmems for parameter lists > # separated by ';' > opts=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 1 | sed -e 's#[ > \t]*$##'` > - remaining=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 2-` > + remaining=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 2- | sed -e > 's#[ \t]*$##'` > while test "x$opts" != "x"; do > perform_groupmems "$SYSROOT" "$OPT $opts" > if test "x$opts" = "x$remaining"; then > break > fi > opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ > \t]*$##'` > - remaining=`echo "$remaining" | cut -d ';' -f 2-` > + remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e > 's#[ \t]*$##'` > done > fi > } > > > -- > ___ > 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 5/5] matchbox-keyboard: Upgrade
On 05/23/2016 04:10 PM, Richard Purdie wrote: -SRCREV = "ebc330eac8b9d38e9aef9f01e7241c904bd01073" +SRCREV = "69d03e2aceb79cf7a616c07f8e0be4e1f9f7976b" PV = "0.0+git${SRCPV}" This is a good moment to start using git version tags instead of just updating commit ids. Let's bring down the amount of 'unknown' upstream versions to zero or close to it: http://recipes.yoctoproject.org/rrs/recipes/2.2/M1/?upstream_status=U nknown# Sadly, "tags" need a network to resolve them and hence using them means the metadata doesn't work standalone. We can't do that. I need to clarify: I would like the version number in PV to match an existing upstream version tag. So that the upstream version check works correctly. The actual git revision for builds will continue to be determined by commit ids in SRCREV. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCHv3] mkelfimage: obey LDFLAGS, sort out HOST_ flags
On Mon, 2016-05-23 at 04:52 +, Khem Raj wrote: > I am getting these errors with clang now > > > http://errors.yoctoproject.org/Errors/Details/64935/ And I am getting the same link error also during normal builds for Beaglebone (but not other platforms): https://ostroproject.org/jenkins/job/build_beaglebone/1663/console ... arm-ostro-linux-gnueabi-gcc -march=armv7-a -mfpu=neon -mfloat-abi=hard -mcpu=cortex-a8 --sysroot=/var/lib/jenkins/ostro-worker-17-slot-1-JopZL/ostro-os/build/tmp-glibc/sysroots/beaglebone -O2 -pipe -g -feliminate-unused-debug-types -fdebug-prefix-map=/var/lib/jenkins/ostro-worker-17-slot-1-JopZL/ostro-os/build/tmp-glibc/work/cortexa8hf-neon-ostro-linux-gnueabi/mkelfimage/4.0+gitAUTOINC+686a48a339-r0=/usr/src/debug/mkelfimage/4.0+gitAUTOINC+686a48a339-r0 -fdebug-prefix-map=/var/lib/jenkins/ostro-worker-17-slot-1-JopZL/ostro-os/build/tmp-glibc/sysroots/x86_64-linux= -fdebug-prefix-map=/var/lib/jenkins/ostro-worker-17-slot-1-JopZL/ostro-os/build/tmp-glibc/sysroots/beaglebone= -fstack-protector-strong -pie -fpie -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security -fno-stack-protector -Wall -DVERSION='"2.7"' -DRELEASE_DATE='"27 March 2006"' -I include -DPACKAGE_NAME=\"\" -DPACKAGE_TARNAME=\"\" -DPACKAGE_VERSION=\"\" -DPACKAGE_STRING=\"\" -DPACKAGE_BUGREPORT=\ "\" -DPACKAGE_URL=\"\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_ZLIB_H=1 -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -fstack-protector-strong -Wl,-z,relro,-z,now objdir/main/mkelfImage.o objdir/linux-i386/mkelf-linux-i386.o objdir/linux-ia64/mkelf-linux-ia64.o -o objdir/sbin/mkelfImage -lz /var/lib/jenkins/ostro-worker-17-slot-1-JopZL/ostro-os/build/tmp-glibc/sysroots/x86_64-linux/usr/bin/arm-ostro-linux-gnueabi/../../libexec/arm-ostro-linux-gnueabi/gcc/arm-ostro-linux-gnueabi/5.3.0/ld: objdir/linux-i386/mkelf-linux-i386.o: relocation R_ARM_MOVW_ABS_NC against `a local symbol' can not be used when making a shared object; recompile with -fPIC objdir/linux-i386/mkelf-linux-i386.o: error adding symbols: Bad value collect2: error: ld returned 1 exit status main/Makefile:6: recipe for target 'objdir/sbin/mkelfImage' failed ... Reverting the commit fixes that, so can we just do that in OE-core master while the problem gets sorted out? -- Best Regards, Patrick Ohly The content of this message is my personal opinion only and although I am an employee of Intel, the statements I make here in no way represent Intel's position on the issue, nor am I authorized to speak on behalf of Intel on this matter. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 5/5] matchbox-keyboard: Upgrade
On Mon, 2016-05-23 at 15:56 +0300, Alexander Kanavin wrote: > On 05/23/2016 03:44 PM, Jussi Kukkonen wrote: > > > -SRCREV = "ebc330eac8b9d38e9aef9f01e7241c904bd01073" > > +SRCREV = "69d03e2aceb79cf7a616c07f8e0be4e1f9f7976b" > > PV = "0.0+git${SRCPV}" > > This is a good moment to start using git version tags instead of just > updating commit ids. > > Let's bring down the amount of 'unknown' upstream versions to zero or > close to it: > > http://recipes.yoctoproject.org/rrs/recipes/2.2/M1/?upstream_status=U > nknown# Sadly, "tags" need a network to resolve them and hence using them means the metadata doesn't work standalone. We can't do that. However, I thought we'd added functionality where it would list the tags, figure out which ones contained a revision and then figured out if there was a more recent version? We do have various components that haven't released for a long time and I have wondered if we should do that, then we'd have tarballs and revisions to make things easier. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Wic and "live" images
On Mon, 23 May 2016 09:00:28 -0400 Sergey Jin Bostandzhyanwrote > Hi, > > I'm risking to land in the "reinvented the wheel" corner, but basically I > had a task to create images with msdos partitions, while at the same time > some things had to be in areas where parted/fdisk were not able to create a > partition yet (i.e. u-boot had to be at a very early offset in the image). > > wic seemed too PC oriented and cumbersome to me, so I came up with > a custom class: > > https://git.digitalstrom.org/dss-oe/dss-oe/blob/master/yocto/dS/meta-digitalstrom-devel/classes/msdos_partition_image.bbclass > > This is more or less what I have now. I was trying to move to 'wic' because the 'image-vm.bbclass' cannot handle some of the things I want. From the manual it sounds like wic is more flexible, but I think it is only flexible in the way you can use plugins to create new partition types. It also lacks any sort of dependency tracking with bitbake so you cannot use it from there without a lot of manual hand holding. I think for the limited types it currently handles it is less capable than image-vm.bbclass. > I have a multimachine configuration which then looks like this (example with > raw image outside a partition): > https://git.digitalstrom.org/dss-oe/dss-oe/blob/master/yocto/dS/meta-digitalstrom-devel/recipes-core/images/dss20-image.inc > > > Or this (example with extended partition): > https://git.digitalstrom.org/dss-oe/dss-oe/blob/master/yocto/dS/meta-digitalstrom-devel/recipes-core/images/dss11e-image.inc > > > The DSSIMG_TASK_DEPENDS variable lists all things that will be > written into the final image (i.e. u-boot, rescue fs, root fs). > > If someone considers this interesting for OE in general, I can surely tune > a few things and submit a patch for review. I do find this very interesting. From the looks of it there seems to be more extensibility than can be had with image-vm.bbclass or wic. > > Kind regards, > Jin > > > > On Mon, May 23, 2016 at 08:13:28AM -0400, Ian Geiser wrote: > > On Mon, 23 May 2016 06:36:23 -0400 Ed Bartosh > > wrote > > > On Thu, May 19, 2016 at 05:52:45AM -0400, Ian Geiser wrote: > > > > Greetings, I am trying to learn "wic" and have been confused as how > > to create a "live" style image. I am following > > "http://www.yoctoproject.org/docs/1.5.2/dev-manual/dev-manual.html#creating-partitioned-images; > > but am getting confused on the target to use to create the a file system > > that has a single squashfs file containing my root file system. > > > > > > > > My desired partition layout is as follows: > > > > 40MiB 40MiB 300MiB > > > > > > ++-+-+ > > > > | BOOT (esp)|DATA (fat) | ROOT (live) > > | > > > > > > ++-+-+ > > > > > > > > BOOT - efi boot partition with kernel and initramfs > > > > DATA - generic fat filesystem to hold configuration files > > > > ROOT - an ext4 filesystem that contains a single os.img, which is a > > squashfs file. > > > > > > > > I have ROOT and DATA figured out but I am at a loss as how to > > generate the os.img file and copy it into ROOT. If I generate the os.img > > file with bitbake and then use the "-r" option to manually supply a > > directory structure it works, but I would rather have it done from a wks > > file for automation reasons. > > > > > > > > Any hints? > > > I'd suggest to use wic image type and generate your image by bitbake. > > > You can find example wic-image-minimal.bb and wic-image-minimal.wks in > > ../meta-selftest/recipes-test/images/ > > > > > This is where I started. I was able to make it work but not with my > > configuration above. It looks like I can use a type of "fsimage" for my > > "ROOT" partition, but I have not been able to figure out the syntax there > > yet. For "BOOT" I am at a complete loss. In theory "bootimg-efi" but > > there doesn't seem to be a way to provide an initramfs. > > > > > You can probably do the same by using wic plugins, but I'd not suggest > > > to go this way. Using wic image type is simpler, more consistent, > > easier to do and provides higher level of automation. > > > > Is using the wic image type and a plugin mutually exclusive? > > > > Thanks! > > > > > > > > -- > > ___ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- ___ Openembedded-core mailing list
Re: [OE-core] Wic and "live" images
Hi, I'm risking to land in the "reinvented the wheel" corner, but basically I had a task to create images with msdos partitions, while at the same time some things had to be in areas where parted/fdisk were not able to create a partition yet (i.e. u-boot had to be at a very early offset in the image). wic seemed too PC oriented and cumbersome to me, so I came up with a custom class: https://git.digitalstrom.org/dss-oe/dss-oe/blob/master/yocto/dS/meta-digitalstrom-devel/classes/msdos_partition_image.bbclass I have a multimachine configuration which then looks like this (example with raw image outside a partition): https://git.digitalstrom.org/dss-oe/dss-oe/blob/master/yocto/dS/meta-digitalstrom-devel/recipes-core/images/dss20-image.inc Or this (example with extended partition): https://git.digitalstrom.org/dss-oe/dss-oe/blob/master/yocto/dS/meta-digitalstrom-devel/recipes-core/images/dss11e-image.inc The DSSIMG_TASK_DEPENDS variable lists all things that will be written into the final image (i.e. u-boot, rescue fs, root fs). If someone considers this interesting for OE in general, I can surely tune a few things and submit a patch for review. Kind regards, Jin On Mon, May 23, 2016 at 08:13:28AM -0400, Ian Geiser wrote: > On Mon, 23 May 2016 06:36:23 -0400 Ed Bartosh >wrote > > On Thu, May 19, 2016 at 05:52:45AM -0400, Ian Geiser wrote: > > > Greetings, I am trying to learn "wic" and have been confused as how to > create a "live" style image. I am following > "http://www.yoctoproject.org/docs/1.5.2/dev-manual/dev-manual.html#creating-partitioned-images; > but am getting confused on the target to use to create the a file system > that has a single squashfs file containing my root file system. > > > > > > My desired partition layout is as follows: > > > 40MiB 40MiB 300MiB > > > ++-+-+ > > > | BOOT (esp)|DATA (fat) | ROOT (live)| > > > ++-+-+ > > > > > > BOOT - efi boot partition with kernel and initramfs > > > DATA - generic fat filesystem to hold configuration files > > > ROOT - an ext4 filesystem that contains a single os.img, which is a > squashfs file. > > > > > > I have ROOT and DATA figured out but I am at a loss as how to generate > the os.img file and copy it into ROOT. If I generate the os.img file with > bitbake and then use the "-r" option to manually supply a directory structure > it works, but I would rather have it done from a wks file for automation > reasons. > > > > > > Any hints? > > I'd suggest to use wic image type and generate your image by bitbake. > > You can find example wic-image-minimal.bb and wic-image-minimal.wks in > ../meta-selftest/recipes-test/images/ > > > This is where I started. I was able to make it work but not with my > configuration above. It looks like I can use a type of "fsimage" for my > "ROOT" partition, but I have not been able to figure out the syntax there > yet. For "BOOT" I am at a complete loss. In theory "bootimg-efi" but there > doesn't seem to be a way to provide an initramfs. > > > You can probably do the same by using wic plugins, but I'd not suggest > > to go this way. Using wic image type is simpler, more consistent, easier > to do and provides higher level of automation. > > Is using the wic image type and a plugin mutually exclusive? > > Thanks! > > > > -- > ___ > 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 5/5] matchbox-keyboard: Upgrade
On 05/23/2016 03:44 PM, Jussi Kukkonen wrote: -SRCREV = "ebc330eac8b9d38e9aef9f01e7241c904bd01073" +SRCREV = "69d03e2aceb79cf7a616c07f8e0be4e1f9f7976b" PV = "0.0+git${SRCPV}" This is a good moment to start using git version tags instead of just updating commit ids. Let's bring down the amount of 'unknown' upstream versions to zero or close to it: http://recipes.yoctoproject.org/rrs/recipes/2.2/M1/?upstream_status=Unknown# Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] ghostscript: Update URL_SRI considered as 'old release'
On 05/23/2016 03:48 PM, Alexander Kanavin wrote: On 05/20/2016 08:59 AM, leonardo.sandoval.gonza...@linux.intel.com wrote: From: Leonardo SandovalThe Ghostcript project started to place their tarballs in two places starting at 9.19 as explained in [1]. 9.18 version is considered old, so including the 'old-gs-releases' in the URL. [1] http://downloads.ghostscript.com/public/ [YOCTO #9573] You also need to add UPSTREAM_CHECK_URI because otherwise ghostscript's latest release will be forever reported as 9.18. Actually, the same 9.18 tarball is available here: https://github.com/ArtifexSoftware/ghostpdl-downloads/releases so why not switch SRC_URI to that? Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] kernel: Fix a typo in kernel.bbclass
Signed-off-by: Thomas Perrot--- meta/classes/kernel.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 6e3e81e..fa0864c 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -361,7 +361,7 @@ inherit cml1 EXPORT_FUNCTIONS do_compile do_install do_configure # kernel-base becomes kernel-${KERNEL_VERSION} -# kernel-image becomes kernel-image-${KERNEL_VERISON} +# kernel-image becomes kernel-image-${KERNEL_VERSION} PACKAGES = "kernel kernel-base kernel-vmlinux kernel-image kernel-dev kernel-modules" FILES_${PN} = "" FILES_kernel-base = "/lib/modules/${KERNEL_VERSION}/modules.order /lib/modules/${KERNEL_VERSION}/modules.builtin" -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] ghostscript: Update URL_SRI considered as 'old release'
On 05/20/2016 08:59 AM, leonardo.sandoval.gonza...@linux.intel.com wrote: From: Leonardo SandovalThe Ghostcript project started to place their tarballs in two places starting at 9.19 as explained in [1]. 9.18 version is considered old, so including the 'old-gs-releases' in the URL. [1] http://downloads.ghostscript.com/public/ [YOCTO #9573] You also need to add UPSTREAM_CHECK_URI because otherwise ghostscript's latest release will be forever reported as 9.18. Alex -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 4/5] mesa-demos: Upgrade 8.2.0 -> 8.3.0
Drop patches included in upstream and the EGL_MESA_screen_surface extension fixes as the relevant code was removed. Rebase other patches. Signed-off-by: Jussi Kukkonen--- There's quite a bit of churn and our patching here was pretty complex (patches on top of patches on top of patches): CCing people who have recently touched the recipe as a "FYI". ...mplement-with-AC_WITH-glut-so-that-withou.patch | 57 - ...llow-to-disable-demos-which-require-GLEW-.patch | 119 +- ...hen-EGL_MESA_screen_surface-extension-isn.patch | 267 ...ay-for-EGL_MESA_screen_surface-extension-.patch | 41 - .../0007-Install-few-more-test-programs.patch | 53 +- ...10-sharedtex_mt-fix-rendering-thread-hang.patch | 43 - ...dependant-on-obsolete-MESA_screen_surface.patch | 1592 .../{mesa-demos_8.2.0.bb => mesa-demos_8.3.0.bb} | 27 +- 8 files changed, 59 insertions(+), 2140 deletions(-) delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0010-sharedtex_mt-fix-rendering-thread-hang.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0011-drop-demos-dependant-on-obsolete-MESA_screen_surface.patch rename meta/recipes-graphics/mesa/{mesa-demos_8.2.0.bb => mesa-demos_8.3.0.bb} (68%) diff --git a/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch b/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch deleted file mode 100644 index 09054cb..000 --- a/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 36829a8d7ad2888515fbee95c2a70b3d636d7538 Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Wed, 9 Jul 2014 14:30:33 +0200 -Subject: [PATCH 2/9] Correctly implement with AC_WITH(glut) so that - --without-glut works. - -Signed-off-by: Ross Burton -Upstream-Status: Submitted (https://patchwork.freedesktop.org/patch/64417/) - - configure.ac | 26 +++--- - 1 file changed, 15 insertions(+), 11 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c4ee12b..9445424 100644 a/configure.ac -+++ b/configure.ac -@@ -67,21 +67,25 @@ DEMO_CFLAGS="$DEMO_CFLAGS $GL_CFLAGS" - DEMO_LIBS="$DEMO_LIBS $GL_LIBS" - - dnl Check for GLUT --GLUT_CFLAGS="" --GLUT_LIBS=-lglut --glut_enabled=yes -+glut_enabled=no - AC_ARG_WITH([glut], - [AS_HELP_STRING([--with-glut=DIR], - [glut install directory])], - [GLUT_CFLAGS="-I$withval/include" -- GLUT_LIBS="-L$withval/lib -lglut"]) --AC_CHECK_HEADER([GL/glut.h], -- [], -- [glut_enabled=no]) --AC_CHECK_LIB([glut], -- [glutInit], -- [], -- [glut_enabled=no]) -+ GLUT_LIBS="-L$withval/lib -lglut"], -+ [GLUT_CFLAGS="" -+ GLUT_LIBS="-lglut"] -+) -+AS_IF([test "x$with_glut" != xno], -+ [AC_CHECK_HEADER([GL/glut.h], -+ [], -+ [glut_enabled=no]) -+ AC_CHECK_LIB([glut], -+[glutInit], -+[], -+[glut_enabled=no]) -+ glut_enabled=yes -+]) - - dnl Check for FreeGLUT 2.6 or later - AC_EGREP_HEADER([glutInitContextProfile], --- -2.0.0 - diff --git a/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch b/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch index 6b58c2b..f6b59a1 100644 --- a/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch +++ b/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch @@ -1,8 +1,7 @@ -From b25e9c675cf560b8b037dc855c6b3b1d09957867 Mon Sep 17 00:00:00 2001 +From 779438770bedf3d53e6ad8f7cd6889b7f50daf3b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 9 Jul 2014 14:23:41 +0200 -Subject: [PATCH 3/9] configure: Allow to disable demos which require GLEW or - GLU +Subject: [PATCH] configure: Allow to disable demos which require GLEW or GLU * in some systems without X11 support we don't have GLEW, but mesa-demos are still useful @@ -10,17 +9,20 @@ Subject: [PATCH 3/9] configure: Allow to disable demos which require GLEW or Upstream-Status: Pending Signed-off-by: Martin Jansa + +Port to 8.3.0 +Signed-off-by: Jussi Kukkonen --- configure.ac
[OE-core] [PATCH 5/5] matchbox-keyboard: Upgrade
This version includes: * french keyboard and the Caps improvements it requires * Gtk+3 input method is now included (not enabled by default yet) Define some additional PACKAGECONFIGs: the default configuration does not change. Signed-off-by: Jussi Kukkonen--- meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb | 12 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb index eba1970..fb4c6e9 100644 --- a/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb +++ b/meta/recipes-sato/matchbox-keyboard/matchbox-keyboard_git.bb @@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://src/matchbox-keyboard.h;endline=17;md5=9d6586c69e4a926f3cb0b4425f24ba3c \ file://applet/applet.c;endline=18;md5=4a0f721724746b14d95b51ddd42b95e7" -DEPENDS = "libfakekey expat libxft gtk+ matchbox-panel-2" +DEPENDS = "libfakekey expat libxft" -SRCREV = "ebc330eac8b9d38e9aef9f01e7241c904bd01073" +SRCREV = "69d03e2aceb79cf7a616c07f8e0be4e1f9f7976b" PV = "0.0+git${SRCPV}" -PR = "r4" SRC_URI = "git://git.yoctoproject.org/${BPN};branch=matchbox-keyboard-0-1 \ file://0001-desktop-file-Hide-the-keyboard-from-app-list.patch \ @@ -25,7 +24,12 @@ inherit autotools pkgconfig gettext gtk-immodules-cache distro_features_check # The libxft, libfakekey and matchbox-panel-2 requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" -EXTRA_OECONF = "--disable-cairo --enable-gtk-im --enable-applet" +EXTRA_OECONF = "--disable-cairo" + +PACKAGECONFIG ??= "gtk2-im applet" +PACKAGECONFIG[applet] = "--enable-applet,--disable-applet,matchbox-panel-2" +PACKAGECONFIG[gtk2-im] = "--enable-gtk-im,--disable-gtk-im,gtk+" +PACKAGECONFIG[gtk3-im] = "--enable-gtk3-im,--disable-gtk3-im,gtk+3" PACKAGES += "${PN}-im ${PN}-applet" -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/5] dropbear: Upgrade 2015.71 -> 2016.73
Backport a patch to fix out-of-tree build. Signed-off-by: Jussi Kukkonen--- .../dropbear/support-out-of-tree-builds.patch | 43 ++ meta/recipes-core/dropbear/dropbear_2015.71.bb | 5 --- meta/recipes-core/dropbear/dropbear_2016.73.bb | 7 3 files changed, 50 insertions(+), 5 deletions(-) create mode 100644 meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch delete mode 100644 meta/recipes-core/dropbear/dropbear_2015.71.bb create mode 100644 meta/recipes-core/dropbear/dropbear_2016.73.bb diff --git a/meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch b/meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch new file mode 100644 index 000..df6efb4 --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch @@ -0,0 +1,43 @@ +From: =?UTF-8?q?Henrik=20Nordstr=C3=B6m?= +Date: Wed, 11 May 2016 12:35:06 +0200 +Subject: [PATCH] Support out-of-tree builds usign bundled libtom + +When building out-of-tree we need both source and generated +folders in include paths to find both distributed and generated +headers. + + + +Signed-off-by: Jussi Kukkonen +Upstream-Status: Backport +--- + libtomcrypt/Makefile.in | 2 +- + libtommath/Makefile.in | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libtomcrypt/Makefile.in b/libtomcrypt/Makefile.in +index 3056ef0..7970700 100644 +--- a/libtomcrypt/Makefile.in b/libtomcrypt/Makefile.in +@@ -19,7 +19,7 @@ srcdir=@srcdir@ + + # Compilation flags. Note the += does not write over the user's CFLAGS! + # The rest of the flags come from the parent Dropbear makefile +-CFLAGS += -c -I$(srcdir)/src/headers/ -I$(srcdir)/../ -DLTC_SOURCE -I$(srcdir)/../libtommath/ ++CFLAGS += -c -Isrc/headers/ -I$(srcdir)/src/headers/ -I../ -I$(srcdir)/../ -DLTC_SOURCE -I../libtommath/ -I$(srcdir)/../libtommath/ + + # additional warnings (newer GCC 3.4 and higher) + ifdef GCC_34 +diff --git a/libtommath/Makefile.in b/libtommath/Makefile.in +index 06aba68..019c50b 100644 +--- a/libtommath/Makefile.in b/libtommath/Makefile.in +@@ -9,7 +9,7 @@ VPATH=@srcdir@ + srcdir=@srcdir@ + + # So that libtommath can include Dropbear headers for options and m_burn() +-CFLAGS += -I$(srcdir)/../libtomcrypt/src/headers/ -I$(srcdir)/../ ++CFLAGS += -I. -I$(srcdir) -I../libtomcrypt/src/headers/ -I$(srcdir)/../libtomcrypt/src/headers/ -I../ -I$(srcdir)/../ + + ifndef IGNORE_SPEED + diff --git a/meta/recipes-core/dropbear/dropbear_2015.71.bb b/meta/recipes-core/dropbear/dropbear_2015.71.bb deleted file mode 100644 index 6332579..000 --- a/meta/recipes-core/dropbear/dropbear_2015.71.bb +++ /dev/null @@ -1,5 +0,0 @@ -require dropbear.inc - -SRC_URI[md5sum] = "2ccc0a2f3e37ca221db12c5af6a88137" -SRC_URI[sha256sum] = "376214169c0e187ee9f48ae1a99b3f835016ad5b98ede4bfd1cf581deba783af" - diff --git a/meta/recipes-core/dropbear/dropbear_2016.73.bb b/meta/recipes-core/dropbear/dropbear_2016.73.bb new file mode 100644 index 000..71a36bd --- /dev/null +++ b/meta/recipes-core/dropbear/dropbear_2016.73.bb @@ -0,0 +1,7 @@ +require dropbear.inc + +SRC_URI += "file://support-out-of-tree-builds.patch" + +SRC_URI[md5sum] = "8d6d78ce60ca52350ec04fcbd711ce9b" +SRC_URI[sha256sum] = "5c61a4f69b093b688629cd365be38701485ff63cfb23642dab7a05ad250aefd7" + -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/5] docbook-xsl-stylesheets: Upgrade 1.78.1 -> 1.79.1
* Use $PV at appropriate places in do_install * Install some new files, avoid installing 25M of java archives * License checksum change is just copyright years changing Signed-off-by: Jussi Kukkonen--- ...1.78.1.bb => docbook-xsl-stylesheets_1.79.1.bb} | 22 +++--- 1 file changed, 11 insertions(+), 11 deletions(-) rename meta/recipes-devtools/docbook-xml/{docbook-xsl-stylesheets_1.78.1.bb => docbook-xsl-stylesheets_1.79.1.bb} (76%) diff --git a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb similarity index 76% rename from meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb rename to meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb index 52de3ab..a29fe00 100644 --- a/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.78.1.bb +++ b/meta/recipes-devtools/docbook-xml/docbook-xsl-stylesheets_1.79.1.bb @@ -1,15 +1,15 @@ SUMMARY = "XSL stylesheets for processing DocBook XML to various output formats" HOMEPAGE = "http://docbook.sourceforge.net; LICENSE = "XSL" -LIC_FILES_CHKSUM = "file://COPYING;md5=a6d43d498c22a835382533356462" +LIC_FILES_CHKSUM = "file://COPYING;md5=6beadd98f9c54ab0c387e14211ee4d0e" SRC_URI = "${SOURCEFORGE_MIRROR}/docbook/docbook-xsl-${PV}.tar.bz2 \ file://docbook-xsl.xml \ file://docbook-xsl-stylesheets-no-bashism-in-docbook-xsl-up.patch \ " -SRC_URI[md5sum] = "6dd0f89131cc35bf4f2ed105a1c17771" -SRC_URI[sha256sum] = "c98f7296ab5c8ccd2e0bc07634976a37f50847df2d8a59bdb1e157664700b467" +SRC_URI[md5sum] = "b48cbf929a2ad85e6672f710777ca7bc" +SRC_URI[sha256sum] = "725f452e12b296956e8bfb876ccece71eeecdd14b94f667f3ed9091761a4a968" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/docbook/files/docbook-xsl/; # Reject versions ending in .0 as those are release candidates @@ -37,18 +37,18 @@ do_install () { install -v -m755 -d ${D}${datadir}/xml/docbook/xsl-stylesheets-${PV} ln -s xsl-stylesheets-${PV} ${D}${datadir}/xml/docbook/xsl-stylesheets - cp -v -R VERSION common eclipse epub extensions fo highlighting html \ - htmlhelp images javahelp lib manpages params profiling \ - roundtrip slides template tests tools webhelp website \ - xhtml xhtml-1_1 catalog.xml \ - ${D}${datadir}/xml/docbook/xsl-stylesheets-1.78.1 + cp -v -R VERSION assembly common eclipse epub epub3 fo \ + highlighting html htmlhelp images javahelp lib manpages \ + params profiling roundtrip slides template webhelp website \ + xhtml xhtml-1_1 xhtml5 catalog.xml \ + ${D}${datadir}/xml/docbook/xsl-stylesheets-${PV} - ln -s VERSION ${D}/${datadir}/xml/docbook/xsl-stylesheets-1.78.1/VERSION.xsl + ln -s VERSION ${D}/${datadir}/xml/docbook/xsl-stylesheets-${PV}/VERSION.xsl install -v -m644 -D README \ - ${D}${datadir}/doc/docbook-xsl-1.78.1/README.txt + ${D}${datadir}/doc/docbook-xsl-${PV}/README.txt install -v -m644RELEASE-NOTES* NEWS* \ - ${D}${datadir}/doc/docbook-xsl-1.78.1 + ${D}${datadir}/doc/docbook-xsl-${PV} install -d ${D}${sysconfdir}/xml/ install -m 755 ${WORKDIR}/docbook-xsl.xml ${D}${sysconfdir}/xml/docbook-xsl.xml -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/5] fontconfig: Upgrade 2.11.94 -> 2.11.95
Remove a backported patch. License checksum stays the same but license location changed. Signed-off-by: Jussi Kukkonen--- ...ges-made-to-FcConfigAppFontAddDir-recentl.patch | 132 - ...fontconfig_2.11.94.bb => fontconfig_2.11.95.bb} | 7 +- 2 files changed, 3 insertions(+), 136 deletions(-) delete mode 100644 meta/recipes-graphics/fontconfig/fontconfig/0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch rename meta/recipes-graphics/fontconfig/{fontconfig_2.11.94.bb => fontconfig_2.11.95.bb} (84%) diff --git a/meta/recipes-graphics/fontconfig/fontconfig/0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch b/meta/recipes-graphics/fontconfig/fontconfig/0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch deleted file mode 100644 index f2fd5d4..000 --- a/meta/recipes-graphics/fontconfig/fontconfig/0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 46ec6a52d4cc447cc3ff4a13b2067ecb76c9db2e Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod -Date: Fri, 26 Jun 2015 17:02:13 -0700 -Subject: [PATCH] Revert changes made to FcConfigAppFontAddDir() recently - -In 32ac7c75e8db0135ef37cf86f92d8b9be000c8bb the behavior of -FcConfigAppFontAddFile/Dir() were changed to return false -if not fonts were found. While this is welldefined and useful -for AddFile(), it's quite problematic for AddDir(). For example, -if the directory is empty, is that a failure or success? Worse, -the false value from AddDir() was being propagated all the way -to FcInit() returning false now. This only happened upon memory -allocation failure before, and some clients assert that FcInit() -is successful. - -With this change, AddDir() is reverted back to what it was. -AddFont() change (which was actually in fcdir.c) from the original -commit is left in. - -Upstream-Status: backport - -Signed-off-by: Li Zhou - doc/fcconfig.fncs |2 +- - src/fccfg.c | 29 +++-- - src/fcint.h |3 --- - src/fcstr.c |8 - 4 files changed, 12 insertions(+), 30 deletions(-) - -Index: fontconfig-2.11.94/doc/fcconfig.fncs -=== fontconfig-2.11.94.orig/doc/fcconfig.fncs -+++ fontconfig-2.11.94/doc/fcconfig.fncs -@@ -232,7 +232,7 @@ the current configuration is used. - @DESC@ - Scans the specified directory for fonts, adding each one found to the - application-specific set of fonts. Returns FcFalse --if the fonts cannot be added (due to allocation failure or no fonts found). -+if the fonts cannot be added (due to allocation failure). - Otherwise returns FcTrue. If config is NULL, - the current configuration is used. - @@ -Index: fontconfig-2.11.94/src/fccfg.c -=== fontconfig-2.11.94.orig/src/fccfg.c -+++ fontconfig-2.11.94/src/fccfg.c -@@ -368,7 +368,6 @@ FcConfigAddDirList (FcConfig *config, Fc - FcStrList *dirlist; - FcChar8 *dir; - FcCache *cache; --FcBool ret = FcFalse; - - dirlist = FcStrListCreate (dirSet); - if (!dirlist) -@@ -383,10 +382,9 @@ FcConfigAddDirList (FcConfig *config, Fc - continue; - FcConfigAddCache (config, cache, set, dirSet); - FcDirCacheUnload (cache); -- ret = FcTrue; - } - FcStrListDone (dirlist); --return ret; -+return FcTrue; - } - - /* -@@ -2199,7 +2197,6 @@ FcConfigAppFontAddFile (FcConfig*con - FcStrSet *subdirs; - FcStrList *sublist; - FcChar8 *subdir; --FcBool ret = FcFalse; - - if (!config) - { -@@ -2229,19 +2226,16 @@ FcConfigAppFontAddFile (FcConfig*con - FcStrSetDestroy (subdirs); - return FcFalse; - } --if (subdirs->num == 0) -- ret = FcTrue; --else if ((sublist = FcStrListCreate (subdirs))) -+if ((sublist = FcStrListCreate (subdirs))) - { - while ((subdir = FcStrListNext (sublist))) - { -- if (FcConfigAppFontAddDir (config, subdir)) -- ret = FcTrue; -+ FcConfigAppFontAddDir (config, subdir); - } - FcStrListDone (sublist); - } - FcStrSetDestroy (subdirs); --return ret; -+return FcTrue; - } - - FcBool -@@ -2250,7 +2244,6 @@ FcConfigAppFontAddDir (FcConfig *con - { - FcFontSet *set; - FcStrSet *dirs; --FcBool ret = FcTrue; - - if (!config) - { -@@ -2269,8 +2262,8 @@ FcConfigAppFontAddDir (FcConfig *con - set = FcFontSetCreate (); - if (!set) - { -- ret = FcFalse; -- goto bail; -+ FcStrSetDestroy (dirs); -+ return FcFalse; - } - FcConfigSetFonts (config, set, FcSetApplication); - } -@@ -2278,10 +2271,12 @@ FcConfigAppFontAddDir (FcConfig*con - FcStrSetAddFilename (dirs, dir); - - if
[OE-core] [PATCH 0/5] Misc. version upgrades
More version upgrades. The tricky one here is mesa-demos (lots of patch changes there). Thanks, Jussi The following changes since commit 32bbf685709d2c6c0d8938e18ef21130d1ea8eef: meta-yocto-bsp: Enable xf86 modeset for beaglebone (2016-05-22 16:11:49 +0100) are available in the git repository at: git://git.yoctoproject.org/poky-contrib jku/more-upgrades http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=jku/more-upgrades Jussi Kukkonen (5): docbook-xsl-stylesheets: Upgrade 1.78.1 -> 1.79.1 dropbear: Upgrade 2015.71 -> 2016.73 fontconfig: Upgrade 2.11.94 -> 2.11.95 mesa-demos: Upgrade 8.2.0 -> 8.3.0 matchbox-keyboard: Upgrade .../dropbear/support-out-of-tree-builds.patch | 43 + meta/recipes-core/dropbear/dropbear_2015.71.bb |5 - meta/recipes-core/dropbear/dropbear_2016.73.bb |7 + ...1.78.1.bb => docbook-xsl-stylesheets_1.79.1.bb} | 22 +- ...ges-made-to-FcConfigAppFontAddDir-recentl.patch | 132 -- ...fontconfig_2.11.94.bb => fontconfig_2.11.95.bb} |7 +- ...mplement-with-AC_WITH-glut-so-that-withou.patch | 57 - ...llow-to-disable-demos-which-require-GLEW-.patch | 119 +- ...hen-EGL_MESA_screen_surface-extension-isn.patch | 267 ...ay-for-EGL_MESA_screen_surface-extension-.patch | 41 - .../0007-Install-few-more-test-programs.patch | 53 +- ...10-sharedtex_mt-fix-rendering-thread-hang.patch | 43 - ...dependant-on-obsolete-MESA_screen_surface.patch | 1592 .../{mesa-demos_8.2.0.bb => mesa-demos_8.3.0.bb} | 27 +- .../matchbox-keyboard/matchbox-keyboard_git.bb | 12 +- 15 files changed, 131 insertions(+), 2296 deletions(-) create mode 100644 meta/recipes-core/dropbear/dropbear/support-out-of-tree-builds.patch delete mode 100644 meta/recipes-core/dropbear/dropbear_2015.71.bb create mode 100644 meta/recipes-core/dropbear/dropbear_2016.73.bb rename meta/recipes-devtools/docbook-xml/{docbook-xsl-stylesheets_1.78.1.bb => docbook-xsl-stylesheets_1.79.1.bb} (76%) delete mode 100644 meta/recipes-graphics/fontconfig/fontconfig/0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch rename meta/recipes-graphics/fontconfig/{fontconfig_2.11.94.bb => fontconfig_2.11.95.bb} (84%) delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0010-sharedtex_mt-fix-rendering-thread-hang.patch delete mode 100644 meta/recipes-graphics/mesa/mesa-demos/0011-drop-demos-dependant-on-obsolete-MESA_screen_surface.patch rename meta/recipes-graphics/mesa/{mesa-demos_8.2.0.bb => mesa-demos_8.3.0.bb} (68%) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Wic and "live" images
On Mon, 23 May 2016 06:36:23 -0400 Ed Bartoshwrote > On Thu, May 19, 2016 at 05:52:45AM -0400, Ian Geiser wrote: > > Greetings, I am trying to learn "wic" and have been confused as how to > > create a "live" style image. I am following > > "http://www.yoctoproject.org/docs/1.5.2/dev-manual/dev-manual.html#creating-partitioned-images; > > but am getting confused on the target to use to create the a file system > > that has a single squashfs file containing my root file system. > > > > My desired partition layout is as follows: > > 40MiB 40MiB 300MiB > > ++-+-+ > > | BOOT (esp)|DATA (fat) | ROOT (live)| > > ++-+-+ > > > > BOOT - efi boot partition with kernel and initramfs > > DATA - generic fat filesystem to hold configuration files > > ROOT - an ext4 filesystem that contains a single os.img, which is a > > squashfs file. > > > > I have ROOT and DATA figured out but I am at a loss as how to generate the > > os.img file and copy it into ROOT. If I generate the os.img file with > > bitbake and then use the "-r" option to manually supply a directory > > structure it works, but I would rather have it done from a wks file for > > automation reasons. > > > > Any hints? > I'd suggest to use wic image type and generate your image by bitbake. > You can find example wic-image-minimal.bb and wic-image-minimal.wks in > ../meta-selftest/recipes-test/images/ > This is where I started. I was able to make it work but not with my configuration above. It looks like I can use a type of "fsimage" for my "ROOT" partition, but I have not been able to figure out the syntax there yet. For "BOOT" I am at a complete loss. In theory "bootimg-efi" but there doesn't seem to be a way to provide an initramfs. > You can probably do the same by using wic plugins, but I'd not suggest > to go this way. Using wic image type is simpler, more consistent, easier to > do and provides higher level of automation. Is using the wic image type and a plugin mutually exclusive? Thanks! -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] wic wks: data partition only mounted on second boot?
> It creates the /data partition, and adds it to the .wic file, all fine. But on > the first boot it is not auto-mounted. From the boot log: > > > [1.898069] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data > mode. Opts: (null) > [1.906798] VFS: Mounted root (ext4 filesystem) readonly on device 179:2. > [1.919446] devtmpfs: mounted > [1.923113] Freeing unused kernel memory: 264K (c069e000 - c06e) > version 2.88 booting > Starting udev > [2.535288] udevd[657]: starting version 182 Hi again, fixed and found it myself already. There is an error while mounting that partition on the first boot because the mount point (/data) doesn't exist yet. Then, later during first boot, some application creates it. Which explains why it does work on the second boot. Which brings me to a new question: Is there are reason for mountall.sh to put all errors into /dev/null? See: https://github.com/openembedded/openembedded-core/blob/master/meta/recipes-core/initscripts/initscripts-1.0/mountall.sh#L20 Or shall I send a -tiny- patch dropping that 2>/dev/null? Best, Matthijs -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] wic wks: data partition only mounted on second boot?
Hi, I have my wks file like this: part /boot --source bootimg-partition --ondisk mmcblk0 --fstype=vfat --label boot --active --align 4 --size 16 part / --source rootfs --ondisk mmcblk0 --fstype=ext4 --label root --align 4 part /data --ondisk mmcblk0 --size 100M --fstype=ext4 --label data --align 4 It creates the /data partition, and adds it to the .wic file, all fine. But on the first boot it is not auto-mounted. From the boot log: [1.898069] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null) [1.906798] VFS: Mounted root (ext4 filesystem) readonly on device 179:2. [1.919446] devtmpfs: mounted [1.923113] Freeing unused kernel memory: 264K (c069e000 - c06e) version 2.88 booting Starting udev [2.535288] udevd[657]: starting version 182 And some extra info: root@beaglebone:~# mount /dev/root on / type ext4 (rw,relatime,data=ordered) devtmpfs on /dev type devtmpfs (rw,relatime,size=243816k,nr_inodes=60954,mode=755) proc on /proc type proc (rw,relatime) sysfs on /sys type sysfs (rw,relatime) debugfs on /sys/kernel/debug type debugfs (rw,relatime) tmpfs on /run type tmpfs (rw,nosuid,nodev,mode=755) tmpfs on /var/volatile type tmpfs (rw,relatime) devpts on /dev/pts type devpts (rw,relatime,gid=5,mode=620) root@beaglebone:~# cat /etc/fstab # stock fstab - you probably want to override this with a machine specific one /dev/root/auto defaults 1 1 proc /procproc defaults 0 0 devpts /dev/pts devpts mode=0620,gid=5 0 0 tmpfs/run tmpfs mode=0755,nodev,nosuid,strictatime 0 0 tmpfs/var/volatiletmpfs defaults 0 0 /dev/mmcblk0p3 /data ext4defaults0 0 Now, if I just reboot the device, the extra image is mounted during startup: [1.897948] EXT4-fs (mmcblk0p2): mounted filesystem with ordered data mode. Opts: (null) [1.906674] VFS: Mounted root (ext4 filesystem) readonly on device 179:2. [1.919137] devtmpfs: mounted [1.922811] Freeing unused kernel memory: 264K (c069e000 - c06e) version 2.88 booting [2.925735] EXT4-fs (mmcblk0p3): mounted filesystem with ordered data mode. Opts: (null) Starting udev udev: Not using udev cache because of changes detected in the following files: udev: /proc/version /proc/cmdline /proc/devices udev: lib/udev/rules.d/* etc/udev/rules.d/* udev: The udev cache will be regenerated. To identify the detected changes, udev: compare the cached sysconf at /etc/udev/cache.data udev: against the current sysconf at /dev/shm/udev.cache [3.193848] udevd[664]: starting version 182 And also mount shows it mounted: root@beaglebone:~# mount /dev/root on / type ext4 (rw,relatime,data=ordered) devtmpfs on /dev type devtmpfs (rw,relatime,size=243816k,nr_inodes=60954,mode=755) proc on /proc type proc (rw,relatime) sysfs on /sys type sysfs (rw,relatime) debugfs on /sys/kernel/debug type debugfs (rw,relatime) tmpfs on /run type tmpfs (rw,nosuid,nodev,mode=755) tmpfs on /var/volatile type tmpfs (rw,relatime) /dev/mmcblk0p3 on /data type ext4 (rw,relatime,data=ordered) devpts on /dev/pts type devpts (rw,relatime,gid=5,mode=620) Any ideas how to make it boot during the first boot as well? Thanks, Matthijs -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] Wic and "live" images
On Thu, May 19, 2016 at 05:52:45AM -0400, Ian Geiser wrote: > Greetings, I am trying to learn "wic" and have been confused as how to create > a "live" style image. I am following > "http://www.yoctoproject.org/docs/1.5.2/dev-manual/dev-manual.html#creating-partitioned-images; > but am getting confused on the target to use to create the a file system > that has a single squashfs file containing my root file system. > > My desired partition layout is as follows: > 40MiB 40MiB 300MiB > ++-+-+ > | BOOT (esp)|DATA (fat) | ROOT (live)| > ++-+-+ > > BOOT - efi boot partition with kernel and initramfs > DATA - generic fat filesystem to hold configuration files > ROOT - an ext4 filesystem that contains a single os.img, which is a squashfs > file. > > I have ROOT and DATA figured out but I am at a loss as how to generate the > os.img file and copy it into ROOT. If I generate the os.img file with > bitbake and then use the "-r" option to manually supply a directory structure > it works, but I would rather have it done from a wks file for automation > reasons. > > Any hints? I'd suggest to use wic image type and generate your image by bitbake. You can find example wic-image-minimal.bb and wic-image-minimal.wks in ../meta-selftest/recipes-test/images/ You can probably do the same by using wic plugins, but I'd not suggest to go this way. Using wic image type is simpler, more consistent, easier to do and provides higher level of automation. -- Regards, Ed -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/5] useradd.bbclass: Strip trailing '; ' in cmd params
On Mon, 2016-05-23 at 10:07 +0200, Patrick Ohly wrote: > On Wed, 2016-05-18 at 12:38 -0700, Khem Raj wrote: > > This fix was not sufficient and there has to be extra fix done to > > also > > consider the case > > when sysroot is created during image build time. I have updated it > > in > > pull request here > > > > http://git.openembedded.org/openembedded-core-contrib/commit/?h=kra > > j/pu=642c6cf0b6a0371de476513162bd0cefa9c438b3 > > That now fails for cases where the USERADD_PARAM ends in trailing > white > space after the last valid opts. The reason is that the 'if test "x > $opts" = "x$remaining"; then break; fi' check does not get triggered > anymore, because $remaining has the trailing white space whereas > "$opts" > does not. > > I'm not sure what the best approach is in this case. Perhaps also > strip > trailing whitespace from all assignments to $remaining? > > The case were we see this is: > USERADD_PARAM_iot-rest-api-server="--system --home /var/lib/empty - > -no-create-home --shell /bin/false --gid restful restful " > > The build then hangs because the useradd preinst loops forever. I've posted a patch which addresses this issue since its pretty nasty for people to run into. Cheers, Richard -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] useradd: Fix infinite build loop
http://git.openembedded.org/openembedded-core-contrib/commit/?id=642c6cf0b6a0371de476513162bd0cefa9c438b3 introduces a problem if the USERADD_PARAM variable has trailing whitespace as the code infinitely loops causing build hangs. Add a similar sed expression to $remaining to avoid this. Signed-off-by: Richard Purdiediff --git a/meta/classes/useradd.bbclass b/meta/classes/useradd.bbclass index 67dae88..28dd341 100644 --- a/meta/classes/useradd.bbclass +++ b/meta/classes/useradd.bbclass @@ -55,14 +55,14 @@ if test "x`echo $GROUPADD_PARAM | tr -d '[:space:]'`" != "x"; then # Invoke multiple instances of groupadd for parameter lists # separated by ';' opts=`echo "$GROUPADD_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` - remaining=`echo "$GROUPADD_PARAM" | cut -d ';' -f 2-` + remaining=`echo "$GROUPADD_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` while test "x$opts" != "x"; do perform_groupadd "$SYSROOT" "$OPT $opts" if test "x$opts" = "x$remaining"; then break fi opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` - remaining=`echo "$remaining" | cut -d ';' -f 2-` + remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` done fi @@ -71,14 +71,14 @@ if test "x`echo $USERADD_PARAM | tr -d '[:space:]'`" != "x"; then # Invoke multiple instances of useradd for parameter lists # separated by ';' opts=`echo "$USERADD_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` - remaining=`echo "$USERADD_PARAM" | cut -d ';' -f 2-` + remaining=`echo "$USERADD_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` while test "x$opts" != "x"; do perform_useradd "$SYSROOT" "$OPT $opts" if test "x$opts" = "x$remaining"; then break fi opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` - remaining=`echo "$remaining" | cut -d ';' -f 2-` + remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` done fi @@ -87,14 +87,14 @@ if test "x`echo $GROUPMEMS_PARAM | tr -d '[:space:]'`" != "x"; then # Invoke multiple instances of groupmems for parameter lists # separated by ';' opts=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` - remaining=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 2-` + remaining=`echo "$GROUPMEMS_PARAM" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` while test "x$opts" != "x"; do perform_groupmems "$SYSROOT" "$OPT $opts" if test "x$opts" = "x$remaining"; then break fi opts=`echo "$remaining" | cut -d ';' -f 1 | sed -e 's#[ \t]*$##'` - remaining=`echo "$remaining" | cut -d ';' -f 2-` + remaining=`echo "$remaining" | cut -d ';' -f 2- | sed -e 's#[ \t]*$##'` done fi } -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/5] useradd.bbclass: Strip trailing '; ' in cmd params
On Wed, 2016-05-18 at 12:38 -0700, Khem Raj wrote: > This fix was not sufficient and there has to be extra fix done to also > consider the case > when sysroot is created during image build time. I have updated it in > pull request here > > http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/pu=642c6cf0b6a0371de476513162bd0cefa9c438b3 That now fails for cases where the USERADD_PARAM ends in trailing white space after the last valid opts. The reason is that the 'if test "x $opts" = "x$remaining"; then break; fi' check does not get triggered anymore, because $remaining has the trailing white space whereas "$opts" does not. I'm not sure what the best approach is in this case. Perhaps also strip trailing whitespace from all assignments to $remaining? The case were we see this is: USERADD_PARAM_iot-rest-api-server="--system --home /var/lib/empty --no-create-home --shell /bin/false --gid restful restful " The build then hangs because the useradd preinst loops forever. -- Best Regards, Patrick Ohly The content of this message is my personal opinion only and although I am an employee of Intel, the statements I make here in no way represent Intel's position on the issue, nor am I authorized to speak on behalf of Intel on this matter. -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core