Skip to content

Commit e080e32

Browse files
committed
imagebuilder: support snapshot APK package feed
1 parent 11f5539 commit e080e32

File tree

3 files changed

+36
-4
lines changed

3 files changed

+36
-4
lines changed

group_vars/version_snapshot.yml

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
---
22
feed_version: snapshot
33
imagebuilder_filename: "openwrt-imagebuilder-{{ target | replace('/', '-') }}.Linux-x86_64.tar.zst"
4+
feed: "https://firmware.berlin.freifunk.net/feed/{{ feed_version }}/packages/{{ instr_set }}/falter/packages.adb"
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

+31-4
Original file line numberDiff line numberDiff line change
@@ -74,26 +74,53 @@
7474
instr_set: "{{ instr_set_result.stdout_lines | first }}"
7575
when: 'instr_set is not defined and feed_version is defined'
7676

77-
- name: Insert falter feed
77+
- name: Insert falter OPKG feed
7878
lineinfile:
7979
path: "{{ build_dir }}/repositories.conf"
8080
line: "{{ feed }}"
81-
when: 'feed_version is defined'
81+
when: 'feed_version is defined and openwrt_version != "snapshot"'
8282

83-
- name: Add falter feed key
83+
- name: Add falter OPKG feed key
8484
copy:
8585
src: "files/packagefeed_master.pub"
8686
dest: "{{ build_dir }}/keys/61a078a38408e710" # matches fingerprint
8787
mode: "preserve"
8888
when: 'feed_version is defined'
8989

90-
- name: Disable Signature verification if required
90+
- name: Disable OPKG signature verification if required
9191
lineinfile:
9292
path: "{{ build_dir }}/repositories.conf"
9393
line: "option check_signature"
9494
state: "absent"
9595
when: 'imagebuilder_disable_signature_check is defined and imagebuilder_disable_signature_check'
9696

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+
97124
- name: Override compat_version check to bbb-configs exclusive value 9.9
98125
lineinfile:
99126
path: "{{ build_dir }}/include/image-commands.mk"

0 commit comments

Comments
 (0)