|
74 | 74 | instr_set: "{{ instr_set_result.stdout_lines | first }}"
|
75 | 75 | when: 'instr_set is not defined and feed_version is defined'
|
76 | 76 |
|
77 |
| -- name: Insert falter feed |
| 77 | +- name: Insert falter OPKG feed |
78 | 78 | lineinfile:
|
79 | 79 | path: "{{ build_dir }}/repositories.conf"
|
80 | 80 | line: "{{ feed }}"
|
81 |
| - when: 'feed_version is defined' |
| 81 | + when: 'feed_version is defined and openwrt_version != "snapshot"' |
82 | 82 |
|
83 |
| -- name: Add falter feed key |
| 83 | +- name: Add falter OPKG feed key |
84 | 84 | copy:
|
85 | 85 | src: "files/packagefeed_master.pub"
|
86 | 86 | dest: "{{ build_dir }}/keys/61a078a38408e710" # matches fingerprint
|
87 | 87 | mode: "preserve"
|
88 | 88 | when: 'feed_version is defined'
|
89 | 89 |
|
90 |
| -- name: Disable Signature verification if required |
| 90 | +- name: Disable OPKG signature verification if required |
91 | 91 | lineinfile:
|
92 | 92 | path: "{{ build_dir }}/repositories.conf"
|
93 | 93 | line: "option check_signature"
|
94 | 94 | state: "absent"
|
95 | 95 | when: 'imagebuilder_disable_signature_check is defined and imagebuilder_disable_signature_check'
|
96 | 96 |
|
| 97 | +- name: Add falter APK feed |
| 98 | + lineinfile: |
| 99 | + path: "{{ build_dir }}/repositories" |
| 100 | + line: "{{ feed }}" |
| 101 | + when: 'feed_version is defined and openwrt_version == "snapshot"' |
| 102 | + |
| 103 | +- name: Add falter APK feed to image |
| 104 | + lineinfile: |
| 105 | + path: "{{ configs_dir }}/etc/apk/repositories.d/falter.list" |
| 106 | + line: "{{ feed }}" |
| 107 | + create: true |
| 108 | + when: 'feed_version is defined and openwrt_version == "snapshot"' |
| 109 | + |
| 110 | +- name: Add falter APK feed key |
| 111 | + copy: |
| 112 | + src: "files/falter.snapshot.pem" |
| 113 | + dest: "{{ build_dir }}/keys/" |
| 114 | + mode: "preserve" |
| 115 | + when: 'feed_version is defined' |
| 116 | + |
| 117 | +- name: Add falter APK feed key to image |
| 118 | + copy: |
| 119 | + src: "files/falter.snapshot.pem" |
| 120 | + dest: "{{ configs_dir }}/etc/apk/keys/" |
| 121 | + mode: "preserve" |
| 122 | + when: 'feed_version is defined' |
| 123 | + |
97 | 124 | - name: Override compat_version check to bbb-configs exclusive value 9.9
|
98 | 125 | lineinfile:
|
99 | 126 | path: "{{ build_dir }}/include/image-commands.mk"
|
|
0 commit comments