diff options
author | Michael Wood <michael.g.wood@intel.com> | 2016-08-22 16:42:32 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-02 16:29:36 +0100 |
commit | d57a9124650e5367919668dfccf6aad4962a77f1 (patch) | |
tree | 85fc16efe6e54083ca05054b5bf8467793d5ce43 /lib/toaster/orm | |
parent | 092ef32e695b43c3337b7116722c4c6eba981396 (diff) | |
download | bitbake-contrib-d57a9124650e5367919668dfccf6aad4962a77f1.tar.gz |
toaster: Fix oe-core fixture
Due to a copy paste error we managed to get some of the wrong
information in the oe fixture that provides a suggested default settings
for Toaster. This meant it tested correctly when it shouldn't have.
Fix:
- The use of local bitbake
- An incorrect call to realpath which didn't include its parent module.
- The field used for the local_dir of an existing openembedded-core
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>
Diffstat (limited to 'lib/toaster/orm')
-rw-r--r-- | lib/toaster/orm/fixtures/oe-core.xml | 16 | ||||
-rw-r--r-- | lib/toaster/orm/fixtures/poky.xml | 6 | ||||
-rw-r--r-- | lib/toaster/orm/fixtures/settings.xml | 17 |
3 files changed, 22 insertions, 17 deletions
diff --git a/lib/toaster/orm/fixtures/oe-core.xml b/lib/toaster/orm/fixtures/oe-core.xml index 9572ef692..d062de57f 100644 --- a/lib/toaster/orm/fixtures/oe-core.xml +++ b/lib/toaster/orm/fixtures/oe-core.xml @@ -1,17 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> <django-objects version="1.0"> + <!-- Set the project default value for DISTRO --> + <object model="orm.toastersetting" pk="1"> + <field type="CharField" name="name">DEFCONF_DISTRO</field> + <field type="CharField" name="value">nodistro</field> + </object> + <!-- Bitbake versions which correspond to the metadata release --> <object model="orm.bitbakeversion" pk="1"> <field type="CharField" name="name">master</field> <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field> <field type="CharField" name="branch">master</field> - <field type="CharField" name="dirpath">bitbake</field> </object> <object model="orm.bitbakeversion" pk="2"> <field type="CharField" name="name">HEAD</field> - <field type="CharField" name="giturl">git://git.openembedded.org/bitbake</field> - <field type="CharField" name="branch">HEAD</field> - <field type="CharField" name="dirpath">bitbake</field> </object> <!-- Releases available --> @@ -43,15 +45,15 @@ <!-- TYPE_LOCAL = 0 Layers for the Local release --> <object model="orm.layer" pk="1"> <field type="CharField" name="name">openembedded-core</field> - <field type="CharField" name="layer_index_url"></field> <field type="CharField" name="vcs_url">git://git.openembedded.org/openembedded-core</field> </object> <object model="orm.layer_version" pk="1"> <field rel="ManyToOneRel" to="orm.layer" name="layer">1</field> - <field type="IntegerField" name="layer_source">0</field> <field rel="ManyToOneRel" to="orm.release" name="release">2</field> + <field type="CharField" name="local_path">OE-CORE-LAYER-DIR</field> <field type="CharField" name="branch">HEAD</field> - <field type="CharField" name="commit">HEAD</field> + <field type="CharField" name="dirpath">meta</field> + <field type="IntegerField" name="layer_source">0</field> </object> </django-objects> diff --git a/lib/toaster/orm/fixtures/poky.xml b/lib/toaster/orm/fixtures/poky.xml index 373e43d81..75a29168e 100644 --- a/lib/toaster/orm/fixtures/poky.xml +++ b/lib/toaster/orm/fixtures/poky.xml @@ -1,5 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <django-objects version="1.0"> + <!-- Set the project default value for DISTRO --> + <object model="orm.toastersetting" pk="1"> + <field type="CharField" name="name">DEFCONF_DISTRO</field> + <field type="CharField" name="value">poky</field> + </object> + <!-- Bitbake versions which correspond to the metadata release --> <object model="orm.bitbakeversion" pk="1"> <field type="CharField" name="name">master</field> diff --git a/lib/toaster/orm/fixtures/settings.xml b/lib/toaster/orm/fixtures/settings.xml index 64a26f517..78c0fdca7 100644 --- a/lib/toaster/orm/fixtures/settings.xml +++ b/lib/toaster/orm/fixtures/settings.xml @@ -1,34 +1,31 @@ <?xml version="1.0" encoding="utf-8"?> <django-objects version="1.0"> <!-- Default project settings --> - <object model="orm.toastersetting" pk="1"> + <!-- pk=1 is DISTRO --> + <object model="orm.toastersetting" pk="2"> <field type="CharField" name="name">DEFAULT_RELEASE</field> <field type="CharField" name="value">master</field> </object> - <object model="orm.toastersetting" pk="2"> + <object model="orm.toastersetting" pk="3"> <field type="CharField" name="name">DEFCONF_PACKAGE_CLASSES</field> <field type="CharField" name="value">package_rpm</field> </object> - <object model="orm.toastersetting" pk="3"> + <object model="orm.toastersetting" pk="4"> <field type="CharField" name="name">DEFCONF_MACHINE</field> <field type="CharField" name="value">qemux86</field> </object> - <object model="orm.toastersetting" pk="4"> + <object model="orm.toastersetting" pk="5"> <field type="CharField" name="name">DEFCONF_SSTATE_DIR</field> <field type="CharField" name="value">${TOPDIR}/../sstate-cache</field> </object> - <object model="orm.toastersetting" pk="5"> + <object model="orm.toastersetting" pk="6"> <field type="CharField" name="name">DEFCONF_IMAGE_INSTALL_append</field> <field type="CharField" name="value"></field> </object> - <object model="orm.toastersetting" pk="6"> + <object model="orm.toastersetting" pk="7"> <field type="CharField" name="name">DEFCONF_IMAGE_FSTYPES</field> <field type="CharField" name="value">ext3 jffs2 tar.bz2</field> </object> - <object model="orm.toastersetting" pk="7"> - <field type="CharField" name="name">DEFCONF_DISTRO</field> - <field type="CharField" name="value">poky</field> - </object> <object model="orm.toastersetting" pk="8"> <field type="CharField" name="name">DEFCONF_DL_DIR</field> <field type="CharField" name="value">${TOPDIR}/../downloads</field> |