This file is already opened a few lines previously, so drop the duplicated
call.
(From OE-Core rev: 4808629faa1222b31f92a3e410e06adb8e081293)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
string.join() is deprecated syntax and doesn't work under python3
so use the modern sytax instead.
(From OE-Core rev: 402d652edf79bcfe1eaf1a3b55ad1177d1e3ee85)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
I mistakenly thought subprocess had getcmdstatus in python 2. It doesn't so lets
add a wrapper and have this work in both worlds.
(From OE-Core rev: 2253e9f12734c6e6aa489942b5e4628eca1fa29d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The has_key() attribute has been removed in python 3 since there is better
syntax available. Use the improved syntax.
(From OE-Core rev: 3dff13793e875ff58cc38c4a960caca9b6969843)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The commands module is removed in python3. Use the subprocess module instead
and the pipes module to replace the mkargs usage.
(From OE-Core rev: e2e1dcd74bc45381baccf507c0309dd792229afe)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We open the file we're writing to in binary mode so open the input stream with the
same mode so things match. This avoids errors with python3.
(From OE-Core rev: 4f47b3a4726dd47e8a6db228fcaf25d1890e3e52)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In python 3 print is a function call. In some cases bb.note is a more
appropriate call to make.
(From OE-Core rev: 754874e68d1037c76fc4cc7d35d3fa12946d00f8)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The <> operator is deprecated, use != instead which is equivalent.
(From OE-Core rev: dde7af5f6c769eae721b1ee18462b841c8ea3277)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
file() syntax is removed in python 3, use open() instead.
(From OE-Core rev: b2d10f15db23246e3957b69d77433f87674928bb)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There are some left over tab characters in the python functions. This
removes them and resolves python 3 errors.
(From OE-Core rev: fafeb381c48291fa65c634c01c244843c8d7fad3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Modern expection rasing syntax is function call format, convert to this
to keep python 3 happy and model correct coding style in the core.
(From OE-Core rev: f4b382754603d3f1caa13824bcc8d06b568bbc59)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
python3 doesn't like files being left open. This updates the code style
to ensure file are closed.
(From OE-Core rev: ec74285bd2108f12f33fc8ac0dc1d124ab48be21)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update older code to use modern exception handling syntax which
is the form accepted by python 3.
(From OE-Core rev: b010501cd089e649a68f683be0cf4d0aac90fbe3)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add comment for NOHDD which is used for skipping building the HDDIMG if
set to 1
(From OE-Core rev: 9843ad9d783f68b97fedfe5b435528538bb26c1c)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Using "before do_rootfs" would have this task added to do_rootfs
dependencies regardless of the filtering options. Instead, add this
dependency in the anonymous python function.
(From OE-Core rev: 2400a74923e51e17ecfa94c2d63908b0b2aac76a)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* like PERSISTENT_DIR I find BUILDHISTORY_DIR more persistent
then tmp-eglibc directory
* WARN: people with existing checkouts in TMPDIR/buildhistory
need to move it to new location first (in order to save history)
(From OE-Core rev: d3ad9a4c573fec08b5606a4c3e86f93cb95e8718)
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
do_rootfs[cleandirs] contains ${S} and, if do_rootfs task starts before
the do_dumpdata_create_diff_gz is finished, an error will occur in the
process because the directory will be removed while still needed by the
create_diff_gz() function.
This patch will force the do_dumpdata_create_diff_gz task to run before
do_rootfs when the final image is created.
[YOCTO #4310]
(From OE-Core rev: cd90be31571178d6822dba5a94a2795209a3576c)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Generation of elf images fails because kernel images are no longer staged under
${STAGING_DIR_HOST}/kernel, but rather ${STAGING_DIR_HOST}/usr/src/kernel. This
patch fixes the path to point to the correct location.
(From OE-Core rev: 6e57a3231fb29f869d476b8511d6f4393f82651b)
Signed-off-by: Tomas Frydrych <tomas@sleepfive.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When image.bbclass was first conceived (as rootfs_ipk.bbclass), oemake
was unable to figure out when the inputs to do_rootfs had changed in
such a way that it would need to be rerun. Absent any reliable
information of this kind, it was necessary to adopt the conservative
assumption that images always needed rebuilding and, to this end,
do_rootfs and do_build in image recipes were marked as nostamp. (The
nostamp annotation for do_build was added in oe-classic commit
80d622e0c1dbc284858e01d3eb670303a6d8cdf9 from January 2005; the exact
point at which do_rootfs was made nostamp is obscure, but it predates
oe-classic revision 63fad339e01d4b16105146c32a61f24460397126.)
This situation persisted for the following eight years but, during that
period, oemake evolved into today's sstate-enabled bitbake, oe itself
gained the OEBasicHash algorithm which can reliably detect changes to
the input data for do_rootfs or any other task, and OEBasicHash was made
the default for oe-core in 4199efed48005a62267fa3374c33b13627d85f44
(June 2012).
Given these various changes in the wider landscape, there is no longer
any obvious benefit to having these two tasks marked as nostamp, and
indeed having them so marked causes needless rebuilds which can be
annoying. Anybody who does genuinely wish to rerun these tasks when
nothing in the input has changed can run "bitbake -f", just like with
any other task. So, let's remove the nostamp annotations and just let
bitbake figure out when to rerun them.
(From OE-Core rev: 8505008c115efb54d18e5f25441c7a938a32ffaf)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Make it easy for the wildcard specifications for complementary package
features to be extended outside of image.bbclass. For example, to add a
new "foo-pkgs" item that could be added to IMAGE_FEATURES that would
cause *-foo packages to be installed for all packages currently in the
image, you can now use this line at the global level:
COMPLEMENTARY_GLOB[foo-pkgs] = "*-foo"
Implements [YOCTO #4228].
(From OE-Core rev: 4e39c1b9dbba1d2b07ffc2c6a1a252fc8f7680ee)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Make hard links for staging files instead of copy to save the disk space
(3G will be saved for a core-image-sato build), and it doesn't affect
much on the build time.
The following directories are affected:
1) The sysroot
2) The DEPLOY_DIR
3) The pkgdata
[YOCTO #4372]
(From OE-Core rev: 5853e0f482b22258c909268fe71673a29e31989b)
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>
This reverts commit 9f5a6f89d9.
The reason for reverting this is:
* qemuwrapper has now a fallback method;
* when using multilib, calling qemu_target_binary from recipes would
always point to the qemu binary corresponding to the machine
architecture. Hence, postinstalls needing to use qemu would call the
wrong qemu user emulation binary;
(From OE-Core rev: 15408466515cec7cbb4c394aa203c87b6165f884)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
With normal toolchain it works. But fails badly when external Linaro
toolchain is used. And this is why:
-e "s/^\(CCFLAGS =.*\)/\1 -isystem/home/hrw/devel/canonical/aarch64/openembedded/build/linaro-tcwg/gcc-linaro-aarch64-linux-gnu-4.7-2013.04-20130415_linux//aarch64-linux-gnu/include -O2 -pipe -g -feliminate-unused-debug-types/" \
(From OE-Core rev: f6244a9d3da7c301f19efc114c2aaf39e5eec299)
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Otherwise we might end up creating directories under sstate-cache with whatever
random umask has been selected for the task that we're trying to package. This
would be a bad thing since it might result in losing group write access for
newly created dirs, and/or losing group read access for the sstate files
themselves.
(From OE-Core rev: d8c4f442c41bf3ac5e064630657cd3fa1b5c43b1)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The kernel's penchant for custom linker scripts means that it doesn't
generally get on very well with gold. Make sure we are using the BFD
linker here no matter what the distro default is set to.
(From OE-Core rev: 5c8277610ae84740e0724b27f10dba3895d40c05)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
An excluded package left its files behind, which meant they could end up in
another package instead, meaning we could ship GPLv3 binaries even with GPLv3
in INCOMPATIBLE_LICENSE. Skip the files belonging to the excluded packages to
prevent this from occurring.
(From OE-Core rev: c045bfe6b991006ac80f0e2d06a8917ae58d9262)
Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Due to some issues with postinstalls that register hooks, we changed the
logic a bit. Now, all postinstalls that register hooks will return
successfully and only after, if hooks fail, mark the package as unpacked.
(From OE-Core rev: 82dae98d0eb771c05e57635f0f8763b118d8177e)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This will allow to register, in a single postinstall, multiple hooks.
(From OE-Core rev: b396138ee081c8f5dddbaab0e374787ba2e31029)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This will allow to register, in a single postinstall, multiple hooks.
(From OE-Core rev: 2cd244d6c93ec6d39e2649de64575c365bd4238d)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This will allow to register, in a single postinstall, multiple hooks.
(From OE-Core rev: 9553874cf02ba443aff1bbead56bacfcda9bb6ca)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The postinstall for the opkg run-postinst hook checks for the existence of this
file. We therefore ensure it always exists during image generation.
(From OE-Core rev: 540cf355599e555615ed9684c3b480463588eb78)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
THe USERADD_PARAMS and similar group variables are package specific variables
which should get added to the vardeps of the packaging process. This
change also ensures they get remapped correctly by the multilib code.
(From OE-Core rev: 805add18e7b917aaef61c82c0b5f2e9682af1d0d)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If we don't do this, multilib packages don't have any code
added to the postinstalls to handle user additions.
(From OE-Core rev: b10d17d1b03fd0564103a6998f218d0968d1032b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently, you can set VIRTUAL-RUNTIME_init_manager to an init system that
isn't in DISTRO_FEATURES. This leads to head scratching over unbootable images.
This adds a sanity check which ensures more valid systems are built.
(From OE-Core rev: c72ec4b52827f75351790eab483d258b2e87611a)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If we put a valid glob like "*/foo/*" into FILES, populate_packages
breaks with a "file exists" message. This is because the glob expansion
does not have "./" prefix however there may already be an entry in
the seen list which does have such a prefix. The easiest/simplest fix
right now is to add the prefix if it doesn't exist which only happens
for certain globs.
(From OE-Core rev: 138c5f3af892e33f576fc7dd268e122b179f82a1)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Ensure that the DEPENDS we're adding is correct in the multilib case by
including MLPREFIX, fixing unnecessary dependencies in those images.
(From OE-Core rev: 1fa8909e24866ffada75daf63225c8daa000b9be)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Currently the names used for the kernel in deploy will contain "AUTOINC"
instead of the final incremental numbering. This fixes the problem by
ensuring data is obtained from the PR service and using the PKG* variables
instead of PE/PV/PR directly.
[YOCTO #4293]
(From OE-Core rev: 1392f959cb8cd50b5a4492899e54f3ed68ef56d7)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
allarch multilib recipes are meant to provide a list of different multilib variants.
Unfortunately since the pkgdata also has mappings for these, they get mapped back to
the original package name which means the effect is undone at package creation time
when the remapping code is called.
This patch adds in a conditional to break that chain meaning the packages get
the correct RPROVIDES and image builds work correctly with opkg.
[YOCTO #3453]
(From OE-Core rev: 1a1927f8a04fe0a2b3b853ebdd33ccb807f00b59)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Fix the fairly long-standing problem of treating a newer bblayers.conf
in the same manner as an older one (reporting that it had been updated
even if nothing was done). The recent work to do a reparse without
having to manually re-run bitbake turned this from an annoyance into an
endless loop, so it had to be fixed.
As part of fixing this the following changes have been made:
* Extensions are now implemented using a function list, so distro layers
can add their own functions which should either succeed (indicating
they have successfully updated the file) or raise an exception
(indicating nothing could be done). The functions are called in
succession until one succeeds, at which point we reparse.
* If we can't do the update, the error message now says "older/newer"
instead of just "older" since we only know the version is different.
(From OE-Core rev: 46b00fdfc9d1e3dc180de087bae2682a1baa2954)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
when we have multilib and a 64bit machine and initramfs then image/lib
directory will not be created and it will end up with errors like
| DEBUG: Executing python function sstate_task_prefunc
| DEBUG: Python function sstate_task_prefunc finished
| DEBUG: Executing shell function do_deploy
| tar: lib: Cannot stat: No such file or directory
| tar: Exiting with failure status due to previous errors
So in order to overcome this shortcoming lets mkdir -p the
lib directory so the modules can be happily installed.
(From OE-Core rev: 3f501204f375cc40a14597a25cb09faaba9ff802)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
1, In bitbake.conf
PKGR ?= "${PR}${EXTENDPRAUTO}"
EXTENDPKGV ?= "${EXTENDPKGEVER}${PKGV}-${PKGR}"
RDEPENDS_${PN}-dev = "${PN} (= ${EXTENDPKGV})"
2, When PR Server is enabled, EXTENDPRAUTO is not none which means PKGR and PR
don't have the same value.
3, When multilib is enabled, RDEPENDS_${PN}-dev is not expanded correctly
which uses PR rather than PKGR in the versioned dependency string.
4, Make sure PKGR rather than PR in version string when do_package_rpm.
[YOCTO #4050]
(From OE-Core rev: cf53c606fc1bc81abb68b6851ae68916f92e1d84)
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Move ${PN}-ptest to start of PACKAGES to ensure all ptest files are
packaged in the -ptest package.
Add QA exclusions to insane.bbclass to ensure -ptest packages can contain
any files they need.
Disable ptest for native packages.
Don't emit errors on missing _ptest functions.
(From OE-Core rev: 01bea4ef932e46eb2fcc8b4be7ff5e2b5b2a0978)
Signed-off-by: Björn Stenberg <bjst@enea.com>
Signed-off-by: Anders Roxell <anders.roxell@enea.com>
Signed-off-by: Josep Puigdemont <josep.puigdemont@enea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Allow recipes to specify sections to be stripped from the kernel output
using KERNEL_IMAGE_STRIP_EXTRA_SECTIONS. For example:
KERNEL_IMAGE_STRIP_EXTRA_SECTIONS = ".comment .unwanted"
The kernel output is stripped in place.
Since the toolchain does not give indication when the specified sections
are absent, we read the sections first and make this report by issuing a
warning to the developer.
The toolchain by default strips the image with the -s option (even
when -s is not specified):
-s --strip-all Remove all symbol and relocation information
For example, these sections are always removed:
.debug_aranges
.debug_info
.debug_abbrev
.debug_line
.debug_frame
.debug_str
.debug_loc
.debug_ranges
.symtab
.strtab
In addition to these, the sections listed in
KERNEL_IMAGE_STRIP_EXTRA_SECTIONS will also be removed.
Only stripping of vmlinux (elf) is supported at this time. A warning
will be given if the image type is not vmlinux.
Stripping the image could also be done in the kernel, but that would
only work for linux-yocto based kernels, so it's not the route we
decided to go.
[YOCTO 3515]
(From OE-Core rev: 5f6d33b05b4e7883f2728ca812cb5386d1e36989)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Michel Thebeau <michel.thebeau@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Postinstalls that use qemu are throwing a segmentation fault when
building for qemux86-64 on a 64bit host (it might also happen for
qemux86 if building on a 32bit host but I didn't test). It looks like
qemu looks for ld.so.cache which is not found because it is generated
after rootfs_(rpm|ipk|deb)_do_rootfs is called and then it tries to load
libraries from the default paths (which are the host's). In order to
avoid this, pass the LD_LIBRARY_PATH explicitly to the target's dynamic
loader.
(From OE-Core rev: 48e8b613b3f5c7b1d917bf3147606d44072ce49e)
Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The creation of a clone of d with extra OVERRIDES was removed in
72c1fd72d3b479c728e249eaa763116d352e945b but some of the lookups are essential
so that variables such as ${INITSCRIPT_PARAMS} get overriden and resolved
correctly on a per-package basis.
[ YOCTO #3960 ]
(From OE-Core rev: b016bc9aaabc90fe4dc98af8c5e73dfcb4526ef4)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
