summaryrefslogtreecommitdiff
path: root/roles/openwrt/image/tasks
diff options
context:
space:
mode:
Diffstat (limited to 'roles/openwrt/image/tasks')
-rw-r--r--roles/openwrt/image/tasks/main.yml5
1 files changed, 2 insertions, 3 deletions
diff --git a/roles/openwrt/image/tasks/main.yml b/roles/openwrt/image/tasks/main.yml
index e019bf6f..62dcbc9d 100644
--- a/roles/openwrt/image/tasks/main.yml
+++ b/roles/openwrt/image/tasks/main.yml
@@ -35,10 +35,9 @@
src: "{{ openwrt_imgbuilder_dir }}/{{ openwrt_tarball_basename }}/bin/targets/{{ openwrt_arch }}/{{ openwrt_target }}/{{ openwrt_output_image_name_base }}-{{ item }}"
dest: "{{ openwrt_output_dir }}"
- ## TODO: make this less ugly..
- name: set output image names
set_fact:
- openwrt_output_images: "{{ '[\"' + openwrt_output_dir + '/' + openwrt_output_image_name_base + '-' + (openwrt_output_image_suffixes | join('\", \"' + openwrt_output_dir + '/' + openwrt_output_image_name_base + '-')) + '\"]' }}"
+ output_images: "{{ [(openwrt_output_dir, openwrt_output_image_name_base) | path_join | realpath] | product(openwrt_output_image_suffixes) | map('join', '-') }}"
always:
- name: save stdout build-log to output directory
@@ -53,7 +52,7 @@
content: "{{ openwrt_build.stderr }}\n"
dest: "{{ openwrt_output_dir }}/build-stderr.log"
- - name: Delete the temporary build directory
+ - name: delete the temporary build directory
when: not openwrt_keep_temporary_build_dir
file:
path: "{{ openwrt_imgbuilder_dir }}"