summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Pointner <equinox@spreadspace.org>2020-02-03 20:23:51 +0100
committerChristian Pointner <equinox@spreadspace.org>2020-02-03 20:23:51 +0100
commitcee2c232de5cdf6c090d78b8afd4801f68b1f405 (patch)
tree19286189a254d467032a31c11c3b9ad2749f4d9a
parentsk-cloudia: update kubelet (diff)
ele-router: upgrade to openwrt 19.07.1
-rw-r--r--inventory/host_vars/ele-router.yml4
-rw-r--r--roles/openwrt/image/tasks/main.yml10
2 files changed, 10 insertions, 4 deletions
diff --git a/inventory/host_vars/ele-router.yml b/inventory/host_vars/ele-router.yml
index 8e025469..ed21ff36 100644
--- a/inventory/host_vars/ele-router.yml
+++ b/inventory/host_vars/ele-router.yml
@@ -137,12 +137,12 @@ openwrt_dhcp_base:
openwrt_variant: openwrt
-openwrt_release: 18.06.1
+openwrt_release: 19.07.1
openwrt_arch: ramips
openwrt_target: mt7621
openwrt_profile: ubnt-erx
openwrt_output_image_suffixes:
- - "{{ openwrt_profile }}-squashfs-sysupgrade.tar"
+ - "{{ openwrt_profile }}-squashfs-sysupgrade.bin"
openwrt_packages_remove:
- ppp
diff --git a/roles/openwrt/image/tasks/main.yml b/roles/openwrt/image/tasks/main.yml
index 17a31ba1..5a3f332b 100644
--- a/roles/openwrt/image/tasks/main.yml
+++ b/roles/openwrt/image/tasks/main.yml
@@ -39,11 +39,17 @@
openwrt_output_images: "{{ '[\"' + openwrt_output_dir + '/' + openwrt_output_image_name_base + '-' + (openwrt_output_image_suffixes | join('\", \"' + openwrt_output_dir + '/' + openwrt_output_image_name_base + '-')) + '\"]' }}"
always:
- - name: save build-log to output directory
+ - name: save stdout build-log to output directory
when: openwrt_build is defined
copy:
content: "{{ openwrt_build.stdout }}\n"
- dest: "{{ openwrt_output_dir }}/build.log"
+ dest: "{{ openwrt_output_dir }}/build-stdout.log"
+
+ - name: save stderr build-log to output directory
+ when: openwrt_build is defined
+ copy:
+ content: "{{ openwrt_build.stderr }}\n"
+ dest: "{{ openwrt_output_dir }}/build-stderr.log"
- name: Delete the temporary build directory
file: