When the head of a branch is a merge commit, combo-layer did not
record that commit as last_revision because it only considers applied
patches, and the merge commit never gets applied.
This causes problems when the merge commit leads to multiple patches
and the commit id that gets recorded only reaches some of these
patches. The next run then will try to re-apply the other patches.
This special case is now detected and dealt with by bumping
last_revision to the branch commit. The behavior where the head is a
normal commit is intentionally not changed, because some users might
prefer the traditional behavior.
(From OE-Core rev: 701bcd52c208f22a9a6c48a11a35bcf1c4e413df)
Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Look for OPTARGS variable in /etc/default/weston
and set it as weston's service default options.
This can be used to force system's supported backend.
Change-Id: I0562c9326df5b46226093199873ef58d77aeae75
(From OE-Core rev: 8ffcdcc53bac64c62478fbb72d817c842dde8b28)
Signed-off-by: Philippe Coval <philippe.coval@open.eurogiciel.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upgrade to fix CVE-2015-0245
(From OE-Core rev: 63054fa28d36e10b4cb09af18374068674f6746b)
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Drop backports obviously
additionally drop local patches around
parallel compilation since it got reworked upstream
To select set
GCCVERSION = "5.1%"
SDKGCCVERSION = "5.1%"
in local.conf
Change-Id: Icdfa61017a617244128f361b022e7c8f1f9e0610
(From OE-Core rev: 4bc4acc67e5d7b3f27afadeda5710f9ba5f627d2)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As reported by Steffen Pankratz <Steffen.Pankratz@elektrobit.com>, the
previous logic of KBUILD_DEFCONFIG processing would not propagate an in
tree defcofig to WORKDIR if one was not already present.
We fix the propagation by copying the in tee config if a defconfig is
not already in WORKDIR.
Additionally we only warn (versus copying) if an in tree configuration
is specified, is different than the WORKDIR version and isn't copied.
(From OE-Core rev: 58cc903a5156063b24e48011438a709cb6e09f54)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating the SRCREVs to import the following fix:
mips: define cpu_has_saa in common features include
To avoid build failures such as the following on non-cavium
platforms:
| arch/mips/include/asm/atomic.h: In function 'atomic_add':
| arch/mips/include/asm/atomic.h:52:6: error: 'cpu_has_saa'
| undeclared (first use in this function)
| if (cpu_has_saa) {
| ^
We define a disabled cpu_has_saa unless the machine specific feature
overrides define a value.
(From OE-Core rev: b2f786ca319714bd41d6f9e7ba9efaa8a6d412ab)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
There are two tasks that must run before a linux-yocto kernel is built.
- Kernel checkout and relocation to work-shared (kernel_checkout)
- Meta data gathering and configuration prep (kernel_metadata)
The current task definitions for both are simply "before do_patch",
which is correct, but kernel_checkout must run before and not race with
kernel_metadata.
So we set the definition of kernel_checkout to be more specific and
enforce the proper ordering.
[YOCTO: #7731]
(From OE-Core rev: 9d806f3d05de918952f839f5e595cb71cd1261db)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Updating to include the following commits:
a4d0c407cced dmaengine: dw: don't handle interrupt when dmaengine is not used
e92b2ce791b2 dmaengine: dw: define DW_DMA_MAX_NR_MASTERS
931304a6567e dmaengine: dw: provide DMA capabilities
468bad4f7a6f dmaengine: dw: Split device_control
b4afd7710db7 i2c: i801: Use managed pcim_* PCI device initialization and reservation
d81a8a11ecba i2c: i801: Remove pci_enable_device() call from i801_resume()
40e18604e70c i2c: i801: Use managed devm_* memory and irq allocation
b54f65dbe57b i2c: i801: Remove i801_driver forward declaration
e95740d4d079 i2c: i801: Don't break user-visible strings
423e98721e04 ACPI: Introduce has_acpi_companion()
291f620dc052 i2c: designware: Suppress error message if platform_get_irq() < 0
cf5ff51a8e3f i2c: designware-pci: no need to provide clk_khz
4f583ce420d3 i2c: designware-pci: remove Moorestown support
e000c549c9d8 i2c: designware: Add Intel Baytrail PMIC I2C bus support
7ffbd9ca19a7 i2c: designware: fixup return handling of wait_for_completion_timeout
5758d5a1df32 i2c: designware: Do not calculate SCL timing parameters needlessly
2f58fcae92db i2c: designware: Add i2c bus locking support
84a73e51e900 i2c: designware: use {readl|writel}_relaxed instead of readl/writel
f672bb8424e6 serial: 8250_dw: Fix get_mctrl behaviour
91bd64585489 serial: 8250: add support for ACPI-probed serial port for X-Gene platform
1190cba71f09 serial:8250:8250_pci: delete unneeded quirk entries
6405a4b71451 serial:8250:8250_pci: fix redundant entry report for WCH_CH352_2S
0a1a31bbbc19 serial: 8250_pci: remove one useless explicit type conversion
4edc52a55f82 intel_idle: Add support for the Airmont Core in the Cherrytrail and Braswell SOCs
934f85e8bfdb x86/irq, ACPI: Implement ACPI driver to support IOAPIC hotplug
c6a3440252a8 ACPI / LPSS: check the result of ioremap()
6aacc0c931b7 pinctrl: update direction_output function of cherryview driver
cb4a43a2177d pinctrl: cherryview: Configure HiZ pins to be input when requested as GPIOs
0df22c007ce1 pinctrl: intel: drop owner assignment from platform_drivers
07b16f04700b pinctrl: cherryview: Save and restore pin configs over system sleep
e8e5cfffa231 pinctrl: baytrail: Save pin context over system sleep
04cb3cc0ff21 pinctrl: baytrail: Rework interrupt handling
4cac25d2574d pinctrl: baytrail: Clear interrupt triggering from pins that are in GPIO mode
eacab9ab234a pinctrl: baytrail: Relax GPIO request rules
(From OE-Core rev: d2dd36bafdef7b0424041f5369706b9152ea13da)
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
If xinerara can be selected via PACKAGECONFIG, xserver-xorg recipe can
be easier modified via bbappend.
xinerama is needed by the fglrx driver (from AMD).
(From OE-Core rev: 350c488883ccf5cc8ccfdd36f93052a8cd43d4b6)
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This way, this configuration can be easily changed via .bbappend file
without having to re-define the whole EXTRA_OECONF.
With --disable-check libgstcheck is not build.
(From OE-Core rev: b964917c7c75c637f64389363d566f57487a14da)
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
It is more elegant
Suggested-by: Ross Burton <ross.burton@intel.com>
(From OE-Core rev: 81636555fa7f18407efc172c0d5b9f466b2d4014)
Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Rename the "libxml2" PACKAGECONFIG to "httpstats" so that is is meaningful, and
disable it by default as a web frontend to the server statistics shouldn't be
enabled by default.
(From OE-Core rev: 27ab6150f87bee605dc229a948e737a750559759)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Refresh the libxml2 detection patch to directly call pkg-config instead of
attempting to use xml2-config, which will always return an error in OE.
(From OE-Core rev: 76c53feaec1b8c1045aaf2a78a9225a732a37f1f)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
1. Remove two unneeded CVE patches, 9.10.2 fixed the CVE-2015-1349 also
2. Remove bind-subdirs-run-serially.patch and cross-build-fix.patch,
similar fixes are merged into 9.10.2
3. update the dont-test-on-host.patch
4. update the Copyright file checksum, since the date in it has been changed.
5. replace the hardcode lib dir with $base_libdir in bind-add-crosscripts*.patch
(From OE-Core rev: 41d53f0139a9cb29679dbcaaab8311a1364c65f4)
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This redefinition is not needed and also used Mozilla specific API to
access the data thus breaking the date filter in all other browsers.
[YOCTO #7577]
(Bitbake rev: b64bbc2dd51369b64fae2b1a10502b9dd4ceebfd)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Adds links to the layer details for the layer that has just been
removed or added
(Bitbake rev: 3b323af501f7ec81cce34adb4ea86a7d6599e60a)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We have multiple pages which have buttons to add and remove layers this
patch adds functionality to libtoaster to abstract this and implements
it in the pages affected. We handle loading and showing the dependencies
dialog here too and generating the notification messages.
Also implemented is using the selectmachine api from the projectapp to
avoid having to handle this in each page that allows selecting machines.
A small number of jshint issues, help text and the machine page name
have also been fixed.
(Bitbake rev: ae7a656ba7fc6f4356b57aa309a9b6d035e51d2e)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Use the project page to select the machine rather than setting it and
then redirecting to the project page. This will also avoid having to have a
special handler in the machines page it's self.
(Bitbake rev: 9847e04d86063e4464afb402cb1352243b51f504)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We have a bunch of context data which are used in multiple pages so it
makes more sense to have this in a single place libtoaster.ctx that's
accessible from each page rather than request it from every page.
(Bitbake rev: 4ef2774a2f683929c700550a9acc7b8f6074195b)
Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Moving the code to close the build and instantiate a fresh
buildinfohelper object to BuildCompleted event, as the
CommandCompleted/Failed/Exit events come in too early.
(Bitbake rev: af63abe88327fd5c1b3d7c00a84d9e408ef23285)
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This patch modifies the toasterui to properly return the exit
code based on the errors found in the toaster itself.
The upload event file API call will not delete event logs for which
toasterui showed an error. This will facilitate debugging.
Minor enhancement in the buildinfohelper to reduce the number
of lookups on unknown layer objects (prevented testing of the patch).
(Bitbake rev: 1ddd6a9e4280a4adf971132ff1fe7ec9b3252905)
Signed-off-by: Alexandru DAMIAN <alexandru.damian@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Check up front in test_devtool_deploy_target whether the tap devices
exist and skip if not. If we don't do this we get a significantly less
comprehensible error via pexpect.
(From OE-Core rev: 2258345e19efff7717fe19a5026ec55f1b6f90b6)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
After OE-Core commit 67db7182faf6742b0d971d61d8c5ba34f69d2e12, PV is
appended to the end of the gcc-source PN, thus we need to handle that in
devtool and the corresponding test.
Part of the fix for [YOCTO #7729].
(From OE-Core rev: 440029dc229a566b9bead1481215d5e5760c5fe6)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
I already had the file fetched from some previous work and thus it
didn't attempt to download the invalid URL when I tested it earlier.
Part of the fix for [YOCTO #7729].
(From OE-Core rev: f9bad5aeb507f5b3c1346118011c7766c44d9ba4)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Backport a patch to fix CVE-2015-1572
http://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2015-1572
(From OE-Core rev: 203e1024cc7517cad28423cc04f641376cc8f2f5)
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Upgrade to include a security fixes for CVE-2015-3153
(From OE-Core rev: a99047605020ea76209279e98556687c61e1da0d)
Signed-off-by: Roy Li <rongqing.li@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
We use standard ISO C data types and get rid of configure guess work
which is iffy in cross compiled environment. Cleans up the re-build as well
since we were deleting art_config.h without considering if the file is
there in first place or not.
(From OE-Core rev: b6a1d8b4a62c6f43c610acb27e935e62dbb75f97)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Race condition between do_compile_kernelmodules and do_shared_workdir
tasks occurs when do_compile_kernelmodules changes files in
include/generated/* while do_shared_workdir tries to copy them to
shared working directory.
Fixed race by moving do_shared_workdir after do_compile but before
do_compile_kernelmodules.
[YOCTO #7321]
(From OE-Core rev: b4ec689f71fe9504559c1921c893f5e096d6b744)
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Rename BNFILE and DEVFILE so that they are clearly specific to this
class, since they end up in the global scope
* Use "with open" when opening files consistently
* Use getVar('PF', True) instead of expand('${PF}')
* Drop some unnecessary assignments
(From OE-Core rev: 2392c9bae9fc7732ebafb8c2cd42e49ab281afc9)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
mkdirhier() doesn't raise an exception if the directory exists, so if it
does raise one we should just be failing, otherwise we're just going
to hit errors later anyway.
(From OE-Core rev: 76daab82185851608e5e225487e411504ecb6569)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* Drop trailing whitespace
* Use spaces around equals in assignments
* Replace an errant tab with spaces
(From OE-Core rev: e6d2b407979869219da1f15ed4b5c1c804548fce)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
qemu guesses via probing the format of root FS, but
gives a warning and restricts write operations on block 0.
So fix it by setting correctly the format as raw.
(From OE-Core rev: 1da6bd7fce9c193c7940a7294baa370fd8b66e76)
Signed-off-by: Cristian Iorga <cristian.iorga@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Update SRC_URI to use debian mirrors as googlecode will be closed
in near future. Also added a summary to the recipe.
(From OE-Core rev: 7a4304ba775b703e1d2025d750638e5e418de2a8)
Signed-off-by: Maxin B. John <maxin.john@enea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As Python-3.4 pip is required and installed by default, pips installation
is bootstrapped using python wheels, this makes it complicated to patch,
by default the installation uses an absolute path to /tmp, on most cases
this would not be a problem, but since on the Autobuilders several Python
installations (for different archs) may be happening at the same time,
this shared resource utilization results in errors at do_install(), this
patch disables pip installation by default for now, until we have a
python3-pip package which we can easily patch in these situations.
(From OE-Core rev: be2d305e3f5d675ed98bfe160357f87dc99a8675)
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
As Python-3.4 pip is required and installed by default, pips installation
is bootstrapped using python wheels, this makes it complicated to patch
and causes errors on the Autobuilders, since we don't need pip for
python3-native, this disables it fixing the issues.
(From OE-Core rev: f279f1df6429b0f76e5354c6f0f0b5c29f558edd)
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
When installing python3-native sometimes pips default build
directory (which is on the host and is user dependant) is left unclean,
due to this, when python3-core is being installed it tries to use
the same directory producing an error, this explicitly removes
what the previous installation might have left behind, fixing the issue.
(From OE-Core rev: c27a5a9ba649e7fcf681f6ac4575442e252fd29b)
Signed-off-by: Alejandro Hernandez <alejandro.hernandez@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
