Skip to content

Commit c50d41c

Browse files
committed
imagebuilder: use APK feed on snapshot
1 parent b425061 commit c50d41c

File tree

2 files changed

+20
-3
lines changed

2 files changed

+20
-3
lines changed
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
-----BEGIN PUBLIC KEY-----
2+
MFYwEAYHKoZIzj0CAQYFK4EEAAoDQgAEE1NSmLpdMjXJpDQki9ziqW3Ve0aIX99t
3+
uAc1Yn5TexwhBhHsGxUxICHS63pDXYj9xg1AZHlvbEnFrBNrsdjJQQ==
4+
-----END PUBLIC KEY-----

roles/cfg_openwrt/tasks/imagebuilder.yml

+16-3
Original file line numberDiff line numberDiff line change
@@ -72,24 +72,37 @@
7272
instr_set: "{{ instr_set_result.stdout_lines | first }}"
7373
when: 'instr_set is not defined and feed_version is defined'
7474

75-
- name: Insert falter feed
75+
- name: Insert falter opkg feed
7676
lineinfile:
7777
path: "{{ build_dir }}/repositories.conf"
7878
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"'
8086

8187
- name: Define Key-Dir
8288
stat:
8389
path: "{{ build_dir }}/keys/"
8490
register: keydir
8591

86-
- name: Add falter feed key
92+
- name: Add falter opkg feed key
8793
copy:
8894
src: "files/packagefeed_master.pub"
8995
dest: "{{ build_dir }}/keys/61a078a38408e710" # matches fingerprint
9096
mode: "preserve"
9197
when: 'feed_version is defined and keydir.stat.exists'
9298

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+
93106
- name: Disable Signature verification if required
94107
lineinfile:
95108
path: "{{ build_dir }}/repositories.conf"

0 commit comments

Comments
 (0)