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>
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>
When running multiple sets of builds on the same
system, it is hard to distinguish which build belongs
to which screen session and you can end up resuming
the wrong session.
The simple solution is to just append the process
id to the screen session invocation to make each
unique.
(From OE-Core rev: 1677b736bca5dc46db522da1874459d2de77209d)
Signed-off-by: Jason Wessel <jason.wessel@windriver.com>
Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The commit a9f11849 [linux-yocto: explicitly export KMETA to scripts]
allows the meta branch name to be changed by exporting it to all
phases of the build.
But if a custom kernel without a meta branch is built, we end up
passing an empty string to the creation scripts, which breaks the
build since input is expected.
Inhibiting the export of KMETA to the creation scripts when empty
fixes the problem.
(From OE-Core rev: 61162fbe01993659301fe2e821bf9c3e801206d8)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
To support custom repositories that set a SRCREV and that only have
a single master branch, do_validate_branches needs a special case
for 'master'. We can't delete and recreate the branch, since you
cannot delete the current branch, instead we must reset the branch
to the proper SRCREV.
(From OE-Core rev: de5bb5879fa3282c46dc1ede36af34eaab8f647f)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
In the kernel's tools/perf/Makefile CFLAGS was previously hard coded to
contain "-I/usr/include/slang" to work with hosts that have
"/usr/include/slang/slang.h" as well as hosts that have
"/usr/include/slang.h". This path can cause compile warnings like:
cc1: warning: '/usr/include/slang' doesn't exists.
or
cc1: warning: include location "/usr/include/slang" is unsafe for
cross-compilation [-Wpoison-system-directories]
Then in some cases warnings become errors if WERROR is enabled hence
build errors.
In coordination with a kernel fix, we can fix this error for all
kernels by modifying the perf Makefile within the staged kernel
source.
(From OE-Core rev: 4e0daf05ed04e9fb4343032c6290a379f53b89f3)
Signed-off-by: Liang Li <liang.li@windriver.com>
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
"ERROR: Nothing PROVIDES 'grub-efi-x86_64-native'" is returned when
trying to build meta-intel/meta-cedartrail with DEFAULTTUNE = "core2-64"
Used TRANSLATED_TARGET_ARCH instead of TARGET_ARCH in grub-efi.bbclass
[YOCTO #3013]
(From OE-Core rev: 20e2aaacb36113604c4ea7c40dd0bbbf224b8360)
Signed-off-by: Mihai Lindner <mihaix.lindner@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
kmod will fail to build with the following error because O_CLOEXEC is
not defined:
| libkmod/libkmod-module.c: In function 'kmod_module_get_initstate':
| libkmod/libkmod-module.c:1640: error: 'O_CLOEXEC' undeclared (first use in this function)
| libkmod/libkmod-module.c:1640: error: (Each undeclared identifier is reported only once
| libkmod/libkmod-module.c:1640: error: for each function it appears in.)
| libkmod/libkmod-module.c: In function 'kmod_module_get_refcnt':
| libkmod/libkmod-module.c:1754: error: 'O_CLOEXEC' undeclared (first use in this function)
| libkmod/libkmod-module.c: In function 'kmod_module_get_sections':
| libkmod/libkmod-module.c:1913: error: 'O_CLOEXEC' undeclared (first use in this function)
| libkmod/libkmod-file.c: In function 'kmod_file_open':
| libkmod/libkmod-file.c:282: error: 'O_CLOEXEC' undeclared (first use in this function)
| libkmod/libkmod-file.c:282: error: (Each undeclared identifier is reported only once
| libkmod/libkmod-file.c:282: error: for each function it appears in.)
Since we are only using kmod-native for depmod, and it's a non-threaded
user of this libary being built this should be safe to override O_CLOEXEC.
Keep in mind this is ONLY effecting the native builds and not what is
being shipped in the root file system.
(From OE-Core rev: edcb57fe308979cc5b92359d064e32bb70d4ad76)
Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
gtk-update-icon-cache is called for each subdir of ${datadir}/icons,
but there are some themes without an index.theme file such as
xcursor-transparent, so add -t(--ignore-theme-index) option to avoid
errors of gtk-update-icon-cache.
(From OE-Core rev: bab34e5fa734a98cb5199db4ebc95a6634a38431)
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Dropped --without-apache option as it does not exists.
Added patch from subversion-users ML to not build mod_dontdothat.
(From OE-Core rev: c79fb25161b958b07fbfa965768754d51717d616)
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
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>
The task-core-lsb-runtime-add subpackage includes eglibc-pic as an
RDEPEND. That's incorrect, eglibc-pic is nothing but 22MB of static
libraries and should never appear as a runtime dependency.
(From OE-Core rev: 79545d068659c943ac9aa925a7da0eee82207b8b)
Signed-off-by: Andy Ross <andy.ross@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Original location was kernel.org and it was not restored after server
was hacked.
(From OE-Core rev: 149b8bebe21ebf2f126d3ab2a21c036c556a63c7)
Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit adds the vmx* files needed to setup a VMware image,
this also packages the vmdk along with the vmx files.
(From OE-Core rev: 968cfc0b630fb409430a46b1512d6bf0de225ad1)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
With pseudo the cmod in pkg_postinst is actaully redundant since
the do_install uses install -m 4555 and pseudo is able to track that
between the install time and the rootfs package installation, so the
perms are correct.
[YOCTO #2894]
(From OE-Core rev: a2bc81032c85548f7c72dc76e6020ab4df9af6de)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Add patch for fixing the _gen/svc-gtk-doc.h target in
the makefiles.
(From OE-Core rev: a39cad99a95dd5e31213e4661304f515dc48628d)
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The 0001-Fix-a-race-in-_gen-reentrant-methods.list patch is
included in the 0.19.6 version.
(From OE-Core rev: 712c365bf745de3fe927fcc24da505009d17a3e5)
Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The last two distutils changes progressivly broke the builds. Firstly they
moved things from the site_packages directory to being higher up the tree
which introduced package QA warnings as a side effect. Secondly, it interacts
badly with setuptools which passes in --root=${D} itself.
This patch restores the original directory layout, hence fixing the QA
warnings and also passes extra options to setuptools to deal with the
--root option it passes.
(From OE-Core rev: bed18d5df7915e4127a538be9c7550e185c8c850)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Its not listed in DEPENDS, this ensures build reproducibility.
(From OE-Core rev: a6029573fba6badc077486f2e3eab8df46e455ad)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This avoids problems with libstdc++ having bad rpaths (/usr/lib/../.lib)
in its .la file. See the patch for more information.
(From OE-Core rev: bd27e81f1fa49e2770da9a4a65a83e9d4c3a0dd0)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use the built-in normalization function instead of the sed hack.
(From OE-Core rev: ba8263e5dc520f5024fc76d8bd2e10fe0564b0e2)
Signed-off-by: Andy Ross <andy.ross@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
The -rpath argument would search the host filesystem for libraries,
even when a sysroot was defined. For cross toolchains with targets
compatible with the host architecture this can find incorrect
libraries. Leave -rpath-link unmodified, as build systems in the wild
are already using this to point to host directories.
[YOCTO #2965]
(From OE-Core rev: bccea580f1abb762d231f785a4e60c9cd368dcdf)
Signed-off-by: Andy Ross <andy.ross@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
