Simplify by removing unnecessary KMACHINE/KBRANCH and SRC_URI items.
Also simplify machine-preempt-rt.scc
(From meta-yocto rev: b9973f7761b86e3d4571fe5582759e5405e1d7b4)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Simplify machine-standard.scc for all the templates.
(From meta-yocto rev: ad0d944698a854a281d0beea1c87a0600e98ccbd)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Simplify by removing unnecessary KMACHINE/KBRANCH and SRC_URI items.
(From meta-yocto rev: d1224846e5ff6c101bf50011d5d3314cbbd81f61)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Simplify machine-standard.scc for all the templates.
(From meta-yocto rev: ac8ec04c50bc8dbf716ff5746c8942566fd5c2bf)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update map_standard_kbranch() with preempt-rt and tiny variants.
(From meta-yocto rev: 48233b051b0599ee745d0b8d24863a08e7440d6a)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use map_standard_branch() instead of naming the branch directly.
(From meta-yocto rev: 34ec7d4cf53f82adb8de61969d0981344f9a1d87)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update map_standard_kbranch() to be consistent with the new changes in
meta naming and remove obsolete standard/default mapping.
(From meta-yocto rev: 40998ba44e1a4ebb1c165cab1a250025041e0da0)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update the default custom kernel to 3.8.y, the current stable kernel
available at this point.
(From meta-yocto rev: f10f30bf77ee0571c1b5edc083833c5267d013d6)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
For Yocto 1.4, 3.8 is the preferred kernel and 3.2 is obsolete.
(From meta-yocto rev: 5b07921319901a3709492c43397c57bbd2201585)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The script greps for 'Disk', which doesn't work when your crazy Dutch distro has parted call it 'Schijf', so force LANG=C.
The second problem is that 'Disk' might be a substring in the Model entry:
[root@Angstrom-F16-vm-rpm contrib] # parted /dev/sdc unit mb print
Model: SanDisk SDDR-113 (scsi)
Disk /dev/sdc: 3905MB
(From OE-Core rev: 2e404930f6fc7d818d2f429793e84bce77163afd)
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Contents:
- Summary
- Usage
- Implementation summary
- Output
- TODO
* Summary:
This is used for printing what is about to happen between the current and last
builds, for example:
$ bitbake core-image-sato
# Edit some recipes
$ bitbake-whatchanged core-image-sato
The changes will be printed.
* Usage:
bitbake-whatchanged [[opts] recipe]
* Implementation summary:
- Use the "STAMPS_DIR=<path> bitbake -S recipe" to generate the new
stamps, compare these stamps to the one in the old stamps dir (tmp/stamps),
so we will get what are changed.
- When the "-v" (verbose) is not specified:
> Figure out the newly added tasks
> Figure out the PV (including PE) and PR changed tasks
> The left tasks are the ones that the "Dependencies" changed tasks
- When "-v" is specified:
> Figure out the newly added tasks
> Use bb.siggen.compare_sigfiles to figure out the details
* Output, for example (core-image-sato with different git tags)
and with recipes upgraded):
- without "-v":
Figuring out the STAMPS_DIR ...
Generating the new stamps ... (need several minutes)
=== Newly added tasks: (5 tasks)
core-image-sato: do_configure do_populate_lic do_install do_rootfs do_compile
# Note: This is because the "bitbake -S" always generate the sigdata for
# do_compile, do_rootfs and other task, we may need fix this from "bitbake -S"
=== PV changed: (130 tasks)
alsa-utils: 1.0.25 -> 1.0.26
cross-localedef-native: 2.16 -> 2.17
eglibc-initial: 2.16 -> 2.17
[snip]
=== Dependencies changed: (3593 tasks)
busybox: do_package do_package_write do_build do_packagedata do_populate_sysroot do_install do_compile do_package_write_rpm do_configure do_populate_lic
atk-native: do_compile do_package_write_rpm do_package do_configure do_populate_sysroot do_install do_populate_lic do_patch do_packagedata do_build do_package_write do_unpack
[snip]
=== Summary: (3728 changed, 1134 unchanged)
Newly added: 5
PV changed: 130
PR changed: 0
Dependencies changed: 3593
Removing the newly generated stamps dir ...
- with "-v":
=== Newly added tasks: (5 tasks)
core-image-sato: do_configure do_populate_lic do_install do_rootfs do_compile
=== The verbose changes of glib-2.0-native.do_do_install:
Hash for dependent task virtual:native:glib-2.0_2.34.3.bb.do_compile changed from bab8b8dd95be1b83dcec93f755b1812b to 70f746df7809acaa52de204b0685abb4
[snip]
=== Summary: (3728 changed, 1134 unchanged)
Newly added: 5
Dependencies changed: 3723
Removing the newly generated stamps dir ...
* TODO
- It seems that the "bitbake -S core-image-sato" has bugs, it would always
report errors, but doesn't fatal errors
- The gcc-cross' stamps are in tmp/stamps/work-shared, but the
"bitbake -S" doesn't put the stamps in work-shared.
- The "bitbake -S" always generates the sigdata for image recipe's do_compile,
do_install and other tasks, we may need fix this from "bitbake -S".
- Print the ones which can be installed from the sstate.
[YOCTO #1659]
(From OE-Core rev: 8783fcc23ccbd829ecb0dc59cf71ee44376094cc)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add STAMPS_DIR for constructing STAMP, the defination of STAMP is:
STAMP = "${TMPDIR}/stamps/${MULTIMACH_TARGET_SYS}/${PN}/${EXTENDPE}${PV}-${PR}"
We can only change the TMPDIR if we want to change the STAMP's location,
but the bb_cache.dat would be regenerated if TMPDIR changes, so add
STAMPS_DIR for constructing it, and add it to the BB_ENV_EXTRAWHITE,
this is very usefull for the "bitbake -S", since then it can be run by:
STAMPS_DIR=<path> bitbake -S <recipe>
which will avoid putting the stamps to ${TMPDIR}/stamps.
BTW, break the too long BB_ENV_EXTRAWHITE into several lines.
[YOCTO #1659]
(From OE-Core rev: ce732c04b3ac06633e20efa8799c4189abfd41b3)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
With 3.8 kernels we get a harmless error message during kernel boot.
For now we can ignore. This allows the tests to pass and ensures we
can merge the 3.8 kernel.
(From OE-Core rev: da1e094c407353af2ab230c4867c9d8fd68e3161)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The description of option `-d' is not correct in useage. It is used to
remove duplicate and debug at the same time. Use option `-D' to control
debug info output and the option `-d' to flag remove duplicate.
[YOCTO #3635]
(From OE-Core rev: fa0b40c233e757fe986aa45798b35b60b89c879f)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The implementation of `--remove-duplicated' has been modified by the commit:
http://git.yoctoproject.org/cgit/cgit.cgi/poky/commit/?id=0740f82aea92da0195524e37c372f9981e7f5e6d
In above commit, sstate cache files with multiple archs are not considered
duplicate and don't need to be removed as duplicated any more.
Update the description of `--remove-duplicated' in usage to keep consistent
with implementation.
[YOCTO #3635]
(From OE-Core rev: c201fdc2f01f398060cd953a1640a685797d9e64)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Currently the assumption is made that only oe-core can include a scripts
directory.
* However, when other layers create a scripts directory the bitbake script
freaks out causing a infinite recursive loop until it crashes.
* Simply changing the regular expression to remove all instances of scripts path
instead of just the first one fixes this problem.
[Yocto Bug 3872]
(From OE-Core rev: 9b445cc39604223b0cfb21d28f748a86ff4cdf68)
Signed-off-by: Franklin S. Cooper Jr <fcooper@ti.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Modify the include file and script to generate a missing RDEPENDS.
Install python on target with python-io. Import ssl:
Python 2.7.3 (default, Feb 9 2013, 16:04:35)
[GCC 4.7.2] on linux2
Type "help", "copyright", "credits" or "license" for more information.
>>> import ssl
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
File "/usr/lib/python2.7/ssl.py", line 58, in <module>
ImportError: No module named textwrap
Installing python-textutils solves the issue.
(From OE-Core rev: 900ae881c3483eea36aa0be456b93f92980f4924)
Signed-off-by: MiLo <milo-software@users.sourceforge.net>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Forcing ps to display unlimited column width allows the qemu IP address to
be discovered during sanity testing when the command line is extremely long.
This seems to fix the sanity testing problem on AB05 which was recently updated
to OpenSUSE 12.2. I'm not sure what about qemu or process listing is different
on that distribution but this simpile fix seems to work and my help on other
distro's as well.
(From OE-Core rev: 4cea35cc4e4ed8e68cd117825b1dd4ef1be768c2)
Signed-off-by: Michael Halstead <michael@yoctoproject.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The scripts/postinst-intercepts will contain all postinstall hooks that
we need to run after all packages have been installed.
If one wants to install such a postinst hook, all it needs to do is put
the hook in this directory and, from the package postinstall scriptlet,
call:
postinst_intercept <hook_name> <package_name> <var1=...> ...
This will, practically, add the package_name in the list of packages
that need the hook to run and, also, set any variables that would be
needed in the hook. For example, variables like ${libdir}, ${bindir},
etc. that might depend on distribution can be passed on to the script in
this way.
(From OE-Core rev: 0ef538d75c2f3921a2fcbe6ca1deed5525b276cc)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Avoid the chicken / egg problem of an SDK that provides a working
python but requires that version of python to extract itself. The
RHEL 5.x systems and some other enterprise Linux systems ship with
python 2.4.x as the default python. We need to at least be able to
extract work executables even if we never use the the host provided
python again.
(From OE-Core rev: e1d42db8749b0b965ddc6cfba4f3b93ee96ed4f4)
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There are two cases of corruption that the relocate_sdk.py was not correctly
dealing with.
1) SDK Extras should be left alone
Extra external binaries included in an SDK that were linked against the
host's version of /usr/lib/ld-so.so should not get a relocation applied.
In the case that was discovered these were LSB compliant binaries that
already worked on many hosts.
2) If the interp section is too small generate an error
In the case of the qemu user code, it was using its own .ld file
to link the executables which overrides the default in the nativesdk
binutils. This generated host executables which had a interp section
that was too small to relocate.
Now the relocate_sdk.py will print an error and continue on such that
the error can be fixed by a developer without having to do the
difficult task of debugging why it is crashing or not loading correctly.
(From OE-Core rev: 3752a9c6d772b39bbe04d62ef4d3527b4c7198c1)
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The new oe-git-proxy should address all git proxying needs, remove
the previous scripts.
V2: Separate the removal of the old scripts into their own patch
(From OE-Core rev: 75738ac47b9ca11daa94820c9c5f829937397da7)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
BSD nc was commonly available on the current distros until Fedora 18
appears to have dropped it. socat appears to be a reasonable replacement
with availability on Fedora and Ubuntu and going back some time as well.
Update the script to use the socat syntax.
Simplify the logic a bit by using exec for the no-proxy-needed cases.
(From OE-Core rev: 795b1ea370b8a1d9152c171a50e80bd0b4b8dc60)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
oe-git-proxy.sh is a simple tool to be used via GIT_PROXY_COMMAND. It
uses BSD netcat to make SOCKS5 or HTTPS proxy connections. It uses
ALL_PROXY to determine the proxy server, protocol, and port. It uses
NO_PROXY to skip using the proxy for a comma delimited list of hosts,
host globs (*.example.com), IPs, or CIDR masks (192.168.1.0/24). It is
known to work with both bash and dash shells.
V2: Implement recommendations by Enrico Scholz:
o Use exec for the nc calls
o Use "$@" instead of $* to avoid quoting issues inherent with $*
o Use bash explicitly and simplify some of the string manipulations
Also:
o Drop the .sh in the name per Otavio Salvador
o Remove a stray debug statement
V3: Implement recommendations by Otavio Salvador
o GPL license blurb
o Fix minor typo in comment block
(From OE-Core rev: 62867f56da0e0904f0108f113324c2432659fbac)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Cc: Enrico Scholz <enrico.scholz@sigma-chemnitz.de>
Cc: Otavio Salvador <otavio@ossystems.com.br>
git-proxy cleanup
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Applications are inconsistent in their use of upper and lower case proxy
variables. Curl, for example, specifies NO_PROXY (not no_proxy) in the
man page (changed in 2009 [1]). Avoid proxy issues by ensuring both the
upper and lower case versions of each proxy variable are available in
the environment for the fetcher commands.
Add FTPS_PROXY and ftps_proxy to the list as well.
1. http://curl.haxx.se/mail/tracker-2009-04/0012.html
(From OE-Core rev: 684c6512850ceb108e52af634be98eaacb8351e1)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The following variables perform no function outside of bitbake:
GIT_CONFIG
GIT_PROXY_HOST
GIT_PROXY_PORT
GIT_PROXY_IGNORE
GIT_CONFIG only affects the git-config command which is not relevant to
the fetcher. This was previously used with the OE GIT_CORE_CONFIG
variable which would provide a basic git config to use instead of the
user's config. This usage was deprecated by git for over a year now:
http://git.661346.n2.nabble.com/Overriding-gitconfig-using-GIT-CONFIG-td6680977
GIT_PROXY_HOST and GIT_PROXY_PORT are not used by git.
GIT_PROXY_IGNORE was an OE construct used to create the custom git
config and had no meaning outside of the OE environment. It is not used
by git.
Remove these variables from the fetcher environment.
Users wishing to configure git to work with a proxy should define the
GIT_PROXY_COMMAND environment variable to use an external script.
NO_PROXY can be used within this script to skip the proxy for certain
hosts.
(From OE-Core rev: ea0284a8cc1b531e115b7fdbfa18852f55573f00)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If the qemu is running on a headless machine, a VNC server that only allows
connections from localhost isn't too useful.
Add a "vncpublic" option to bind a VNC server to 0.0.0.0, so it's publically
available.
(From OE-Core rev: 883666821ec46483bbfb9b3cb84c5afa8118a553)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The script was erroring out without a hint on what failed.
(From OE-Core rev: 72266cfa3a12a19a94d9176ecca9d080658dbf2e)
Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The names of the -user files were changed to have the machine
prepended, but the includes weren't - fix the includes.
(From meta-yocto rev: c430d6a0d126df7a51c0f585665de6aebbeac028)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* otherwise it shows error about failing import
(From OE-Core rev: 65b2f068719f4cd6e1bd438e8714c2977bd93535)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
1. Added ability to parse .zip files.
2. Added optional automatic dependency resolving for python
recipes(easy_install wrapper).
3. Fixed a few name/version bugs.
Give it a whirl by:
create-recipe -r https://launchpad.net/nova/folsom/2012.2.3/+download/nova-2012.2.3.tar.gz
Saves me some time unwinding python dependencies, and creating template recipes.
(From OE-Core rev: 1a491a4dde0d3618f8815182d12c21f76b64de5a)
Signed-off-by: David Nyström <david.nystrom@enea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* useful e.g. when sending pull-request to release branch with extra CC
for release maintainer
(From OE-Core rev: 52bc47756eb8a81ea07ef4bc06345ef335b30ceb)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
systemtap_target_arch() should also translate x86-64 (hyphenated) into
x86_64 for the -a param. Failing to do that causes systemtap to see
an architecture mismatch and create a cloned session with a bogusly
synthesized build directory path, and fails to compile the probe.
Fixes [YOCTO #3756]
(From OE-Core rev: 98cae0544884cb5700d42409ec4a9584a17dc9a4)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a script to wipe the sysroots and all of the relevant stamps, so that it
will be correctly re-populated.
(From OE-Core rev: ef98ff5ba562eb710b5a6fbd181fb1c4380010b2)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The bblayer abstraction makes it where multiple layers can be
configured and used at the same time. Some layers make changes to
support a specific machine, and should not have any affect when other
machines are in use.
For linux-yocto, all bsps are created with a user-config.cfg and
user-config.cfg and user-patches.scc. This means that those files
will be pulled from the first location found, which might correspond
to files customized for a different machine.
Instead of using the names user-config.cfg and user-patches.scc, I
propose a machine specific name be used such as
{{=machine}}user-patches.scc and {{=machine}}user-config.cfg. This
would necessitate that all references changed to these new names,
which would affect the yocto-bsp and yocto-kernel scripts.
With this change, it would be possible to have multiple machine BSPs
searched at the same time and to select which to build against by
using a command like MACHINE=qmeux86 bitbake core-image-sato to
override the default.
Note many of the standard BSPs do not seem to suffer this problem as
they do not use the common files user-config.cfg and user-patches.scc
that the yocto-* scripts depend upon.
Additions by Tom Zanussi:
- renamed user-config.cfg to {{=machine}}-user-config.cfg everywhere
- renamed user-patches.scc to {{=machine}}-user-patches.scc everywhere
- added the user-config/patches SRC_URI items to the qemu -rt kernel recipes
- fixed conflicts due to the new open_user_file() helper function
- updated user filename conflicts caused by directory renaming
- updated custom kernel files to match
Fixes [YOCTO #3731]
(From meta-yocto rev: c20bef60aa8d52971fb061d4b8d473ad19c03180)
Signed-off-by: Brian A. Lloyd <brian.lloyd@familyhonor.net>
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
- use migrate_localcount.bbclass to generate AUTOINC entries
which are exported to LOCALCOUNT_DUMPFILE
- import the generated AUTOINC entries
- one can migrate LOCALCOUNT to AUTOINC by executing:
bitbake-prserv-tool migrate_localcount
[YOCTO #3071]
(From OE-Core rev: ffab86f13cafb10d8d6273b6af8cd9a3c84eae20)
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The BB and PM ranges were originally intended to use leading 0s to
ensure all the values were the same string length, making for nice log
filenames and columnar dat files. However, not everyone will do this -
especially if it isn't documented.
Document the intent. Make the generation and parsing of dat files robust
to either method.
(From OE-Core rev: 90dc44c8246f2a580fe4a41ce28c201e52307500)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Normally pre-canned properties are supplied as JSON from a file, which
the user can specify using e.g. the -i option.
We can reuse that basic functionality for dedicated command-line
parameters by sythesizing a JSON string containing those param values
on the fly and passing that in instead.
This adds the ability for the common creation code to accept JSON
strings as well as JSON files.
(From meta-yocto rev: 5a2e840b24822e018de94ec4f554363b59c4e8bd)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If the user specifies a layer priority following the layer name, layer
creation will proceed without further queries using the specified
layer priority and the remaining values defaulted.
(From meta-yocto rev: 84a0bd8940f82fb938972d7b026367d40c9472e7)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This does a bit of refactoring of the bsp-generation code to make it
generically reusable for generating non-bsp layers.
The first user remains the existing yocto-bsp tool; these changes
allow a second user, the new yocto-layer tool, to use the same code.
(From meta-yocto rev: 1527a0ee7bce08a527c9d80516531b17816dff17)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a 'layer' target containing all the data that will be used to
generate a generic yocto layer.
(From meta-yocto rev: 198a85f61ebd6435830285b2a9b1b925aea6779e)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is essentially 'the documentation' for the yocto-layer tool.
(From meta-yocto rev: 34229b931bad8fc0e4d4431bb5cb46fccbea03bf)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Implementation of the 'yocto-layer' command-line tool, for creating
generic layers and listing their input properties.
(From meta-yocto rev: 8170bea55379d1a25acc0fea108675526eeab6f6)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a new yocto_layer_create() function that will be used to generate
a generic yocto layer (for the new 'yocto-layer' command).
(From meta-yocto rev: 44acd01bf47c2e0a777e686c9339a6ff951fc972)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
yocto-bsp create does a 'git ls-remote
git://git.yoctoproject.org/linux-yocto-3.4.git *heads*' to get the set
of existing branches from the kernel repo.
If the user isn't connected to the network, or if git isn't configured
sanely, yocto-bsp fails with an ugly Python backtrace.
We should try to avoid this by doing a basic sanity check for those
things before actually running the command.
The sanity check can be avoided by specifying -s on the yocto-bsp
command-line:
$ yocto-bsp create -s test qemu
Fixes [YOCTO #3279]
(From meta-yocto rev: 496e76f9bed2ed5a04ef757724d2e63d05c7a601)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add support for booting an ISO image for runqemu scripts.
[YOCTO #3710]
(From OE-Core rev: edd629029979dc18905fce23b64216f15eea501f)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add 'debugshell' as a default kernel option for ramfs booting.
If rootfs.img cannot be found under /media, init-live.sh loops
forever without showing any information. Silently looping forever
and blocking users is inappropriate.
Now that the 'debugshell' feature has been implemented in init-live.sh,
It's reasonable to add it to the kernel option when booting a ramfs-based
image. In this way, the system doesn't loop forever and instead drops
to a shell after a default timeout (30 seconds).
(From OE-Core rev: 0ffdfabc5ab5f6303aff11f8ea511875f1eaf0f5)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This ensures that regardless of what else is in our search path, we always use
the bitbake corresponding to the running buildhistory-diff command.
(From OE-Core rev: 246990e8a3da01020f65d151971883740eacb378)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The problem: SDK binaries were not properly relocated when the SDK
was installed into a path that had a length less than the default one.
Apparently, there were two problems here: the padding was done wrong
(the size of one program header table entry was used instead of the
program section size) and the new padded string was not used at all.
[YOCTO #3655]
(From OE-Core rev: 3815030c5f31c11495893c1ae28d56c1aff31d97)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* takes tmpdir, machines and targets from command arguments or env variables
(From OE-Core rev: 1e4bdd6147c73547d2451705bbb874918621cbfc)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If you are using an image in '-serial stdio' mode, temporarily change the
terminal's interrupt character to 'Ctrl-]' for the duration of the image
run. In this way, hitting 'Ctrl-C' for something running in the image
doesn't accidentally abort the entire qemu session.
(From OE-Core rev: 642cfaac0cb515008cfc91aafe04ab1db7a51581)
Signed-off-by: Trevor Woerner <twoerner@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Allow vmdk images to be run through the 'runqemu' facility.
(From OE-Core rev: 9efa0aa914cae9e13d90ddf99b482ccf0936573c)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Added the change that prevented runqemu to throw
sound errors.
[YOCTO #3528]
(From OE-Core rev: 0ddcd2ce24f0cc65561e2d26c9d63048beedc40e)
Signed-off-by: Andrei Dinu <andrei.adrianx.dinu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
With the addition of custom kernel support, we also need to handle the
normal PR format found in .bb files.
(From meta-yocto rev: e17570b6bbd36a731f546f800ef5f271ed5c3697)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We no longer have to include patches in the SRC_URI, since things now
work using only patch in the .scc file, so remove anything to do with
maintaining patches in the SRC_URI and fix up all previous users of
that code.
(From meta-yocto rev: 8f3cd1f80f898d963797bc96b3fe599f7f8ea343)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Previously we assumed we were always dealing with .bbappends. With
custom kernels, we now have SRC_URIs in .bb files, so add .bb files to
the list of file types we examine and modify.
(From meta-yocto rev: 4200c5c99b7d61e05b0d9d1580e267e7d6d49760)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Kernels don't need to have a PREFERRED_VERSION, so remove that
assumption from the code that looks for the kernel definition.
(From meta-yocto rev: 2ea9d54ac5ebd80b5306851d62411960f3293ede)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
After adding comments to the config and patch templates, I noticed
they were displayed as items, which they shouldn't be. This prevents
them from being displayed.
(From meta-yocto rev: 4cd0bde48cd17468923bba80b88d187014cda1a3)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
With the addition of custom kernels, we can no longer rely on a
hard-coded /files directory for BSPs - we need to be able to find the
user_config/patches files in a number of different directories.
We now hide the search inside a new open_user_file() function that
accomplishes the same thing as before but with a more flexible scope.
(From meta-yocto rev: 26a7032553e8d8691239368f0f994f948db06eed)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a function that can be used to replace a template file by a
user-specified file. The initial use of this capability is to allow
users-specified defconfigs.
(From meta-yocto rev: b52a22d40d4701a9515490bdd31c8d0341fb12bc)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a subclassed edit box that verifies the existence of a
user-specified file.
(From meta-yocto rev: 8ca7f688a6a0e41dd6527b1c13ebaa77bbfeba69)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a subclassed edit box that verifies the existence of a
user-specified git repo.
Also adds a verify_git_repo() function that can be used as a basic
sanity check for local git setup.
(From meta-yocto rev: 64f1176d62ed02d7c61d32fdae11dc8b7d365603)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update existing templates to integrate with linux-yocto-custom.
(From meta-yocto rev: 7a8b55bdf499d001b77bb87345eb4eeab6013b2e)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a synthetic choice for linux-yocto-custom to the list of available
kernels. Choosing this will lead the user down the path of options
needed to specify a custom kernel.
(From meta-yocto rev: 220ad83b5ccc241d7b5b2c3321f2a6a59813e3d6)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a template to support custom kernels via a custom kernel recipe
derived from linux-yocto-custom.bb.
(From meta-yocto rev: 98c7861ebdd40b1fc4d803701ad9fb979be54273)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add logic in the create-pull-request to detect and warn about the
trailing white space inserted by patches.
(From OE-Core rev: 3e35310db3cd6d265092724a0e542b9616aca9c5)
Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Have the script skip:
* "Recipe" lines.
* Lines with 11 "=", not 12.
(From OE-Core rev: b9f14425a3f975a40a881b868b7bddcbd3c22580)
Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There were some changes in the xserver-xorg upstream project that need
to be reflected here too:
* extmod module was removed completely as it became empty;
* DRI1, DRI2, DBE (among others) were made built-in;
(From meta-yocto rev: ed681441a2cf06dc55e71035ecbfc637ff83640d)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Rather than hardcode the value of "8", allow the minimum task length to be
configured from the commandline using the -m option. "-m 0" means all
tasks will be graphed.
(From OE-Core rev: 30001153d3ce7dadf8f1ec79e634a638a9994518)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If two entries have the same start time, the data store used will cause
all but one of the entries to be lost. This patch enhances the data
storage structure to avoid this problem and allow more than one
event to start at the same time.
(From OE-Core rev: 220b071fd8d1cc6bdbca58f75489e3c9b34921ca)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update the template with the changes from the last commits to meta/conf/machine/qemux86.conf
Building sato image for a machine created using yocto-bsp with qemux86/x86-64 templates fails because nothing RPROVIDES qemugl anymore so remove support from the template as well.
Also drop redundant glibc configure knobs (they are no longer optional and they don't exist in conf/machine/qemux86.conf anymore so for consistency the template shouldn't keep them).
(From meta-yocto rev: 644c201a8fb9e589cdda1f76385a0b41549ea057)
Signed-off-by: Stefan Stanacar <stefanx.stanacar@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In the URL, there may be more than just digits in the version section,
something like xz 5.1.2alpha. Update RE pattern to catch all the string
after package name and before '.tar' in URL as package version.
And error message which has been sent to /dev/null still shows on Ubuntu
12.10 with perl 5.14. Update the way to find source tar file to eraser
the error message.
configure files may rewrite the version section, and that is not necessary.
Test when version section has been set, omit the version value from
configure files.
And tweak for output to bb file.
(From OE-Core rev: 17f09ab713acc814ec0561b1c41fa87d9bf7b83f)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The git URLs used in bitbake recipes are not compatible directly with git. In
bitbake-speak, all git URLs start with git:// and the protocol is optionally
specified in the SRC_URI. Local git mirrors are specified like so:
git:///path/to/local/mirror.git;protocol=file
The URL that git requires would be:
file:///path/to/local/mirror.git
Update the yocto-bsp kernel.py to make the necessary adjustment when parsing
the SRC_URI to extract the git URL.
(From meta-yocto rev: 30506f51cc95f0994cf54144295832e931d15f61)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
CC: Tom Zanussi <tom.zanussi@intel.com>
CC: evadeflow@gmail.com
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
yocto_bsp_list_property_values() is missing the context it needs to
properly filter choicelists, so add it to the context object.
Fixes [YOCTO #3233]
(From meta-yocto rev: 064b15f76c5b52899f4c3fdef06412c3063062a5)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Since we generally have lots of copies of the directories created using this tool, use
hardlinks where possible. This should save a little disk space and improve performance
slightly.
(From OE-Core rev: bfa11c028c2da093f7b4e6b7b1d611da90ae052f)
(From OE-Core rev: 8c5544c2311b080bb212efb7f6b804db63e125f5)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If a revision is in more than one branch, the check_rev_branch() function can't
cope with it and the tool returns incorrect errror messages. This patch
ensures it copes with this situation.
(From OE-Core rev: 14bd101c6a86dd048da98817f47694fb21504209)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This allows for use of bitbake in offline mode, but override it in
command line.
(From OE-Core rev: bcefd015fb163d9c382ae05a86569dbcfd3d736a)
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
A miscalculation in the way the port numbers of mountd and nfsd
are created was causing conflicts when starting multiple instances
of qemu using userspace nfs.
Thanks to Rudolf Streif for proposing this fix!
Fixes [YOCTO #1969]
(From OE-Core rev: 94eef772c283170d19ba92c8de0054cd093fc487)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
mountd requires rpcbind or portmap. Check that one of these
services is running before doing anything else, and report
a user-friendly error when they are not found.
(From OE-Core rev: 16d6ec51f4b976c9b86a8b6bf6251089df2d2732)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If vhost_net module is not properly installed,
runqemu script will report the error and
provide the user with a link to the guide.
Also corrected small cosmetic issues in
runqemu script messages.
Also removed <> (read/write) check.
Fixes [YOCTO #3184]
(From OE-Core rev: f7365f62325189b0f9a9a1d440f11f2356c8f01d)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The SDK/ADT may ship with a python installed which may not have all the modules
need for a bitbake build. We should therefore detect if its already present in the
environment and error out in this case, asking the user to use a clean environment.
This also removes the potential for any other conflict between the two.
[YOCTO #2979]
(From OE-Core rev: 9496d4cd77ae632251b4262b63be857fc4fcb31e)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
A couple bsp templates have some options that were used for testing
but aren't needed for any other reason - remove them.
(From meta-yocto rev: dd3bbd04919f7cc69141f405ac95d736abddd637)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The xserver-xf86-config .bbappends are still using FILESPATH - update
them to use FILESEXTRAPATHS as recommended by the Poky Reference
Manual and BSP Developer's Guides.
(From meta-yocto rev: 6aaef8eb9e95a46ab02ef038ae53c8e63eb04e09)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The cfg/dmaengine/dmaengine feature changed location to cfg/dmaengine
in the 3.4 yocto kernel's meta branch. Add template code to include
the appropriate version.
(From meta-yocto rev: b650fcb7781e1c6af6254c98ae64d5ea81b46abc)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The linux-yocto-3.2 cfg/vfat feature changed location to cfg/fs/vfat
in the 3.4 yocto kernel's meta branch. Add template code to include
the appropriate version depending on kernel version.
Fixes [YOCTO #3178].
(From meta-yocto rev: d574c56c51789ec56ff50518ac2057607740eaa8)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Bitbake fails to run when an empty element exists in $PATH. Avoid
creating this situation when $CROSSPATH is not set.
This fixes bug [YOCTO #3101]
(From OE-Core rev: 1f7f590369eaa76dc970c9cffd1f0db53ce08c00)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Ran into another bug that was masked by hiding a bitbake error message.
This catches this situation and displays the error to the user.
Also includes whitespace fixes.
(From OE-Core rev: 435ffeefe4a1df53335fd397ff404bed7deae2df)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If the files being relocated are already used by other processes the
relocate script will fail with a traceback. This patch will trap any IO
errors when opening such a file and gracefully report them to the user.
Also change the exit code from 1 to -1 for a better adt-installer user
experience (like pointing the user to the adt_installer.log).
[YOCTO #3164]
(From OE-Core rev: 26daec758b2eaeb208356d5aa8a9a191bd366751)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
On Fedora systems (and likely others), ifconfig returns interface
names that end with a colon. Make sure we strip the colon off the
tap device name before using it.
This fixes [YOCTO #3028]
(From OE-Core rev: 85ed217b603a86113dda11d952850e8ceed30795)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
KVM, paravirtualization and virtio drivers are now activated
in runqemu using the kvm option flag for qemux86-64.
Host CPU features are also exported to guest OS (Yocto Linux).
Usage example: runqemu qemux86-64 core-image-x11 kvm
Implements [YOCTO #2550].
(From OE-Core rev: cbb6431b3ee9128ea15c9ae0a19e7d2998ffc561)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
KVM, paravirtualization and virtio drivers are now activated
in runqemu using the kvm option flag for qemux86.
Host CPU features are also exported to guest OS (Yocto Linux).
Usage example: runqemu qemux86 core-image-x11 kvm
Implements [YOCTO #2550].
(From OE-Core rev: a35d03e2eb905de4eadc9c7df5b50bff1fb7f897)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In certain edge cases, bitbake may fail to run and cause setup_tmpdir()
within runqemu to fail, and not give the user a helpful error message.
Catch this case and show the user the output of bitbake -e.
This fixes [YOCTO #3112]
(From OE-Core rev: 465d7b6e66b5a55706535e194b3e44e11ee542c6)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Sometimes it is convenient to prepare a bootable image from the
host rather than using a live-image to install to a disk on the
target.
This script takes a live image as input, partitions a device, and
performs the installation just as the installer would if run on
the target.
(From OE-Core rev: 7225c6739f9f1e51741a42437692868165aa1dfe)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
oe-core removed the prerequisite to have sh as bash. POSIX doesn't define
any options and furthermore allows 'echo -e' to be the default behavior.
This means that in dash 'echo -e' will actually print '-e' and interpret
backslashes by default. We use instead 'printf' builtin command with or
without '\n' to simulate 'echo -e' or 'echo -n'.
'printf' needs format while 'echo' can be used without any arguments. So
'echo >' was replaced by 'printf "" >'.
'echo' without '-n' flag adds a new line by default so to keep the same
behavior of two new lines while using 'echo "\n"', 'printf "\n\n"' is
used.
[YOCTO #3138]
(From OE-Core rev: a19880ad10ccb5d7d909dcf9de5c3dc58a0ebcd3)
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If both branch and last_revision are specified for a component when
combo-layer init is run, ensure that the specified revision is actually
on the specified branch and error out if not. Also ensure that the error
message mentions the component.
(From OE-Core rev: e498257ecbec94cec181d73bda57d44335b4dee0)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If last_revision is specified for a component when running combo-layer
init, then use that revision instead of the latest revision on the
branch. Also, remove unnecessary git checkout during init since we
specify the revision to all calls to git when dealing with the component
repositories.
Fixes [YOCTO #3040].
(From OE-Core rev: ff8277cd133e9a02b131977078cff61fa587a1af)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When using runqemu with distros outside oe-core then
MACHINE may not be there in local.conf so use the one
thats available in environment of runqemu which is actually
the correct one.
(From OE-Core rev: 5c3fec058a2d370fbb625901ca1822ce04927ac2)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The functionality previously added by these bbappends was already
handled in task-core-tools-profile.bb (now
packagegroup-core-tools-profile.bb), so remove this.
(From meta-yocto rev: e999a6639a711f5c9a64c69d6b89fb478566d34a)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
New qemu calls the x86 system emulator to be qemu-system-i386
which is consistent now so change it in scripts
(From OE-Core rev: b1ccf0202ba66f9be76463df177f11719ab589e8)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
one test case to check syslogd is executing on target.
(From OE-Core rev: 9286ea7a4eb85ba559d48135458f3b94da7a3866)
Signed-off-by: veerabrahmam <veerabrahmamvr@huawei.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
one test case to check disk space availability.
(From OE-Core rev: d7b549a72a91db41d8b7084b4b3efa162a62a880)
Signed-off-by: veerabrahmam <veerabrahmamvr@huawei.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
one test case to check bash command availability on qemu target.
Signed-off-by: veerabrahmam <veerabrahmamvr@huawei.com>
(From OE-Core rev: 357478b624b27fdfce25b6064b0f64717db75fa6)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
the autoconf-nativesdk package name was recently changed to nativesdk-autoconf which in turn broke the cleanup-workdir script. Changed the package to the correct name.
(From OE-Core rev: 0df6904f8050c4305d90d9bb4c9cac279508d9ca)
Signed-off-by: Jack Mitchell <jack.mitchell@dbbroadcast.co.uk>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* The problem is that you're looking for duplicates across all available archs, so
armv4t and armv7a populate_sysroot are considered duplicate and only last one is
kept, but to rebuild from sstate-cache you need both!
(From OE-Core rev: 46309e96300c35f6e8a5f33512a6a38720c629d2)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* find them dynamically in layers like AVAILTUNES
(From OE-Core rev: fb6d838b1b80f26e9261acfd3893a7ef7f9e1940)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* many layouts have other layers on the same level as oe-core checkout
(From OE-Core rev: 6faf27b771176ff691c17a2dbfa98ac7b3ed1fc7)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* it was also picking line
openembedded-core/meta/conf/machine/include/README:AVAILTUNES - This is a list of all of the tuning definitions currently
filling all_archs with wrong entries
(From OE-Core rev: ceeefd964026e11ce0bb3b0285dbf9917533ae5e)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* using checksum without recipe/task name doesn't seem like good idea IMHO
(From OE-Core rev: ef1044da4b30b9a1264a7c83727a722a4b0b60cc)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
"Package group" is a much more appropriate name for these than task,
since we use the word task to describe units of work executed by
BitBake.
(From OE-Core rev: 424dcf7046e4ad09dcc664eb1992201195247fcf)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a strip_base() function to remove '/base' from the branch names
presented to the user.
(From meta-yocto rev: 216a38f6bb453e8e6617f82c3642151dbde2f377)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a text snippet to the README to say that if emgd-driver-bin is
included in the BSP, LICENSE_FLAGS_WHITELIST needs to be set to for a
successful build.
(From meta-yocto rev: e9437a58a99eefa23402b82a1d9a85e7381e109f)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
With move of ia32-base to oe-core, the only case remaining where
meta-intel needs to be added to bblayers.conf for a new BSP is the
case of an x86 BSP that selects EMGD.
Update the documentation to note that fact.
(From meta-yocto rev: b63c199c716d68147def036eb06481245e595802)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
With move of ia32-base to oe-core, the intel-specific variables were
split off into meta-intel.inc, which needs to be included when using
components present only in meta-intel.
In the case of i386, that's currently just emgd, so conditionally
include emgd if emgd is selected as the xserver choice.
(From meta-yocto rev: b9cc7ce3407d3bc3909e7cc57c8a1290cb84a58b)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This script makes it easy to run a systemtap script on a remote target
from a build host.
The script itself contains documentation on basic setup and usage -
see that for details. In a nutshell, if you have a systemtap script
on the build host, this script allows that systemtap script to be
compiled and run on the target host and for the output appear on the
host terminal.
The crosstap script requires to an sdk build of the target (or a build
with 'tools-profile' added to EXTRA_IMAGE_FEATURES) because it needs
to be able to run the native systemtap built by the systemtap recipe,
which in turn needs access to the kernel built for the target in order
to build the kernel modules that implement the systemtap probe
specified by the systemtap script and which ultimately get shipped to
the target and insmod'ed there.
The crosstap script also needs to be able to ssh to the target host in
order insert the modules on the target, so the target system needs to
support incoming ssh connections.
(From OE-Core rev: c6da6b648328377ba3590fd38cb12dad26a46a13)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix it for the downloaded sstate cache file
* The downloaded sstate cache file is in SSTATE_DIR, and there is a
symlink points to it, the sstate cache file should not be removed if
the corresponding symlink is kept, it would be removed when the
symlink is removed (with -L option).
* Fix a comment line.
[YOCTO #2897]
(From OE-Core rev: 12ed7e6bb215e70b119d5ce123e36e2fd380ff1e)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The new yocto-kernel way of specifying that the branch sanity check
doesn't need to be run is to specify a default kbranch and build that.
In the case where we have a new kbranch but it's not yet in the repo,
we need to tell it that our new branch is the default and we're
building the default and that's how we avoid the sanity check and the
subsequent do_validate_branches() failure.
(From meta-yocto rev: dadd020c67e901609be3ac13a4ffd8cb28532966)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The logbuf-normal feature is obsolete, so remove any references to it.
The dmaengine and hpet features have changed, but don't really need to
be added by default to i386 - leave that to the BSP developer. Also,
remove a couple duplicate feature references in the .scc files.
(From meta-yocto rev: 3f37864d474912d680c2e6ee2a962e9fa61df39b)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In a few places, we have scripts which use <rootfs>/var/pseudo for
the pseudo state directory controlling a given filesystem. This
seems possibly risky because it means that stuff running under
qemu or whatnot could wipe out the data being used to handle that
rootfs. Move this to:
<rootfs>/../$(basename_rootfs).pseudo_state
to avoid problems.
This also solves at least one case (not directly hit by yocto's
tree) wherein you could end up trying to remove a rootfs while
pseudo was using a database inside that rootfs, and thus the
remove would fail.
(From OE-Core rev: aa5d6bd006d3b4eede21d8987451876ed3385ab8)
Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Compiling tar-replacement or not is decided by version of host tar,
if the host tar version is lower than 1.23, Compiling tar-replacement
is needed.
When doing popoluate tar-replacement sysroot to write the tar to
sysroot, but writing is not finished. other packages probably
use the being written tar to unzip file, which will lead to failure
and report the below error:
"bitbake_build/tmp/sysroots/x86_64-linux/usr/bin/tar: Text file busy"
Now we compile tar-replacement firstly to ensure that a being written
tar command will not be used.
(From OE-Core rev: 3c1c4719fc96f6f1fbb257413d6baf3d91fdf4e8)
Signed-off-by: Roy.Li <rongqing.li@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The branch updating for the [YOCTO #2587] fix inadvertently changed
some of the qemu branch names incorrectly, fix it.
(From meta-yocto rev: dde4cd9f88093b8c520a6a42f9dda917f4aff5e4)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
YOCTO_KERNEL_EXTERNAL_BRANCH is now obsolete, so remove it from the
templates.
(From meta-yocto rev: 0c440984f3f429d5282559208313dfe7492b8b90)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Make i386 template use emgd 1.14, along with associated changes.
(From meta-yocto rev: 69f49f7e8370112164b70b9a5ae6f3c0e1ce0bfa)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Remove mapping for 3.0 and add mapping for 3.4.
(From meta-yocto rev: e4ddfcda2cc6aad0c3e99066d43d69f5c1ab2f18)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
For 1.3, 3.4 is the preferred kernel and 3.0 isn't supported.
(From meta-yocto rev: ef7f8257ec9830e3eab0acec20564105d23a74f7)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Users seem to want to specify incomplete property sets when using json
input. Allow this by generating default properties before the
user-specified properties are applied; the user will then get the
defaults for any unspecified values, and avoid cryptic backtraces.
(From meta-yocto rev: 3f0361f77cf64844da93ba4a76c42cd5befff5ad)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Make i386 template use emgd 1.10 for denzil, along with associated
changes.
(From meta-yocto rev: 7a93139bcaca7639da0f182356153d2a7539e0c3)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add some useful default options to to the i386 and x86_64 templates.
(From meta-yocto rev: 2f98c6dfce82d670acf54bb93c827cf142539b98)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If reusing a branch (need_new_branch == 'n') we don't need to branch
in the .scc, so make it conditional on need_new_branch.
(From meta-yocto rev: 1e698ad2d18249c6224821bd52e3b979750db256)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
strip() isn't necessary and causes unintended formatting changes in
the output; rstrip() remove the trailing newlines as intended while
leaving indenting whitespace intact.
(From meta-yocto rev: 0caa6cd8c094b531ee8e78154dbf5a8e6014d1fd)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a mechanism to distinguish common-pc variants of standard
branches.
(From meta-yocto rev: c313ad936499104235c47f05bd98ef86b990d713)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add a "branches_base" property that can be used to allow only matching
branches to be returned from all_branches().
(From meta-yocto rev: c3481e22fc4690ff5e449f9c16c2453fa964205d)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Make sure the default branch names match branch names found in the
kernel branch listing.
Fixes [YOCTO #2587].
(From meta-yocto rev: a46fc3dad25eac4a28265c956913f46ef25c0cee)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
For new branches, users can specify /base branches, but we don't want
the '/base' in the resultant branch name, so remove it.
Fixes [YOCTO #2693].
(From meta-yocto rev: 40e925862884fd981dec63fc598326c73e4a4c20)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The MACHINE/KERNEL Checks setup MACHINE is it's unset, the KVM checks valid
MACHINE is qemux86 or qemux86-64 and fail if it's unset!
[YOCTO #2970]
(From OE-Core rev: 8d5e6999caff50a4b7d9a9ba69f9875285270459)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Handle the case during update where the configured branch is not
currently checked out in the component repository by just specifying
it in the places where it was not previously.
(From OE-Core rev: a3ddf39af7e7cd47156677d8ae753964ee582745)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Expand the usage to be able to specify KERNEL and ROOTFS
on commandline. This helps in using the script for booting
images that are essentially not part of OE-Core
(From OE-Core rev: c985b02130658dd64581ecf14b16e2c70d1d8db5)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Several fixes:
* We have put the sstate file to SSTATE_DIR/??/ currently, but the
sstate file on the SSTATE_MIRRORS or the obsolete one is still in
SSTATE_DIR/ (no subdir), update the script to support manage them.
* Remove the related ".done" file in the SSTATE_DIR.
* Add a "-L, --follow-symlink" which will remove both the symbol link and
the destination file
* Change the "ls -u file_list" (access time) to "ls -t file_list"
(change tiem), since the "ls -u" and readlink will change the
symlink's access time, which would make the result inconsistent.
A solution is save the access time before every "ls -u" and "readlink",
save it back after the command, but this would cause performance lost
since it needs check each file and modify the symlink's status. Use
the "-t" doesn't cause much different.
[YOCTO #2897]
(From OE-Core rev: 209ec08787981345a7f62b10a8a5c2ace0887c8e)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is no longer necessary since we've dropped the GL passthrough patches.
(From OE-Core rev: b6bc580f1cf56c2e771e87dfeadbb1e5d8416fce)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Wihtout it, you have both mesa-dri and mesa-xlib as providers. Let's
prefer the accelerated version.
(From meta-yocto rev: 13f847744aa842ef38b3f2adf3764425319b5507)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The yocto-bsp tool generates kernels with additional strings within
the filename, e.g. zImage-myqemuarm.bin. Loosen the MACHINE detection
regex to work with these filenames.
Fixes [YOCTO #2890].
(From OE-Core rev: 17d616adffc3514b6778acc6ab5d6da34a7366b5)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Added support for booting ramfs-based images (e.g, poky-tiny) which
do not have block device support.
This fixes [YOCTO #2612].
(From OE-Core rev: b09c45f017da71ff966004752f8e926ea00ac451)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update it for the new layout of sstate-cache.
Note: It doesn't handle the old sstate-cache/sstate-xxx.tgz (or
siginfo), the user should remove it manually (rm -fr
sstate-cache/sstate-* would be OK).
[YOCTO #2897]
(From OE-Core rev: fcb61aa552a641faafdf2216fa57ba5ac6b9991f)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
runqemu-if* now requires UID as a command line option which means
runqemu-gen-tapdevs needs to take it as an option.
(From OE-Core rev: a624ec02c4acec83efbe66406f22abafbdce5d63)
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This script will be embedded in the SDK tarball and will be called by
the SDK installer. It replaces the interpreter path in all binaries and
it also changes the ld.so.cache and SYSDIRS in dynamic loader.
(From OE-Core rev: 3d366f4953962566f33a3d77d65ed0bd2c48f922)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The switch statement does not fall through as the comment suggests.
This results in -a not implying -c as was intended.
Add the two lines from -c to -a to achieve the intended behavior.
(From OE-Core rev: 319d2cc8e60450106b665ee4172e2e6dc90e14b5)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Move scripts/rpm-createsolvedb.py to
meta/recipes-support/createrepo/createrepo/ since we should wrap it to
use the native python.
[YOCTO #2822]
(From OE-Core rev: 72d673bef385e756bd858f9eca7fe419efaceb39)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Check for .packaged file and exclude packages if this file does not
exist - this avoids attempting to install empty packages during
complementary package installation within do_rootfs that didn't end up
being created (and failing as a result).
(From OE-Core rev: 4a85d8a4026cf1d1603513ed9780f80c603cc611)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If the local configuration is already split out, ensure the init action
works properly and does not error in the case that last_revision is not
set. Additionally, if the local configuration is within the repository,
prevent it from being committed and add it to .gitignore.
(From OE-Core rev: de339b0cb201035e27df1128ccf526937b8325ec)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
With the current code, we're calling awk to do a floating point comparison
between '1.7.0.4' and '1.7.5' (on an ubuntu 10.04 LTS machine). These clearly
aren't proper floating point numbers, and the comparison is incorrect. It's
returning true for 1.7.0.4 >= 1.7.5.
Instead of using a floating point comparison for this, call out to python and
let it do it.
(From OE-Core rev: f28f6267271edbbef16caec323e9ba76e2216723)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Allow splitting the local parts of the configuration (mostly
local_repo_dir and last_revision, although there is no limitation) to
a side-by-side -local.conf file, with component sections optionally
tagged with the combo layer branch name. This effectively allows you to:
* avoid polluting the history by committing the updated last revision
to the combo repository for every update
* avoid putting local repo paths into the combo repository
* manage multiple branches of the combo repository whilst avoiding the
possibility of mixing the configuration for one branch with another.
An example split configuration (note, values may be artificial):
------------------- combo-layer.conf -------------------
[bitbake]
src_uri = git://git.openembedded.org/bitbake
dest_dir = bitbake
hook = scripts/combo-layer-hook-default.sh
[oe-core]
src_uri = git://git.openembedded.org/openembedded-core
dest_dir = .
hook = scripts/combo-layer-hook-default.sh
--------------------------------------------------------
---------------- combo-layer-local.conf ----------------
[bitbake]
local_repo_dir = ../repos/bitbake
[oe-core]
local_repo_dir = ../repos/oe-core
[bitbake|master]
branch = master
last_revision = db689a99beffea1a285cdfc74a58fe73f1666987
[oe-core|master]
branch = master
last_revision = 121a1499a81706366acc0081272a6bff634d4d62
[bitbake|denzil]
branch = 1.12
last_revision = 24b631acdaa143a4de39c6e1328849660c66f219
[oe-core|denzil]
branch = denzil
last_revision = 741146fa90f28f7ce8d82ee7f7e254872d519724
--------------------------------------------------------
It is assumed that the local config file will be added to .gitignore.
(From OE-Core rev: f0065d7a6973628803a17c57f2265512aba3234c)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If the user edits the configuration file by hand and sets last_revision,
we need to ensure that the revision is valid and on the specified
branch.
(From OE-Core rev: 05382932257257247b8c18bc06e9c0039d134d06)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Ignore blank lines in patch list
* Don't fail in interactive mode if patch list is deleted
* Show patch counter
* Show relative path for patches
* Print headings before applying patch list for each component
Also change to using a "with" block to read the patch list so it gets
closed properly when we're finished.
Fixes [YOCTO #2455].
(From OE-Core rev: 65461d7c35fdadb5b008052798731dce19ed187f)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If applying a patch fails during the update process, drop to a shell
instead of exiting; at that point the user can manually apply the patch,
do nothing and "exit" to skip it, or "exit 1" to abort the process.
(From OE-Core rev: c82b28982c4f630c130c827a7da3ac0454cd93b6)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Make the dirty repo check somewhat less strict by ignoring old
patch directories created by this tool.
(From OE-Core rev: fea477ac55e2555c5bb0aad36db641aaa27aa915)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Add a -n option to disable component repo pull during update
* Add a 'pull' action to pull the component repos only
(From OE-Core rev: 61983b2191253b24117b63f586d5aac00c7eb48e)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
&> does not work with dash - use > xxxx 2>&1 instead.
(From OE-Core rev: 5582cc58e42402c4680877e669d8c1ce058e7098)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use a similar mechanism that was previously used to install locales at
rootfs generation time to install other "complementary" packages (e.g.
*-dev packages) - i.e. install all of the explicitly requested packages
and their dependencies, then get a list of the packages that were
installed, and use that list to install the complementary packages. This
has been implemented by using a list of globs which should make it
easier to extend in future.
The previous locale package installation code assumed that the locale
packages did not have any dependencies that were not already installed;
now that we are installing non-locale packages this is no longer
correct. In practice only the rpm backend actually made use of this
assumption, so it needed to be changed to call into the existing package
backend code to do the complementary package installation rather than
calling rpm directly.
This fixes the doc-pkgs IMAGE_FEATURES feature to work correctly, and
also ensures that all dev/dbg packages get installed for
dev-pkgs/dbg-pkgs respectively even if the dependency chains between
those packages was not ensuring that already.
The code has also been adapted to work correctly with the new
SDK-from-image functionality. To that end, an SDKIMAGE_FEATURES variable
has been added to allow specifying what extra image features should go
into the SDK (extra, because by virtue of installing all of the packages
in the image into the target part of the SDK, we already include all of
IMAGE_FEATURES) with a default value of "dev-pkgs dbg-pkgs".
Fixes [YOCTO #2614].
(From OE-Core rev: 72d1048a8381fa4a8c4c0d082047536727b4be47)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We require git version 1.7.5 or later for the git remote --mirror=xxx syntax.
If we have an older version of git, this patch ensure we build git-replacement-native.
We add an alternative PROVIDES in the same way as tar-native to allow this script
to trigger the build whilst still allowing git-native in ASSUME_PROVIDED.
(From OE-Core rev: 269f3b3cfacaf229d5e45177ee01b16561370ee3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When gl is disabled in PACKAGECONFIG then we dont need
to check for supporting libs to be present before running
qemu.
(From OE-Core rev: 6612873dc59054e6d37fa7488226218bfb759127)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
runqemu can fail to with the following message:
You need libGL.so and libGLU.so to exist in your library path to run the QEMU emulator.
Fedora package names are: mesa-libGL mesa-libGLU.
The libGL.so and libGLU.so files are provided by the mesa-libGL-devel
and mesa-libGLU-devel Fedora packages (yum provides '*/libGL*.so').
(From OE-Core rev: f2b6f9c3a8b4f87b5570b78766a118e4290d773a)
Signed-off-by: Cristian Ciupitu <cristian.ciupitu@yahoo.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The non-x86 qemu machines now require an xorg.conf, change the
templates accordingly.
Fixes [YOCTO #2559]
(From meta-yocto rev: d465c09d8df0e6d210ba8cd3c17549a07a8e134d)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Some changes in the ordering assumptions of the qemu include rendered
X inoperative, fix those in the qemu machine template.
Fixes [YOCTO #2559]
(From meta-yocto rev: c3d208267dea6bc0f8be2eb9c63b4125730bb21b)
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
[Yocto 2579]
When set DISTRO to poky-tiny, only ext2 image is created. But
runqemu-internal doesn't set QEMUOPTIONS for ext2 image that make qemu
fail to boot.
Fix it for qemux86 arch since poky-tiny can only build for qemux86 now.
(From OE-Core rev: 5f2f951bdcb6f29e3ece39250715293d92db5f69)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update the help text to tell user that the files and dirs under WORKDIR
which are not created by Yocto will be deleted.
(From OE-Core rev: dcd2ebc5d63965a7ad6e714406149f63ffb4a704)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Some users may build for different archs under same workdir, so they
don't want to clean the dirs not related to current arch.
Run command 'bitbake -e' with selected packages to get the dirs related
to current arch then clean them.
Update the way to get the WORKDIR by parsing the IMAGE_ROOTFS by the
way.
(From OE-Core rev: a16727ebc341e0a0ce59a5200dc774cf672593ee)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use modules subprocess to run command instead of module commands.
(From OE-Core rev: 33f18965bbeeec47f694f2aa165e5e07eadb7ab7)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update the way to check obsolete directories.
According to package and its version construct a list of all packages'
current build directory. If any directory under $WORKDIR/*/ is not in
the list will be removed.
At same time, all the files(vs. directory) under $WORKDIR and
$WORKDIR/*/ will be removed because they are not created by poky.
(From OE-Core rev: 4d2920dee32bbc5d12ed98234de096d28d29415b)
Signed-off-by: Kang Kai <kai.kang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Fix teh output filename to make it easy to use
* Add a default output format (svg)
* Fix the usage message
* Fix the version to v1.0.0
Currently, the help messages are:
$ ./pybootchartgui.py --help
Usage: pybootchartgui.py [options] /path/to/tmp/buildstats/<recipe-machine>/<BUILDNAME>/
Options:
--version show program's version number and exit
-h, --help show this help message and exit
-i, --interactive start in active mode
-f FORMAT, --format=FORMAT
image format: svg, pdf, png, [default: svg]
-o PATH, --output=PATH
output path (file or directory) where charts are
stored
-s NUM, --split=NUM split the output chart into <NUM> charts, only works
with "-o PATH"
-n, --no-prune do not prune the process tree
-q, --quiet suppress informational messages
--very-quiet suppress all messages except errors
--verbose print all messages
[YOCTO #2403]
(From OE-Core rev: 138c2c31e41e3f1803b7efbedf78326d71821468)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Split the output chart into multiple ones to make it more readable, it
only works with "-o path", which means that it doesn't work if the user
doesn't want to save the chart to the disk. For example:
$ ./pybootchartgui.py /path/to/tmp/buildstats/core-image-sato-qemux86/201205301810/ -f svg -s 5 -o /tmp/
bootchart written to /tmp/bootchart_1.svg
bootchart written to /tmp/bootchart_2.svg
bootchart written to /tmp/bootchart_3.svg
bootchart written to /tmp/bootchart_4.svg
bootchart written to /tmp/bootchart_5.svg
[YOCTO #2403]
(From OE-Core rev: 04a34899e1c15a70babd97a3a59ccb9f8af05bad)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The original patch is from Richard, I rebased it to the up-to-date
upstream code, here are the original messages from him:
We have just merged Beth's initial buildstats logging work. I was
sitting wondering how to actually evaluate the numbers as I wanted to
know "where are we spending the time?".
It occurred to me that I wanted a graph very similar to that generated
by bootchart. I looked around and found pyboootchartgui and then hacked
it around a bit and coerced it to start producing charts like:
http://tim.rpsys.net/bootchart.png
which is the initial "pseudo-native" part of the build. This was simple
enough to test with.
I then tried graphing a poky-image-sato. To get a graph I could actually
read, I stripped out any task taking less than 8 seconds and scaled the
x axis from 25 units per second to one unit per second. The result was:
http://tim.rpsys.net/bootchart2.png
(warning this is a 2.7MB png)
I also added in a little bit of colour coding for the second chart.
Interestingly it looks like there is more yellow than green meaning
configure is a bigger drain on the build time not that its
unexpected :/.
I quite enjoyed playing with this and on a serious note, the gradient of
the task graph makes me a little suspicious of whether the overhead of
launching tasks in bitbake itself is having some effect on build time.
Certainly on the first graph there are some interesting latencies
showing up.
Anyhow, I think this is the first time bitbake's task execution has been
visualised and there are some interesting things we can learn from it.
I'm hoping this is a start of a much more detailed understanding of the
build process with respect to performance.
[YOCTO #2403]
(From OE-Core rev: 6ea0c02d0db08f6b4570769c6811ecdb051646ad)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This is from:
http://pybootchartgui.googlecode.com/files/pybootchartgui-r124.tar.gz
Will modify it to make the build profiling in pictures.
Remove the examples since they would not work any more, and they cost
much disk space.
[YOCTO #2403]
(From OE-Core rev: 1f0791109e1aed715f02945834d6d7fdb9a411b4)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This allows core-image-sato to access the WAN.
Thanks to Dexuan Cui for proposing this fix.
Fixes [YOCTO #2329]
(From OE-Core rev: d294b1bddece429f2639676ddc97d2896fc58916)
Signed-off-by: Scott Garman <scott.a.garman@intel.com>
Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The os.popen function would fail (more or less) silently if the executed
program cannot be found, and here what we need is os.system not os.popen
since it doesn't use the return value, use os.unlink() and ignore
exceptions from it would be better as Chris suggested.
[YOCTO #2454]
(From OE-Core rev: bc9f7d7b7eda1c45ad1aaee469ebe28ee1c0c96b)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Tom Zanussi
Koen Kooi
Robert Yang
Richard Purdie
Hongxu Jia
Franklin S. Cooper Jr
MiLo
Michael Halstead
Laurentiu Palcu
Jason Wessel
Darren Hart
Ross Burton
David Nyström
Bernhard Reutner-Fischer
Martin Jansa
Brian A. Lloyd
Constantin Musca
Tom Zanussi
Chen Qi
Christopher Larson
Trevor Woerner
Björn Stenberg
Paul Eggleton
Andrei Dinu
Nitin A Kamble
Robert P. J. Day
Stefan Stanacar
Kang Kai
Otavio Salvador
Scott Garman
Cristian Iorga
Andrei Gherzan
Khem Raj
Veerabrahmam vr
Jack Mitchell
Peter Seebach
Roy.Li
Saul Wold
Damien Lespiau
Elizabeth Flanagan
Dennis Lan
Cristian Ciupitu
