diff options
| -rw-r--r-- | templates/base/agl-base-defaults.jinja2 | 2 | ||||
| -rw-r--r-- | utils/agljobtemplate.py | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/templates/base/agl-base-defaults.jinja2 b/templates/base/agl-base-defaults.jinja2 index 3f13f08..45b61ec 100644 --- a/templates/base/agl-base-defaults.jinja2 +++ b/templates/base/agl-base-defaults.jinja2 @@ -12,7 +12,7 @@ {%- set kernel_defconfig = kernel_defconfig|default("defconfig+CONFIG_AGL=y") %} {%- set kernel_defconfig_base = kernel_defconfig_base|default("defconfig") %} {%- set kernel_image = kernel_image|default('uImage') %} -{%- set kernel_tree = kernel_tree|default("AGL-kernel-tree") %} +{%- set kernel_tree = kernel_tree|default("AGL-yocto") %} {%- set kernel_url = kernel_url|default(baseurl(kernel_image)) %} {%- set kernel_version = kernel_version|default("AGL-kernel-version") %} {%- set rootfs_type = rootfs_type|default("ramdisk") %} diff --git a/utils/agljobtemplate.py b/utils/agljobtemplate.py index 59abcb0..dda2d77 100644 --- a/utils/agljobtemplate.py +++ b/utils/agljobtemplate.py @@ -99,6 +99,7 @@ class Agljobtemplate(object): job['yocto_machine'] = machine job['priority'] = priority job['build_type'] = build_type + job['image_type'] = "AGL-%s" % build_type defaults, infra = parse_cfg_file(self._template_path, 'default.cfg', build_type) @@ -150,6 +151,12 @@ class Agljobtemplate(object): if build_version is not None: job['kernel_version'] = build_version + if url_version: + job['kernel_version'] = url_version + + if url_branch: + job['vcs_branch'] = url_branch + if rfs_type is not None: job['rootfs_type'] = rfs_type |