summaryrefslogtreecommitdiffstats
path: root/bitbake/lib/toaster
Commit message (Collapse)AuthorAgeFilesLines
* bitbake: toaster: adjust the search field widthBelen Barros Pena2016-02-263-4/+5
| | | | | | | | | | | | | | | | The search field at the top of our tables was using one of the Bootstrap classes for text field sizing. Those classes are a bit rigid, resulting in text fields too wide that made other table controls wrap. Setting a maximum width to the search form using one of the span classes, combined with a % width css declaration, make for text fields that adapt a bit better to the horizontal space available in each table. (Bitbake rev: 7833fab2e03f2d9a01ab9ad0a13c190382098b5e) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: make 'configuration' the first tabBelen Barros Pena2016-02-261-5/+5
| | | | | | | | | | | | | | | Our project pages have 4 tabs: builds, configuration, import layer and new custom image. Even though we treat the 'configuration' as the default tab, it comes second after the builds tab. That's a bit strange: the default tab should be the first one listed. This patch changes the tab order to put 'configuration' first. (Bitbake rev: ccb90019489c2c324c2a5a60295e02280a2ec18f) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: link to configuration in all breadcrumbsBelen Barros Pena2016-02-266-27/+6
| | | | | | | | | | | | | | | | The existing breadcrumb does not always provide a link to the project configuration page. When you are in the build history pages, you must go back to the builds information first, and from there access the project configuration. That feels very long. Change the breadcrumb so that the project name item always provides a link to the project configuration. (Bitbake rev: 9910f3f292d35fc91215d550c5f123dcf18ab35d) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: reduce max height of modal dialogsBelen Barros Pena2016-02-261-0/+1
| | | | | | | | | | | | | | | | Now that we use modal dialogs to display dependency information for packages, we are hitting their maximum height relatively often. It is set by default to 400px, which makes it a bit tight at a 1280x800 viewport size. Reduce the maximum height to 300px to make things a bit more comfortable. (Bitbake rev: e36001d61768979d66cba0f3d4f5a2aaf4af2cb7) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: disable add layer button on clickBelen Barros Pena2016-02-261-0/+2
| | | | | | | | | | | | | | | | | The 'add layer' button in the project configuration page remains enabled after you add a layer. If you click it again, the same layer you just added is added again. This patch disables the 'add layer' button on click, to avoid this bit of weirdness. [YOCTO #8905] (Bitbake rev: 63705f60035884a810fdd36e5a3fe10e411f23c7) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: apply error class to name fieldBelen Barros Pena2016-02-261-0/+3
| | | | | | | | | | | | | | | The form for naming new custom images shows you an error message when the name already exists or you include an invalid character in it. But when an error appears, the input field was missing the red highlight. This patch applies the right class to the form controls whenever an error message is shown. (Bitbake rev: df342e7662179410467c47cd870180ea75f863d4) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: fix custom image name formBelen Barros Pena2016-02-262-2/+2
| | | | | | | | | | | | | | The placeholder text in the form where you name your new custom images didn't display fully. This patch fixes the styles so that the text shows properly. It also changes the text itself to make it a bit shorter. [YOCTO #9122] (Bitbake rev: 9df802182b0b96295b148a1681c2265e72d8306b) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: comment out project release changeBelen Barros Pena2016-02-261-5/+14
| | | | | | | | | | | | | | | | | | | | | | Although the support for building more than one release and how we handle the build directories is the subject of lively discussion, we all seem to agree on removing the ability to change the release of a project. The feature is currently not working but exposed to users, which is not a happy state of affairs. This patch comments out the controls that give access to the release changing functionality to hide them from users, but does not touch anything else. Once all moving pieces start to settle down, we can make a final decision regarding this feature, and clean up the code accordingly. [YOCTO #8917] (Bitbake rev: 3a8c6f7155517cd61a160595b81e7bed84ba4eaf) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: toastergui Fix invalid char test and implementationMichael Wood2016-02-192-3/+6
| | | | | | | | | | | | | This test was passing but because the assertion was the wrong way round and should have expected the first one to pass and second one to fail, in reality both were failing as the method for checking the invalid char was incorrect. (Bitbake rev: 932a92b8130d4815656dc885f0c6e4afa4502022) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: PackagesTable show only installed packagesMichael Wood2016-02-191-1/+3
| | | | | | | | | | | | | | When showing the package list for the image recipe details only show the packages which are installed in the image rather than all the packages which are produced. [YOCTO #9108] (Bitbake rev: be7dca6c7607c0d13151c2d3f7ad7adcdf365076) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: toastergui unit tests convert to use fixturesMichael Wood2016-02-192-213/+488
| | | | | | | | | | | | | | Instead of having to manually write up in the setUp function all the different objects to create in the database, just specifiy them in a fixture and load it. This has the advantage that it can be used on a live server by using the ./manage.py loaddata command and can then be inspected. (Bitbake rev: 8a653ad8b075892d24d15696b3070c5a28a4fbe2) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: SoftwareRecipesTable apply default order_byMichael Wood2016-02-191-0/+1
| | | | | | | | | | Make sure the default orderby for the SoftwareRecipesTable is applied (Bitbake rev: 1688608b537d8de840c6d1e4802ae41ca872e5bf) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: orm migrations Sort out migrations messMichael Wood2016-02-198-122/+26
| | | | | | | | | | | | | | | | | We messed up the migrations by squashing some of the image customisation model definitions into the initial migration which has meant some irreversible operations on mysql took place. This deletes, re-orders and fixes the migrations. If your schema is up to date you may want to use ./manage migrate with --fake or --fake-initial to avoid re-applying migrations. [YOCTO #9116] (Bitbake rev: 19bd63fc3a28dcbd0f531a5b06a037da34568bac) Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: buildinfohelper: unset brbe variable when build finishesElliot Smith2016-02-111-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The brbe variable is set on the bitbake server when the Toaster UI starts. This enables Toaster to associate events with the correct build and build environment. However, the brbe variable is also used when a build starts to identify whether a new build needs to be created, or an existing one looked up. This causes a bug for command-line builds which happen after a Toaster-triggered build: because the brbe variable is never unset on the server or the buildinfohelper, the new command-line build events are treated as originating from the previous build. Ensure the brbe variable is reset when the buildinfohelper "closes" a build, so that each build then either sets the brbe variable (Toaster-triggered builds) or leaves it blank (command-line builds). Also modify the localhostbecontroller so that the brbe variable is not set on the server and not looked up from the server. This ensures that it is only set when the triggerBuild() method is called, and that it remains as None for command-line builds. [YOCTO #9021] (Bitbake rev: 4a6a8d0074f62208d843b06344be31ae73d9b745) Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* toaster: tests Remove symlinks from toasteruitest folderMihail Stanciu2016-02-112-2/+0
| | | | | | | | | | | Remove symlinks in the UI tests folder as they are causing problems for bitbake upstream. [YOCTO #8787] Signed-off-by: Mihail Stanciu <stanciux.mihail@intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: models Remove manual transaction control from lsupdatesMichael Wood2016-02-101-22/+1
| | | | | | | | | | | | | | | | | | Revert "toaster: models.py do not use transactions". This reverts commit e248a503ba84658dea086e65e9cde8b845b9c0ed (Bitbake rev: 48d0d510816346073f135bb86fb7904fdb50bb27) Manually managing the database transactions caused more problems than it temporarily solved so we return control back to Django's orm. [YOCTO #8796] (Bitbake rev: 25c531915b6f8f79a0822996ceb97f90483e359f) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: build section Improve display of builds when > 1 targetsBelen Barros Pena2016-02-102-7/+12
| | | | | | | | | | | | | | | | | | | | * Display always the first target in alphabetical order to match what we do in the breadcrumbs and the build dashboard heading * Remove the extra space between the '+' and the additional number of targets * Make sure the tooltip with the full target list takes the Bootstrap tooltip styles * Replace the word 'targets' in the tooltip with 'recipes', since that's how we call build targets everywhere else in Toaster (Bitbake rev: 3b8747d0af4b9164e973940ed97751c951e74110) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: templates make build data breadcrumb consistentBelen Barros Pena2016-02-103-5/+3
| | | | | | | | | | | | | | | | | | | | | The pages in the build data section of Toaster showed different breadcrumbs: in some pages the machine was displayed, but not in others. For builds with more than one target, some pages showed the first alphabetical target (the correct behaviour), others didn't. This patch removes the inconsistencies, showing exactly the same breacrumb across all pages in the section. The patch also removes the extra space between the '+' and the number of targets when the builds have more than one target. Remove an unneeded debug message (Bitbake rev: 9cdbb543311b6f4a8a88c27fc157d998242444ee) Signed-off-by: Belen Barros Pena <belen.barros.pena@intel.com> Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: Enable Image Customisation featureMichael Wood2016-02-104-10/+0
| | | | | | | | | | Remove environment variable to toggle Image customisation feature (Bitbake rev: 2e9c86229b8f924a5b62987f4b166f63392f12e8) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: xhr_customrecipe_packages Add dependencies to included ↵Michael Wood2016-02-101-0/+12
| | | | | | | | | | | | | | packages Add the dependencies of packages which are added to the CustomImageRecipe. Currently just handle the first tier of dependencies as this is what we show in the UI. (Bitbake rev: 5c44609a9bf9fb23241b7dd7c58b08901d75008d) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: orm generate_recipe_content only exclude locale packagesMichael Wood2016-02-101-8/+3
| | | | | | | | | | | | Allow package groups in our custom image recipe. Excluding them creates more undefined behaviour than including them at this stage. Also update to use convenience method for returning all packages. (Bitbake rev: 8c2e8a13badacb816c4b1178b6661600008b38af) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: customrecipe page Add last successful build link and ↵Michael Wood2016-02-101-2/+11
| | | | | | | | | | | | | conditionals Add link to the last successful build if there is one and add conditionals for the ancillary recipe metadata. (Bitbake rev: 4660aaf1c6775270f8f3d0afbb7fa2ee7a2a1563) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: models Add update_package_list for CustomImageRecipeMichael Wood2016-02-101-2/+48
| | | | | | | | | | | | | | | Add a method to update the packages included list from the last build, this effectively "synchronises" the package list from what we think will happen at the Customise image stage with what actually was produced with a build. It's not ideal to have this function here but we also need to make sure that no race condition of the user accessing this list and it being updated occurs. (Bitbake rev: 8cf6e67a955574b33856a082bdadf3194f2b6ba4) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: orm Add last_updated field to CustomImageRecipeMichael Wood2016-02-102-0/+20
| | | | | | | | | | | Field to keep track of when the package list for the CustomImageRecipe was last updated from a build. (Bitbake rev: 4bd4e49f13a7625997a43f3b2e67ed42c3c8e08b) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: models add get_last_successful_built_target methodMichael Wood2016-02-101-0/+7
| | | | | | | | | | | Add a convenience method to get the last successful build target for a CustomImageRecipe. (Bitbake rev: 4dde3d830cd38bbe306d83629dcb80da5fc9b027) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: pkg_dependencies_popover just show direct dependenciesMichael Wood2016-02-101-2/+2
| | | | | | | | | | | In the dependencies popover just show direct dependency in the list rather than recommends, conflicts etc (Bitbake rev: e69b00532b011327bc2495a6fb52cfe98f0f897d) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: models add all_depends method for Package_DependencyManagerMichael Wood2016-02-101-0/+5
| | | | | | | | | | This convenience method returns just the Package_Dependency for the package which are regular dependencies i.e. not RECOMMENDS or any other types. (Bitbake rev: bd76c22fe2aa06690b4ee25de69219ac0bf6b4d6) Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: newcustomimage_modal add frontend name validationMichael Wood2016-02-102-9/+35
| | | | | | | | | | | Add front end handling of validation response from create new CustomImageRecipe api. (Bitbake rev: eff66b502df8e001cd0abc25bcbd742687169619) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: API CustomImageRecipe check the recipe name supplied is validMichael Wood2016-02-101-0/+21
| | | | | | | | | | | | | Check that the name for a new CustomImageRecipe doesn't already exist in the project or in the database of existing recipes (e.g. from the layer index). Also restrict the characters entered for the recipe naming convention. (Bitbake rev: f290d428460a07e73050ff613bc222cc8c04f5ec) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: views CustomRecipe API add size information to the package ↵Michael Wood2016-02-101-2/+12
| | | | | | | | | | | | lists Add the file size of the packages and the total to the JSON response. (Bitbake rev: bbbd304c49b0940a695d15273934edff95d70836) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: models Invalidate ToasterTables cache when a m2m field changesMichael Wood2016-02-101-0/+1
| | | | | | | | | | | | | Whem a m2m field changes we need to clear the ToasterTables cache as this can affect the state of items in ToasterTables. For example the CustomImagePackages being added or removed from a custom image recipe. (Bitbake rev: c9d7b68ee0186a71e8e75a5d87122a0328001515) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: customrecipe Add dependency tracking to package selectionMichael Wood2016-02-104-31/+80
| | | | | | | | | | | | Update the states of the packages in the package selection UI to reflect whether it's likely that 1st level dependencies for the package will be also added. (Bitbake rev: 119569d83c3fb1d1bd162624819b3f9c63a791c4) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: tables move template logic into the pkg_add_rm_btnMichael Wood2016-02-102-14/+16
| | | | | | | | | | | Instead of defining this as a string it's sufficiently large enough to warrant its own file. (Bitbake rev: 6b39423fe5a3ed30289a8b303329a5725f7d273b) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: CustomImageRecipe generate overwrite IMAGE_FEATURESMichael Wood2016-02-101-1/+1
| | | | | | | | | | | If we're breaking up an image recipe's packages we will also need to override IMAGE_FEATURES to make sure the customisation is not altered (Bitbake rev: 9fd7b05dc0cf9240f7c8e3dc77b009064fd2b0cb) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: make locale packages uneditable in custom image pageElliot Smith2016-02-104-2/+34
| | | | | | | | | | | | | | | | | | | | When the packages associated with a custom image recipe are shown in the customrecipe editing page, locale packages are shown in the same way as all other packages. This gives the false impression that these packages can be removed, when in fact they are automatically added due to the IMAGE_LINGUAS build variable. Modify the customrecipe page so that locale packages cannot be removed, and provide some help text explaining why. [YOCTO #8927] (Bitbake rev: b2208e53c00a67a7d0345e7378e6806b8ae40fb4) Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: include locale and packagegroup packages in custom imageElliot Smith2016-02-101-7/+2
| | | | | | | | | | | | | | | The custom image editing page doesn't show locale and packagegroup packages: they are filtered out of the queryset used to populate the ToasterTable. Rather than filtering these packages out, include them in the list of packages which are shown. (Bitbake rev: 38a753e7b2e9ede326856b830b25e13bdd6d0d9b) Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: update custom image package table filtersElliot Smith2016-02-101-26/+20
| | | | | | | | | | | | | | The custom image package selection filters were using the old ToasterTable filter approach, which caused the table filter to fail. Amend the table to use the new ToasterTable filtering API to fix this. (Bitbake rev: 72a4cb30842fd053e46dc56df222729cbe735162) Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: move recent builds query to modelElliot Smith2016-02-104-25/+46
| | | | | | | | | | | | | | | | | | | | | The progress updater for the recent builds section makes a JSON call to the project view URL to get progress for each build. However, conversion of the builds pages to ToasterTable broke this, as the JSON response no longer contained the data necessary to populate the progress bars. Move the recent builds query to the Build model, so that it is accessible to the ToasterTables using it ("project builds" and "all builds"), as well as to the "project" view. Modify the code in the recent builds template to use the slightly different objects returned by the recent builds query on Build. (Bitbake rev: 5189252635ddc7b90c9a43aaed9f196c31e1dcad) Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: update customimagerecipe migrationElliot Smith2016-02-101-0/+19
| | | | | | | | | | | | | | | | | | When applying migrations, Django shows this warning: "Your models have changes that are not yet reflected in a migration, and so won't be applied." This is because the customimagerecipe model has changed, but those changes are not covered by a migration. Add the missing migration to clear this warning. (Bitbake rev: df8185fcbd84061976d91b03b2a9268b319a6184) Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: add merge migration to resolve conflictElliot Smith2016-02-101-0/+15
| | | | | | | | | | | | | | Django detects a conflict between a migration added to support image customisation and another migration which supports PROVIDES. Add a merge migration to resolve the conflict (as suggested by Django). (Bitbake rev: a26bfd9d2490dc0fd90bf6d1690e63ac26001559) Signed-off-by: Elliot Smith <elliot.smith@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: orm generate_recipe_file_contents Handler for require recipeMichael Wood2016-02-101-1/+23
| | | | | | | | | | | | | | | | | | Add a special case for when the recipe we have based a custom image recipe on requires another recipe. In this case we need to adjust the file location to be able to require the recipe when we're in the toaster-custom-images layer. For example: "require core-image-minimal.bb" is changed to: "require recipes-core/images/core-image-minimal.bb" (Bitbake rev: 26025e1ea49b3ebfcfd508d1608fa8c9e722ad03) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: project builds Poll the server to get latest progress for ↵Michael Wood2016-02-101-3/+61
| | | | | | | | | | | | | | | | build Poll the server for the project build progress value. This is something that will need to be re-done once we have a proper API for this on the server side. [YOCTO 8328] (Bitbake rev: ec467e43c39eadf02412b89db10c09ed78a5a9f5) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: localhostbectrl Update the dirpath of customrecipe's base ↵Michael Wood2016-02-101-0/+19
| | | | | | | | | | | | | | layer We need to know the location of the based_on recipe's layer on the file system before we try and generate the custom image recipe. As we read the recipe to make the custom version. (Bitbake rev: e6a7cacbddd1df5bac0b79384199cf7264c5bbd5) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: tables Check layer presence in project for customise_btnMichael Wood2016-02-102-4/+13
| | | | | | | | | | | | Make sure we send the current list of layers to the customise button to be able to know whether it should be set as an add layer button or a customise button on the New custom image page. (Bitbake rev: 5ddb35c98b609d85f97d482b54cabe3a2812afe6) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: toastergui tests Add addtional data to the setUp for new ↵Michael Wood2016-02-101-25/+66
| | | | | | | | | | | | | | tables Add additional data to the setUp to be able to test all the tables for Image Customisation. Also add the name of the table being tested to the num of rows assertion. (Bitbake rev: dfcbcf789cf3f0733ca26b0601fdf97ce4291674) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: tables SelectPackagesTable rename recipe_id to custrecipeidMichael Wood2016-02-102-6/+10
| | | | | | | | | | | | | Rename the recipe_id to custrecipeid to avoid confusion about which type of object we're going to be accessing. This means that in the unit tests for tables we can pass a different kwargs for custom recipes vs normal recipes. (Bitbake rev: ae3301a1047b3efb4b340b50a10d5d585b7333da) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: toastergui tests Update package test to use CustomImagePackageMichael Wood2016-02-101-9/+16
| | | | | | | | | | | | | | Update test for adding and removing a package from a CustomImageRecipe so that it uses the CustomImagePackage and correct fields for the packages included. Change the test for error condition to use an invalid package id as ManyToMany remove() on package that isn't in the relationship does not throw an error. (Bitbake rev: daccb2978f833a9e7af270160331da3e9a158219) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: customrecipe Add further front end features using new APIMichael Wood2016-02-103-33/+180
| | | | | | | | | | | | | | | | This adds some basic package dependency hint modals when you add and remove a package. It also makes sure that if the CustomImageRecipe has no current included packages that we go and check this with the server to see if a relevant build has taken place which will provide this information. [YOCTO #8082] (Bitbake rev: 418f5509e74d46d36a8eb966a245083006e5f4ba) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: xhr_customrecipe_packages add GET info for package responseMichael Wood2016-02-101-42/+98
| | | | | | | | | | | | | | Add response for GET to the xhr_customrecipe_packages ReST API /xhr_customrecipe/<recipe_id>/packages/<package_id> Thie response includes the id, name, version and dependency information for the package. (Bitbake rev: c45791fc85d26c43b0a3b0a459111d2ff5583540) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
* bitbake: toaster: xhr_customrecipe_id change to use CustomImagePackageMichael Wood2016-02-101-19/+23
| | | | | | | | | | | | | | Instead of doing a shallow copy of the package into the CustomImageRecipe when we add packages we can now use the CustomImagePackage as a M2M field on the Package to CustomImageRecipe. Also switch to using Target_Installed_Package as the method to retrieve the package list from the build. (Bitbake rev: 4ebc81823b3aec6ecf38835acad5263a81eb41c5) Signed-off-by: Michael Wood <michael.g.wood@intel.com> Signed-off-by: brian avery <avery.brian@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>