summaryrefslogtreecommitdiffstats
path: root/scripts
Commit message (Collapse)AuthorAgeFilesLines
* multilib_header: Update wrapper to handle arm 32/64 bitRichard Purdie2017-03-311-10/+16
| | | | | | | | | | | | | Having arm 32/64 bit headers coexisting turns out to be tricky. Unfortunately our wrapper works using wordsize.h and this differs on arm so we can't use it. Therefore replicate the logic here for arm. I did look into writing our own wordsize.h but we also need to remap kernel headers on arm and since wordsize.h comes from libc, that doesn't work for kernel headers. (From OE-Core rev: 141dc7136c9c62da1d30132df4b3244fe6d8898d) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/lib/compatlayer: detect_layers always use realpath'sAníbal Limón2017-03-311-0/+1
| | | | | | | | | | | | If you are using relative paths and change to other folder for execution it will fail, so use realpaths always. [YOCTO #11164] (From OE-Core rev: 14283700f8ec9dcb29cbc00c92d76173f1601bf5) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* sysroot-relativelinks: also consider links to dirs on the hostChristopher Larson2017-03-291-1/+1
| | | | | | | | | | | | | | | Dead symlinks, or symlinks to existing files will show up in 'files' of an os.walk, but symlinks to existing directories show up in 'dirs', so we need to consider both. As one example where this is an issue, the symlink from /usr/lib/ssl/certs was left pointing to /etc/ssl/certs rather than the relative path when the sdk was built on hosts where the latter exists. (From OE-Core rev: c5b522378fff13962a5187d9d09979866f805cb5) Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* update_gio_module_cache: fix host user contaminationAbdur Rehman2017-03-291-0/+2
| | | | | | | | | | | | | | update_gio_module_cache intercept creates file: $D${libdir}/gio/modules/giomodule.cache Change ownership of this file to root:root to avoid user contamination by host. (From OE-Core rev: 9a23af37ad11a7176248ade88511f34fe6dd97bb) Signed-off-by: Abdur Rehman <abdur_rehman@mentor.com> Signed-off-by: Christopher Larson <chris_larson@mentor.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/yocto-compat-layer.py: Add dependency validation in add_layerAníbal Limón2017-03-291-1/+5
| | | | | | | | | | Some layers don't have dependencies so add a validation to avoid exception when trying to None.split(). (From OE-Core rev: 39103285029a0bb7b64dc5a305c484988b4c651a) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* recipes-kernel: Skip kernel version check on kernel templatesLeonardo Sandoval2017-03-2856-1/+113
| | | | | | | | | | | | | | | | | | Currently, SRCREV is set to AUTOREV, causing mismatch between PV and the kernel version shown in the makefile (see below to see the bitbake log). The solution is to skip this check, suggesting to remove it once SRCREV is locked. ERROR: linux-yocto-4.10+gitAUTOINC+01f18cba44_53be19cad6-r0.1 do_kernel_version_sanity_check: Package Version (4.10+gitAUTOINC+01f18cba44_53be19cad6) does not match of kernel being built (4.10.5). Please update the PV variable to match the kernel source or set KERNEL_VERSION_SANITY_SKIP="1" in your recipe. ERROR: linux-yocto-4.10+gitAUTOINC+01f18cba44_53be19cad6-r0.1 do_kernel_version_sanity_check: Function failed: do_kernel_version_sanity_check (log file is located at /home/lsandov1/poky2/build/tmp/work/myqemu-poky-linux/linux-yocto/4.10+gitAUTOINC+01f18cba44_53be19cad6-r0.1/temp/log.do_kernel_version_sanity_check.26904) ERROR: Logfile of failure stored in: /home/lsandov1/poky2/build/tmp/work/myqemu-poky-linux/linux-yocto/4.10+gitAUTOINC+01f18cba44_53be19cad6-r0.1/temp/log.do_kernel_version_sanity_check.26904 ERROR: Task (/home/lsandov1/poky2/meta/recipes-kernel/linux/linux-yocto_4.10.bb:do_kernel_version_sanity_check) failed with exit code '1 [YOCTO #11064] (From meta-yocto rev: 79bfd911f826c6c7e26827bb200dd69e6f567b17) Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: open kconfig fragment in binary modeStephano Cetola2017-03-281-1/+1
| | | | | | | | | | | | | | When devtool writes to the kconfig fragment, it writes the output of the diff command returned from pipe.communicate(). This function returns binary objects. We should open the kconfig fragment file in binary mode if we expect to write binary objects to it. [YOCTO #11171] (From OE-Core rev: 72bec63ab0e78753fb6ed1794d11beef9485c014) Signed-off-by: Stephano Cetola <stephano.cetola@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: fix generation of partition UUIDEd Bartosh2017-03-271-1/+1
| | | | | | | | | | | | | | | | | Partition UUID for msdos partitioning is based on a 4 bytes long system identifier. Wic uses random number to generate system identifier. For the numbers starting with 0 partition uuid is shorter, which makes wic images non-bootable as kernel expects 8 charactest in PARTUUID parameter. Padded system identifier with '0' when generating partition UUID to make it always 8 characters long. This should fix the boot issue. (From OE-Core rev: bdaba95af2b2c9174311374436f184d2a927f6f1) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/contrib: scripts that updates kernel templatesLeonardo Sandoval2017-03-271-0/+60
| | | | | | | | | | | | Updating the kernel templates (those use by the yocto-bsp script) is a mechanical process (and prone to errors) which consists of copying latest kernel template then applying string replacements from old to new kernel version. This script collects these commands allowing quick updates in the future. (From meta-yocto rev: 450313d9d8bb1e728ed5a7208decd30f50633be1) Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/lib/bsp/substrate: kernel templates for 4.10Leonardo Sandoval2017-03-2721-14/+527
| | | | | | | | | | | New set of templates that target the 4.10 kernel version. [YOCTO #11174] (From meta-yocto rev: 8a11b0cc2a1bfaab25200c251b301c812141ba58) Signed-off-by: Leonardo Sandoval <leonardo.sandoval.gonzalez@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/wic: fix typoRobert Yang2017-03-271-2/+2
| | | | | | | | | roofs -> rootfs (From OE-Core rev: 131629ca6238ea0596f5dd11d659ce2ca63067a4) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* build-perf-test-wrapper.sh: store buildstats under git-notesMarkus Lehtonen2017-03-271-0/+2
| | | | | | | | | | | | | | In order to dramatically reduce the data footprint of the result branches. This makes cloning/pulling result repositories a lot faster. Buildstats can still be accessed, when needed by doing git fetch refs/notes/buildstats/*:refs/notes/buildstats/* [YOCTO #10582] (From OE-Core rev: 5b52bbf09bb2fbec9d2d54f3c3c46c74a09fbfd0) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/oe-git-archive: implement --notesMarkus Lehtonen2017-03-271-3/+18
| | | | | | | | | | | Option for adding git-notes to the commit. [YOCTO #10582] (From OE-Core rev: 0ef7c143262a441c38235ea71832ca7714ce4a35) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/oe-git-archive: implement --excludeMarkus Lehtonen2017-03-271-2/+10
| | | | | | | | | | | May be used for excluding certain files from the commit. [YOCTO #10582] (From OE-Core rev: fd125cf694bebefbe9a98fd1bb199d6ca472dad5) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/oe-git-archive: fix pushingMarkus Lehtonen2017-03-271-2/+3
| | | | | | | | | Git arguments were badly laid out. (From OE-Core rev: cea9c1380891a85f686cb3b5cb42b6166f38e8d5) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* oe-build-perf-test: pack all buildstat in one fileMarkus Lehtonen2017-03-271-0/+1
| | | | | | | | | | | | | | | | Write out all buildstats into one big json file, instead of using multiple per-measurement files. Individual buildstats will be indexed using "<test_name>.<measurement_name>" as the key. Also, changes the per-testcase working directories into temporary directories that will be removed after test execution as there are no more per-testcase data files to store permanently. [YOCTO #10582] (From OE-Core rev: a7f2e8915db379021f3409ca640de5d3b054a830) Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: use kernel_dir to find systemd-efi bootloaderEd Bartosh2017-03-241-1/+1
| | | | | | | | | | | | | | Fixed test failure caused by using bootimg_dir path instead of kernel_dir to find systemd-efi bootloader: FAIL: test_systemd_bootdisk (oeqa.selftest.wic.Wic) ... FileNotFoundError: [Errno 2] No such file or directory: 'tmp/work/qemux86_64-poky-linux/core-image-minimal/1.0-r0/recipe-sysroot/usr/share' (From OE-Core rev: 552bd782d9ffe275b8fc7d7cb0b9aaceb51888c3) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqemu-gen-tapdevs: fix file path in exampleChen Qi2017-03-241-2/+2
| | | | | | | | | | | Fix the path in example so that '/usr/bin/tunctl' could be found under this path. (From OE-Core rev: d1b8e1460b25018ac8f65d3647bc736f3393ed3e) Signed-off-by: Chen Qi <Qi.Chen@windriver.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: improve getting syslinux pathEd Bartosh2017-03-231-24/+27
| | | | | | | | | | Used wic-tools STAGING_DATADIR if syslinux can't be found in default bootimg_dir. (From OE-Core rev: 79a935cfc86ffce6f4b4f328b90337de36ba6dbb) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: remove empty plugin methodsEd Bartosh2017-03-233-58/+0
| | | | | | | | | | | | | Removed do_install_disk and do_configure_partition methods from bootimage-partition, fsimage and rawcopy plugins as they're empy and not used. [YOCTO #10618] (From OE-Core rev: d58c8ef2836418056f776a9586e0bb0d33afb788) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: use STAGING_DATADIR as a default for bootimg_dirEd Bartosh2017-03-231-2/+1
| | | | | | | | | | | | Default value for bootimg_dir was not set in main wic script unlike the rest of artifacts: kernel_dir, roofts_dir and native_sysroot. Set it to the value of STAGING_DATADIR for consistency and to avoid confusion of wic plugin developers. (From OE-Core rev: afc486b6316f1118c8dcc74a5e217bb217dd1f85) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: fix bug in sparse_copyEd Bartosh2017-03-231-0/+1
| | | | | | | | | | | | | | sparse_copy creates output file that is smaller than input file when input file ends with unmapped blocks. Used truncate(<input file size>) when output file is created to ensure the size of output file will always be equal to the size of input file. (From OE-Core rev: 567186f995302a095a771baede4ff5034d1d1862) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: use kernel_dir instead of bootimg_dirEd Bartosh2017-03-233-18/+18
| | | | | | | | | | | | | | | bootimg_dir is usually set to the value of STAGING_DATADIR and kernel_dir - to the value of DEPLOY_DIR_IMAGE, so usage of kernel_dir is more logical in bootimg-efi, bootimg-partition and rawcopy plugins. Replaced usage of bootimg_dir to kernel_dir in 3 above mentioned plugins that use DEPLOY_DIR_IMAGE as a default artifact location. (From OE-Core rev: 48a5d67d7cafdeac821e6f35bea380521ef017d5) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: don't set creator.bootimg_dir in pluginsEd Bartosh2017-03-232-4/+0
| | | | | | | | | | | Changing bootimg_dir in plugins is a dangerous hack as this value comes from wic command line and can be used by multiple plugins. (From OE-Core rev: 2457ea5338f7309316b474562b4723e8cb09286d) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: remove rootfs_pcbios_ext pluginEd Bartosh2017-03-231-213/+0
| | | | | | | | | Removed broken unused plugin. (From OE-Core rev: 6d162118a2567ccbcdbc2a9ca14a8c358fa1a055) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/yocto-compat-layer.py: Handle layer dependencies when testAníbal Limón2017-03-222-9/+41
| | | | | | | | | | | | If some layer depends on other tries to find layer dependency, if the layer dependency isn't found avoid to test the layer and notice the user. (From OE-Core rev: 1e7cf9bb71521f1632dd2e6b01fe7fcc95732983) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/yocto-compat-layer.py: Add option to disable layer autodiscoveryAníbal Limón2017-03-222-6/+15
| | | | | | | | | | | | Sometimes there is a need to only analyze the layer specified by the command line, the new option -n will disable autodiscovery of layers and only will try to test specified layers. (From OE-Core rev: f2f6f0c938226802163698ef14a8a9103da362a0) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/lib/compatlayer: Remove require of meta- in layer dir nameAníbal Limón2017-03-221-1/+1
| | | | | | | | | | | The layers isn't required to have a dirctory name start with meta- so remove the validation. (From OE-Core rev: 576c6486f547b1d7422cdd12f688aef74ee632ae) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/compatlayer: Add exclude of meta-world-pkgdata on get_signaturesAníbal Limón2017-03-221-0/+14
| | | | | | | | | | | | | The meta-world-pkgdata recipe can be modified when a layer is added may be can add recipes to world target, so exclude by default. [YOCTO #11162] (From OE-Core rev: cde30d70b04eb66bff66a351ddf733022e98ddab) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/yocto-compat-layer.py: Make output log argument optionalAníbal Limón2017-03-221-12/+5
| | | | | | | | | | | | | | Only create a log file when --output-log option is specified, since logger is dumping to stdout by default is better to let the user decide if a log needs to be created. [YOCTO #11160] (From OE-Core rev: f91ccdeb8b0b3e4063ed2bf22215a25f8902cbd9) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/yocto-compat-layer.py: Dump log to stdout instead of stderrAníbal Limón2017-03-221-1/+1
| | | | | | | | | | | | | The common unix tools uses stdout as standard for log output, by default python logging uses stderr if not stream is specified. [YOCTO #11160] (From OE-Core rev: 95ad04f7daed17bde5be5fc264f6c731fecfdfa9) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scriptutils: Add support for specify stream on logger_createAníbal Limón2017-03-221-2/+2
| | | | | | | | | | | | | It is a good idea to let the script to choose what stream wants to dump the logging output. [YOCTO #11160] (From OE-Core rev: 60c9b06f4085f6bddb6aa397a38bfc2ceb10f964) Signed-off-by: Aníbal Limón <anibal.limon@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: partition.py: Add fsck to avoid corrupt EXT file systemsDaniel Schultz2017-03-221-0/+3
| | | | | | | | | | | | | This patch avoids the creation of a corrupt EXT file system. Since there are no checks if a EXT file system was successfully created, this should add to prevent possible system failures. (From OE-Core rev: 95ac3d0637cad7e12f246b8bd64ab64348df0483) Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* gen-lockedsig-cache: catch os.link errorbrian avery2017-03-221-1/+5
| | | | | | | | | | | | We do a hard link to speed up sdk creation but if your sstate-cache is across a file system boundary, this tries and fails. This patch catches that error and does a copy instead. (From OE-Core rev: fb9fdd7a74917cdcab039aa3a9a9944b18246fea) Signed-off-by: brian avery <brian.avery@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool: tidy up handling of parse failuresPaul Eggleton2017-03-221-2/+9
| | | | | | | | | | | | Since the tinfoil2 refactoring, if an error occurred during parsing, we were showing a traceback and not correctly exiting (since we weren't calling shutdown()). Fix both of these issues. (From OE-Core rev: 18304036e1b513fd12c049dbf549ba75c503ed84) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic/partionedfs: Avoid reserving space for non-existing ext. partitionKristian Amlie2017-03-221-2/+6
| | | | | | | | | | | | We don't need the gap that the extended partition occupies if we already know that we have less than five partitions. Saves up to one full alignment of space. (From OE-Core rev: 485315dc170e29962a8848db38db73abafd0586e) Signed-off-by: Kristian Amlie <kristian.amlie@mender.io> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* devtool/recipetill: npm install of devDependenciesAnders Darander2017-03-223-5/+27
| | | | | | | | | | | | | | Web applications built using e.g. angular2, usually requires that the packages in devDependencies are available. Thus, add an option '--fetch-dev' to both devtool add and recipetool, to add npm packages in devDependencies to DEPENDS. (From OE-Core rev: f246f820d53b459596fde6758a09f7a0d7db7c4c) Signed-off-by: Anders Darander <anders@chargestorm.se> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqemu: output network configurationEd Bartosh2017-03-221-1/+3
| | | | | | | | | | | | | | | | | | | | runqemu adds network configuration parameters to the kernel command line to configure guest networking. This works only for the images that run with external kernel using qemu -kernel parameter. It doesn't work for the images that use bootloader to boot kernel as -kernel parameter is not used and network configuration is not possible to get. Added host and guest ip addresses and netmask of tap link to the runqemu output. This should allow external programs that execute runqemu to get network configuration. [YOCTO #10833] (From OE-Core rev: cf66a1850677548aa63a54276fa4917f40259daf) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqemu: only boot ramfs when specifiedRobert Yang2017-03-171-1/+9
| | | | | | | | | | | | | | | | This can fix a problem: IMAGE_FSTYPES += "iso" $ bitbake core-image-minimal $ runqemu qemux86 It may boot core-image-minimal-initramfs rather than core-image-minimal, this is not what we want usually. This patch makes it avoid booting ramfs when there are other choices, or when it is specified, for example, "runqemu qemux86 ramfs" (From OE-Core rev: 614bde6774f4dfd414066bbaf75ed422943e37ab) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqemu: add -h and --helpRobert Yang2017-03-161-2/+3
| | | | | | | | | | | | | | | | Fixed: $ runqemu -h runqemu - INFO - Assuming MACHINE = -h runqemu - INFO - Running MACHINE=-h bitbake -e... [snip] Exception: FSTYPE is NULL! [YOCTO #10941] (From OE-Core rev: 6b9dd7a589537b12da648be50298cf7d36461797) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqemu: improve when no machine specifiedRobert Yang2017-03-161-0/+6
| | | | | | | | | | | | | | | | | Fixed: $ runqemu core-image-minimal [snip] Exception: FSTYPE is NULL! [snip] Get DEPLOY_DIR_IMAGE from "bitbake -e" to make it work. [YOCTO #10471] (From OE-Core rev: ca551b72a020782f164703765b97156000b908d2) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqemu: independent network and rootfs setupJuro Bystricky2017-03-161-0/+4
| | | | | | | | | | | | | Presently, runqemu sets up rootfs as part of network setup. In case there is no network desired we will end up without rootfs as well. This patch sets up network and rootfs independently. It is also possible to bypass setup of rootfs if QB_ROOTFS is set to "none". (From OE-Core rev: 006ab8c6bcfe9d065c215cab15289357cefc9259) Signed-off-by: Juro Bystricky <juro.bystricky@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* yocto-compat-layer: improve error handling in signature creationPatrick Ohly2017-03-161-11/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When "bitbake -k -S none world" failed, the error printed by yocto-compat-layer.py contained the stack trace multiple times and did not contain the stderr output from bitbake, making the error hard to understand and debug: INFO: ====================================================================== INFO: ERROR: test_signatures (common.CommonCompatLayer) INFO: ---------------------------------------------------------------------- INFO: Traceback (most recent call last): File "/fast/work/poky/scripts/lib/compatlayer/__init__.py", line 144, in get_signatures stderr=subprocess.PIPE) File "/usr/lib/python3.4/subprocess.py", line 620, in check_output raise CalledProcessError(retcode, process.args, output=output) subprocess.CalledProcessError: Command 'bitbake -k -S none world' returned non-zero exit status 1 During handling of the above exception, another exception occurred: Traceback (most recent call last): File "/fast/work/poky/scripts/lib/compatlayer/cases/common.py", line 51, in test_signatures curr_sigs = get_signatures(self.td['builddir'], failsafe=True) File "/fast/work/poky/scripts/lib/compatlayer/__init__.py", line 149, in get_signatures raise RuntimeError(msg) RuntimeError: Traceback (most recent call last): File "/fast/work/poky/scripts/lib/compatlayer/__init__.py", line 144, in get_signatures stderr=subprocess.PIPE) File "/usr/lib/python3.4/subprocess.py", line 620, in check_output raise CalledProcessError(retcode, process.args, output=output) subprocess.CalledProcessError: Command 'bitbake -k -S none world' returned non-zero exit status 1 Loading cache...done. Loaded 1328 entries from dependency cache. NOTE: Resolving any missing task queue dependencies NOTE: Runtime target 'zlib-qat' is unbuildable, removing... Missing or unbuildable dependency chain was: ['zlib-qat'] ... Summary: There were 5 ERROR messages shown, returning a non-zero exit code. The yocto-compat-layer.log was incomplete, it only had the first part without the command output. stderr was missing due to stderr=subprocess.PIPE. Instead of the complicated try/except construct it's better to check the return code ourselves and raise just a single exception. The output (both on stderr and in the yocto-compat-layer.log) now is: INFO: ====================================================================== INFO: ERROR: test_signatures (common.CommonCompatLayer) INFO: ---------------------------------------------------------------------- INFO: Traceback (most recent call last): File "/fast/work/poky/scripts/lib/compatlayer/cases/common.py", line 51, in test_signatures curr_sigs = get_signatures(self.td['builddir'], failsafe=True) File "/fast/work/poky/scripts/lib/compatlayer/__init__.py", line 147, in get_signatures raise RuntimeError(msg) RuntimeError: Generating signatures failed. This might be due to some parse error and/or general layer incompatibilities. Command: bitbake -k -S none world Output: Loading cache...done. Loaded 1328 entries from dependency cache. NOTE: Resolving any missing task queue dependencies ERROR: Nothing PROVIDES 'qat16' (but /fast/work/meta-intel/common/recipes-extended/openssl-qat/openssl-qat_0.4.9-009.bb DEPENDS on or otherwise requires it) ERROR: qat16 was skipped: incompatible with machine qemux86 (not in COMPATIBLE_MACHINE) ... Missing or unbuildable dependency chain was: ['openssl-qat-dev'] ... Summary: There were 5 ERROR messages shown, returning a non-zero exit code. (From OE-Core rev: 5b9ac62ab535d2791b9713857e1016f49f53dd8d) Signed-off-by: Patrick Ohly <patrick.ohly@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/oe-setup-rpmrepo: replace createrepo with createrepo_cAlexander Kanavin2017-03-141-1/+1
| | | | | | | (From OE-Core rev: bab25f09d34a32301e483ff0700add1209809b14) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* scripts/rpm2cpio.sh: replace 5.x version with 4.x versionAlexander Kanavin2017-03-141-53/+55
| | | | | | | (From OE-Core rev: a7da1aade118d1ccf1b286f82556cd9f706bd2a4) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic/direct.py: Avoid exception if using multiple rawcopy/no-table entries.Kristian Amlie2017-03-111-1/+1
| | | | | | | | | | | | | | | | | If we are both having a bootloader and a U-Boot environment file, we can end up with two entries using "--source rawcopy" and "--no-table", and since they reuse the same file [1], their cleanup handlers will try to delete the same file twice. So make sure we only do it once. [1] Although they reuse the same file, the resulting output is correct, so it appears the file is accessed in properly sequential order. (From OE-Core rev: f1a3eac376c4600cdb128d870ad9b7e9d51ed9c0) Signed-off-by: Kristian Amlie <kristian.amlie@mender.io> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* runqemu-gen-tapdevs: Improve help text with an exampleRichard Purdie2017-03-101-0/+2
| | | | | | | | | Figuring how the correct commandline isn't trivial, improve the help text with RSS in mind. (From OE-Core rev: 056a9da9f3ac2bc175f19243b11864ca90eee28b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: filemap: Fixed spared_copy skipDaniel Schultz2017-03-101-3/+3
| | | | | | | | | | | | This patches removes the empty space in front of the copied file which was skipped. Without this reduction it's not possible to place a partition with rawcopy and skip parameter on a desired alignment. (From OE-Core rev: 5c024d71f9413b81ee1707dbc41f0721f8f27bdb) Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* wic: plugins: rawcopy: Fixed wrong variable typeDaniel Schultz2017-03-101-1/+1
| | | | | | | | | | | | | | | | | Without the int() function this variable will be a string. This will led to a error in Filemap on line 545 due wrong types. > [...] > File > ".../poky/scripts/lib/wic/filemap.py", line 545, in sparse_copy > if start < skip < end: > TypeError: unorderable types: int() < str() (From OE-Core rev: 46b5814bcdc0e7e3cb293e877e2aa949baf5fef8) Signed-off-by: Daniel Schultz <d.schultz@phytec.de> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* relocate_sdk.py: skip debug files from relocationNikunj Kela2017-03-081-0/+2
| | | | | | | | | | | | | | | | | Debug files only have debug symbols hence don't need to be relocated. Relocation script throws errors when run on the debug files. This change skips these files that have zero size. (From OE-Core rev: 132e8bfd499c713eb63075fd6380317b60f0bd27) (From OE-Core rev: 93b73b2495f9cb18741837c5437de629adfd3780) Signed-off-by: Nikunj Kela <nkela@cisco.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>