Age | Commit message (Collapse) | Author |
|
Without grub-efi test_iso_image test case fails with this error:
AssertionError: Command 'wic create mkhybridiso --image-name
core-image-minimal' returned non-zero exit status 1:
Error: Please build grub-efi first
Fixed by adding dependency wic-tools -> grub-efi.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
|
|
Generated wic-tools.env file for wic to be able to get values of
wic-tools variables when wic run from bitbake.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
|
|
Used wic-tools target to get location of syslinux.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
|
|
Rebuild wic-tools if its native sysroot doesn't exist to ensure
that all required tools are available.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
|
|
This parameter will be used to allow or prevent variable caching.
For example, we don't want to cache value of RECIPE_SYSROOT_NATIVE
wic-tools variable as we may decide to rebuild wic-tools.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
|
|
This won't help to solve dependency issues as all dependencies are
present only in wic-tools recipe sysroot. It's better to ensure
wic-tools is always built and its .env file is generated.
This reverts commit 10b78a638a402542d1ebadb2cfda29360bc93008.
|
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Fixed test_systemd_bootdisk, test_wic_image_type and test_qemu
test cases by building core-image-minimal with correct configuration.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
|
|
Setting WKS_FILE variable should be done only when
wic image is expected to be built by bitbake.
If it's set for all images it breaks image building in
some cases.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
|
|
Fixed isoimage-isohybrid plulgin and correspondent wic tet case:
- used wic-tools target when getting varlue of STAGING_LIBDIR variable
- ensured that image is built with efi and hddimg enabled
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
|
|
Renamed grub-efi-native -> grub-efi in NATIVE_RECIPES
dictionary as '-native' suffix is added to the recipe name in
the code.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
|
|
wic used native sysroot to get path to pseudo utility.
This approach doesn't work with recipe specific sysroots.
Using FAKEROOTCMD should fix the issue.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
|
|
As STAGING_DIR_TARGET started to point to a recipe specific
sysroot wic is not able to add .env files when .wks file refers
to multiple rootfs recipes.
Used STAGING_DIR instead of STAGING_DIR_TARGET to make the
directory with .env files the same for all recipes.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
|
|
Added RECIPE_SYSROOT_NATIVE to the WICVARS for wic
to be able to access it when run from bitbake.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
|
|
wic used STAGING_DIR_NATIVE variable as a path to native sysroot.
This doesn't work with recipe specific sysroots as STAGING_DIR_NATIVE
points to the native sysroot of the current recipe.
Used RECIPE_SYSROOT_NATIVE variable of wic-tools recipe
to fix the issue.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
|
|
Built wic-tools recipe instead of set of tools recipes
to ensure that all tools are available from one recipe sysroot.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
|
|
Added dependency do_image_wic -> wic-tools:do_build to ensure
that all required tools are ready to use by wic.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
|
|
This meta recipe is for building tools used by wic.
It allows wic to find tools in recipe specific sysroot as
all tools will be present in wic-tools sysroot.
NOTE: task do_build_sysroot is created to ensure that
sysroot is re-populated when package is built. Otherwise it will
be taken from sstate and sysroot will not be populated.
[RP: Added syslinux exclusion for non-IA arches]
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
There is no common sysroot any more so add the libusb dependency using DEPENDS
and check for the output in the sysroot output directory so the tests
work with recipe specific sysroots.
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
I'm this locally on my build machine so its likely to work.
(From meta-yocto rev: df2bdba3b96ae0957fee5065befa569fc940b5e3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
If PATH contains WORKDIR which contains PV which contains SRCPV we can end
up in circular recursion within the fetcher. This code change allows for the recursion
to be broken by giving PV a temporary dummy value in a data store copy.
(Bitbake rev: ce1e70b8018340b54dba3a81d7d379182cb77514)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
When we're running with bitbake -b, BB_TASKDEPDATA is incorrect and limited.
We really need a way to know this from the metadata and this new variable
provides this in worker context. This means existing code can stop having
to guess.
(Bitbake rev: 05763bc886024dcce2ce6b3060fb00abf79a9402)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
There are various pieces of code which need to run after the tasks are
finalised but before bitbake locks in on the task dependencies. This
adds such an event so dependency changes in anonymous python can
be accounted for and acted upon by these specific event handlers.
(Bitbake rev: 4dcd0e53f5ff4bf4f2d6cbdc51ff33a5f5f206af)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Without this, bitbake -b of image recipes cause tracebacks since
the list of providers is empty.
(Bitbake rev: c53e43f3c6a675c0934a7a4e358fd66b049ffca3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Currently "bitbake universe -c fetch" will error if every task in the system
doesn't have a fetch task. This seems unreasonable so filter the list based
upon whether the task exists. This implementation does assume if a task exits
for a given provider name, it can run, even if the preferred provider that
ends up getting built might be the namespace without the task. This is unlikely
to be a real world issue at this point.
(Bitbake rev: 438986f4e39974930ee3205ca4c4d620090e57bb)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Currently you cannot build a target for all the configured multiconfigs without
specifying a list. The list can be quite long, requiring to type several lines
of text.
This enhancement is to support globbing so that you can do this,
e.g. instead of:
$ bitbake multiconfig:A:bash multiconfig:B:bash bash
you can do:
$ bitbake multiconfig:*:bash
There are real world use cases where it is desirable to use multiconfig with
two different tasks. For example: SDKs with multiple toolchains but also
containing set of additional host tools, or multiconfig builds requiring one image for
the main CPU(s) and a different co-image for a companion CPU.
For this reason, two variations of the new syntax are supported.
For example, the following:
$ bitbake multiconfig:*:meta-toolhchain
would expand to:
$ bitbake multiconfig:A:meta-toolchain multiconfig:B:meta-toolchain meta-toolchain
However the following:
$ bitbake multiconfig:*:meta-toolhchain hosttools
would expand to:
$ bitbake multiconfig:A:meta-toolchain multiconfig:B:meta-toolchain hosttools
In other words, if the user specified the "default" task explicitly, it replaces the implicit
"default" task.
[YOCTO#10680]
(Bitbake rev: 1559ad1fc3ae8b1e4e75b210f598b90be192571b)
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
The staging code strips binaries and we need virtual/binutils for that.
Add a specific dependency since the one from do_configure and others
may not be enough to ensure the binaries are in our own sysroot.
(From OE-Core rev: 3634e94cf4310a8bae68bda2f2427d5d33b5d07a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
buildhistory interfers with various tests so error if the user has it enabled,
hence avoiding time spent running the tests only for them to fail.
(From OE-Core rev: 6f6a83bdacb363c16853aa32f6784705b35c2012)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
This code was pointless so cleanup, drop the unused event and the
filtering is no longer needed.
(From OE-Core rev: c8db6e33df49fd3ec779f9a8a8ef861abba6ed16)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
When extracting source for a recipe within devtool (for extract, modify
or upgrade) We need to redirect WORKDIR, STAMPS_DIR etc. under a
temporary directory so that:
(a) we pick up all files that get unpacked to the WORKDIR, and
(b) we don't disturb the existing build
However, with recipe-specific sysroots the sysroots for the recipe will
be prepared under WORKDIR, and if we used the system temporary directory
i.e. usually /tmp) as used by mkdtemp by default, then our attempts to
hardlink files into the recipe-specific sysroots will fail on systems
where /tmp is a different filesystem, and we'd have to fall back to
copying the files which is a waste of time. Put the temp directory under
the WORKDIR to prevent that from being a problem.
(From OE-Core rev: 8022664d606cacc6c9dd121e80f2e0634ce6f400)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
[RP: Add needed mkdirhier call]
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
The code wasn't working properly, tweak so that it works as expected and
the grep expression includes the right patterns. Not sure this code has ever
worked prior to this.
(From OE-Core rev: 5e244fbab846768f6c2dfe80668f8c53d881ae4d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
These recipes use glib-2.0 NLS tools so we need to depend on glib-2.0-native.
(From OE-Core rev: 1ebc75e06cc5c3dabb3c873501eaf339cfc05f98)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Configure searches for xmllint which comes from libxml2-native.
(From OE-Core rev: 4e5e7ecd2a3271b7ac5625917ed3e2e9ab5333f8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Configure searches for xmllint which comes from libxml2-native.
(From OE-Core rev: a969ba3ca43f4e86b63805d303dd7ff03f56ef8b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Configure searches for this and fails if its not present.
(From OE-Core rev: ed44b5fe788b0e94c2ea865b5fbb03ac49e2a5bf)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
This tool has been missing from the SDKs, the recipe specific sysroot
work highlighted the issues.
(From OE-Core rev: b3aea35c0c4d2769eab12e5828e90dfdb843421c)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
This is needed in order to be able to build nativesdk-intltool.
(From OE-Core rev: 69588fd9c850ff3b3d9038d01cd23a42fe7580d8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Some of the tinfoil2 changes resulted in TOASTER_DIR being cleared by
the memory resident bitbake server toaster starts up. This prevented
toaster from being able to connect to its sqlite database. Adding
TOASTER_DIR to the BB_ENV_EXTRAWHITE list stops the cooker from clearing
out the TOASTER_DIR variable.
[YOCTO #9252]
(Bitbake rev: 2420953b3d03551d8254609300ca572717aecdcd)
Signed-off-by: brian avery <brian.avery@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
When a non-existing MACHINE is specified, sanity check issues
the following message:
Please set a valid MACHINE in your local.conf or environment
However, MACHINE can also be set in multiconfig .conf file(s).
Hence we may have several different MACHINE settings within one
(multiconfig) build, so the present error message is fairly
ambiguous.
This patch remedies this by explicitly naming the offending MACHINE and
by amending the list of places where this erroneous MACHINE definition
could have originated.
MACHINE=xyz is invalid. Please set a valid MACHINE in your local.conf, environment or other configuration file.
[YOCTO#10810]
(From OE-Core rev: a7cb408dd784178197687a2129e936620bf6a0d3)
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Presently there is no check to verify the existence of configuration
files as listed in BBMULTICONFIG.
For example, BBMULTICONFIG = "foobar" in local.conf does not trigger
an error or even a warning when there is no conf/multiconfig/foobar.conf.
The missing file is silently ignored.
This patch changes the inclusion of all multiconfig configuration files as
a non-optional requirement. If the file is missing, we get an error such as:
ERROR: ParseError at /data/master-multi/poky/meta/conf/bitbake.conf:704: Could not include required file conf/multiconfig/foobar.conf
Although the "default" configuration is not listed in BBMULTICONFIG,
this change also requires the file multiconfig/default.conf to exist.
The "default" (non-multiconfig) configuration is normally configured via local.conf,
so although this file is required, it can/should be empty. This patch creates
an empty file default.conf in meta/conf/multiconfig.
[YOCTO#10917]
(From OE-Core rev: ca46c09d38b766b69f485f1e82fc78f2a5e6a4c8)
Signed-off-by: Juro Bystricky <juro.bystricky@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Since we replaced gummiboot with systemd-boot
along with its tests, the gummiboot tests are
no longer necessary.
[YOCTO #10332]
(From meta-yocto rev: 43c3f96d0395c9ceb0f3c63a026ec34073fad69e)
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
When the gitsm fetcher is used with a repo that includes a .gitattributes
file that makes git modify files on cloning (e.g. line break characters),
the subsequent checkout performed in the update_submodules function fails.
This is fixed by adding the force flag (-f) to the checkout command.
(Bitbake rev: c05e1396625b14e66d795408ea2ae4cd2afc3209)
Signed-off-by: Ola Redell <ola.redell@retotech.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
This change significantly shortens the time on reparsing stage
of '-S' option.
Each file is reparsed and then dumped within a dedicated
process. The maximum number of the running processes is not
greater than the value of BB_NUMBER_PARSE_THREADS if it is set.
The dump_sigs() in class SignatureGeneratorBasic is _replaced_
by a new dump_sigfn() interface, so calls from the outside and
subclasses are dispatched to the implementation in the base
class of SignatureGeneratorBasic.
Fixes [YOCTO #10352]
(Bitbake rev: 99d3703edd77a21770b366c6ad65a3c0f5183493)
Signed-off-by: Jianxun Zhang <jianxun.zhang@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Moved mpc8315e-rdb.wks from scripts/lib/wic/canned-wks/ to
layer wic/ directory to gather all wks files for reference
BSPs in one place.
(From meta-yocto rev: 73337565a4489225a9a204aaf24b8fa82fdb821e)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|
|
Added instructions to flash and boot device from USB stick.
[YOCTO #8719]
(From meta-yocto rev: 69d7d159f07eed1ca71f6530e1a7822146878575)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
|