Hob: Change icon to error because parsing error is an error

(Bitbake rev: 66fcc8cdf8fb3365cd4a056b94fe3aa3e1aedc86)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: clear the building state after a successful build, as a failed build does

(Bitbake rev: afd51c524006e8e6db1542cc2ebc5decab3faa1b)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: Replace "local.conf" in error message

(Bitbake rev: c8dac1eefab79b12243468986c37f391c3421134)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: Fix the setting hash calculation

Sometimes even setting are not changed, the hash values differs due to
variable order issue. This commit fixes the issue.

(Bitbake rev: 1fe0996f89952af72cbdc46ca7c6495868d27a56)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: Change the format to store image_fstype variable

Use string format to store image_fstype instead of a list.

(Bitbake rev: c91fe7f9d21939fd437dbd79a923499f90fc95c6)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: Remember user settings when reparse config

When config reparse is issued (e.x, adding a layer), we will firstly
remember the past user settings by setting them to bitbake server,
and then do the reparse.

(Bitbake rev: 8a1f6953a082d8002585bfd9e8a67d2a7f69d6aa)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: Update configuration after parsing

We need to update the parameters stored in Hob side after
configuration is parsed.

(Bitbake rev: 9560e4ccef497e878f2cb8624136ab8f193c061a)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: Inherit image_types.bbclass in set_user_config()

(Bitbake rev: f34cb901bd9b3598f4da528cc54f6faa57c9d389)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: Improve for init a new build

After a successful build, user can initiate a new build by clicking
"Build a new image" button. The previous solution is simply switch to
the first screen and unset MACHINE. This commit will try to re-init
everything for the new build.

(Bitbake rev: df63e15c41d129fe0cff6b8ab3c97434c4809c83)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

command.py: Move triggerEvent to command async class

The parameters in triggerEvent function is an event object, and it may
cost some time to pass this object through pipe, causing the pipe's
poll() function timeout. Change it to async mode.

(Bitbake rev: 3b5909ebc86a12dedfb30e5446aa81eb58921760)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: Improve the matching for runnable machine type

(Bitbake rev: 1b14488bcfb345a3258b15ebfdaa2e1235a5fe87)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: Define a variable to store the image name and toolchain

(Bitbake rev: d0b64d901b33c9e5247dbb2b05c89a1d65abbf8b)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: Fix adding duplicated meta-hob layer

While adding meta-hob layer, we need to detect whether it already
exists in current layers.

(Bitbake rev: b195823d19bcb71bd5eef19acfe22b2dd670d90a)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: Remove un-used signal and functions

(Bitbake rev: 9c632467eddc267ed54b78a40d5b1413287e3032)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

lib/bb/ui/crumbs/hig: fix layers_changed test

Because we sort the treeview to list specific layers at the top, and
therefore implicitly change the sorting of the underlying model, we can't
be certain that the original layer list will equal the new layer list
despite the included layers being the same.

To ensure we can do a simple equality test to determine whether the layers
have been modified first sort the lists to ensure we're comparing based on
contents alone.

(Bitbake rev: ae86cd8b4ef1e43b79230326ccba69e2900d074f)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

lib/bb/ui/crumbs: hob progress bar should not be red when user stops build

If the user explicitly stops the build telling them the build failed is a
misnomer.

(Bitbake rev: 722f4f0e31f9debf5ad20a91da759a8c25151567)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

lib/bb/ui/crumbs/builder: allow user to cancel Layer selection dialogue

Because layer changes may take some time allow the user to cancel out of
the dialogue and prevent Hob from applying any of the changes made.

(Bitbake rev: a2d1c035a5dd3d112a887e4386dfaf9b0c37c104)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

lib/bb/ui/crumbs/hobwidget: change text sizes in HobImageButton

(Bitbake rev: 4301cc1e859a68d93eba3122be099bfaa90fbdfb)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

lib/bb/ui/crumbs/imageconfigurationpage: add extra space between widgets

Add space between the target machine combo and the 'Layers' button.

(Bitbake rev: bdd50d92e90f96bf7ff433bb539cdde4b0d21cdb)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

lib/bb/ui/crumbs/hobwidget: add padding to HobImageButton

Add more padding between the icon and the text

(Bitbake rev: a81f6a33cf1fa9fe869ac617f2d14d66e07009ff)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: change some words in settings dialog to make them consistent

(Bitbake rev: 1def8d4d8e725bd9fc4330179557604dda27b917)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: change some words on recipes screen and package screen to make them consistent

(Bitbake rev: 63bfa397059823bea6fa453703cf0653fc123f0b)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: change some words on image configuration screen to make them consistent

(Bitbake rev: 6d5bcf80afbd081d41572985b724c615bd3a16b6)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: change some words for build configurations on build details screen

This patch is to change some words of variables to make them consistent with the GUI.

(Bitbake rev: 4af7ab24ff3b170dfa74159c057e7110a615a8d3)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: add Templates and Settings on image details screen

This patch is to add Templates and Settings tool buttons on the image
details screen, which makes things easier and simplier.

In order to fulfill that, the code splits the functions
show_load_template_dialog() and show_adv_settings_dialog() in builder.py
because they will possibly be called from different screens later.

[Yocto #2163]

(Bitbake rev: 29bea7b7076a7b74d36237da86a4eff6605d17ec)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: Set one of deployable images or runnable images as the default toggled item

With this patch, even though there are a lot of images built out, a default image
which is either deployable or runnable is toggled by default. So, for users, one
more action to select an image before running qemu or deploying is not needed any more.

Note: If there are more than one runnable or deployable images (such as ext2, ext3,
jffs2 and btrfs), only the first image is toggled by default for run-qemu or
deployment. If the user wants to run or deploy others, he/she needs to toggle them
manually.

[Yocto #2155]

(Bitbake rev: 4568dfbd5e693cce0e6e947f323eaf08a3176744)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

ui/knotty: Add a footer to the build output for interactive terminals as knotty2 UI

On terminals which support it, add summary information to the end of the
build output about the number of tasks currently running and how many tasks
we've run so far.

This provides a summary at a glace of what the current state of the build is
and what the build is currently doing which is lacking in the current UI.

Also disable echo of characters on stdin since this corrupts the disable,
particularly Crtl+C.

The "waiting for X tasks" code can be merged into this code too since
that is only useful on interactive terminals and this improves the
readability of that output too.

Improvements since v0:

* The tasks are ordered in execution order.
* The display is only updated when the list of tasks changes or there
  is output above the footer.
* Running task x oy y and package messages are supressed from the console

This UI can be accessed with "bitbake -u knotty2".

(From Poky rev: e38b4569648f2916c4370871c79e6a6090eb8bc1)

(Bitbake rev: 156189c799d2bb1f69bdaa04b5cd718fe7881425)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

uihelper: Keep track of pids in execution order

(Bitbake rev: cec2f3eaa45a6fd8d3c53c09aaf010ac6101e7ba)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

license.bbclass: remove existing license.manifest before appending new data

without this fix, we append license each time we build again the same image,
ending with a large not up to date file.

(From OE-Core rev: 2d49a8f659694b60cdb706e8993cd9550e2002bd)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

ghostscript: Fix remaining CP_ prallel make races

(From OE-Core rev: 8fe53bdc807184bc41469d8587368b31192e6252)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

bb.build: use relative log links, not absolute

Using symlinks to absolute paths isn't gaining us anything, and can cause
problems in situations such as automated build systems when they try to
resolve the link, depending on the mechanism used to pull the build artifacts
(e.g. nfs).

(Bitbake rev: f9cf2671c0ecad153db11bca1aebe151213bfb42)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

rpm: Ensure we depend on file

rpm links to libmagic from file so it needs to be listed in DEPENDS else we
can have race conditions causing build failures such as those seen on the
autobuilder recently.

(From OE-Core rev: 432e36300d7231c9b01cd2c6c4b39b84cf4fddca)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

eglibc-2.15: Update SRCREV

Get new patches and remove the one that got merged upstream

(From OE-Core rev: 0e1a843a1f0c54f00736170de39a8a8f62d26879)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

clutter: clutter_git is really clutter-1.8_git, rename

Both these clutter recipes provide 1.8. With different PN namespace, a world
build cna build both causing the clutter libraries to "disappear" at certain
points of the build. In particular, this causes issues for mx.

This patch puts then into the same PN namespace so only one can be built.

[YOCTO #2158]

(From OE-Core rev: d5a7a9090b57793be1de63dca86fe40437628e9d)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

tiff: Make builds deterministic

libtiff now depends on lzma which can be obtained from xz and doesn't use lzo.
Previously, libtiff would detect and use lzma if it was present leading to
a number of race conditions including failures in things linking to libtiff
such as ghostscript since lzma could be removed while being rebuild leading
to failures in linking.

This patch corrects the dependency.

(From OE-Core rev: b6369ed4ea03fb5410f94c1ee646d488bf981987)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

gcc-cross-intermediate: Ensure we move the libraries from the correct location

This fixes multilib issues if you try for example to use a BASELIB of /lib32
which wouldn't work without this change since the compiler install location
is taken from gcc -print-multi-os-directory which can still turn out to be
"/lib".

The reason is that a 32 bit gcc has no multilib code enabled and will always
return "." as that value rather than "../${base_libdir}" which our changes
to gcc enable and return in 64 bit mode.

(From OE-Core rev: cc953e2259bf77e9e1f7a1e3d0dbe1509c79477e)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

ghostscript: Fixes for parallel_make

(From OE-Core rev: e3408adc6912629f268795a1d3adb9df7134979b)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: allow users to setup the proxies

This patch is to read the proxy variables such as all_proxy, http_proxy, https_proxy, ftp_proxy, GIT_PROXY_HOST, GIT_PROXY_PORT, CVS_PROXY_HOST, and CVS_PROXY_PORT from the bitbake server, show them on the Settings dialog for users to change and set proxies for the build.

(From Poky rev: bbef66e4005def54d70d3720ec131fa7edc22e2a)

(Bitbake rev: 66c63167cd139706100bfa35eb4ca66c98407615)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: fixed some not compatible places for make runningbuild.py can be reused by another application

The runningbuild.py has been shared by different applications, not only hob, so fixed the some not compatibled codes

(From Poky rev: 99fa7388500fa97fe4629456daa50bb5637e51e6)

(Bitbake rev: 23c13560fa76442c798058700863bd91491ca826)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: change the implementation way about get config info for building log

Make the building log config information to get from the bitbake parameters directly, and then cancel the old way of filting the building log on running

[YOCTO #2144]

(From Poky rev: b52025a0fe2ca65e4d8549b1b90f5813b0c2e39f)

(Bitbake rev: 983f8848da0be02dadb1bb6530ff736325d014ba)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: use hob icon checker to check the gtk icon for make the icon constaintly

Because we have hob icon, so need to make some gtk icon to transfer to hob icon. so use hob icon checker to fixed the gtk icon

[YOCTO #2108]

(From Poky rev: d1d84e5529e0d0752fdcd8d3458ed7595d373115)

(Bitbake rev: 65bbc07a3557ac760c6b900880ea6ae2937afde3)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: change the recipe pasing error dialog icon from 'dialog-info' to 'dialog-error'

[YOCTO #2109]

(From Poky rev: 1fbd6eefc68ec38875968b8513739b732da412b8)

(Bitbake rev: 840a566ce4c18a1c63ee82257de06c3ed910fe88)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: fixed visually differentiate warnings and errors icon in building log

fixed the bug of 'error' and 'warning' icon is not constaintly with hob ui design

[YOCTO #2097]

(From Poky rev: 5b4f379b5341222e2678043f078b3d33c0556a86)

(Bitbake rev: 3807a95cd48a01486b3ecd5360a59ddfc3a3b6d6)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: add refresh icon as ui request in building log

add a refresh icon to indicator the running task, for avoid add more heavy to bitbake building process, increased the timer interval counter, and decreased the refresh icon render size.

(From Poky rev: cf76d2cef0905a442e61769560173b2e6a58fb62)

(Bitbake rev: d5923a484f80bc1577f78035152c2d0728e4a1f3)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

lib/bb/ui/crumbs/imagedetails: use secondary button style for 'View files'

Use HobAltButton, rather than gtk.LinkButton, for the 'View files'
button.

Use xdg-open to display the folders contents.

(From Poky rev: 22955b47ac485e0d069ddd8301a11658d76bcfee)

(Bitbake rev: 9647c188c0d06ec045c15281eae785e935c25d2b)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

lib/bb/ui/crumbs/imageconfigurationpage: ensure widgets stay positioned

Tweak the table layout and insert some dummy widgets when the buttons
aren't drawn such that when the buttons do get drawn the existing widgets
don't all jump up.

(From Poky rev: 9edd833e7e36aea6a7350a36a5aad0ef300959c4)

(Bitbake rev: c09f71414d459eb926aa567d90a63407407d173e)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

lib/bb/ui/crumbs: tweak build status display

Use two lines to display the active task and recipe, per visual design.

(From Poky rev: ea61503fc439e033b341bb7a50bac77c5e88834e)

(Bitbake rev: ab508907308e8b1bc1b097df1f583dffd7ef25af)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

lib/bb/ui/crumbs: apply primary/secondary dialogue button styling

The design calls for primary buttons which are orange and large and
secondary buttons which are subtle with pale blue text. This is so that the
user is drawn towards the primary action and their use of the application
is more guided.

This patch uses HobButton and HobAltButton classes to style all dialogue
buttons accordingly.

Fixes [YOCTO #2125]

(From Poky rev: 1a52fe9f9e79f33686bd92613fc93eb97daacab8)

(Bitbake rev: 723ad434d427398b202b70f27762878315ffb22c)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

procps: don't print error message with kernel 3.0+

* All procps tools print a message like this when the kernel
  version consists of only two numbers:

| Non-standard uts for running kernel:
| release ... gives version code ...

* Import a patch from Debian to quieten this message.

(From OE-Core rev: ec8c54946572200c4fb779ff1fe2d2848660acab)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

powerpc e500: set -mfloat-gprs=double

Use of FPRs instead of GPRs is incompatible with e500/SPE, so let's be
explicit about the use of GPRs to avoid potential errors. For example, with
the Sourcery G++ toolchain, one can hit: conftest.c:1:0: error: E500 and FPRs
not supported.

(From OE-Core rev: 32bb6afe3e6f3e374e4d14edc238b46a90d44169)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

external-csl: add mapping for powerpc-nf

This ensures we get the files from the correct multilib dir in the external
toolchain when using powerpc with soft-float.

(From OE-Core rev: 27edc9f8c053e2d5fa7c1bb44ae7d028666c5722)

Signed-off-by: Christopher Larson <chris_larson@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

scripts/bitbake: Update to help rebuild pseudo-native

Attempt to detect when pseudo-native has been updated.  If it has been updated,
or if the user is attempting an operation with pseudo-native in the name, force
a build of pseudo-native, prior to running the main build.

Note: This causes a build, then clean in the case of
   bitbake -c cleansstate pseudo-native

(From OE-Core rev: f79184d4000708020f76d82330428b5e7a803642)

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Pseudo: Update to 1.3

The various local patches have made it into upstream, so we update
the build files and jump to pseudo 1.3.  This also includes a popen()
fix which fixes some edge cases that caused failures trying to check
git branches and the like.

[Yocto bug #2181]

(From OE-Core rev: 0b007519fcfb1bcf2be9cad40b0f6265f8798518)

Signed-off-by: Seebs <peter.seebach@windriver.com>
Updated the pseudo_git.bb to match.

Signed-off-by: Mark Hatle <mark.hatle@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

zypper: Fix build with gcc 4.7

More details in patch header

(From OE-Core rev: 38a18c9d52b2f0276445b3f8be7dbf464f5b64c7)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

linux-yocto: support externalsrc builds

There are a few extra task that modify the source tree that should
be removed when externalsrc is inherited by a recipe that uses a
linux-yocto tree.

Adding those tasks to SRCTREECOVEREDTASKS means that they are skipped
and externalsrc works as intended.

(From OE-Core rev: e3117fb15498c899282f25a195f3dd3dc889168c)

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

tune/armv7: Delete

armv7 is least common denominator of armv7-a
armv7-m and armv7-r and armv7-m does not support
ARM instructions but only thumb2 instruction set
which means armv7 when chosen will complain if
code is compiled in arm mode which is default
in OE if not specified other wise

if we chose this tuning errors like below pop up

error: target CPU does not support ARM mode

This tuning seems theoretical and base tune
for armv7 would be one of armv7-a,  armv7-m or
armv7-r

(From OE-Core rev: 75b8adbc042e0f65fb1286bc550d02becd3b6aea)

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

nspr 4.8.9: failed to build on x86_64 board

nspr failed to build on x86_64 board(e.g., qemux86-64):

x86_64-poky-linux-gcc    -m64 ... -m32 ...
...
fatal error: gnu/stubs-32.h: No such file or directory

This is because there are both '-m64' and '-m32' in gcc's options, and
the later one is used, but what we need is '-m64' since it is x86_64,
this is caused by an incorrect logic in configure.in, we should assume
that the pkg uses 64bit when target_cpu is x86_64 (it has two options:
--enable-n32 and --enable-64bit, both of them are not set by default),
we only can assume that the pkg uses 32bit when USE_N32 is set. But
what it did was that assumed 32bit when target_cpu was x86_64 unless
--enable-64bit was set, this seems unreasonable and caused the "gcc -m64
-m32" error.

Some had noticed this error before:
https://lists.yoctoproject.org/pipermail/poky/2011-May/005799.html

NOTE:
* Both fix configure and configure.in since we can't run the
  "autoreconf" for nsrp, please see more explanation in
  trickly-fix-build-on-x86_64.patch.

* Also fixed powerpc64, this is just fixed by conclusion since we don't
  suport ppc64.

[YOCTO #2179]

(From OE-Core rev: 1d8fea3b9c9dd8f3e2b72ee8c8a9b834f4a3d729)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

contacts.inc: conditionally install shema

Install schema should respect to GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL,
If GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL is set, the schema should not
be installed, but it always installed shema before, this was incorrect
and it would cause host contamination since it would read
$HOME/gconf/.gconf.

[YOCTO #2178]

(From OE-Core rev: 674fa286d882ff94830cbf748e3f5abc63a5575a)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

contacts 0.9: failed to build

contacts_0.9.bb failed to build since lacks of:

* SRC_URI[md5sum] or SRC_URI[sha256sum]
* LIC_FILES_CHKSUM

And an indent error in Makefile.am.

Fix these problems at the moment, maybe we should remove this old
version recipe since there is a contacts_git.bb

[YOCTO #2178]

(From OE-Core rev: d60b918186cadde05f2cde5b64d5b593ee0a6aba)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

image_types: remove duplicate setting of -i for inode count

inode count is already set in the EXTRA_IMAGECMD definition

(From OE-Core rev: db5a1785615f72a707c139a539c1cfa6c5bd0d23)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

builder: Enable auto starting of Hob

(From OE-Core rev: bcf024fa1840d532c61ff56f369039bb1e531465)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

vmdk: Update for direstdisk

The conversion to directdisk is necessary due to the limitation
in the mkdosfs version we carry and larger filesystems.

(From OE-Core rev: 0f8a33cfa254f59bb87fe4a6727e329b0772551a)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

boot-directdisk: Fix Block Calcuation

This also changes the timeout to be settable

The block calcuation was not correctly rounding, see comment

Thanks to Darren Hart for fixing this.

Cc: Darren Hart <dvhart@linux.intel.com>
(From OE-Core rev: 53ae1737611e10e7fef815e8fde9e22165aa1047)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

image-vmdk: Add symbolic link for a short named vmdk image

This adds a link from the date stamped vmdk image to a shortened
name file.

(From OE-Core rev: fe157bb9543bbb6c9523c0feb150ae3913802379)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

self-hosted-image: pre-populate the builder user with poky source

This patch installs the poky source into the /home/builder/poky/ of the
self-hosted-image.
This makes the user of self-hosted-image easier to start a build.

I think the recent poky master is stable enough, so I specify
a commit number by SRCREV -- we may want to update this number before
releasing 1.2.

This patch fixes [YOCTO #2065]

(From OE-Core rev: 1f2d9be4516cd8c1ed5ce468cb2276f062296ad1)

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Added code for supporting target based pseudo
fixed indentation

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

gcc-cross-canadian: Clean non shipped empty directories.

Cleaning up non shipped empty directories.

(From OE-Core rev: e2fd32919e1d96136528c61677bdfeee2b064320)

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

guile: Deal with hardcoded path issues

Without this build of autogen-native break if the guile-native package has been
recloated.

(From OE-Core rev: 644b7503c37fd73730dd3d7841463b158b8934ed)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

rootfs_ipk: replace 3 opkg-cl calls with one in get_package_filename

* || true is needed for cases where grep doesn't find anything
* and quotes around info are needed to keep line breaks

(From OE-Core rev: 9a8199e4a0f46ed3e9582143b206144aee28b709)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

classes: scons: add EXTRA_OESCONS

(From OE-Core rev: 8c9ff3a5df85339e5d2b85fa00e471b6a3d17bd2)

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

archive-configured-source.bbclass: Archive configured source

This bbclass prepares for archiving configured source.

[YOCTO #1977]

(From OE-Core rev: a81c03cf6111106d04f2883b168f5be78900ee5f)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

archive-original-source.bbclass: Archive original source

This bbclass prepares for archiving original source.
If original source is tarball, then copy this tarball to
${DEPLOY_DIR}/sources.
If original source is dirctory, then archive this directory to
tarball

[YOCTO #1977]

(From OE-Core rev: bc18dfdf42c8ece353a580671502ad79d37fa476)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

archiver.bbclass:

1 Archive sources in ${S} in the different stage
  (do_unpack,do_patch,do_configure).
2 Archive patches including series
3 Archive logs including scripts (.bb and .inc files)
4 dump environment resources which show all variable and functions
  used to xxx.showdata.dump when running a task
5 dump all content in 's' including patches to file xxx.diff.gz

All archiving packages  will be deployed to ${DEPLOY_DIR}/sources/

[YOCTO #1977]

(From OE-Core rev: 2fdc271887db8c0ef0641472d00e850e8b3caa19)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

package_rpm: Add srpm function to this bbclass

Add a new function to archive source, patches and logs to a source rpm
package. Every source rpm package will be deployed to
${DEPLOY_DIR}/sources/deploy-srpm

[YOCTO #1977]

(From OE-Core rev: be2db850fbe516b92a3991a5eaf646c4a2b8a1b9)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

src_distributelocal.bbclass: Remove src_distribute_local.bbclass

This bbclass has been merged into archiver.bbclass

[#YOCTO 1977]

(From OE-Core rev: be5a531b47b6b8875ba03dd5ab5f2fc84088718e)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

src_distribute.bbclass: Remove src__distribute.bbclass

This bbclass has been merged into archiver.bbclass

[#YOCTO 1977]

(From OE-Core rev: 7a61fc6300a1892e5570352e919f200278153831)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

sourcepkg.bbclass: Remove sourcepkg.bbclass

This bbclass has been merged into archiver.bbclass.

[YOCTO #1977]

(From OE-Core rev: 23133241f3ed421ecafd8dcc5571a3b3ea8a3e92)

Signed-off-by: Xiaofeng Yan <xiaofeng.yan@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

linux-yocto: common-pc: Add PCNET32 to the config

Updating the meta SRCREV to pick up this commit:

[
    common-pc: Add PCNET32 to the config

    Qemu and VM Ware both support PCNET32 and the latter requires it for
    32 bit images.

    (From OE-Core rev: 6b431f1a09abde57d03b799e57186afb9a572387)

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
]

Signed-off-by: Darren Hart <dvhart@linux.intel.com>5A
Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

kernel.bbclass: touch .scmversion also in ${S}

(From OE-Core rev: e3bf54731973a444edf69ad8876d019aa404db75)

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Fix empty file case that caused build error at do_rootfs

(From OE-Core rev: 2035ce464cc41672c98f7efb8c4a966f93aa7bd0)

Signed-off-by: Jessica Zhang <jessica.zhang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

speex: fix FILES variables

actually FILES_${PN} and FILES_${PN}-dev match the same files.
these files are supposed to go into ${PN} so remove the other entry.

(From OE-Core rev: 4fc0f65e7d6e6fc6775a9a7e54510b629c9786d9)

Signed-off-by: Eric Bénard <eric@eukrea.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

python: fix packaging dependencies on minimal systems

If you install the top-level python package only on a minimal
system which has no other python packages installed then python
is not functional at all.  Without any extra packages installed
this error is seen:
  # python
  Traceback (most recent call last):
    File "/usr/lib/python2.7/site.py", line 64, in <module>
      import traceback
  ImportError: No module named traceback

Installing python-lang only partly fixes the problem as this
error still exists:
  # python
  Traceback (most recent call last):
    File "/usr/lib/python2.7/site.py", line 569, in <module>
      main()
    File "/usr/lib/python2.7/site.py", line 551, in main
      known_paths = addusersitepackages(known_paths)
    File "/usr/lib/python2.7/site.py", line 278, in addusersitepackages
      user_site = getusersitepackages()
    File "/usr/lib/python2.7/site.py", line 253, in getusersitepackages
      user_base = getuserbase() # this will also set USER_BASE
    File "/usr/lib/python2.7/site.py", line 243, in getuserbase
      USER_BASE = get_config_var('userbase')
    File "/usr/lib/python2.7/sysconfig.py", line 520, in get_config_var
      return get_config_vars().get(name)
    File "/usr/lib/python2.7/sysconfig.py", line 400, in get_config_vars
      import re
  ImportError: No module named re

(From OE-Core rev: c239564c768d0f305d8707103f4c59cf60431670)

Signed-off-by: Gary Thomas <gary@mlbassoc.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

image_types.bbclass: Define runnable and deployable pattern

Define runnable image type and machine pattern.
Define deployable image type.

(From OE-Core rev: 602a0aede00ec961ffb008619cc8f6ee4ae51f58)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Various typoes fixed, all comments or output strings.

Typoes fixed: "enviroment", "editted", "spliting", "scheulder".

(From OE-Core rev: 17e981a857a51b0bec08c929e8539d36d83874b6)

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

busybox: move watch to /usr/bin for compatibility with procps

Commit 68dc2a3fa30c03a196d650de34d0c657a7b85454 broke opkg upgrade:

| update-alternatives: Error: cannot register alternative watch to
| /usr/bin/watch since it is already registered to /bin/watch

(From OE-Core rev: fa8b2d2bed63fa4fc2af45f094998b0f9e69d272)

Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

qemu: add fedora pkg names when build failed

When qemu build failed, we can see such messages:

You need libGL.so and libGLU.so to exist in your library path and the
development headers for SDL installed to build qemu-native.

Ubuntu package names are: libgl1-mesa-dev, libglu1-mesa-dev and
libsdl1.2-dev

These pkgs have different names on Fedora distributions, and Fedora is
one the
main linux distributions, so add Fedora package names.

The following Fedora versions have these pkgs:
Fedora 9 64bit
Fedora 13 32bit
Fedora 13 64bit
Fedora 16 64bit

[YOCTO #2174]

(From OE-Core rev: 246438582f8a23ce1847bae230bce07fbb3c6d15)

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

gcc-cross-canadian: Fixed packaging warnings.

Removed non-shipped empty directories:
 -${prefix}/${TARGET_SYS}
 -${libdir}/../lib
 -${prefix}/include

(From OE-Core rev: 04a08bf7e8d7cf4b6b844a88173b5d1d7917c8af)

Signed-off-by: Lianhao Lu <lianhao.lu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

core-image-minimal-mtdutils.bb: Simple DESCRIPTION grammar fix.

(From OE-Core rev: 647595821870693186c9ecad1bdfa12fe4ea334d)

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

setserial: Correct LICENSE

setserial's license is GPL version 2.0 per:

http://sourceforge.net/projects/setserial/develop

(From OE-Core rev: 07480748d0f2d5da5af64284997fe9b51607cc21)

Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

common-license: Add ICU generic

Another lone license with no generic available.

(From OE-Core rev: 544dec2bbe8055418e2d28262e59c40d0d55b289)

Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

common-licenses: Adding GPL-2.0-with-OpenSSL-exception

socat uses this. There is no good standardized text for this,
but as socat is the only one who utilizes this, it should do
for now although this package has some licensing issues according
to debian. See:

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=632481

(From OE-Core rev: 9a43af4a86d290e730eb3d1683d933ad8ff28710)

Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

license.bbclass: Style guide compliance

4 spaces. Correcting some bash whitespace in license to comply
with the style guide.

(From OE-Core rev: 0945bf7871fd33df3587cdfb1290b028d7843915)

Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

util-linux: Example of pkg level INCOMPATIBLE_LICENSE

util-linux-lscpu provides an example of pkg level incompatible
license. In this instance, we've set the license for this specific
package as GPLv3. The other packages inherit the recipe LICENSE.

What this allows is the package to not be included on install to
the image.

(From OE-Core rev: ed84f2cee691b16671f93fb68a83ed1b0715c1be)

Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

INCOMPATIBLE_LICENSE: support for spdx and pkg licenses

This adds a few things to the incompatible license functionality

1. INCOMPATIBLE_LICENSE was unable to distinguish any variation
within LICENSE (e.g. GPLv3 v. GPLv3.0). This now utilizes the
SPDXLICENSEMAP of the license indicated as INCOMPATIBLE_LICENSE

2. Given a recipe where the main LICENSE was incompatible but
a package of the recipe was compatible, the entire recipe would
be excluded. This allows us some finer grained control over what
exactly gets excluded.

(From OE-Core rev: a8d7246f7b13ef2636c325263c8bfa22552d7a57)

Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

license.bbclass: Whitespace standardization

Removing tabs within check_license_flags to standardize to
4 space tabbing

(From OE-Core rev: 178be339e09078c56a5231a10551f3b9aed16f9c)

Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

license.bbclass: Add spdx mapping to GPL-1.0

Perl is GPL-1.0. For consistency sake, adding an spdx map for
GPLv1

(From OE-Core rev: 2bc1d04e62a8c84e3195d538f844e90c32df8acc)

Signed-off-by: Elizabeth Flanagan <elizabeth.flanagan@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

PPP: Remove leftover reference to "nylon" distro from PPP recipe.

Delete reference to what is apparently a remnant from the OE-core
split, according to Paul Eggleton.

(From OE-Core rev: 4b0fcffae17c03c5c6b2223f202e1d6e8ac55c98)

Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Hob: add build status labels in the build details screen to make it more close to the visual design

This patch is to add build status (incl. "Running task XX of XX: XXXXXX") in the build details screen,
in order to provide clear information about task in progress and make the GUI close to the visual design.

[Yocto #2098]

(Bitbake rev: 02d3451b2e0744204a1280f9effe9fd862bb4faf)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

lib/bb/ui/crumbs: use a PersistentTooltip for the Brought in by information

(Bitbake rev: c57a45c64a17f1b9dd89743692c3da130ffd38f4)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

lib/bb/ui/crumbs/persistenttooltip: ensure a reasonable minimum size

The persistent tooltip looks a little weird when it's too small, request
that the toolkit and WM give it a reasonable minimum size.

(Bitbake rev: 637ea3671dda9c5a1065f992fd9ee87d63043cf4)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

lib/bb/ui/crumbs/persistenttooltip: layout tweaks

The design documents have the close button vertically aligned with the
tooltip contents - reorganise the interal widget layout to achieve this.

(Bitbake rev: 4f8c36226867291c7b6c413ee2570d61a326ec47)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>