Commit Graph

1479 Commits

Author SHA1 Message Date
Dongxiao Xu 048aa0d472 Hob: Remove duplication for certain bitbake variables
Sometimes, certain variables have duplicated values inside, for example,
IMAGE_FSTYPES = "tar.bz2 ext3 tar.bz2 ext3"

We need to remove the redundancy for those values.

(Bitbake rev: 98849cf9201239b23bbbe9247db4d6901f0ed905)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-05 14:00:26 +01:00
Dongxiao Xu 20ea123c28 Hob: Remove some calling of initiate_new_build()
initiate_new_build() function is in async mode and could not be called
before another async function.

Also we could not initialize the build if user simply change a setting,
therefore remove this function.

(Bitbake rev: c184cefe90115623e2312ad2bbe34ea95788c129)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-05 14:00:26 +01:00
Dongxiao Xu 9cc1e86356 Hob: Update the cache when setting changed
If values in advanced is changed, we also need to reparse the cache to
get the latest value.

(Bitbake rev: 7b2f6744201511060f26cd2761e9556efec4b9a2)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-05 14:00:26 +01:00
Dongxiao Xu c77321180b Hob: Fix MACHINE setting
Define the empty curr_mach to be "" instead of None.
Fix the judgement for ' if self.curr_mach == "" ' to be
' if self.curr_mach '.
Also set machine to bitbake server when "MACHINE" is not empty.

(Bitbake rev: 662fa1b126d5b9b3a80193205c22b2fe29305185)

Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-04-05 14:00:26 +01:00
Richard Purdie d55db7b058 bitbake/cooker.py: Bring into sync with upstream bitbake (trivial difference)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-31 08:07:49 +01:00
Liming An 525275dcfd Hob: In building log page, fixed the issue about 'endpath' not clear when next to start build
Fixed the issue about the building log scrollbar can not auto scroll to page end sometimes

[YOCTO #2098]

(Bitbake rev: 035e146ff92236a3eda71ad71e8389737f91753b)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-30 17:20:21 +01:00
Shane Wang 984c23f7d7 runqueue: wait and deal with those <defunct> sub-processes as soon as they are os.killed() when "Force stop"
When "Force stop" is performed during the build stage, after os.kill() kills the build sub-processes, there are many <defunct> python processes in the system. In Hob, when the user initiates a new build, os.waitpid() in runqueue_process_waitpid() will be called, and the pids of those <defunct> processes will be returned as result[0], then self.build_pids[result[0]] will throw KeyError exception because now for the new build self.build_pids is empty.

This patch is to address the above issue to collect the results and handle the sub-processes as soon as they are killed.

[Yocto #2186]

(Bitbake rev: e9f4ca467e795bbc520d12b0e7a5985b6ff0a20e)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-30 17:20:21 +01:00
Joshua Lock 35acc9edc8 lib/bb/ui/crumbs/hoblistmodel: fix sorting of RecipeListModel
Sort in ascending order on the recipe name (A-Z) and unset the default sort
function so that there's no third (unsorted) state.

(Bitbake rev: c6ab6c7caf16c04e2a0c0f2aefd3377f781206c7)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-30 17:20:20 +01:00
Joshua Lock b9b0ff98a2 lib/bb/ui/crumbs/hobpages: change title from HOB to Hob
(Bitbake rev: 2ecbd68abbf564be15707f330f80e811d92ef87d)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-30 17:20:20 +01:00
Joshua Lock 8c5536543f Hob: tweak font sizes and layout
Switch to proportional font sizes and tweak padding and layout based on
feedback from design team.

(Bitbake rev: 356f190bb3f0ee9a15df900714edcb85593d6989)

Signed-off-by: Joshua Lock <josh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-30 17:20:20 +01:00
Richard Purdie 64d9976cdc knotty: Add back getTasks() call to ensure we don't repeat messges
(Bitbake rev: 8fed4fdf4bbbc9ef036ff96755c0bfe15c3a9dd0)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-29 21:38:37 +01:00
Liming An b5dad0e563 Hob: in build details page, change error icon to denied icon
For make icongraphy consistently to change the original gtk-icon to hob-icon

[YOCTO #2108]

(Bitbake rev: 8c3401bc11c6f3708b8ee9c0175f389399fdff5a)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-29 21:25:55 +01:00
Liming An 2e6ea8565a Hob: fixed the 'error' icon source picture and adjusted corresponding showed icon size
The error source picture is not right, so fixed it and adjusted its size.

[YOCTO #2097]

(Bitbake rev: ce680f10037b42831179a4598a69fb39688fb238)

Signed-off-by: Liming An <limingx.l.an@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-29 21:25:55 +01:00
Shane Wang f717cd64cd Hob: some color style changes to make HobTabBar more close to visual design
The change includes:
 - remove the colors which are not used
 - change the background of indicators to deep red
 - change the color style of the texts on HobTabBar, i.e., the tab text and the indicator background are gray when the tab is the current tab; the tab text is white and the indicator background is deep red when the tab is not the current tab.

(Bitbake rev: 95acecbf50cee906dca4abd5ce758701e5761668)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-29 21:25:55 +01:00
Shane Wang ad8fe62cee Hob: make ORANGE to be the same as the color on the dialog
(Bitbake rev: a50d884ebe1af2b9b2a5a54289181bccb751ddab)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-29 21:25:55 +01:00
Shane Wang 59ca1af3a1 Hob: Change "Just bake" to "Build image" as required
[Yocto #2160]

(Bitbake rev: 4ed5b8b862027755d5e9e480fd8a1d0250f7a3b7)

Signed-off-by: Shane Wang <shane.wang@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-29 21:25:54 +01:00
Shane Wang 407c93d3e8 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>
2012-03-29 21:25:54 +01:00
Shane Wang 1ea547c154 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>
2012-03-29 21:25:54 +01:00
Dongxiao Xu 00e262e490 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>
2012-03-29 21:25:54 +01:00
Dongxiao Xu 1c3ff8623f 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>
2012-03-29 21:25:54 +01:00
Dongxiao Xu f5fd769f5a 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>
2012-03-29 21:25:54 +01:00
Dongxiao Xu a8c0323034 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>
2012-03-29 21:25:53 +01:00
Dongxiao Xu e24f10e275 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>
2012-03-29 21:25:53 +01:00
Dongxiao Xu d30b75fecf 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>
2012-03-29 21:25:53 +01:00
Dongxiao Xu 72bc345f85 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>
2012-03-29 21:25:53 +01:00
Dongxiao Xu 1da504536a 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>
2012-03-29 21:25:53 +01:00
Dongxiao Xu f73ea0e40d 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>
2012-03-29 21:25:52 +01:00
Dongxiao Xu abcb2e0916 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>
2012-03-29 21:25:52 +01:00
Dongxiao Xu 345a2dd01c 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>
2012-03-29 21:25:52 +01:00
Dongxiao Xu 8b26fdcb3a 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>
2012-03-29 21:25:52 +01:00
Joshua Lock 71c1de347e 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>
2012-03-29 21:12:57 +01:00
Joshua Lock 57434b40b8 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>
2012-03-29 21:12:57 +01:00
Joshua Lock 7463dd803a 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>
2012-03-29 21:12:57 +01:00
Joshua Lock c489990f82 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>
2012-03-29 21:12:57 +01:00
Joshua Lock 25e9e16a39 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>
2012-03-29 21:12:57 +01:00
Joshua Lock 366bf755ac 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>
2012-03-29 21:12:57 +01:00
Shane Wang 19a5489f4c 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>
2012-03-29 21:12:56 +01:00
Shane Wang 96be713241 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>
2012-03-29 21:12:56 +01:00
Shane Wang 3ac86ce2ea 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>
2012-03-29 21:12:56 +01:00
Shane Wang 2aa1468054 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>
2012-03-29 21:12:56 +01:00
Shane Wang ff43873706 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>
2012-03-29 21:12:56 +01:00
Shane Wang 3038c0c65d 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>
2012-03-29 21:12:55 +01:00
Richard Purdie eeb0529e13 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>
2012-03-29 19:44:01 +01:00
Richard Purdie 5b84c902eb uihelper: Keep track of pids in execution order
(Bitbake rev: cec2f3eaa45a6fd8d3c53c09aaf010ac6101e7ba)

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
2012-03-29 19:43:04 +01:00
Christopher Larson 4d16bc3c5e 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>
2012-03-29 09:44:45 +01:00
Shane Wang 8b0bc593b3 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>
2012-03-28 16:49:19 +01:00
Liming An 7990d36f50 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>
2012-03-28 16:49:19 +01:00
Liming An 26cce34e4d 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>
2012-03-28 16:49:18 +01:00
Liming An 044376692d 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>
2012-03-28 16:49:18 +01:00
Liming An 278fcca539 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>
2012-03-28 16:49:18 +01:00