diff options
| -rw-r--r-- | templates/base/agl-base-defaults.jinja2 | 23 | ||||
| -rw-r--r-- | templates/base/agl-base.jinja2 | 3 | ||||
| -rw-r--r-- | templates/base/agl-metadata.jinja2 | 12 | ||||
| -rw-r--r-- | templates/machines/dra7xx-evm.jinja2 | 2 | ||||
| -rw-r--r-- | templates/machines/m3ulcb.jinja2 | 8 | ||||
| -rw-r--r-- | templates/machines/porter.jinja2 | 6 | ||||
| -rw-r--r-- | templates/machines/qemux86-64.jinja2 | 8 | ||||
| -rw-r--r-- | templates/machines/raspberrypi3.jinja2 | 2 |
8 files changed, 42 insertions, 22 deletions
diff --git a/templates/base/agl-base-defaults.jinja2 b/templates/base/agl-base-defaults.jinja2 index af82379..7f75a76 100644 --- a/templates/base/agl-base-defaults.jinja2 +++ b/templates/base/agl-base-defaults.jinja2 @@ -1,31 +1,38 @@ {%- macro baseurl(object) -%} {{ urlbase }}/{{ dl_dir }}/{{ object }} {%- endmacro %} -{%- set dl_dir = dl_dir|default(yocto_machine) %} -{%- set boot_timeout = boot_timeout|default(10) %} -{%- set job_timeout = job_timeout|default(30) %} {%- set action_timeout = action_timeout|default(15) %} +{%- set boot_timeout = boot_timeout|default(10) %} {%- set connection_timeout = connection_timeout|default(5) %} {%- set deploy_timeout = deploy_timeout|default(15) %} {%- set device_type = device_type|default(yocto_machine+"-uboot") %} +{%- set dl_dir = dl_dir|default(yocto_machine) %} +{%- set image_type = image_type|default("AGL") %} +{%- set job_timeout = job_timeout|default(30) %} +{%- 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_url = kernel_url|default(baseurl(kernel_image)) %} +{%- set kernel_version = kernel_version|default("AGL-kernel-version") %} {%- set rootfs_type = rootfs_type|default("ramdisk") %} +{%- set vcs_branch = vcs_branch|default("agl-branch") %} +{%- set vcs_url = vcs_url|default(baseurl()) %} {%- if dtb %} {%- set dtb_url = dtb_url|default(baseurl(dtb)) %} {%- endif %} {%- if modules %} -{%- set modules_url = modules_url|default(baseurl(modules)) %} {%- set modules_compression = modules_compression|default(modules|get_extension) %} +{%- set modules_url = modules_url|default(baseurl(modules)) %} {%- endif %} {%- if rootfs_type == 'nbd' %} -{%- set deploy_to = "nbd" %} {%- set boot_commands = "nbd" %} -{%- set nbdroot = rfs_image|default("core-image-minimal-" + yocto_machine + ".ext4.xz") %} -{%- set nbdroot_url = nbdroot_url|default(baseurl(nbdroot)) %} -{%- set nbdroot_compression = nbdroot_compression|default(nbdroot|get_extension) %} +{%- set deploy_to = "nbd" %} {%- set nbdinitrd = nbdinitrd|default("initramfs-netboot-image-" + yocto_machine +".ext4.gz") %} {%- set nbdinitrd_url = nbdinitrd_url|default(baseurl(nbdinitrd)) %} +{%- set nbdroot = rfs_image|default("core-image-minimal-" + yocto_machine + ".ext4.xz") %} +{%- set nbdroot_compression = nbdroot_compression|default(nbdroot|get_extension) %} +{%- set nbdroot_url = nbdroot_url|default(baseurl(nbdroot)) %} {%- elif rootfs_type == 'ramdisk' %} {%- set initrd = rfs_image|default("initramfs-boot-image-" + yocto_machine + ".gz") %} {%- set initrd_compression = initrd_compression|default(initrd|get_extension) %} diff --git a/templates/base/agl-base.jinja2 b/templates/base/agl-base.jinja2 index f717ef6..069eeb2 100644 --- a/templates/base/agl-base.jinja2 +++ b/templates/base/agl-base.jinja2 @@ -1,8 +1,7 @@ {%- extends 'base/agl-base-defaults.jinja2' %} {%- block job %} {%- block metadata %} -metadata: - image.type: 'AGL' +{% include 'base/agl-metadata.jinja2' %} {% endblock %} {% if callback_name %} {% include 'base/agl-callback.jinja2' %} diff --git a/templates/base/agl-metadata.jinja2 b/templates/base/agl-metadata.jinja2 new file mode 100644 index 0000000..050eeff --- /dev/null +++ b/templates/base/agl-metadata.jinja2 @@ -0,0 +1,12 @@ +metadata: + git.branch: {{ vcs_branch }} + image.type: {{ image_type }} + job.arch: {{ device_arch }} + job.name: {{ name }} + kernel.tree: {{ kernel_tree }} + kernel.version: {{ kernel_version }} + kernel.defconfig_base: {{ kernel_defconfig_base }} + kernel.defconfig: {{ kernel_defconfig }} + platform.mach: {{ device_mach }} + platform.name: {{ device_type }} + vcs.url: {{ vcs_url }} diff --git a/templates/machines/dra7xx-evm.jinja2 b/templates/machines/dra7xx-evm.jinja2 index e092530..b4f4f34 100644 --- a/templates/machines/dra7xx-evm.jinja2 +++ b/templates/machines/dra7xx-evm.jinja2 @@ -1,6 +1,6 @@ {%- extends 'boot/generic-uboot-tftp.jinja2' %} {%- set device_type = "ti-vayu-uboot" %} -{%- set rootfs_type = rootfs_type|default("nbd") %} {%- set dtb = "zImage-dra7-evm-lcd-lg.dtb" %} {%- set kernel_image = "zImage" %} +{%- set rootfs_type = rootfs_type|default("nbd") %} {%- set uboot_type = "bootz" %} diff --git a/templates/machines/m3ulcb.jinja2 b/templates/machines/m3ulcb.jinja2 index b6e789b..568706e 100644 --- a/templates/machines/m3ulcb.jinja2 +++ b/templates/machines/m3ulcb.jinja2 @@ -1,7 +1,9 @@ {%- extends 'boot/generic-uboot-tftp.jinja2' %} +{%- set device_arch = "arm64" %} +{%- set device_mach = "renesas" %} {%- set device_type = "r8a7796-m3ulcb" %} -{%- set rootfs_type = rootfs_type|default("nbd") %} -{%- set kernel_image = "Image" %} +{%- set dl_dir = "m3ulcb-nogfx" %} {%- set dtb = "Image-r8a7796-m3ulcb.dtb" %} +{%- set kernel_image = "Image" %} +{%- set rootfs_type = rootfs_type|default("nbd") %} {%- set uboot_type = "booti" %} -{%- set dl_dir = "m3ulcb-nogfx" %} diff --git a/templates/machines/porter.jinja2 b/templates/machines/porter.jinja2 index 62a2255..f5d3aeb 100644 --- a/templates/machines/porter.jinja2 +++ b/templates/machines/porter.jinja2 @@ -1,6 +1,6 @@ {%- extends 'boot/generic-uboot-tftp.jinja2' %} {%- set device_type = "renesas-porter-uboot" %} -{%- set rootfs_type = rootfs_type|default("nbd") %} -{%- set nbdinitrd = "initramfs-netboot-image-" + yocto_machine +".ext4.gz.u-boot" %} -{%- set dtb = "uImage-r8a7791-porter.dtb" %} {%- set dl_dir = "porter-nogfx" %} +{%- set dtb = "uImage-r8a7791-porter.dtb" %} +{%- set nbdinitrd = "initramfs-netboot-image-" + yocto_machine +".ext4.gz.u-boot" %} +{%- set rootfs_type = rootfs_type|default("nbd") %} diff --git a/templates/machines/qemux86-64.jinja2 b/templates/machines/qemux86-64.jinja2 index 905136e..1c4d44d 100644 --- a/templates/machines/qemux86-64.jinja2 +++ b/templates/machines/qemux86-64.jinja2 @@ -1,8 +1,8 @@ {%- extends 'boot/generic-qemu-tmpfs.jinja2' %} +{%- set deploy_to = "tmpfs" %} {%- set device_type = "qemu" %} -{%- set rootfs_type = rootfs_type|default("ramdisk") %} {%- set kernel_image = "bzImage" %} -{%- set qemu_cmdline = "console=ttyS0,115200 root=/dev/hda debug verbose" %} -{%- set qemu_args = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt -m 1048 -soundhw hda" %} {%- set qemu_arch = "x86_64" %} -{%- set deploy_to = "tmpfs" %} +{%- set qemu_args = "-cpu qemu64,+ssse3,+sse4.1,+sse4.2,+popcnt -m 1048 -soundhw hda" %} +{%- set qemu_cmdline = "console=ttyS0,115200 root=/dev/hda debug verbose" %} +{%- set rootfs_type = rootfs_type|default("ramdisk") %} diff --git a/templates/machines/raspberrypi3.jinja2 b/templates/machines/raspberrypi3.jinja2 index 543b6c3..f1e1454 100644 --- a/templates/machines/raspberrypi3.jinja2 +++ b/templates/machines/raspberrypi3.jinja2 @@ -1,5 +1,5 @@ {%- extends 'boot/generic-uboot-tftp.jinja2' %} {%- set device_type = "bcm2837-rpi-3-b" %} -{%- set rootfs_type = rootfs_type|default("nbd") %} {%- set dtb = "uImage-bcm2710-rpi-3-b.dtb" %} {%- set nbdinitrd = "initramfs-netboot-image-" + yocto_machine +".ext4.gz.u-boot" %} +{%- set rootfs_type = rootfs_type|default("nbd") %} |