Wic throws this message when any of the build artifacts are
not provided:
Build artifacts not completely specified, exiting.
(Use 'wic -e' or 'wic -r -b -k -n' to specify artifacts)
It was not clear which artifact was not specified.
Reworked the code to specify list of missed artifacts.
Now the message looks like this:
The following build artifacts are not specified:
bootimg-dir, kernel-dir, native-sysroot
[YOCTO #7912]
(From OE-Core rev: 98912687f15f6d7537746fb38499f739e1a47be9)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Moved code of __write_partition to 'assemble' method.
This way it should be more readable.
(From OE-Core rev: f7059362053c87f96ce68d1ab850962defb76540)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Made the code to backup and restore fstab only if it's modified.
Cleaned up the code. Made it more pythonic.
Improved code readability by moving code from several tiny
methods into one place.
(From OE-Core rev: e663b1857fd2975585003bfa4739f8f84c652708)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Added --uuid option to the configuration of wks parser.
This option specifies partition UUID. The code to process
it is already in place. It was implemented for --use-uuid
option.
(From OE-Core rev: c7ffe3785e61f3c57aeeebc34ec573685f0ea6a8)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Image file name is not unique for the partitions without label.
This causes image being rewritten and used as a source for all
partitions without label. Wic produces broken or incorrect result
images because of that.
Added wks line number to the image name to make it unique.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Moved code out of prepare_empty_partition* methods
to avoid code duplication.
(From OE-Core rev: 7dc4e007aa9f02162b3f24705e9d9dba7a1cf7ef)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Shortened code by using getattr to obtain a method to call for
prepare_empty_partition_* and prepare_rootfs_* methods.
(From OE-Core rev: 066f713f71828ff6f408448e5ea4fcd56faa423e)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Renamed partition images into <final image>.p<partition number>
This should make output directory look more organized and easier
to understand.
(From OE-Core rev: c826939e4eeed034f39207089ec1a7ed87c1c493)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Moved code out of prepare_roots* methods to avoid code duplication.
(From OE-Core rev: ab1c845758d4f80c82ffcf481007803905e45c29)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Switched debug level to 'normal' to prevent huge 'bitbake -e'
output to go into wic debug output. This should help to make
wic debug info much more clean and easier to read.
(From OE-Core rev: 71510c32d78ba24bf1172548f8eb4adfe621d2de)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Wic tries to find plugins in every layer and prints a message
'Plugin dir is not a directory or does not exist' if layer
doesn't have plugin dir. It causes a lot of duplicated
messages in the debug output, which makes it hard to find
useful info there.
(From OE-Core rev: e6ed2e07d70eaa07d4c2ab9e484eacedd193323e)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Wic doesn't show any information for the partition if label is not set.
Fixed this by adding mount point to the report.
(From OE-Core rev: 36be9c1f7a6fded146a6f1c268455d826d78f97b)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Wic gets bitbake variables by parsing output of 'bitbake -e' command.
This implementation improves this procedure as it runs 'bitbake -e' only
when API is called and does it only once, i.e. in a "lazy" way. As parsing
results are cached 'bitbake -e' is run only once and results are parsed
only once per requested set of variables.
get_bitbake_var became the only API call. It replaces find_artifacts,
find_artifact, find_bitbake_env_lines, get_bitbake_env_lines,
set_bitbake_env_lines and get_line_val calls making API much more clear.
(From OE-Core rev: 3abe23bd217315246ec2d98dc9c390b85cfe6a92)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Added testcase to create multi-rootfs images using rootfs plugin
with paths to rootfs directories in wic command line.
(From OE-Core rev: 8becfc2281282a2e63b3bf511936df36315c9cb1)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Due to usage of incorrect variable wic produces strange message
"No image named None found, exiting." when specified canned .wks
doesn't exist.
Fixed by replacing wks_file -> argv[0]
(From OE-Core rev: 2be905feff3c2166adaa8f50ad09d4b6896461ab)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Make sure the error value is initialised and update the string match
that we have to identify bitbake's current startup status.
Patch contribution from Eduard Bartosh
(Bitbake rev: 915ba08a8a3013e9787e564f2ffd8698c948f433)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The recent refactoring moved this enum value to BuildRequests table
rather than Build.
(Bitbake rev: 4338ab03826df3353e1222f0bd825dfdd04dd933)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Partial revert of bb commit 6e46e1e3882b9770872d8a0bb459bc7d5d6bfed3
The non managed mrb_section defined the title 'All builds' which is already
defined correctly for the projects page as 'All projects'
(Bitbake rev: 3500b59cbfd006a83bab9431f434f98c1944a0ac)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Partial revert of bb commit 2efc338cefd6e6e097af83d7dff63e9ba177d021
This feature was not ready to go live as the surrounding implementation
work to make this usable has not yet been done.
(Bitbake rev: 40c8829369628927944c8a950524d482a663913e)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Partial revert of bb commit 7aecb974d44d9bc711ffba5cc65e770811397fba
There were changes in this commit which broke the compatible layers
mechanism meaning that no layers, recipes or machines were showing.
(Bitbake rev: 124157b567469639c6c839233f42049a093ba083)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The package_qa task isn't required for cross builds, so delete it along with the
other packaging tasks to match native.bbclass.
[ YOCTO #7934 ]
(From OE-Core rev: 24a6590e85c941a73ea852b91939db8c0835d683)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This tune file is needed to enable a GAS option specific to this cpu family
in order to disable the usage of lock prefix instructions.
(From OE-Core rev: 7eb0abc5f4d971d9a511c93cfb2eb52b72e6f228)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The hddimg uses FAT, so the single file size should be less than 4GB,
otherwise errors, check that and error out.
Another way might be use ext2/3/4 rather than FAT, but EFI only supports
FAT, if we make EFI use FAT, and non-EFI use extX, that would the code
very different, which seems not worth.
[YOCTO #6449]
(From OE-Core rev: a82f62627f79761e1b09b8f54896a9f85a591443)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There will be problems when rootfs.img is larger than 4GB:
mkisofs: Value too large for defined data type. File /path/to/iso/rootfs.img is too large for current mkisofs settings - ignoring
And will get a wrong iso.
Check the size of ${ISODIR}/rootfs.img, use mkisofs -iso-level 3
when it exceeds 3.8GB, the specification is 4G - 1 bytes, we need
leave a few space for other files.
[YOCTO #6449]
(From OE-Core rev: 40cdf918dc2507a1270a4d933b2c2f46a514d6e2)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
call "exportfs -r" to reexport all directories when start the nfsserver.
This change does follow debian and nfs-utils stardard.
(From OE-Core rev: 967aa21662930fe5584485d820eb7959a29815bb)
Signed-off-by: Li Wang <li.wang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Undefined symbols in a library can be provided by the application
that links to the library, such as `logsink' in libmultipath.so.0.
This fix checks the type of object in which the symbol is needed
and the existence of the symbol in application, when a symbol
cannot be provided by libraries. It prevents false alarm on absence
of symbols.
(From OE-Core rev: 0dbc895c58a1bb81467a20b154e068806278fc83)
Signed-off-by: Yuanjie Huang <yuanjie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
12-cve-2014-9636-test-compr-eb.patch is same as unzip-6.0_overflow3.diff,
is to fix CVE-2014-9636
(From OE-Core rev: 43cc77f6dd1615ec6797a159647a1ad677c1df23)
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There is an outside chance gdbm could be found at these other locations,
undefine them along with the other variables for completeness.
(From OE-Core rev: c3c9f0f7c9a3746d10d807aadea43d6627ee17c1)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If this test fails the current output tells us nothing about what happened.
Show the exit status and output to aid debugging.
(From OE-Core rev: e54437b7e7c5f1b8c33627b3914f896724207837)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently if a test fails the cleanup isn't performed, leading to cascade
failures in other tests. We can do better.
(From OE-Core rev: db01d6ba2ce87e1586dc8804dd823a0a038d5794)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There are gdbm 1.8.3 and gdbm 1.11, while 1.8.3 is GPLv2, it should
install ndbm.h and dbm.h as what 1.11 does, to make perl build OK when
non-gplv3 build.
Fixed when perl build: (non-gplv3 buld)
| NDBM_File.xs:18:60: fatal error: gdbm/ndbm.h: No such file or directory
| # include <gdbm/ndbm.h> /* RedHat compatibility version */
| ^
| compilation terminated.
And:
| ODBM_File.xs:8:19: fatal error: dbm.h: No such file or directory
| # include <dbm.h>
| ^
| compilation terminated.
(From OE-Core rev: f2abe18d2a3c9c4ff2b6b442bc496fd3b2203598)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
upgrade to fix the CVE: CVE-2015-1788..CVE-2015-1792 and CVE-2014-8176
remove a backport patch
update the c_rehash-compat.patch
(From OE-Core rev: 5a70e45b8c6cb0fa7ea4fe1b326ad604508d00cb)
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixed test case:
Failed test 146 - single result for config_re('byteorder') at ../lib/Config.t
got "2"
expected "1"
There is a byteorder in config.sh-32/64.
(From OE-Core rev: 536e2f71874154e70676ba9902329d0efa24e2c3)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It should be ../t/lib/dbmt_common.pl.
Fixed:
Can't locate ../../t/lib/dbmt_common.pl in @INC
(From OE-Core rev: d261f4254b049276c086bc05adb068deb331e1d5)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fixed for test case ../ext/ODBM_File/t/odbm.t:
ok 1 - use ODBM_File;
ok 2 - use Fcntl;
./perl: symbol lookup error: /usr/lib/perl/5.22.0/auto/ODBM_File/ODBM_File.so: undefined symbol: dbminit
The checking "if -e $_.'/libgdbm_compat.so'" doesn't work when cross
build, so always link libgdbm_compat, since perl depends on gdbm and we
always have libgdbm_compat.
(From OE-Core rev: 942fb460339c9771e40d2e1bc36ac09b0ac39821)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Remove:
- perl-5.14.3-fix-CVE-2010-4777.patch: backport
- fix-FF_MORE-crash.patch: backport
- perl-rprovides.inc: it was introduced by 5.8.7, the lines in it are like:
RPROVIDES_perl-module-b-asmdata = "perl-module-${TARGET_SYS}-b-asmdata"
If some packages do RPDEND on something like
perl-module-${TARGET_SYS}-b-asmdatam, we need update the package rather
than keep use RPROVIDES in perl-rprovides.inc, so remove it.
- perl-rprovides_5.20.0.inc: it only has one line:
RPROVIDES_perl-module-module-build, but the perl-module-module-build
is gone in 5.22.0, so remove it.
* Update:
- debian patches from http://ftp.de.debian.org/debian/pool/main/p/perl/perl_5.20.0-1.debian.tar.xz
- Makefile.SH.patch
- Merge 0001-Makefile.SH-fix-do_install-failed.patch into Makefile.SH.patch
- native-nopacklist.patch
- config.sh
* The CGI.pm and Module::Build disappear from core, so no
perl-module-module-build.rpm any more, more info:
http://perltricks.com/article/165/2015/4/10/A-preview-of-Perl-5-22
(From OE-Core rev: 06d43a90acbe63baea62d220659149a3ff2f9198)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove -Werror, since it is suitable to develop only; otherwise when
gcc adds -O0 option to compile codes, the error will be generated
since the warning:
//# warning _FORTIFY_SOURCE requires compiling with optimization (-O)
(From OE-Core rev: 11d31170fa955a5a1293455ba24d5e3a88dc69af)
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
