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>
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>
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 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>
While testing the fix for [YOCTO #2222] I noticed that the tuning for
the qemu x86_64 target was using the wrong tuning file - it should be
x86_64 instead of i586. Change the template to match.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
While testing the fix for [YOCTO #2222] I noticed a new build error
that wasn't there in previous testing:
ERROR: Multiple .bb files are due to be built which each provide virtual/libgl
The build still completed and produced a good image, but an error
message was displayed, which this patch removes.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
While testing the fix for [YOCTO #2222] I noticed that the qemuarch
test was wrong - there is no 'x86' qemuarch, just 'i386'. Change the
test to match.
Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
