On 02/08/16 14:32, Michael Wood wrote:
Replace the custom loadconf command with django's own inbuilt loaddata command.
Django's command is much better tested, supports multiple formats and makes for
much easier customisation of Toaster.
We check the TEMPLATECONF value to determine if Toaster is running within poky
or OpenEmbedded-core. And fallback if no value is found.
Based on this we can load default data for the correct environment the first
time you run Toaster.
- settings.xml This contains Toaster wide settings, such as the default
values for
certain bitbake variables.
- poky.xml This is the release metadata for supported poky based setup
- oe-core.xml This is the release metadata for supported oe-core based setups
As we also want to allow customisation of Toaster at start up added is a mechanism to
load a "custom" fixture if present in the fixtures directory (see README).
After this is merged we can. Remove toasterconf.json in the OpenEmbedded-core
layer and the copy in the meta-poky layer.
While testing this I added one unrelated patch which is to add a spinner for
parsing/http fetch on the layerindex fetcher - When on a slow
connection/machine it's not clear if downloading and parsing the data from the
Layerindex is still underway so add some visual feedback.
Michael Wood (5):
toaster: Add poky and openembedded configuration fixtures
toaster: checksettings call django's loaddata instead of custom
command
toaster: lsupdates Add spinner for parsing/http fetch
toaster: Remove old toaster config loading mechanism
toaster: fixtures Add README
bitbake/bin/toaster | 18 +--
.../management/commands/checksettings.py | 88 +++++-----
.../bldcontrol/management/commands/loadconf.py | 179 ---------------------
bitbake/lib/toaster/orm/fixtures/README | 30 ++++
bitbake/lib/toaster/orm/fixtures/oe-core.xml | 57 +++++++
bitbake/lib/toaster/orm/fixtures/poky.xml | 105 ++++++++++++
bitbake/lib/toaster/orm/fixtures/settings.xml | 36 +++++
.../toaster/orm/management/commands/lsupdates.py | 35 +++-
8 files changed, 307 insertions(+), 241 deletions(-)
delete mode 100644
bitbake/lib/toaster/bldcontrol/management/commands/loadconf.py
create mode 100644 bitbake/lib/toaster/orm/fixtures/README
create mode 100644 bitbake/lib/toaster/orm/fixtures/oe-core.xml
create mode 100644 bitbake/lib/toaster/orm/fixtures/poky.xml
create mode 100644 bitbake/lib/toaster/orm/fixtures/settings.xml
Forgot to mention the branch is available at poky-contrib
michaelw/toaster_replace_loadconf
---------------------------------------------------------------------
Intel Corporation (UK) Limited
Registered No. 1134945 (England)
Registered Office: Pipers Way, Swindon SN3 1RJ
VAT No: 860 2173 47
This e-mail and any attachments may contain confidential material for
the sole use of the intended recipient(s). Any review or distribution
by others is strictly prohibited. If you are not the intended
recipient, please contact the sender and delete all copies.
--
_______________________________________________
toaster mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/toaster
