aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2016-01-19wic: pylinted ksparser moduleed/wic/kickstart-include-8848Ed Bartosh
Added missing docstrings, fixed wrong indentation and long lines. Final pylint score is 9.89/10 Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
2016-01-19wic: add help for 'include' commandEd Bartosh
Added description of 'include' parser command to the 'wic help kickstart' output. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
2016-01-19wic: move parts of canned .wks into common.wks.incEd Bartosh
In order to give and example of 'include' feature of ks parser and for testing purposes common parts of 3 canned wks files were moved into common.wks.inc Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
2016-01-19wic: implement search of includesEd Bartosh
Used custom argument type to implement search of include .wks files in canned wks paths. Include files can be specified either by full path or by name. [YOCTO #8848] Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
2016-01-19wic: refactor get_boot_configEd Bartosh
This function is going to be used by ks parser to find include .wks files. get_boot_config name is a bit confusing as function is quite generic. It looks if file is present in the canned wks directories. Renamed get_boot_config -> get_canned. Renamed parameter file_boot -> file_name. Updated description. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
2016-01-19wic: ksparser: add support for includeEd Bartosh
Extended parser to support inclusion of .ks files: recursively called self._parse to parse included .ks Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
2016-01-19wic: do not remove build dir in source pluginsEd Bartosh
Interesting bug was found during implementation of 'include' parser command. Build directory was removed in do_configure_partition method of bootimg- source plugins. This can cause removal of previously prepared partition images if /boot partition is mentioned after other partitions in .ks file. Moved work directory removal to direct.py before processing partitions. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
2016-01-19wic: use unique partition numberEd Bartosh
This is a preparation for 'include' support. Used unique counter instead of line number for partitions in .ks file. Line numbers can be equal for different .ks files, which can cause problems if one .ks file is included into another. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
2016-01-19wic: move wks parsing code to KickStart._parseEd Bartosh
This is a preparation for implementation of include statement. Parser will be called recursively to parse included .wks files, so it should be available as a method. Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
2016-01-18classes/populate_sdk_ext: fix task dependency regressionPaul Eggleton
Fix a regression caused by OE-Core revision eabeb26335b1a4eb1e68218160dbdbe8fdf36272 where we lost the task dependency on packages in TOOLCHAIN_HOST_TASK (such as meta-environment-extsdk-${MACHINE}) which led to errors about missing packages when building the extensible SDK. This happened because I only moved half of the dependencies coming from the standard SDK task to do_sdk_depends. While I'm at it, tidy up the do_populate_sdk_ext[depends] line. (From OE-Core rev: 4f6afc0aab53c30b02488a4285dbee06cf459b07) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18image: Handle image types containing '-' correctlyRichard Purdie
Shell function names can't contain '-' characters, which means our image task names also can't. Add some mapping to use '_' instead of the '-' so images like "rpi-sdimg" work again. (From OE-Core rev: 5b5331f8a311e674a5c8b1eb06afdad19bfb899f) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18oe-selftest: devtool: fix test_devtool_add_library if python was built firstPaul Eggleton
If Python is in the sysroot then this test can fail due to some brokenness in libftdi's CMakeLists.txt file for its python bindings. Just disable it in order to have the test work more reliably. (From OE-Core rev: da58d7e600ec6f3d9bd202f8cee0ffe8c3f8992c) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18recipetool: create: add a couple more license checksumsPaul Eggleton
I found these when I was looking at libftdi and they seem to be generic enough to show up in at least a couple of other packages so I figure I'll add them. (From OE-Core rev: 12da749266c7dc47ba8d2226eed0499934a8d62f) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18recipetool: create: add basic support for extracting dependencies from cmakePaul Eggleton
Add support for extracting dependencies from CMakeLists.txt. There's still a bunch of things missing that are outside the scope of OE-Core and we still lack a proper extension mechanism, but this is a good start. This also adds an oe-selftest test to exercise the new code a bit. Implements [YOCTO #7635]. (From OE-Core rev: fcaf78c41876758f544df3f18891bc7e51a3bfbc) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18recipetool: create: force GL libraries to virtual/*Paul Eggleton
We want to specify dependencies on virtual/* rather than whatever library is selected in the current configuration. (From OE-Core rev: c48a61d2313cbc407aa7ca3da8c773c751f6b09f) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18recipetool: create: move dependency mapping code to RecipeHandlerPaul Eggleton
Some refactoring to allow access to the library/header/pkg-config mappings and the DEPENDS / unmapped dependency output code from other classes than AutotoolsRecipeHandler. (From OE-Core rev: cfd87cd4c77208eb3ee99f4de592e0666132e925) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18recipetool: create: fix overzealous mapping of git URLsPaul Eggleton
The regex for detecting git URLs was unanchored, leading to it matching where it shouldn't have. An example of where this went wrong was http://taglib.github.io/releases/taglib-1.9.1.tar.gz. (From OE-Core rev: cd0732ef93a9c7b1f7f7860a34a99ab0afc8e289) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18recipetool: create: support additional autoconf macros from autoconf-archivePaul Eggleton
Support a number of macros from autoconf-archive when reading configure.ac to extract dependencies. (From OE-Core rev: 1245503d65163752778ef84d1c814fa4f2d9142a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18recipetool: create: detect flex/bison dependencyPaul Eggleton
There are a few different macros that can be used to pick up these tools, add support for them all. (From OE-Core rev: 12d6a5adb8f6afc731590cd2257ba4180baff8f0) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18recipetool: create: pick up boost macros in configure.acPaul Eggleton
The presence of BOOST_REQUIRE or AX_BOOST.* indicates that boost is a dependency. (From OE-Core rev: 6c52319055c25d25354f9ec9c0a7a4917156d585) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18recipetool: create: improve extraction of pkg-config / lib depsPaul Eggleton
* The regexes for PKG_CHECK_MODULES / AC_CHECK_LIB were a bit too strict and thus we were skipping some macros. * Add support for PKG_CHECK_EXISTS * Avoid duplicates in warning on missing pkg-config dependencies * Ignore dependency on musl (since this may come up if it's the selected C library) (From OE-Core rev: f90f9a928b29e1cf16c0fae740944e98dda1596a) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18wic: rename kickstarter.py -> ksparser.pyEd Bartosh
kickstarter.py was not the best name for this module as previously there was a directory with the same name in scripts/lib/wic/. All files were removed from it, but .pyc files could still stay there causing imports from wic.kickstart to fail with ImportError: cannot import name KickStart. (From OE-Core rev: 34ee9e4bcbb237db17ee9c038ef9e41fb2b81b12) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18wic: override ArgumentParser.errorEd Bartosh
Overriden error method to throw exception instead of printing usage error message. Exception is caught by KickStart code to add .ks file name and line number. (From OE-Core rev: b8d1a204a9000d5aaba683b0debb97430b28bc93) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18wic: removed unused importsEd Bartosh
Removed imports of wic.kickstart from plugins as they're not used in the code. (From OE-Core rev: 36511a36fefeed54b9d00b479ca2fb004a6ea5f3) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18wic: improve processing of parseing errorsEd Bartosh
Caught argparse.ArgumentError Included .ks file name and line number into the error messages. (From OE-Core rev: bbe25585d1f8ed9cb065939fabd92611e64cebbe) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18wic: catch KickStartErrorEd Bartosh
Catch parsing errors and output them using msger. (From OE-Core rev: 8c08ac096363d3229d73285c42bf69a1552ac3f9) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18wic: add custom exception KickStartErrorEd Bartosh
This exception will be raised by kickstart parser on parsing errors and processed in the code which calls parser to produce meaningful error output. (From OE-Core rev: 2851fd0862baf7798781fb7e617751278a4879fd) Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18bootimg/image-vm/image-live: Improve image dependenciesRichard Purdie
Now that image generation consists of separate tasks, we can improve the dependencies in these classes. We can also incorporate the tasks within do_image_complete instead of do_build so we have a specific task for when the deploy directory is populated with images. This fixes various expectations about do_image_completed and the way I'd tried to use it to fix some sanity test problems. (From OE-Core rev: 2444099033ea0104aef4969ca61ec2d26b36d3a0) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18image: Always run do_rootfs_wicenvRichard Purdie
The wic command can be used externally but for this to work, the wic environment file needs to be present. Therefore write this out universally, it runs in parallel with other image construction so any performance implications are negligible. (From OE-Core rev: d43680e7dd1a4d027bf766de925d8a138479742a) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18selftest/buildhistory: Improve test to remove sources of errorRichard Purdie
When we add buildhistory, we expect do_rootfs to rerun, but depending on IMAGE_FSTYPES, the number of tasks which would execute after do_rootfs varies (e.g. live would add do_bootimg and we recently added do_image). Therefore limit the test to -c rootfs and then we're clear that only one task should re-run. (From OE-Core rev: dbac9b560edfe4f7bfb5511e4ca1263faed82efc) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18bootimg/image: Enhance bootimg to respect RM_OLD_IMAGERichard Purdie
Currently, iso and hddimg links don't respect RM_OLD_IMAGE. This updates them to use the common symlinks code so that they behave like the rest of the system. (From OE-Core rev: ae55c78852ab88bfaaf24dab129097a2642bc5f5) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18rootfs-postcommands: Ensure license manifests respect RM_OLD_IMAGERichard Purdie
When RM_OLD_IMAGE is set, old manifest files should be removed along with old image files and our QA tests expect this. This patch ensures this happens. (From OE-Core rev: 08d41f56d401df2caf1c73274599c28d7620056c) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18image: Ensure we don't expand TMPDIR in image commandsRichard Purdie
Similarly to DATETIME, don't expand TMPDIR in image commands. This ensures some of the stamp comparisons we make in the QA tests work correctly. (From OE-Core rev: 6102249d5d09e14b02c6e5c651543eabfb77d6bf) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18image: Fix instability of do_image_* checksumsRichard Purdie
The do_image_* tasks contained the expanded version of DATETIME. Due to the expansion, we couldn't exclude the value from the task checksum which meant the task would rerun. We fix this by deleting the DATETIME value during expansion so we don't expand any references to at that time. This means the task's hash can be stable rather than having hardcoded date/time values. It will get expanded at execution time. This also fixes errors shown by -S: NOTE: Reparsing files to collect dependency data Writing locked sigs to /home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/build/locked-sigs.inc ERROR: Bitbake's cached basehash does not match the one we just generated (/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/meta/recipes-sato/images/core-image-sato.bb.do_image_tar)! ERROR: The mismatched hashes were 77872792556367f1dde49a1425caf1a0 and 9bb0aca6286ab7dd22d3c69964beb665 (From OE-Core rev: 7ad31ea6082820e7c22857332c7b837d49f397db) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18image: Fix wic environment issuesRichard Purdie
The wic environment function needs to run after the rootfs size is setup. We move this code to a specific task, and depend on that task from the wic images and other places its needed. This fixes: ====================================================================== FAIL: test_image_env (oeqa.selftest.wic.Wic) ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/meta/lib/oeqa/utils/decorators.py", line 106, in wrapped_f return func(*args, **kwargs) File "/home/pokybuild/yocto-autobuilder/yocto-worker/nightly-oe-selftest/build/meta/lib/oeqa/selftest/wic.py", line 218, in test_image_env self.assertTrue(var in content, "%s is not in .env file" % var) AssertionError: False is not true : ROOTFS_SIZE is not in .env file (From OE-Core rev: f5ac4524b5066829c02f6ad22b1c65c5f93abb29) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18insane: Start to clean up do_configure_qa codeRichard Purdie
This cleans up the do_configure_qa code so that the exit status from package_qa_handle_error is handled correctly. It also converts package_qa_check_license to use our standard QA check configuration interface through package_qa_handle_error rather than a mix of return values, bb.fatal and bb.build.FuncFailed. Due to the merging of multiple lines into one message, we need to tweak a QA test to account for this. (From OE-Core rev: 220840a3e4a44a9254c8b67fd37b399cb5f2f902) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18insane: Clean up horrible return value processing codeRichard Purdie
Whilst in theory return values are nice, handling the complex aggregation of the return values is ugly. The code already uses QA_SANE as a marker to signal problems. Whilst that isn't as idealistic, it makes the code massively cleaner, so rely on this instead. (From OE-Core rev: 06b7ec5d5fa956e4e23127dda6bf8ff526fef773) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18openssh: CVE-2016-1907Armin Kuster
This issue requires three commits: https://anongit.mindrot.org/openssh.git/commit/?id=ed4ce82dbfa8a3a3c8ea6fa0db113c71e234416c https://anongit.mindrot.org/openssh.git/commit/?id=f98a09cacff7baad8748c9aa217afd155a4d493f https://anongit.mindrot.org/openssh.git/commit/?id=2fecfd486bdba9f51b3a789277bb0733ca36e1c0 (From OE-Core rev: a42229df424552955c0ac62da1063461f97f5938) Signed-off-by: Armin Kuster <akuster@mvista.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18license.bbclass: fix license manifestJackie Huang
The license manifest is wrong when there is no spaces before and after separates |&() and we can get warning like: WARNING: The license listed Artistic-1.0GPLv1+ was not in the licenses collected for recipe (From OE-Core rev: 20d6a4ce4e395251604d92111ce5ecacde5ce172) Signed-off-by: Jackie Huang <jackie.huang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18wic/help.py: document requirements for valid fstab generationJoshua Lock
Without one of the --ondrive, --ondisk or --use-uuid options for a partition with a mountpoint specified the automatically generated fstab entry will be invalid. [YOCTO #8844] (From OE-Core rev: a524ced19db05e776834cd1f1db03c68a05f9c0b) Signed-off-by: Joshua Lock <joshua.g.lock@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18glib-2.0: add dependency glib-2.0-native backKai Kang
It uses command glib-genmarshal to build glib-2.0 which is from glib-2.0-native. If the command doesn't exist on host, build fails with error: | /bin/sh: --prefix=test_marshal: command not found | make[4]: *** [testmarshal.c] Error 127 So add the dependency back. (From OE-Core rev: 86136f6013b216d8ee258783e5612c3cd0043a58) Signed-off-by: Kai Kang <kai.kang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18kernel-yocto.bbclass: move do_kernel_link_vmlinux() into kernel.bbclassAndre McCurdy
Move do_kernel_link_vmlinux() from kernel-yocto.bbclass into kernel.bbclass so that it's available to any kernel recipe. Note that the task is not enabled by default in kernel-yocto.bbclass, so don't enable by default in kernel.bbclass either. To enable, see the example in linux-yocto.inc, ie: addtask kernel_link_vmlinux after do_compile before do_install (From OE-Core rev: a29371848deda618a42f9a30f9856a44c2342fe6) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18kernel-yocto.bbclass: remove do_kernel_link_vmlinux from SRCTREECOVEREDTASKSAndre McCurdy
The do_kernel_link_vmlinux() task modifies the build directory (not the source tree) and should not be skipped when externalsrc is being used. (From OE-Core rev: 70b8a60d42831c701d10066eb57aaaad7a6fb7ae) Signed-off-by: Andre McCurdy <armccurdy@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18libarchive: Add bsdtar and bsdcpio packagesDmitry Rozhkov
Some products might need to use a tar replacement that 1. supports xattrs and 2. has more permissive license than GNU tar. And the bsdtar binary produced from libarchive meets these requirements. (From OE-Core rev: ebf68926139ae5374c4d2669930d7f3817ad8f5a) Signed-off-by: Dmitry Rozhkov <dmitry.rozhkov@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18toaster.bbclass: Separate artifact dump from image file dumpElliot Smith
SDK artifacts were being dumped alongside the image file dump. However, the dump was not being triggered correctly, as it should be attached as a postfunc to do_populate_sdk, rather than do_rootfs, as do_rootfs doesn't always fire when populating the SDK directory. By adding a postfunc to do_populate_sdk, the postfunc is fired in the correct situations. Also fixes the directory which is scanned for SDK artifacts, as this is different from the image file directory. [YOCTO #7603] (From OE-Core rev: cd2eb45ce1f9be15e133d6fe940c1cff2199099b) Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18pax-utils: 1.0.5 -> 1.1.4Hongxu Jia
- Support autotools: *) Touch NEWS/AUTHORS/ChangeLog to workaroud failure caused by 'automake --add-missing' *) Add patch to fix configure failure caused by missing macro definition in m4 directory - Add PACKAGECONFIG flags for libcap, libseccomp and pyelftools, and disable them by default. - Add PACKAGECONFIG flag for largefile. - Since we add PACKAGECONFIG flags for pyelftools, we do not need python in RDEPENDS. BTW: Currently oe-core does not support libseccomp. (https://github.com/seccomp/libseccomp) Currently oe-core does not support pyelftools. (https://github.com/eliben/pyelftools) (From OE-Core rev: d966a4ed8f0de7dc9b08880505c668421e6d4488) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18sqlite3: upgrade to version 3.10.0Maxin B. John
3.9.2 -> 3.10.0 1. Fixed a parallel build problem 2. Added a PACKAGECONFIG for readline (From OE-Core rev: ed46ac71846845ffc41efcd55a36e27883d9980a) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18connman: upgrade to 1.31Maxin B. John
1.30 -> 1.31 Included newly introduced connman-wait-online service. (From OE-Core rev: dd329d28ab3f47c8b03563e88703f6b1c09ce72b) Signed-off-by: Maxin B. John <maxin.john@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18python3: add missing dependency on PN-misc to PN-modulesRoss Burton
Installing python3-modules should install *all* of the Python standard library, not just most of it. (From OE-Core rev: b2c1c48d90aa9a94f90836557856e0319ddcb524) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2016-01-18useradd-staticids.bbclass: Remove unnecessary spacesPeter Kjellerstedt
This removes unnecessary spaces inserted before semicolons in the modified USERADD_PARAM_${PN} and GROUPADD_PARAM_${PN} variables. This should not affect the handling of the variables as the only one that actually sees the semicolons is the code in useradd.bbclass that uses cut to split the variables at them, and any whitespace preceeding or following the semicolons will be properly ignored. (From OE-Core rev: acc17ef91a6f506e3cacdc0d4ebfa268b3f3affd) Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>