Re: [OE-core] [PATCH] image: Fix "metadata is not deterministic" when chaining 2+ CONVERSION_CMDs
On Tue, 2017-07-25 at 15:58 -0400, Tom Rini wrote: > When we have more than one CONVERSION_CMD being used, for example > ext4.gz.sha256sum we will see errors about "metadata is not > deterministic". This is because we do not have a stable order of > intermediate files that will be removed in the generated shell > command. > We fix this by calling sorted() on the set of rm_tmp_images so that > we > will have a stable hash again. > > Cc: Patrick Ohly> Signed-off-by: Tom Rini Acked-by: Patrick Ohly -- 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
[OE-core] ✗ patchtest: failure for openssl: By default, disable cryptodev.
== Series Details == Series: openssl: By default, disable cryptodev. Revision: 1 URL : https://patchwork.openembedded.org/series/7942/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fixRebase your series on top of targeted branch Targeted branch master (currently at 98a2afeb3a) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] openssl: By default, disable cryptodev.
Because according to the other Distros,cryptodev is not enabled. If users want enable cryptodev, just have to add "cryptodev-linux" into PACKAGECONFIG. Signed-off-by: Huang Qiyu--- meta/recipes-connectivity/openssl/openssl_1.0.2l.bb | 6 ++ 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb b/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb index c00dd81..7c8f18b 100644 --- a/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb +++ b/meta/recipes-connectivity/openssl/openssl_1.0.2l.bb @@ -2,10 +2,8 @@ require openssl.inc # For target side versions of openssl enable support for OCF Linux driver # if they are available. -PACKAGECONFIG[cryptodev-linux] = ",,cryptodev-linux" -DEPENDS += "${@bb.utils.contains('PACKAGECONFIG', 'cryptodev-linux', 'cryptodev-linux', '', d)}" - -CFLAG += "${@bb.utils.contains('PACKAGECONFIG', 'cryptodev-linux', '-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS', '', d)}" +PACKAGECONFIG[cryptodev-linux] = "-DHAVE_CRYPTODEV -DUSE_CRYPTODEV_DIGESTS,,cryptodev-linux" +CFLAG += "${PACKAGECONFIG_CONFARGS}" CFLAG_append_class-native = " -fPIC" -- 2.7.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 0/5] runqemu: 5 fixes
Ping. // Robert On 07/18/2017 11:21 AM, Robert Yang wrote: The following changes since commit ef68005a8c527e9b1d05b7769f0ec8ebe9ec3f91: webkitgtk: Upgrade to 2.16.5 (2017-07-17 13:49:04 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib rbt/runqemu http://cgit.openembedded.org/openembedded-core-contrib/log/?h=rbt/runqemu Robert Yang (5): runqemu: add --debug and --quiet runqemu: check qbconfload before running bitbake runqemu: check tar.bz2 and .tar.gz runqemu: validate combos runqemu: chmod 0o777 for lockdir scripts/runqemu | 64 ++--- 1 file changed, 43 insertions(+), 21 deletions(-) -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] mirrors.bbclass: provide git repo fallbacks using the https protocol
Use MIRRORS to provide git repo fallbacks using the https protocol, for cases where git native protocol fetches may fail due to local firewall rules, etc. These rules should cover all git native repos used by recipes within oe-core, with the exception of mtd-utils, for which there's currently no upstream alternative to the git native protocol for anonymous access ( see http://git.infradead.org/mtd-utils.git ). Signed-off-by: Andre McCurdy--- meta/classes/mirrors.bbclass | 11 +++ 1 file changed, 11 insertions(+) diff --git a/meta/classes/mirrors.bbclass b/meta/classes/mirrors.bbclass index 9b72473..b98684f 100644 --- a/meta/classes/mirrors.bbclass +++ b/meta/classes/mirrors.bbclass @@ -62,3 +62,14 @@ npm://.*/.* http://sources.openembedded.org/ \n \ ${CPAN_MIRROR} http://cpan.metacpan.org/ \n \ ${CPAN_MIRROR} http://search.cpan.org/CPAN/ \n \ " + +# Use MIRRORS to provide git repo fallbacks using the https protocol, for cases +# where git native protocol fetches may fail due to local firewall rules, etc. + +MIRRORS += "\ +git://anonscm.debian.org/.* git://anonscm.debian.org/git/PATH;protocol=https \n \ +git://git.gnome.org/.*git://git.gnome.org/browse/PATH;protocol=https \n \ +git://git.savannah.gnu.org/.* git://git.savannah.gnu.org/git/PATH;protocol=https \n \ +git://git.yoctoproject.org/.* git://git.yoctoproject.org/git/PATH;protocol=https \n \ +git://.*/.* git://HOST/PATH;protocol=https \n \ +" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/2] gnu-config: update SRC_URI to new savannah.gnu.org hostname
http://sv.gnu.org/ now redirects to http://savannah.gnu.org/ Signed-off-by: Andre McCurdy--- meta/recipes-devtools/gnu-config/gnu-config_git.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/gnu-config/gnu-config_git.bb b/meta/recipes-devtools/gnu-config/gnu-config_git.bb index 072726f..f1c7788 100644 --- a/meta/recipes-devtools/gnu-config/gnu-config_git.bb +++ b/meta/recipes-devtools/gnu-config/gnu-config_git.bb @@ -11,7 +11,7 @@ INHIBIT_DEFAULT_DEPS = "1" SRCREV = "b576fa87c140b824466ef1638e945e87dc5c0343" PV = "20150728+git${SRCPV}" -SRC_URI = "git://git.sv.gnu.org/config.git \ +SRC_URI = "git://git.savannah.gnu.org/config.git \ file://gnu-configize.in" S = "${WORKDIR}/git" -- 1.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] package/bbclass: sources are packaged separately from debug.
From: Juan M Cruz AlcarazThe configuration variable PACKAGE_DEBUG_SPLIT_STYLE includes the new mode debug-with-srcpkg that instructs the system to remove the source files from the debug package but include them in a separate package with a "-src" suffix in the name. [YOCTO #9998] Signed-off-by: Juan M Cruz Alcaraz --- meta/classes/package.bbclass | 25 ++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index cc466bd1b2..d2fa6175e6 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -879,6 +879,11 @@ python split_and_strip_files () { debugdir = "/.debug" debuglibdir = "" debugsrcdir = "" +elif d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') == 'debug-with-srcpkg': +debugappend = "" +debugdir = "/.debug" +debuglibdir = "" +debugsrcdir = "/usr/src/debug" else: # Original OE-core, a.k.a. ".debug", style debug info debugappend = "" @@ -1092,6 +1097,15 @@ python populate_packages () { autodebug = not (d.getVar("NOAUTOPACKAGEDEBUG") or False) +split_source_package = (d.getVar('PACKAGE_DEBUG_SPLIT_STYLE') == 'debug-with-srcpkg') + +# If debug-with-srcpkg mode is enabled then the src package is added +# into the package list and the source directory as its main content +if split_source_package: +src_package_name = ('%s-src' % d.getVar('PN')) +packages += (' ' + src_package_name) +d.setVar('FILES_%s' % src_package_name, '/usr/src/debug') + # Sanity check PACKAGES for duplicates # Sanity should be moved to sanity.bbclass once we have the infrastucture package_list = [] @@ -1100,7 +1114,12 @@ python populate_packages () { if pkg in package_list: msg = "%s is listed in PACKAGES multiple times, this leads to packaging errors." % pkg package_qa_handle_error("packages-list", msg, d) -elif autodebug and pkg.endswith("-dbg"): +# If debug-with-srcpkg mode is enabled then the src package will have +# priority over dbg package when assigning the files. +# This allows src package to include source files and remove them from dbg. +elif split_source_package and pkg.endswith("-src"): +package_list.insert(0, pkg) +elif autodebug and pkg.endswith("-dbg") and not split_source_package: package_list.insert(0, pkg) else: package_list.append(pkg) @@ -1460,7 +1479,7 @@ python package_do_filedeps() { for pkg in packages.split(): if d.getVar('SKIP_FILEDEPS_' + pkg) == '1': continue -if pkg.endswith('-dbg') or pkg.endswith('-doc') or pkg.find('-locale-') != -1 or pkg.find('-localedata-') != -1 or pkg.find('-gconv-') != -1 or pkg.find('-charmap-') != -1 or pkg.startswith('kernel-module-'): +if pkg.endswith('-dbg') or pkg.endswith('-doc') or pkg.find('-locale-') != -1 or pkg.find('-localedata-') != -1 or pkg.find('-gconv-') != -1 or pkg.find('-charmap-') != -1 or pkg.startswith('kernel-module-') or pkg.endswith('-src'): continue for files in chunks(pkgfiles[pkg], 100): pkglist.append((pkg, files, rpmdeps, pkgdest, magic)) @@ -1578,7 +1597,7 @@ python package_do_shlibs() { combos.append("-".join(options[0:i])) return combos -if (file.endswith('.dylib') or file.endswith('.so')) and not pkg.endswith('-dev') and not pkg.endswith('-dbg'): +if (file.endswith('.dylib') or file.endswith('.so')) and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-src'): # Drop suffix name = os.path.basename(file).rsplit(".",1)[0] # Find all combinations -- 2.12.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] action: new bitbake-layer plugin to create a simple layer
From: Leonardo SandovalThough the script bitbake-layers (from the bitbake project), this plugin creates a simple layer with a example recipe, the latter with a single task (do_build). Layer's license and priority is MIT and 6, respectively. Example recipe and layer's priority can be specified through the command line. [YOCTO #11567] Signed-off-by: Leonardo Sandoval --- meta/lib/bblayers/create.py| 66 ++ meta/lib/bblayers/templates/README | 41 + meta/lib/bblayers/templates/example.bb | 11 ++ meta/lib/bblayers/templates/layer.conf | 10 ++ 4 files changed, 128 insertions(+) create mode 100644 meta/lib/bblayers/create.py create mode 100644 meta/lib/bblayers/templates/README create mode 100644 meta/lib/bblayers/templates/example.bb create mode 100644 meta/lib/bblayers/templates/layer.conf diff --git a/meta/lib/bblayers/create.py b/meta/lib/bblayers/create.py new file mode 100644 index 00..6a41fe0504 --- /dev/null +++ b/meta/lib/bblayers/create.py @@ -0,0 +1,66 @@ +import logging +import os +import sys +import shutil + +import bb.utils + +from bblayers.common import LayerPlugin + +logger = logging.getLogger('bitbake-layers') + +def plugin_init(plugins): +return CreatePlugin() + +def read_template(template, template_dir='templates'): +lines = str() +with open(os.path.join(os.path.dirname(__file__), template_dir, template)) as fd: +lines = ''.join(fd.readlines()) +return lines + +class CreatePlugin(LayerPlugin): +def do_create_layer(self, args): +"""Create a basic layer""" +layerdir = os.path.abspath(args.layerdir) +if os.path.exists(layerdir): +sys.stderr.write("Specified layer directory exists\n") +return 1 + +# create dirs +conf = os.path.join(layerdir, 'conf') +bb.utils.mkdirhier(conf) + +# Create the README from templates/README +readme_template = read_template('README') % (args.layerdir, args.layerdir, args.layerdir, args.layerdir, args.layerdir, args.layerdir) +readme = os.path.join(layerdir, 'README') +with open(readme, 'w') as fd: +fd.write(readme_template) + +# Copy the MIT license from meta +copying = 'COPYING.MIT' +dn = os.path.dirname +license_src = os.path.join(dn(dn(dn(__file__))), copying) +license_dst = os.path.join(layerdir, copying) +shutil.copy(license_src, license_dst) + +# Create the layer.conf from templates/layer.conf +layerconf_template = read_template('layer.conf') % (args.layerdir, args.layerdir, args.layerdir, args.priority) +layerconf = os.path.join(conf, 'layer.conf') +with open(layerconf, 'w') as fd: +fd.write(layerconf_template) + +# Create the example from templates/example.bb +example_template = read_template('example.bb') +example = os.path.join(layerdir, 'recipes-' + args.examplerecipe, args.examplerecipe) +bb.utils.mkdirhier(example) +with open(os.path.join(example, args.examplerecipe + '.bb'), 'w') as fd: +fd.write(example_template) + +logger.plain('Add your new layer with \'bitbake-layers add-layer %s\'' % args.layerdir) + +def register_commands(self, sp): +parser_create_layer = self.add_command(sp, 'create-layer', self.do_create_layer, parserecipes=False) +parser_create_layer.add_argument('layerdir', help='Layer directory to create') +parser_create_layer.add_argument('--priority', '-p', default=6, help='Layer directory to create') +parser_create_layer.add_argument('--example-recipe-name', '-e', dest='examplerecipe', default='example', help='Filename of the example recipe') + diff --git a/meta/lib/bblayers/templates/README b/meta/lib/bblayers/templates/README new file mode 100644 index 00..5a77f8d347 --- /dev/null +++ b/meta/lib/bblayers/templates/README @@ -0,0 +1,41 @@ +This README file contains information on the contents of the %s layer. + +Please see the corresponding sections below for details. + +Dependencies + + + URI: + branch: + + URI: + branch: + + . + . + . + +Patches +=== + +Please submit any patches against the %s layer to the mailing list (x...@.org) +and cc: the maintainer: + +Maintainer: XXX YY + +Table of Contents += + + I. Adding the %s layer to your build + II. Misc + + +I. Adding the %s layer to your build += + +Run 'bitbake-layers add-layer %s' + +II. Misc + + +--- replace with specific information about the %s layer --- diff --git a/meta/lib/bblayers/templates/example.bb b/meta/lib/bblayers/templates/example.bb new file mode 100644 index 00..c4b873d593 --- /dev/null +++
[OE-core] [PATCH v2] oeqa/buildperf: Add 'bitbake -m' on sync function to ensure bitbake is unloaded
From: Jose Perez CarranzaAdd 'bitbake -m' to the sync method and ensure all process related to bitbake are correctly unloaded before doing the different measurements. Also add a call to sync funtion on Test4 before final measurment of eSDK deploy dir disk usage. Signed-off-by: Jose Perez Carranza --- meta/lib/oeqa/buildperf/base.py | 1 + meta/lib/oeqa/buildperf/test_basic.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py index 6e62b279c1..7b2b4aa2a4 100644 --- a/meta/lib/oeqa/buildperf/base.py +++ b/meta/lib/oeqa/buildperf/base.py @@ -485,6 +485,7 @@ class BuildPerfTestCase(unittest.TestCase): @staticmethod def sync(): """Sync and drop kernel caches""" +runCmd2('bitbake -m', ignore_status=True) log.debug("Syncing and dropping kernel caches""") KernelDropCaches.drop() os.sync() diff --git a/meta/lib/oeqa/buildperf/test_basic.py b/meta/lib/oeqa/buildperf/test_basic.py index a9e4a5b731..a19089a6ed 100644 --- a/meta/lib/oeqa/buildperf/test_basic.py +++ b/meta/lib/oeqa/buildperf/test_basic.py @@ -121,5 +121,7 @@ class Test4(BuildPerfTestCase): self.sync() self.measure_cmd_resources([installer, '-y', '-d', deploy_dir], 'deploy', 'eSDK deploy') +#make sure bitbake is unloaded +self.sync() self.measure_disk_usage(deploy_dir, 'deploy_dir', 'deploy dir', apparent_size=True) -- 2.12.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] wic: Switch to using --use-uuid by default
The most portable way to specifiy a root device in a disk image that we create is to use PARTUUID rather than /dev/sda2. As background, both GPT and MBR tables provide valid UUID values for each partition and the Linux Kernel contains the logic to parse this value. With this change we can now boot the default disk images when used as any valid block device that the included kernel uses. This for example means that VirtualBox can be used to run vmdk without changes as it uses IDE for the virtual disk controller. Cc: Ed BartoshCc: Matt Porter Signed-off-by: Tom Rini --- scripts/lib/wic/canned-wks/common.wks.inc | 2 +- scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg | 8 scripts/lib/wic/canned-wks/qemux86-directdisk.wks | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/scripts/lib/wic/canned-wks/common.wks.inc b/scripts/lib/wic/canned-wks/common.wks.inc index 5cf2fd1..89880b4 100644 --- a/scripts/lib/wic/canned-wks/common.wks.inc +++ b/scripts/lib/wic/canned-wks/common.wks.inc @@ -1,3 +1,3 @@ # This file is included into 3 canned wks files from this directory part /boot --source bootimg-pcbios --ondisk sda --label boot --active --align 1024 -part / --source rootfs --ondisk sda --fstype=ext4 --label platform --align 1024 +part / --source rootfs --use-uuid --fstype=ext4 --label platform --align 1024 diff --git a/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg b/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg index d5a07d2..c58e74a 100644 --- a/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg +++ b/scripts/lib/wic/canned-wks/directdisk-bootloader-config.cfg @@ -12,16 +12,16 @@ DEFAULT Graphics console boot LABEL Graphics console boot KERNEL /vmlinuz -APPEND label=boot root=/dev/sda2 rootwait +APPEND label=boot rootwait LABEL Serial console boot KERNEL /vmlinuz -APPEND label=boot root=/dev/sda2 rootwait console=ttyS0,115200 +APPEND label=boot rootwait console=ttyS0,115200 LABEL Graphics console install KERNEL /vmlinuz -APPEND label=install root=/dev/sda2 rootwait +APPEND label=install rootwait LABEL Serial console install KERNEL /vmlinuz -APPEND label=install root=/dev/sda2 rootwait console=ttyS0,115200 +APPEND label=install rootwait console=ttyS0,115200 diff --git a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks index db30bbc..1f8466a 100644 --- a/scripts/lib/wic/canned-wks/qemux86-directdisk.wks +++ b/scripts/lib/wic/canned-wks/qemux86-directdisk.wks @@ -4,5 +4,5 @@ include common.wks.inc -bootloader --timeout=0 --append="vga=0 uvesafb.mode_option=640x480-32 root=/dev/sda2 rw mem=256M ip=192.168.7.2::192.168.7.1:255.255.255.0 oprofile.timer=1 rootfstype=ext4 " +bootloader --timeout=0 --append="vga=0 uvesafb.mode_option=640x480-32 rw mem=256M ip=192.168.7.2::192.168.7.1:255.255.255.0 oprofile.timer=1 rootfstype=ext4 " -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] image: Fix "metadata is not deterministic" when chaining 2+ CONVERSION_CMDs
When we have more than one CONVERSION_CMD being used, for example ext4.gz.sha256sum we will see errors about "metadata is not deterministic". This is because we do not have a stable order of intermediate files that will be removed in the generated shell command. We fix this by calling sorted() on the set of rm_tmp_images so that we will have a stable hash again. Cc: Patrick OhlySigned-off-by: Tom Rini --- meta/classes/image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index b095bca..dee17ae 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -474,7 +474,7 @@ python () { # Clean up after applying all conversion commands. Some of them might # use the same input, therefore we cannot delete sooner without applying # some complex dependency analysis. -for image in rm_tmp_images: +for image in sorted(rm_tmp_images): cmds.append("\trm " + image) after = 'do_image' -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] image: Convert vmdk/vdi/qcow2 to strict CONVERSION_CMD types
The vmdk/vdi/qcow2 IMAGE_FSTYPEs predate wic. As such, they provide some similar underlying functionality in order to produce a "disk" image that in turn can be converted into different formats that various hypervisor types work with. They do not however provide the ability for other disk image types to be converted into these same output types. Furthermore, they are less flexible than what wic does provide. This drops the old style vmdk/vdi/qcow2 types and re-introduces them under the CONVERSION_CMD framework. The equivalent of vmdk is now wic.vmdk and so forth for the other types. Signed-off-by: Tom Rini--- This depends on my previous series to correct chaining compression support. I had attempted to keep the vmdk/vdi/qcow2 IMAGE_FSTYPES for compatibility sake using IMAGE_TYPEDEP_vmdk = "wic" and introducing an oe_qemuimg function to run to do the conversion. This was working, but I could not get it to have the symlinks created automatically. At this timeI think it makes most sense to not hide that the underlying disk content has changed at least slightly from the old vmdk type to the new type and that we can simply handle this change in documentation. As such, if there's agreement about dropping the types I'll include some documentation changes in the next version. meta/classes/image-vm.bbclass | 171 - meta/classes/image.bbclass | 3 - meta/classes/image_types.bbclass | 12 +- .../images/build-appliance-image_15.0.0.bb | 6 +- 4 files changed, 10 insertions(+), 182 deletions(-) delete mode 100644 meta/classes/image-vm.bbclass diff --git a/meta/classes/image-vm.bbclass b/meta/classes/image-vm.bbclass deleted file mode 100644 index b52df9f..000 --- a/meta/classes/image-vm.bbclass +++ /dev/null @@ -1,171 +0,0 @@ -# image-vm.bbclass -# (loosly based off image-live.bbclass Copyright (C) 2004, Advanced Micro Devices, Inc.) -# -# Create an image which can be placed directly onto a harddisk using dd and then -# booted. -# -# This uses syslinux. extlinux would have been nice but required the ext2/3 -# partition to be mounted. grub requires to run itself as part of the install -# process. -# -# The end result is a 512 boot sector populated with an MBR and partition table -# followed by an msdos fat16 partition containing syslinux and a linux kernel -# completed by the ext2/3 rootfs. -# -# We have to push the msdos parition table size > 16MB so fat 16 is used as parted -# won't touch fat12 partitions. - -inherit live-vm-common - -do_bootdirectdisk[depends] += "dosfstools-native:do_populate_sysroot \ - virtual/kernel:do_deploy \ - syslinux:do_populate_sysroot \ - syslinux-native:do_populate_sysroot \ - parted-native:do_populate_sysroot \ - mtools-native:do_populate_sysroot \ - ${PN}:do_image_${VM_ROOTFS_TYPE} \ - " - -IMAGE_TYPEDEP_vmdk = "${VM_ROOTFS_TYPE}" -IMAGE_TYPEDEP_vdi = "${VM_ROOTFS_TYPE}" -IMAGE_TYPEDEP_qcow2 = "${VM_ROOTFS_TYPE}" -IMAGE_TYPEDEP_hdddirect = "${VM_ROOTFS_TYPE}" -IMAGE_TYPES_MASKED += "vmdk vdi qcow2 hdddirect" - -VM_ROOTFS_TYPE ?= "ext4" -ROOTFS ?= "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.${VM_ROOTFS_TYPE}" - -# Used by bootloader -LABELS_VM ?= "boot" -ROOT_VM ?= "root=/dev/sda2" -# Using an initramfs is optional. Enable it by setting INITRD_IMAGE_VM. -INITRD_IMAGE_VM ?= "" -INITRD_VM ?= "${@'${IMGDEPLOYDIR}/${INITRD_IMAGE_VM}-${MACHINE}.cpio.gz' if '${INITRD_IMAGE_VM}' else ''}" -do_bootdirectdisk[depends] += "${@'${INITRD_IMAGE_VM}:do_image_complete' if '${INITRD_IMAGE_VM}' else ''}" - -BOOTDD_VOLUME_ID ?= "boot" -BOOTDD_EXTRA_SPACE ?= "16384" - -DISK_SIGNATURE ?= "${DISK_SIGNATURE_GENERATED}" -DISK_SIGNATURE[vardepsexclude] = "DISK_SIGNATURE_GENERATED" - -build_boot_dd() { - HDDDIR="${S}/hdd/boot" - HDDIMG="${S}/hdd.image" - IMAGE=${IMGDEPLOYDIR}/${IMAGE_NAME}.hdddirect - - populate_kernel $HDDDIR - - if [ "${PCBIOS}" = "1" ]; then - syslinux_hddimg_populate $HDDDIR - fi - if [ "${EFI}" = "1" ]; then - efi_hddimg_populate $HDDDIR - fi - - BLOCKS=`du -bks $HDDDIR | cut -f 1` - BLOCKS=`expr $BLOCKS + ${BOOTDD_EXTRA_SPACE}` - - # Remove it since mkdosfs would fail when it exists - rm -f $HDDIMG - mkdosfs -n ${BOOTDD_VOLUME_ID} ${MKDOSFS_EXTRAOPTS} -C $HDDIMG $BLOCKS - mcopy -i $HDDIMG -s $HDDDIR/* ::/ - - if [ "${PCBIOS}" = "1" ]; then - syslinux_hdddirect_install $HDDIMG - fi - chmod 644 $HDDIMG - - ROOTFSBLOCKS=`du -Lbks ${ROOTFS} | cut -f 1` - TOTALSIZE=`expr $BLOCKS + $ROOTFSBLOCKS` - END1=`expr $BLOCKS \* 1024` - END2=`expr $END1 + 512` - END3=`expr \( $ROOTFSBLOCKS
[OE-core] [PATCH] oeqa/buildperf: Add 'bitbake -m' on sync function to ensure bitbake is unloaded
From: Jose Perez CarranzaAdd 'bitbake -m' to the sync method and ensure all process related to bitbake are correctly unloaded before doing the different measurements. Also add a call to sync funtion on Test4 before final measurment of eSDK deploy dir disk usage. Signed-off-by: Jose Perez Carranza --- meta/lib/oeqa/buildperf/base.py | 1 + meta/lib/oeqa/buildperf/test_basic.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/meta/lib/oeqa/buildperf/base.py b/meta/lib/oeqa/buildperf/base.py index 6e62b279c1..7b2b4aa2a4 100644 --- a/meta/lib/oeqa/buildperf/base.py +++ b/meta/lib/oeqa/buildperf/base.py @@ -485,6 +485,7 @@ class BuildPerfTestCase(unittest.TestCase): @staticmethod def sync(): """Sync and drop kernel caches""" +runCmd2('bitbake -m', ignore_status=True) log.debug("Syncing and dropping kernel caches""") KernelDropCaches.drop() os.sync() diff --git a/meta/lib/oeqa/buildperf/test_basic.py b/meta/lib/oeqa/buildperf/test_basic.py index a9e4a5b731..0033ee4815 100644 --- a/meta/lib/oeqa/buildperf/test_basic.py +++ b/meta/lib/oeqa/buildperf/test_basic.py @@ -121,5 +121,7 @@ class Test4(BuildPerfTestCase): self.sync() self.measure_cmd_resources([installer, '-y', '-d', deploy_dir], 'deploy', 'eSDK deploy') +#make sure bitbake is unloaded +#self.sync() self.measure_disk_usage(deploy_dir, 'deploy_dir', 'deploy dir', apparent_size=True) -- 2.12.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] buildperf/tests_basics: sync the system to have clean esdk deploy dir
From: Jose Perez CarranzaIn some cases and depending on the resources measurement of disk usage for eSDK deploy dir is failing due “measure_disk_usage” was locking for tmp files (bitbake.lock and bitbake.sock) that were not deleted on time, this can be avoided by a sync on the system to allow all process to be finished on time and ensuring esdk deploy dir is clean. Signed-off-by: Jose Perez Carranza --- meta/lib/oeqa/buildperf/test_basic.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/lib/oeqa/buildperf/test_basic.py b/meta/lib/oeqa/buildperf/test_basic.py index a9e4a5b731..92197878af 100644 --- a/meta/lib/oeqa/buildperf/test_basic.py +++ b/meta/lib/oeqa/buildperf/test_basic.py @@ -121,5 +121,7 @@ class Test4(BuildPerfTestCase): self.sync() self.measure_cmd_resources([installer, '-y', '-d', deploy_dir], 'deploy', 'eSDK deploy') +#sync before the final disk usage measurement +self.sync() self.measure_disk_usage(deploy_dir, 'deploy_dir', 'deploy dir', apparent_size=True) -- 2.12.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 05/11] gperf: upgrade to 3.1
On Tue, Jul 25, 2017 at 6:12 AM, Burton, Rosswrote: > This breaks the libcap build: > > | In file included from :0:0: > | ./_caps_output.gperf:71:80: error: unknown type name 'size_t' include might help > | gperf_case_strncmp (register const char *s1, register const char *s2, > register size_t n) > | > ^~ > | ./_caps_output.gperf:96:53: error: unknown type name 'size_t' > | __cap_hash_name (register const char *str, register size_t len) > | ^~ gcc is putting a caret pointer in wrong place hmm may be a cut and paste error > | ./_caps_output.gperf:200:55: error: unknown type name 'size_t' > | __cap_lookup_name (register const char *str, register size_t len) > |^~ > | ./_caps_output.gperf:200:1: error: conflicting types for > '__cap_lookup_name' > | __cap_lookup_name (register const char *str, register size_t len) > | ^ > | ./_caps_output.gperf:33:29: note: previous declaration of > '__cap_lookup_name' was here > | const struct __cap_token_s *__cap_lookup_name(const char *, unsigned > int); > | ^ > | cap_text.c: In function 'cap_to_name': > | cap_text.c:291:2: warning: ignoring return value of 'asprintf', declared > with attribute warn_unused_result [-Wunused-result] > | asprintf(, "%u", cap); > | ^ > | Makefile:63: recipe for target 'cap_text.o' failed > > Ross > > On 24 July 2017 at 15:28, Alexander Kanavin > wrote: >> >> Signed-off-by: Alexander Kanavin >> --- >> meta/recipes-extended/gperf/gperf_3.0.4.bb | 5 - >> meta/recipes-extended/gperf/gperf_3.1.bb | 5 + >> 2 files changed, 5 insertions(+), 5 deletions(-) >> delete mode 100644 meta/recipes-extended/gperf/gperf_3.0.4.bb >> create mode 100644 meta/recipes-extended/gperf/gperf_3.1.bb >> >> diff --git a/meta/recipes-extended/gperf/gperf_3.0.4.bb >> b/meta/recipes-extended/gperf/gperf_3.0.4.bb >> deleted file mode 100644 >> index 64003fc0bb7..000 >> --- a/meta/recipes-extended/gperf/gperf_3.0.4.bb >> +++ /dev/null >> @@ -1,5 +0,0 @@ >> -require gperf.inc >> - >> - >> -SRC_URI[md5sum] = "c1f1db32fb6598d6a93e6e88796a8632" >> -SRC_URI[sha256sum] = >> "767112a204407e62dbc3106647cf839ed544f3cf5d0f0523aaa2508623aad63e" >> diff --git a/meta/recipes-extended/gperf/gperf_3.1.bb >> b/meta/recipes-extended/gperf/gperf_3.1.bb >> new file mode 100644 >> index 000..942820b91d5 >> --- /dev/null >> +++ b/meta/recipes-extended/gperf/gperf_3.1.bb >> @@ -0,0 +1,5 @@ >> +require gperf.inc >> + >> + >> +SRC_URI[md5sum] = "9e251c0a618ad0824b51117d5d9db87e" >> +SRC_URI[sha256sum] = >> "588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2" >> -- >> 2.13.2 >> >> -- >> ___ >> Openembedded-core mailing list >> Openembedded-core@lists.openembedded.org >> http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gettext.bbclass: also search for files in target sysroot
fwupd contains polkit policy files that it translates using polkit.its and polkit.loc files that the next polkit release is going to install (see https://github.com/hughsie/fwupd/issues/107). In order to make that work with OE-core, the gettext tools must be told to look also for files in the recipe-sysroot. Otherwise it only uses the GETTEXTDATADIR set by the gettext-native tool wrappers, and that only points to the files provided by gettext-native itself. Signed-off-by: Patrick Ohly--- meta/classes/gettext.bbclass | 5 + 1 file changed, 5 insertions(+) diff --git a/meta/classes/gettext.bbclass b/meta/classes/gettext.bbclass index d60a0c1..689ef55 100644 --- a/meta/classes/gettext.bbclass +++ b/meta/classes/gettext.bbclass @@ -17,3 +17,8 @@ DEPENDS_GETTEXT ??= "virtual/gettext gettext-native" BASEDEPENDS_append = " ${@gettext_dependencies(d)}" EXTRA_OECONF_append = " ${@gettext_oeconf(d)}" + +# Without this, msgfmt from gettext-native will not find ITS files +# provided by target recipes (for example, polkit.its). +GETTEXTDATADIRS_append_class-target = ":${STAGING_DATADIR}/gettext" +export GETTEXTDATADIRS base-commit: d3a41fbd94462efc8c6f1b55f6fb54001b447c45 -- git-series 0.9.1 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH][pyro] kernel.bbclass: fix KERNEL_IMAGETYPE(S) for Image.gz
KERNEL_IMAGETYPES lists all the kernel images that we want to build. in cb17b6c2a7 (kernel.bbclass: support kernel image type of vmlinux.gz), some logic was added to support vmlinux.gz which is not a target built by kernel makefiles (only vmlinux). It is clear that the goal of this logic is only to support vmlinux.gz and not others compressed format (such as Image.gz) which are valid target for kernel makefiles. For Image.gz we should rely on the kernel makefiles and not do the compression in kernel class. This patch updates the logic used to filter out non supported kernel target from KERNEL_IMAGETYPES, and make vmlinux.gz a 'special case', instead of *.gz. If more special cases are needed in the future, we could add them in a similar way. This patch should be a no-op for anyone using vmlinux or vmlinux.gz, and on top of that it is fixing the build for Image.gz which was not working until now. Signed-off-by: Nicolas DechesneSigned-off-by: Richard Purdie (cherry picked from commit cfc0c897656fe67e81a6a5dcd936dff785529f41) Signed-off-by: Nicolas Dechesne --- meta/classes/kernel.bbclass | 18 +- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 7a134d5c29..7670c7107a 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -32,7 +32,6 @@ KERNEL_VERSION_PKG_NAME = "${@legitimize_package_name(d.getVar('KERNEL_VERSION') KERNEL_VERSION_PKG_NAME[vardepvalue] = "${LINUX_VERSION}" python __anonymous () { -import re # Merge KERNEL_IMAGETYPE and KERNEL_ALT_IMAGETYPE into KERNEL_IMAGETYPES type = d.getVar('KERNEL_IMAGETYPE') or "" @@ -44,7 +43,10 @@ python __anonymous () { types = (alttype + ' ' + types).strip() d.setVar('KERNEL_IMAGETYPES', types) -typeformake = re.sub(r'\.gz', '', types) +# some commonly used kernel images aren't generated by the kernel build system, such as vmlinux.gz +# typeformake lists only valid kernel make targets, and post processing can be done after the kernel +# is built (such as using gzip to compress vmlinux) +typeformake = types.replace('vmlinux.gz', 'vmlinux') d.setVar('KERNEL_IMAGETYPE_FOR_MAKE', typeformake) for type in types.split(): @@ -268,14 +270,12 @@ kernel_do_compile() { fi for typeformake in ${KERNEL_IMAGETYPE_FOR_MAKE} ; do oe_runmake ${typeformake} CC="${KERNEL_CC}" LD="${KERNEL_LD}" ${KERNEL_EXTRA_ARGS} $use_alternate_initrd - for type in ${KERNEL_IMAGETYPES} ; do - if test "${typeformake}.gz" = "${type}"; then - mkdir -p "${KERNEL_OUTPUT_DIR}" - gzip -9c < "${typeformake}" > "${KERNEL_OUTPUT_DIR}/${type}" - break; - fi - done done + # vmlinux.gz is not built by kernel + if (echo "${KERNEL_IMAGETYPES}" | grep -wq "vmlinux\.gz"); then + mkdir -p "${KERNEL_OUTPUT_DIR}" + gzip -9c < ${B}/vmlinux > "${KERNEL_OUTPUT_DIR}/vmlinux.gz" + fi } do_compile_kernelmodules() { -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 05/11] gperf: upgrade to 3.1
This breaks the libcap build: | In file included from :0:0: | ./_caps_output.gperf:71:80: error: unknown type name 'size_t' | gperf_case_strncmp (register const char *s1, register const char *s2, register size_t n) | ^~ | ./_caps_output.gperf:96:53: error: unknown type name 'size_t' | __cap_hash_name (register const char *str, register size_t len) | ^~ | ./_caps_output.gperf:200:55: error: unknown type name 'size_t' | __cap_lookup_name (register const char *str, register size_t len) |^~ | ./_caps_output.gperf:200:1: error: conflicting types for '__cap_lookup_name' | __cap_lookup_name (register const char *str, register size_t len) | ^ | ./_caps_output.gperf:33:29: note: previous declaration of '__cap_lookup_name' was here | const struct __cap_token_s *__cap_lookup_name(const char *, unsigned int); | ^ | cap_text.c: In function 'cap_to_name': | cap_text.c:291:2: warning: ignoring return value of 'asprintf', declared with attribute warn_unused_result [-Wunused-result] | asprintf(, "%u", cap); | ^ | Makefile:63: recipe for target 'cap_text.o' failed Ross On 24 July 2017 at 15:28, Alexander Kanavin < alexander.kana...@linux.intel.com> wrote: > Signed-off-by: Alexander Kanavin> --- > meta/recipes-extended/gperf/gperf_3.0.4.bb | 5 - > meta/recipes-extended/gperf/gperf_3.1.bb | 5 + > 2 files changed, 5 insertions(+), 5 deletions(-) > delete mode 100644 meta/recipes-extended/gperf/gperf_3.0.4.bb > create mode 100644 meta/recipes-extended/gperf/gperf_3.1.bb > > diff --git a/meta/recipes-extended/gperf/gperf_3.0.4.bb > b/meta/recipes-extended/gperf/gperf_3.0.4.bb > deleted file mode 100644 > index 64003fc0bb7..000 > --- a/meta/recipes-extended/gperf/gperf_3.0.4.bb > +++ /dev/null > @@ -1,5 +0,0 @@ > -require gperf.inc > - > - > -SRC_URI[md5sum] = "c1f1db32fb6598d6a93e6e88796a8632" > -SRC_URI[sha256sum] = "767112a204407e62dbc3106647cf83 > 9ed544f3cf5d0f0523aaa2508623aad63e" > diff --git a/meta/recipes-extended/gperf/gperf_3.1.bb > b/meta/recipes-extended/gperf/gperf_3.1.bb > new file mode 100644 > index 000..942820b91d5 > --- /dev/null > +++ b/meta/recipes-extended/gperf/gperf_3.1.bb > @@ -0,0 +1,5 @@ > +require gperf.inc > + > + > +SRC_URI[md5sum] = "9e251c0a618ad0824b51117d5d9db87e" > +SRC_URI[sha256sum] = "588546b945bba4b70b6a3a616e80b4 > ab466e3f33024a352fc2198112cdbb3ae2" > -- > 2.13.2 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] gnome-themes-standard: don't generate multiple -dev and -dbg packages
Signed-off-by: Ross Burton--- meta/recipes-gnome/gnome/gnome-themes-standard_3.22.3.bb | 5 - 1 file changed, 5 deletions(-) diff --git a/meta/recipes-gnome/gnome/gnome-themes-standard_3.22.3.bb b/meta/recipes-gnome/gnome/gnome-themes-standard_3.22.3.bb index f75f7c88ccf..e49ad5e9d1b 100644 --- a/meta/recipes-gnome/gnome/gnome-themes-standard_3.22.3.bb +++ b/meta/recipes-gnome/gnome/gnome-themes-standard_3.22.3.bb @@ -30,16 +30,11 @@ do_install_append() { # There could be gnome-theme-highcontrast as well but that requires # gtk+3 and includes lots of icons (is also broken with B != S). PACKAGES += "gnome-theme-adwaita \ - gnome-theme-adwaita-dbg \ - gnome-theme-adwaita-dev \ gnome-theme-adwaita-dark \ " FILES_gnome-theme-adwaita = "${prefix}/share/themes/Adwaita \ ${libdir}/gtk-2.0/2.10.0/engines/libadwaita.so" -FILES_gnome-theme-adwaita-dev = "${libdir}/gtk-2.0/2.10.0/engines/libadwaita.la" -FILES_gnome-theme-adwaita-dbg = "${libdir}/gtk-2.0/2.10.0/engines/.debug/libadwaita.so" FILES_gnome-theme-adwaita-dark = "${prefix}/share/themes/Adwaita-dark" RDEPENDS_gnome-theme-adwaita-dark = "gnome-theme-adwaita" - -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 5/6] wic: add /boot mount point to fstab by default
wic avoided adding /boot to fstab for no reason. This exception was hardcoded in the wic code. There is no need for this as mountpoint in .wks file is an optional field. It can be used only if user wants to have partitions automatically mounted on system boot. [YOCTO #11662] Signed-off-by: Ed Bartosh--- scripts/lib/wic/plugins/imager/direct.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index 4f441c1..0a65a9c 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -135,7 +135,7 @@ class DirectPlugin(ImagerPlugin): updated = False for part in parts: if not part.realnum or not part.mountpoint \ - or part.mountpoint in ("/", "/boot"): + or part.mountpoint == "/": continue # mmc device partitions are named mmcblk0p1, mmcblk0p2.. -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 6/6] oe-selftest: wic: fix test_quemu
This test case boots the image in qemu and checks for mounted partitions. As /boot is mounted automatically the test case fails. Fixed this by adding /boot to the list of mounted partitions. Signed-off-by: Ed Bartosh--- meta/lib/oeqa/selftest/cases/wic.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/lib/oeqa/selftest/cases/wic.py b/meta/lib/oeqa/selftest/cases/wic.py index df205e8..ceb92ae 100644 --- a/meta/lib/oeqa/selftest/cases/wic.py +++ b/meta/lib/oeqa/selftest/cases/wic.py @@ -637,7 +637,7 @@ part /etc --source rootfs --ondisk mmcblk0 --fstype=ext4 --exclude-path bin/ --r cmd = "mount |grep '^/dev/' | cut -f1,3 -d ' '" status, output = qemu.run_serial(cmd) self.assertEqual(1, status, 'Failed to run command "%s": %s' % (cmd, output)) -self.assertEqual(output, '/dev/root /\r\n/dev/sda3 /mnt') +self.assertEqual(output, '/dev/root /\r\n/dev/sda1 /boot\r\n/dev/sda3 /mnt') @only_for_arch(['i586', 'i686', 'x86_64']) @OETestID(1852) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 4/6] wic: rootfs: make copied rootfs unique
Used unique suffix (line number from .wks file) for the copied rootfs directory to avoid possible conflicts. Signed-off-by: Ed Bartosh--- scripts/lib/wic/plugins/source/rootfs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index e438158..aec720f 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py @@ -88,7 +88,7 @@ class RootfsPlugin(SourcePlugin): if part.exclude_path is not None: # We need a new rootfs directory we can delete files from. Copy to # workdir. -new_rootfs = os.path.realpath(os.path.join(cr_workdir, "rootfs")) +new_rootfs = os.path.realpath(os.path.join(cr_workdir, "rootfs%d" % part.lineno)) if os.path.lexists(new_rootfs): shutil.rmtree(os.path.join(new_rootfs)) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 3/6] wic: rootfs: fix rootfs path reporting
wic gets rootfs paths from partition object property 'rootfs_dir' and shows them in final report. rootfs plugin sets this property to the temporary path, which causes temporary paths appearing in the report. Changed the code to prevent storing temporary rootfs path in part.rootfs_dir. This should fix the report. Signed-off-by: Ed Bartosh--- scripts/lib/wic/plugins/source/rootfs.py | 10 -- 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index c08f760..e438158 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py @@ -81,8 +81,9 @@ class RootfsPlugin(SourcePlugin): raise WicError("Couldn't find --rootfs-dir=%s connection or " "it is not a valid path, exiting" % part.rootfs_dir) -real_rootfs_dir = cls.__get_rootfs_dir(rootfs_dir) +part.rootfs_dir = cls.__get_rootfs_dir(rootfs_dir) +new_rootfs = None # Handle excluded paths. if part.exclude_path is not None: # We need a new rootfs directory we can delete files from. Copy to @@ -92,9 +93,7 @@ class RootfsPlugin(SourcePlugin): if os.path.lexists(new_rootfs): shutil.rmtree(os.path.join(new_rootfs)) -copyhardlinktree(real_rootfs_dir, new_rootfs) - -real_rootfs_dir = new_rootfs +copyhardlinktree(part.rootfs_dir, new_rootfs) for orig_path in part.exclude_path: path = orig_path @@ -123,6 +122,5 @@ class RootfsPlugin(SourcePlugin): # Delete whole directory. shutil.rmtree(full_path) -part.rootfs_dir = real_rootfs_dir part.prepare_rootfs(cr_workdir, oe_builddir, -real_rootfs_dir, native_sysroot) +new_rootfs or part.rootfs_dir, native_sysroot) -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 1/6] wic: copy rootfs directory before changing fstab
wic updates /etc/fstab on root partition if there are valid mount points in .wks When wic runs from bitbake this can cause incorrect results or even breakage of other tasks working with the same rootfs directory in parallel with do_image_wic. Implemented copying rootfs directory to a temporary location using copyhardlinktree before updating fstab to avoid conflicts with other tasks working with the same rootfs directory. Signed-off-by: Ed Bartosh--- scripts/lib/wic/plugins/imager/direct.py | 24 +++- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/scripts/lib/wic/plugins/imager/direct.py b/scripts/lib/wic/plugins/imager/direct.py index f20d843..4f441c1 100644 --- a/scripts/lib/wic/plugins/imager/direct.py +++ b/scripts/lib/wic/plugins/imager/direct.py @@ -32,6 +32,8 @@ import uuid from time import strftime +from oe.path import copyhardlinktree + from wic import WicError from wic.filemap import sparse_copy from wic.ksparser import KickStart, KickStartError @@ -115,12 +117,18 @@ class DirectPlugin(ImagerPlugin): fstab_lines = fstab.readlines() if self._update_fstab(fstab_lines, self.parts): -shutil.copyfile(fstab_path, fstab_path + ".orig") +# copy rootfs dir to workdir to update fstab +# as rootfs can be used by other tasks and can't be modified +new_rootfs = os.path.realpath(os.path.join(self.workdir, "rootfs_copy")) +copyhardlinktree(image_rootfs, new_rootfs) +fstab_path = os.path.join(new_rootfs, 'etc/fstab') + +os.unlink(fstab_path) with open(fstab_path, "w") as fstab: fstab.writelines(fstab_lines) -return fstab_path +return new_rootfs def _update_fstab(self, fstab_lines, parts): """Assume partition order same as in wks""" @@ -156,7 +164,10 @@ class DirectPlugin(ImagerPlugin): filesystems from the artifacts directly and combine them into a partitioned image. """ -fstab_path = self._write_fstab(self.rootfs_dir.get("ROOTFS_DIR")) +new_rootfs = self._write_fstab(self.rootfs_dir.get("ROOTFS_DIR")) +if new_rootfs: +# rootfs was copied to update fstab +self.rootfs_dir['ROOTFS_DIR'] = new_rootfs for part in self.parts: # get rootfs size from bitbake variable if it's not set in .ks file @@ -172,12 +183,7 @@ class DirectPlugin(ImagerPlugin): if rsize_bb: part.size = int(round(float(rsize_bb))) -try: -self._image.prepare(self) -finally: -if fstab_path: -shutil.move(fstab_path + ".orig", fstab_path) - +self._image.prepare(self) self._image.layout_partitions() self._image.create() -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 2/6] wic: use absolute paths in rootfs plugin
Using relative paths can cause copyhardlinktree API to fail as it changes current directory when working. Converted all paths to absolute paths using os.path.realpath. Signed-off-by: Ed Bartosh--- scripts/lib/wic/plugins/source/rootfs.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/lib/wic/plugins/source/rootfs.py b/scripts/lib/wic/plugins/source/rootfs.py index 4dc4cb8..c08f760 100644 --- a/scripts/lib/wic/plugins/source/rootfs.py +++ b/scripts/lib/wic/plugins/source/rootfs.py @@ -48,7 +48,7 @@ class RootfsPlugin(SourcePlugin): @staticmethod def __get_rootfs_dir(rootfs_dir): if os.path.isdir(rootfs_dir): -return rootfs_dir +return os.path.realpath(rootfs_dir) image_rootfs_dir = get_bitbake_var("IMAGE_ROOTFS", rootfs_dir) if not os.path.isdir(image_rootfs_dir): @@ -56,7 +56,7 @@ class RootfsPlugin(SourcePlugin): "named %s has been found at %s, exiting." % (rootfs_dir, image_rootfs_dir)) -return image_rootfs_dir +return os.path.realpath(image_rootfs_dir) @classmethod def do_prepare_partition(cls, part, source_params, cr, cr_workdir, -- 2.1.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3 0/6] #11662 - wic should mount /boot
Hi, This patchset adds /boot to the /etc/fstab of root partition, making it mounted on boot. It also fixes reporting and testing issues caused by this change. The patchset also fixes long standing bug: wic updated fstab inplace in rootfs directory. This causes other tasks working with rootfs directory to produce incorrect results or crash. This is fixed by harlinking rootfs content to the temporary directory before updating fstab. Changes in v2: squashed patches by reviewer's request Changes in v3: unlink /etc/fstab in rootfs copy before updating it The following changes since commit be281d536c6ac9cafa8357ced4b1e5ce2e0db501: wic: add 'wic write' command (2017-07-25 14:19:37 +0300) are available in the git repository at: git://git.yoctoproject.org/poky-contrib ed/wip http://git.yoctoproject.org/cgit.cgi/poky-contrib/log/?h=ed/wip Ed Bartosh (6): wic: copy rootfs directory before changing fstab wic: use absolute paths in rootfs plugin wic: rootfs: fix rootfs path reporting wic: rootfs: make copied rootfs unique wic: add /boot mount point to fstab by default oe-selftest: wic: fix test_quemu meta/lib/oeqa/selftest/cases/wic.py | 2 +- scripts/lib/wic/plugins/imager/direct.py | 26 -- scripts/lib/wic/plugins/source/rootfs.py | 16 +++- 3 files changed, 24 insertions(+), 20 deletions(-) -- Regards, Ed -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] image.bbclass: Correct chaining compression support
On Mon, 2017-07-24 at 07:19 -0400, Tom Rini wrote: > On Mon, Jul 24, 2017 at 10:35:37AM +0200, Patrick Ohly wrote: > > On Fri, 2017-07-21 at 18:06 -0400, Tom Rini wrote: > > > The fix for this inadvertently broke chaining > > > compression/conversion. First, correct the u-boot conversion > > > code. > > > > > > Fixes: 46bc438374de ("image.bbclass: do exact > > > match for rootfs type") > > > Cc: Zhenhua Luo> > > Cc: Richard Purdie > > > Cc: Patrick Ohly > > > Signed-off-by: Tom Rini > > > --- > > > This change is fairly important and, imho, innocuous and should > > > be > > > populated to pyro/etc, once merged to master. The next part of > > > the > > > series is clean-up and while with my U-Boot hat on, I would say > > > should > > > be pushed more widely, I am biased. > > > --- > > > meta/classes/image.bbclass | 2 +- > > > meta/classes/image_types_uboot.bbclass | 13 + > > > 2 files changed, 6 insertions(+), 9 deletions(-) > > > > > > diff --git a/meta/classes/image.bbclass > > > b/meta/classes/image.bbclass > > > index de535ce6fcff..bd6a5b7b810a 100644 > > > --- a/meta/classes/image.bbclass > > > +++ b/meta/classes/image.bbclass > > > @@ -453,7 +453,7 @@ python () { > > > rm_tmp_images = set() > > > def gen_conversion_cmds(bt): > > > for ctype in ctypes: > > > - if bt[bt.find('.') + 1:] == ctype: > > > + if bt.endswith("." + ctype) > > > > This reverts 46bc438374de and thus restores the code as I had > > originally written it. > > > > Looking at 46bc438374de, it's not clear to me how the commit > > message > > matches the code, i.e. I don't understand the commit. So it was an > > incorrect fix for the problem described in that commit message, and > > the > > right one are your changes to the u-boot conversion command? > > Ah, so the important bit is the other half of this patch, which > addresses the problem 46bc438374de was intended to deal with, > correctly. > Prior to the chaining compression/conversion support, the "u-boot" > targets would clean up their intermediate files. With your patch > those > files get cleaned up automatically and that the mkimage calling > function > was also doing it lead to build failures. But since we no longer > need > to have a manual cleaning step, we can just drop it. Makes sense. Acked-by: Patrick Ohly -- 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
[OE-core] ✗ patchtest: failure for "elfutils: use HTTP instead of ..." and 2 more
== Series Details == Series: "elfutils: use HTTP instead of ..." and 2 more Revision: 1 URL : https://patchwork.openembedded.org/series/7924/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fixRebase your series on top of targeted branch Targeted branch master (currently at d3a41fbd94) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 3/3] fetch/wget: mitigate a wget race condition when listing FTP directories
Wrong list, sorry. Ross On 25 July 2017 at 11:17, Ross Burtonwrote: > When wget is fetching a listing for a directory over FTP it writes to a > temporary file called .listing in the current directory. If there are > many such > operations happening in parallel - for example during 'bitbake world -c > checkpkg' - then up to BB_NUMBER_THREADS instances of wget will be racing > to > write to, read, and delete the same file. > > This results in various failures such as the file disappearing before wget > has > processed it or the file changing contents, which causes checkpkg to > randomly > fail. > > Mitigate the race condition by creating a temporary directory to run wget > in > when doing directory listings. > > [ YOCTO #11828 ] > > Signed-off-by: Ross Burton > --- > bitbake/lib/bb/fetch2/wget.py | 23 +++ > 1 file changed, 11 insertions(+), 12 deletions(-) > > diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py > index 208ee9bdd69..8ee9769d39b 100644 > --- a/bitbake/lib/bb/fetch2/wget.py > +++ b/bitbake/lib/bb/fetch2/wget.py > @@ -90,13 +90,13 @@ class Wget(FetchMethod): > > self.basecmd = d.getVar("FETCHCMD_wget") or "/usr/bin/env wget -t > 2 -T 30 --passive-ftp --no-check-certificate" > > -def _runwget(self, ud, d, command, quiet): > +def _runwget(self, ud, d, command, quiet, workdir=None): > > progresshandler = WgetProgressHandler(d) > > logger.debug(2, "Fetching %s using command '%s'" % (ud.url, > command)) > bb.fetch2.check_network_access(d, command, ud.url) > -runfetchcmd(command + ' --progress=dot -v', d, quiet, > log=progresshandler) > +runfetchcmd(command + ' --progress=dot -v', d, quiet, > log=progresshandler, workdir=workdir) > > def download(self, ud, d): > """Fetch urls""" > @@ -422,17 +422,16 @@ class Wget(FetchMethod): > Run fetch checkstatus to get directory information > """ > f = tempfile.NamedTemporaryFile() > +with tempfile.TemporaryDirectory(prefix="wget-index-") as > workdir, tempfile.NamedTemporaryFile(dir=workdir, prefix="wget-listing-") > as f: > +agent = "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.12) > Gecko/20101027 Ubuntu/9.10 (karmic) Firefox/3.6.12" > +fetchcmd = self.basecmd > +fetchcmd += " -O " + f.name + " --user-agent='" + agent + "' > '" + uri + "'" > +try: > +self._runwget(ud, d, fetchcmd, True, workdir=workdir) > +fetchresult = f.read() > +except bb.fetch2.BBFetchException: > +fetchresult = "" > > -agent = "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.12) > Gecko/20101027 Ubuntu/9.10 (karmic) Firefox/3.6.12" > -fetchcmd = self.basecmd > -fetchcmd += " -O " + f.name + " --user-agent='" + agent + "' '" > + uri + "'" > -try: > -self._runwget(ud, d, fetchcmd, True) > -fetchresult = f.read() > -except bb.fetch2.BBFetchException: > -fetchresult = "" > - > -f.close() > return fetchresult > > def _check_latest_version(self, url, package, package_regex, > current_version, ud, d): > -- > 2.11.0 > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/3] elfutils: use HTTP instead of FTP to fetch
FTP is inferiour to HTTP is all respects, so use the HTTP URL for the tarball. Signed-off-by: Ross Burton--- meta/recipes-devtools/elfutils/elfutils_0.168.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-devtools/elfutils/elfutils_0.168.bb b/meta/recipes-devtools/elfutils/elfutils_0.168.bb index c0a4f234020..0717616ec0a 100644 --- a/meta/recipes-devtools/elfutils/elfutils_0.168.bb +++ b/meta/recipes-devtools/elfutils/elfutils_0.168.bb @@ -5,7 +5,7 @@ LICENSE = "(GPLv3 & Elfutils-Exception)" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" DEPENDS = "libtool bzip2 zlib virtual/libintl" DEPENDS_append_libc-musl = " argp-standalone fts " -SRC_URI = "ftp://sourceware.org/pub/elfutils/${PV}/${BP}.tar.bz2; +SRC_URI = "https://sourceware.org/elfutils/ftp/${PV}/${BP}.tar.bz2; SRC_URI[md5sum] = "52adfa40758d0d39e5d5c57689bf38d6" SRC_URI[sha256sum] = "b88d07893ba1373c7dd69a7855974706d05377766568a7d9002706d5de72c276" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/3] libpng: use SourceForge mirror
The Gentoo mirror also deletes old versions when they're not used, so revert back to the canonical SourceForge site, adding /older-releases/ to MIRRORS to handle new releases moving the version we want. Original idea by Maxin B. John. Signed-off-by: Ross Burton --- meta/recipes-multimedia/libpng/libpng_1.6.29.bb | 7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/meta/recipes-multimedia/libpng/libpng_1.6.29.bb b/meta/recipes-multimedia/libpng/libpng_1.6.29.bb index 8a3056e1a39..be327caaffc 100644 --- a/meta/recipes-multimedia/libpng/libpng_1.6.29.bb +++ b/meta/recipes-multimedia/libpng/libpng_1.6.29.bb @@ -6,11 +6,14 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=f9acafc1325f8f8da80aeee94dbc1bda \ file://png.h;endline=144;md5=0b2aa20c7ff55d9411108317df8ff0c9" DEPENDS = "zlib" -SRC_URI = "${GENTOO_MIRROR}/libpng-${PV}.tar.xz \ - " +LIBV = "16" + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/${PV}/${BP}.tar.xz" SRC_URI[md5sum] = "3245dbd76ea91e1437507357b858ec97" SRC_URI[sha256sum] = "4245b684e8fe829ebb76186327bb37ce5a639938b219882b53d64bd3cfc5f239" +MIRRORS += "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}${LIBV}/older-releases/${PV}" + BINCONFIG = "${bindir}/libpng-config ${bindir}/libpng16-config" inherit autotools binconfig-disabled pkgconfig -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 3/3] fetch/wget: mitigate a wget race condition when listing FTP directories
When wget is fetching a listing for a directory over FTP it writes to a temporary file called .listing in the current directory. If there are many such operations happening in parallel - for example during 'bitbake world -c checkpkg' - then up to BB_NUMBER_THREADS instances of wget will be racing to write to, read, and delete the same file. This results in various failures such as the file disappearing before wget has processed it or the file changing contents, which causes checkpkg to randomly fail. Mitigate the race condition by creating a temporary directory to run wget in when doing directory listings. [ YOCTO #11828 ] Signed-off-by: Ross Burton--- bitbake/lib/bb/fetch2/wget.py | 23 +++ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/bitbake/lib/bb/fetch2/wget.py b/bitbake/lib/bb/fetch2/wget.py index 208ee9bdd69..8ee9769d39b 100644 --- a/bitbake/lib/bb/fetch2/wget.py +++ b/bitbake/lib/bb/fetch2/wget.py @@ -90,13 +90,13 @@ class Wget(FetchMethod): self.basecmd = d.getVar("FETCHCMD_wget") or "/usr/bin/env wget -t 2 -T 30 --passive-ftp --no-check-certificate" -def _runwget(self, ud, d, command, quiet): +def _runwget(self, ud, d, command, quiet, workdir=None): progresshandler = WgetProgressHandler(d) logger.debug(2, "Fetching %s using command '%s'" % (ud.url, command)) bb.fetch2.check_network_access(d, command, ud.url) -runfetchcmd(command + ' --progress=dot -v', d, quiet, log=progresshandler) +runfetchcmd(command + ' --progress=dot -v', d, quiet, log=progresshandler, workdir=workdir) def download(self, ud, d): """Fetch urls""" @@ -422,17 +422,16 @@ class Wget(FetchMethod): Run fetch checkstatus to get directory information """ f = tempfile.NamedTemporaryFile() +with tempfile.TemporaryDirectory(prefix="wget-index-") as workdir, tempfile.NamedTemporaryFile(dir=workdir, prefix="wget-listing-") as f: +agent = "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.12) Gecko/20101027 Ubuntu/9.10 (karmic) Firefox/3.6.12" +fetchcmd = self.basecmd +fetchcmd += " -O " + f.name + " --user-agent='" + agent + "' '" + uri + "'" +try: +self._runwget(ud, d, fetchcmd, True, workdir=workdir) +fetchresult = f.read() +except bb.fetch2.BBFetchException: +fetchresult = "" -agent = "Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.12) Gecko/20101027 Ubuntu/9.10 (karmic) Firefox/3.6.12" -fetchcmd = self.basecmd -fetchcmd += " -O " + f.name + " --user-agent='" + agent + "' '" + uri + "'" -try: -self._runwget(ud, d, fetchcmd, True) -fetchresult = f.read() -except bb.fetch2.BBFetchException: -fetchresult = "" - -f.close() return fetchresult def _check_latest_version(self, url, package, package_regex, current_version, ud, d): -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v3] dkms: Add new recipe for supporting dkms
Dkms is a tool used to compile out of tree modules directly on target devices (sometimes you have sources or binaries which need to be compiled directly on target, outside OE). I used a simple module and a dkms config to test it, and dkms compiled and installed the module on target. For example: . ├── dkms.conf └── src ├── hello.c └── Makefile hello.c: #include int init_module(void) { printk("Hello World!\n"); return 0; } void cleanup_module(void) { printk("Goodbye Cruel World!\n"); } MODULE_LICENSE("GPL"); Makefile: obj-m += hello.o KERNELDIR ?= /lib/modules/$(shell uname -r)/build PWD := $(shell pwd) install: $(MAKE) -C $(KERNELDIR) M=$(PWD) modules clean: rm -rf *.o *.ko *~ core .depend .*.cmd *.mod.c modules.order Module.symvers dkms.conf: MAKE="make -C src/ KERNELDIR=/lib/modules/${kernelver}/build" CLEAN="make -C src/ clean" BUILT_MODULE_NAME=hello DEST_MODULE_LOCATION=/kernel/drivers/scsi BUILT_MODULE_LOCATION=src/ PACKAGE_NAME=hello PACKAGE_VERSION=0.1 AUTOINSTALL=yes REMAKE_INITRD=yes All files should be in /usr/src/-, in our case in /urs/src/hello-0.1. Signed-off-by: Alexandru Vasiu--- meta/recipes-kernel/dkms/dkms_2.4.0.bb | 12 1 file changed, 12 insertions(+) create mode 100644 meta/recipes-kernel/dkms/dkms_2.4.0.bb diff --git a/meta/recipes-kernel/dkms/dkms_2.4.0.bb b/meta/recipes-kernel/dkms/dkms_2.4.0.bb new file mode 100644 index 00..bb21a959d6 --- /dev/null +++ b/meta/recipes-kernel/dkms/dkms_2.4.0.bb @@ -0,0 +1,12 @@ +SUMMARY = "DKMS Recipe - Adds DKMS tool for target" +HOMEPAGE = "https://github.com/dell/dkms/; +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3" + +SRC_URI = "https://github.com/dell/${PN}/archive/v${PV}.tar.gz; + +SRC_URI[md5sum] = "d2e74dd79086c564a924b5763794091b" + +RDEPENDS_${PN} += "bash kmod gcc make patch kernel-dev" + +inherit autotools-brokensep -- 2.13.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 1/1] wic-tools: ensure pseudo is available
wic will attempt to use pseudo from the wic-tools sysroot to run, but it was only sure to be in there if do_install had executed - which is not the case if it had been restored from sstate, in which case it failed horribly as seen when running the wic.Wic.test_fs_types and test_mkfs_extraopts tests on the Yocto Project autobuilder recently. Add an explicit dependency on pseudo-native to ensure it's always there. Signed-off-by: Paul Eggleton--- meta/recipes-core/meta/wic-tools.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta/recipes-core/meta/wic-tools.bb b/meta/recipes-core/meta/wic-tools.bb index c416a2e..d908e48 100644 --- a/meta/recipes-core/meta/wic-tools.bb +++ b/meta/recipes-core/meta/wic-tools.bb @@ -5,7 +5,7 @@ LICENSE = "MIT" DEPENDS = "\ parted-native syslinux-native gptfdisk-native dosfstools-native \ mtools-native bmap-tools-native grub-efi-native cdrtools-native \ - btrfs-tools-native squashfs-tools-native \ + btrfs-tools-native squashfs-tools-native pseudo-native \ " DEPENDS_append_x86 = " syslinux grub-efi systemd-boot" DEPENDS_append_x86-64 = " syslinux grub-efi systemd-boot" -- 2.9.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 0/1] wic-tools: ensure pseudo is available
The following changes since commit d3a41fbd94462efc8c6f1b55f6fb54001b447c45: linux-yocto: only suggest default kernel type (2017-07-24 09:12:28 +0100) are available in the git repository at: git://git.openembedded.org/openembedded-core-contrib paule/wic-pseudo http://cgit.openembedded.org/openembedded-core-contrib/log/?h=paule/wic-pseudo Paul Eggleton (1): wic-tools: ensure pseudo is available meta/recipes-core/meta/wic-tools.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.4 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH v2] debianutils: set higher priority than busybox for run-parts
From: Jackie Huangdebianutils-run-parts should have higher priority than busybox (which is 50), so set the priority to 60 for debianutils-run-parts. Signed-off-by: Jackie Huang --- meta/recipes-support/debianutils/debianutils_4.8.1.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/debianutils/debianutils_4.8.1.1.bb b/meta/recipes-support/debianutils/debianutils_4.8.1.1.bb index 23f842102b5..d41bf98f895 100644 --- a/meta/recipes-support/debianutils/debianutils_4.8.1.1.bb +++ b/meta/recipes-support/debianutils/debianutils_4.8.1.1.bb @@ -37,6 +37,8 @@ RDEPENDS_${PN} += "${PN}-run-parts" ALTERNATIVE_PRIORITY="30" ALTERNATIVE_${PN} = "add-shell installkernel remove-shell savelog tempfile which" + +ALTERNATIVE_PRIORITY_${PN}-run-parts = "60" ALTERNATIVE_${PN}-run-parts = "run-parts" ALTERNATIVE_${PN}-doc = "which.1" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH] debianutils: set higher priority than busybox for run-parts
I will rebase and send v2 since debianutils is already updated to 4.8.1.1 Thanks, Jackie > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of > jackie.hu...@windriver.com > Sent: Tuesday, July 25, 2017 16:06 > To: openembedded-core@lists.openembedded.org > Subject: [OE-core] [PATCH] debianutils: set higher priority than busybox for > run- > parts > > From: Jackie Huang> > debianutils-run-parts should have higher priority than > busybox (which is 50), so set the priority to 60 for > debianutils-run-parts. > > Signed-off-by: Jackie Huang > --- > meta/recipes-support/debianutils/debianutils_4.8.1.bb | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/meta/recipes-support/debianutils/debianutils_4.8.1.bb > b/meta/recipes-support/debianutils/debianutils_4.8.1.bb > index 54c345ea25..0529a50983 100644 > --- a/meta/recipes-support/debianutils/debianutils_4.8.1.bb > +++ b/meta/recipes-support/debianutils/debianutils_4.8.1.bb > @@ -38,6 +38,8 @@ RDEPENDS_${PN} += "${PN}-run-parts" > > ALTERNATIVE_PRIORITY="30" > ALTERNATIVE_${PN} = "add-shell installkernel remove-shell savelog tempfile > which" > + > +ALTERNATIVE_PRIORITY_${PN}-run-parts = "60" > ALTERNATIVE_${PN}-run-parts = "run-parts" > > ALTERNATIVE_${PN}-doc = "which.1" > -- > 2.11.0 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH 2/2] webkitgtk: Do not use -isystem forcibly
this causes include_next to not find this header since -isystem is added via cmake, we alrady are using --sysroot so rely on that Signed-off-by: Khem Raj--- ...bKitMacros-Append-to-I-and-not-to-isystem.patch | 170 + meta/recipes-sato/webkit/webkitgtk_2.16.5.bb | 1 + 2 files changed, 171 insertions(+) create mode 100644 meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch diff --git a/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch new file mode 100644 index 00..d6f0ce3cd6 --- /dev/null +++ b/meta/recipes-sato/webkit/webkitgtk/0001-WebKitMacros-Append-to-I-and-not-to-isystem.patch @@ -0,0 +1,170 @@ +From 53a00058184cd710c6f4375f4daab49d7e885a30 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 17 Apr 2016 12:35:41 -0700 +Subject: [PATCH] WebKitMacros: Append to -I and not to -isystem + +gcc-6 has now introduced stdlib.h in libstdc++ for better +compliance and its including the C library stdlib.h using +include_next which is sensitive to order of system header +include paths. Its infact better to not tinker with the +system header include paths at all. Since adding /usr/include +to -system is redundant and compiler knows about it moreover +now with gcc6 it interferes with compiler's functioning +and ends up with compile errors e.g. + +/usr/include/c++/6.0.0/cstdlib:75:25: fatal error: stdlib.h: No such file or directory + +Signed-off-by: Khem Raj +--- +Upstream-Status: Pending + + Source/cmake/WebKitMacros.cmake | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: webkitgtk-2.16.5/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt +=== +--- webkitgtk-2.16.5.orig/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt webkitgtk-2.16.5/Tools/DumpRenderTree/TestNetscapePlugIn/CMakeLists.txt +@@ -42,7 +42,7 @@ set(WebKitTestNetscapePlugIn_SYSTEM_INCL + ) + + include_directories(${WebKitTestNetscapePlugIn_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${WebKitTestNetscapePlugIn_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${WebKitTestNetscapePlugIn_SYSTEM_INCLUDE_DIRECTORIES}) + + set(WebKitTestNetscapePlugIn_LIBRARIES + ${X11_LIBRARIES} +Index: webkitgtk-2.16.5/Tools/ImageDiff/CMakeLists.txt +=== +--- webkitgtk-2.16.5.orig/Tools/ImageDiff/CMakeLists.txt webkitgtk-2.16.5/Tools/ImageDiff/CMakeLists.txt +@@ -9,6 +9,6 @@ set(IMAGE_DIFF_LIBRARIES + WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() + + include_directories(${IMAGE_DIFF_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${IMAGE_DIFF_SYSTEM_INCLUDE_DIRECTORIES}) + add_executable(ImageDiff ${IMAGE_DIFF_SOURCES}) + target_link_libraries(ImageDiff ${IMAGE_DIFF_LIBRARIES}) +Index: webkitgtk-2.16.5/Tools/MiniBrowser/gtk/CMakeLists.txt +=== +--- webkitgtk-2.16.5.orig/Tools/MiniBrowser/gtk/CMakeLists.txt webkitgtk-2.16.5/Tools/MiniBrowser/gtk/CMakeLists.txt +@@ -57,7 +57,7 @@ endif () + add_definitions(-DGDK_VERSION_MIN_REQUIRED=GDK_VERSION_3_6) + + include_directories(${MiniBrowser_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${MiniBrowser_SYSTEM_INCLUDE_DIRECTORIES}) + add_executable(MiniBrowser ${MiniBrowser_SOURCES}) + target_link_libraries(MiniBrowser ${MiniBrowser_LIBRARIES}) + +Index: webkitgtk-2.16.5/Tools/WebKitTestRunner/CMakeLists.txt +=== +--- webkitgtk-2.16.5.orig/Tools/WebKitTestRunner/CMakeLists.txt webkitgtk-2.16.5/Tools/WebKitTestRunner/CMakeLists.txt +@@ -106,7 +106,7 @@ GENERATE_BINDINGS(WebKitTestRunnerBindin + WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS() + + include_directories(${WebKitTestRunner_INCLUDE_DIRECTORIES}) +-include_directories(SYSTEM ${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) ++include_directories(${WebKitTestRunner_SYSTEM_INCLUDE_DIRECTORIES}) + + add_library(TestRunnerInjectedBundle SHARED ${WebKitTestRunnerInjectedBundle_SOURCES}) + target_link_libraries(TestRunnerInjectedBundle ${WebKitTestRunner_LIBRARIES}) +Index: webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake +=== +--- webkitgtk-2.16.5.orig/Source/WebCore/PlatformGTK.cmake webkitgtk-2.16.5/Source/WebCore/PlatformGTK.cmake +@@ -321,7 +321,7 @@ if (ENABLE_PLUGIN_PROCESS_GTK2) + ${GTK2_INCLUDE_DIRS} + ${GDK2_INCLUDE_DIRS} + ) +-target_include_directories(WebCorePlatformGTK2 SYSTEM PRIVATE ++target_include_directories(WebCorePlatformGTK2 PRIVATE +
[OE-core] [PATCH 1/2] python3-pycairo: Pass -fPIC via CFLAGS
Fixes | /mnt/a/oe/build/tmp/work/corei7-64-bec-linux/python3-pycairo/1.10.0-r2/recipe-sysroot-native/usr/bin/x86_64-bec-linu x/x86_64-bec-linux-ld: src/cairomodule.c.1.o: relocation R_X86_64_PC32 against symbol `CairoError' can not be used whe n making a shared object; recompile with -fPIC Signed-off-by: Khem Raj--- meta/recipes-devtools/python/python3-pycairo_1.10.0.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-devtools/python/python3-pycairo_1.10.0.bb b/meta/recipes-devtools/python/python3-pycairo_1.10.0.bb index f9031b3bca..9258ba11c7 100644 --- a/meta/recipes-devtools/python/python3-pycairo_1.10.0.bb +++ b/meta/recipes-devtools/python/python3-pycairo_1.10.0.bb @@ -19,6 +19,8 @@ S = "${WORKDIR}/pycairo-${PV}" inherit distutils3 pkgconfig +CFLAGS += "-fPIC" + BBCLASSEXTEND = "native" do_configure() { -- 2.13.3 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] ✗ patchtest: failure for debianutils: set higher priority than busybox for run-parts
== Series Details == Series: debianutils: set higher priority than busybox for run-parts Revision: 1 URL : https://patchwork.openembedded.org/series/7917/ State : failure == Summary == Thank you for submitting this patch series to OpenEmbedded Core. This is an automated response. Several tests have been executed on the proposed series by patchtest resulting in the following failures: * Issue Series does not apply on top of target branch [test_series_merge_on_head] Suggested fixRebase your series on top of targeted branch Targeted branch master (currently at d3a41fbd94) If you believe any of these test results are incorrect, please reply to the mailing list (openembedded-core@lists.openembedded.org) raising your concerns. Otherwise we would appreciate you correcting the issues and submitting a new version of the patchset if applicable. Please ensure you add/increment the version number when sending the new version (i.e. [PATCH] -> [PATCH v2] -> [PATCH v3] -> ...). --- Test framework: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest Test suite: http://git.yoctoproject.org/cgit/cgit.cgi/patchtest-oe -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH V2] tclibc-musl.inc: fix bfd "cannot make copy relocation for protected symbol" issues
Hi, Burton: I also agree with you, your suggestion is better. Hi, Khem: But is this a bug of binutils? Or musl libc? Since I had only observed this error with musl libc only, it did not occur with glibc. //Ming Liu 2017-07-24 15:39 GMT+02:00 Khem Raj: > On Mon, Jul 24, 2017 at 6:18 AM, Burton, Ross > wrote: > > If we're going to silently change the linker to bfd under musl if > ld-is-gold > > is selected, wouldn't it be better just to throw an exception if both > musl > > and ld-is-gold are selected? Better to tell the user so they can not do > > that than silently ignore what they asked. > > yes, that would be better but I am skeptical of disabling it > completely, we should > create testcase and report it to binutils bugzilla > > > > > > Ross > > > > On 22 July 2017 at 14:30, wrote: > >> > >> From: Ming Liu > >> > >> Quite a few such compiling issues were found when I was building with > >> following configs: > >> ... > >> MACHINE = "beaglebone" > >> TCLIBC = "musl" > >> DISTRO_FEATURES_append = " ld-is-gold" > >> ... > >> > >> fixed by adding bfd binding now ldflags. > >> > >> Signed-off-by: Ming Liu > >> --- > >> meta/conf/distro/include/tclibc-musl.inc | 4 > >> 1 file changed, 4 insertions(+) > >> > >> diff --git a/meta/conf/distro/include/tclibc-musl.inc > >> b/meta/conf/distro/include/tclibc-musl.inc > >> index 3d3f6ac..99d52a1 100644 > >> --- a/meta/conf/distro/include/tclibc-musl.inc > >> +++ b/meta/conf/distro/include/tclibc-musl.inc > >> @@ -18,6 +18,10 @@ PREFERRED_PROVIDER_virtual/nativesdk-libiconv ?= > >> "nativesdk-glibc" > >> > >> CXXFLAGS += "-fvisibility-inlines-hidden" > >> > >> +# Workaround for musl libc does not support bfd lazy binding well > >> +# Refer to: https://bugzilla.yoctoproject.org/show_bug.cgi?id=11679 > >> +LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'ld-is-gold', > >> '-Wl,-z,relro,-z,now -fuse-ld=bfd', '', d)}" > >> + > >> IMAGE_LINGUAS = "" > >> > >> LIBC_DEPENDENCIES = "\ > >> -- > >> 2.7.4 > >> > > > > > > -- > > ___ > > Openembedded-core mailing list > > Openembedded-core@lists.openembedded.org > > http://lists.openembedded.org/mailman/listinfo/openembedded-core > > > -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
[OE-core] [PATCH] debianutils: set higher priority than busybox for run-parts
From: Jackie Huangdebianutils-run-parts should have higher priority than busybox (which is 50), so set the priority to 60 for debianutils-run-parts. Signed-off-by: Jackie Huang --- meta/recipes-support/debianutils/debianutils_4.8.1.bb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta/recipes-support/debianutils/debianutils_4.8.1.bb b/meta/recipes-support/debianutils/debianutils_4.8.1.bb index 54c345ea25..0529a50983 100644 --- a/meta/recipes-support/debianutils/debianutils_4.8.1.bb +++ b/meta/recipes-support/debianutils/debianutils_4.8.1.bb @@ -38,6 +38,8 @@ RDEPENDS_${PN} += "${PN}-run-parts" ALTERNATIVE_PRIORITY="30" ALTERNATIVE_${PN} = "add-shell installkernel remove-shell savelog tempfile which" + +ALTERNATIVE_PRIORITY_${PN}-run-parts = "60" ALTERNATIVE_${PN}-run-parts = "run-parts" ALTERNATIVE_${PN}-doc = "which.1" -- 2.11.0 -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core
Re: [OE-core] [PATCH 1/2] ncurses: add SYSROOT_DESTDIR for siteconfig_gencache
> > > > > > > > > On 31 May 2017 at 09:27,wrote: > > > +EXTRASITECONFIG = "CFLAGS='${CFLAGS} - > > I${SYSROOT_DESTDIR}${includedir}'" > > > > > > Why is this ncurses specific, it sounds like something which will impact > > > all > users > > of siteconfig? > > Ping. > > Is my explanation clear enough? What's the suggestion if it's not acceptable? Ping. Thanks, Jackie > > Thanks, > Jackie > > > > > My original issue is not ncurses specific, that is: > > After switching to RSS, the siteconfig cache files in ACLOCALDIR setup by > > autotools.bbclass was dropped, so searching > > the path ACLOCALDIR for siteconfig files ended up with nothing, which caused > > some package (like openhpi) fail to configure, > > so the "PATCH 2/2" change it back to search SITECONFIG_SYSROOTCACHE. > > > > But I met the second issue after the that: > > util-linux depends on ncurses but the siteinfo in ncurses_config which is > > populated to SITECONFIG_SYSROOTCACHE is not correct: > > ac_cv_header_curses_h=${ac_cv_header_curses_h=no} > > ac_cv_header_ncurses_h=${ac_cv_header_ncurses_h=no} > > > > then it fails to build (it should be the same issue for other package that > > depend > > on ncurses), so this patch is needed. > > And the patch will only impact the packages that depend on ncurses, for > > those > > without dependency on ncurses, there > > is no ncurses_config at all in their own recipe-sysroot. > > > > Thanks, > > Jackie > > > > > > > > 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
Re: [OE-core] [PATCH 0/2] rootfs-postcommands: split ssh_allow_empty_password
Ping. > -Original Message- > From: openembedded-core-boun...@lists.openembedded.org > [mailto:openembedded-core-boun...@lists.openembedded.org] On Behalf Of > jackie.hu...@windriver.com > Sent: Friday, June 30, 2017 14:30 > To: openembedded-core@lists.openembedded.org > Subject: [OE-core] [PATCH 0/2] rootfs-postcommands: split > ssh_allow_empty_password > > From: Jackie Huang> > -- > The following changes since commit > de7914954571ea8e717f56b6d6df13157b0973bc: > > scripts/contrib/patchreview: add new script (2017-06-29 13:01:32 +0100) > > are available in the git repository at: > > git://git.pokylinux.org/poky-contrib.git jhuang0/d_ssh-allow-empty_170630_0 > http://git.pokylinux.org/cgit.cgi//log/?h=jhuang0/d_ssh-allow- > empty_170630_0 > > Jackie Huang (2): > dropbear: add default config file to disable root login > rootfs-postcommands: split ssh_allow_empty_password > > meta/classes/image.bbclass | 2 +- > meta/classes/rootfs-postcommands.bbclass | 25 +++- > -- > meta/recipes-core/dropbear/dropbear.inc| 3 +++ > .../dropbear/dropbear/dropbear.default | 2 ++ > 4 files changed, 28 insertions(+), 4 deletions(-) > create mode 100644 meta/recipes-core/dropbear/dropbear/dropbear.default > > -- > 2.11.0 > > -- > ___ > Openembedded-core mailing list > Openembedded-core@lists.openembedded.org > http://lists.openembedded.org/mailman/listinfo/openembedded-core -- ___ Openembedded-core mailing list Openembedded-core@lists.openembedded.org http://lists.openembedded.org/mailman/listinfo/openembedded-core