diff options
| -rw-r--r-- | roles/openwrt/image/tasks/main.yml | 7 | ||||
| -rw-r--r-- | roles/openwrt/image/tasks/prepare.yml | 12 | ||||
| -rw-r--r-- | roles/streaming/dolmetsch-raspi/tasks/main.yml | 2 |
3 files changed, 13 insertions, 8 deletions
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 diff --git a/roles/streaming/dolmetsch-raspi/tasks/main.yml b/roles/streaming/dolmetsch-raspi/tasks/main.yml index e3f6137e..c525c3cd 100644 --- a/roles/streaming/dolmetsch-raspi/tasks/main.yml +++ b/roles/streaming/dolmetsch-raspi/tasks/main.yml @@ -33,6 +33,8 @@ state: absent - name: extract the golang tarball + environment: ### TODO: remove once this lands in ansible: https://github.com/ansible/ansible/pull/76542 + LANGUAGE: en_US.utf8 unarchive: src: "/usr/local/src/go{{ dolmetsch_raspi_golang_version }}.linux-armv6l.tar.gz" dest: /usr/local |