|
72 | 72 | instr_set: "{{ instr_set_result.stdout_lines | first }}"
|
73 | 73 | when: 'instr_set is not defined and feed_version is defined'
|
74 | 74 |
|
75 |
| -- name: Insert falter feed |
| 75 | +- name: Insert falter opkg feed |
76 | 76 | lineinfile:
|
77 | 77 | path: "{{ build_dir }}/repositories.conf"
|
78 | 78 | line: "{{ feed | replace('__INSTR_SET__', instr_set) | replace('__FEED_VERSION__', feed_version) }}"
|
79 |
| - when: 'feed_version is defined' |
| 79 | + when: 'feed_version is defined and openwrt_version != "snapshot"' |
| 80 | + |
| 81 | +- name: Insert falter apk feed |
| 82 | + lineinfile: |
| 83 | + path: "{{ build_dir }}/repositories" |
| 84 | + line: "{{ feed | replace('__INSTR_SET__', instr_set) | replace('__FEED_VERSION__', feed_version) }}" |
| 85 | + when: 'feed_version is defined and openwrt_version == "snapshot"' |
80 | 86 |
|
81 | 87 | - name: Define Key-Dir
|
82 | 88 | stat:
|
83 | 89 | path: "{{ build_dir }}/keys/"
|
84 | 90 | register: keydir
|
85 | 91 |
|
86 |
| -- name: Add falter feed key |
| 92 | +- name: Add falter opkg feed key |
87 | 93 | copy:
|
88 | 94 | src: "files/packagefeed_master.pub"
|
89 | 95 | dest: "{{ build_dir }}/keys/61a078a38408e710" # matches fingerprint
|
90 | 96 | mode: "preserve"
|
91 | 97 | when: 'feed_version is defined and keydir.stat.exists'
|
92 | 98 |
|
| 99 | +- name: Add falter apk feed key |
| 100 | + copy: |
| 101 | + src: "files/falter.snapshot.pem" |
| 102 | + dest: "{{ build_dir }}/keys/" |
| 103 | + mode: "preserve" |
| 104 | + when: 'feed_version is defined and keydir.stat.exists' |
| 105 | + |
93 | 106 | - name: Disable Signature verification if required
|
94 | 107 | lineinfile:
|
95 | 108 | path: "{{ build_dir }}/repositories.conf"
|
|
0 commit comments