From 3186960f5420e69bc731dea2f574d30deac6393b Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 29 Dec 2021 17:26:26 +0100 Subject: add workaround for nasty bug in ansible 5.x --- roles/openwrt/image/tasks/main.yml | 7 ++++--- roles/openwrt/image/tasks/prepare.yml | 12 +++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) (limited to 'roles/openwrt/image/tasks') diff --git a/roles/openwrt/image/tasks/main.yml b/roles/openwrt/image/tasks/main.yml index c029f4c7..e019bf6f 100644 --- a/roles/openwrt/image/tasks/main.yml +++ b/roles/openwrt/image/tasks/main.yml @@ -1,11 +1,12 @@ --- -- include: fetch.yml - run_once: true +- name: fetch imagebuilder when: openwrt_imgbuilder_tarball is not defined + run_once: true + import_tasks: fetch.yml - name: build the image block: - - include: prepare.yml + - import_tasks: prepare.yml - name: Create the output directory for built images file: diff --git a/roles/openwrt/image/tasks/prepare.yml b/roles/openwrt/image/tasks/prepare.yml index 4b7cda7a..10e8a8b3 100644 --- a/roles/openwrt/image/tasks/prepare.yml +++ b/roles/openwrt/image/tasks/prepare.yml @@ -13,9 +13,9 @@ loop: "{{ mixin_directories | flatten }}" vars: mixin_directories: - - "{{ openwrt_download_dir }}/dl/{{ openwrt_arch }}" - - "{{ openwrt_imgbuilder_files }}/etc/config" - - "{{ openwrt_mixin | map('dirname') | map('regex_replace', '^', openwrt_imgbuilder_files) | unique | list }}" + - "{{ openwrt_download_dir }}/dl/{{ openwrt_arch }}" + - "{{ openwrt_imgbuilder_files }}/etc/config" + - "{{ openwrt_mixin | map('dirname') | map('regex_replace', '^', openwrt_imgbuilder_files) | unique | list }}" file: path: "{{ item }}" state: directory @@ -96,9 +96,11 @@ trim_blocks: yes - name: extract image builder tarball - unarchive: - copy: False + environment: ### TODO: remove once this lands in ansible: https://github.com/ansible/ansible/pull/76542 + LANGUAGE: en_US.utf8 + unarchive : src: "{{ openwrt_download_dir }}/{{ openwrt_tarball_name }}" + remote_src: yes dest: "{{ openwrt_imgbuilder_dir }}" - name: Symlink the cache repository -- cgit v1.2.3