WIP

Author: pktpls

group_vars/all/imageprofile.yml

@@ -9,7 +9,7 @@ imagebuilder: >
   https://downloads.cdn.openwrt.org/{{
   'snapshots' if openwrt_version == 'snapshot' else 'releases/' ~ openwrt_version
   }}/targets/{{ target }}/{{ imagebuilder_filename }}
-feed: "src/gz openwrt_falter https://firmware.berlin.freifunk.net/feed/{{ feed_version }}/packages/{{ instr_set }}/falter"
+feed: "src/gz openwrt_falter https://firmware.berlin.freifunk.net/feed/{{ feed_version }}/packages/__INSTR_SET__/falter"
 
 all__packages__to_merge:
   - collectd-mod-interface

group_vars/version_25_12_snapshot.yml

@@ -1,4 +1,4 @@
 ---
 feed_version: 1.6.0-snapshot
-feed: "https://firmware.berlin.freifunk.net/feed/{{ feed_version }}/packages/{{ instr_set }}/falter/packages.adb"
+feed: "https://firmware.berlin.freifunk.net/feed/{{ feed_version }}/packages/__INSTR_SET__/falter/packages.adb"
 uses_apk: true

group_vars/version_snapshot.yml

@@ -1,5 +1,5 @@
 ---
 feed_version: snapshot
 imagebuilder_filename: "openwrt-imagebuilder-{{ target | replace('/', '-') }}.Linux-x86_64.tar.zst"
-feed: "https://firmware.berlin.freifunk.net/feed/{{ feed_version }}/packages/{{ instr_set }}/falter/packages.adb"
+feed: "https://firmware.berlin.freifunk.net/feed/{{ feed_version }}/packages/__INSTR_SET__/falter/packages.adb"
 uses_apk: true

roles/cfg_openwrt/tasks/imagebuilder.yml

@@ -77,7 +77,7 @@
 - name: Insert falter OPKG feed
   lineinfile:
     path: "{{ build_dir }}/repositories.conf"
-    line: "{{ feed }}"
+    line: "{{ feed | replace('__INSTR_SET__', instr_set) }}"
   when: 'uses_opkg is defined and feed_version is defined'
 
 - name: Add falter OPKG feed key
@@ -97,7 +97,7 @@
 - name: Add falter APK feed
   lineinfile:
     path: "{{ build_dir }}/repositories"
-    line: "{{ feed }}"
+    line: "{{ feed | replace('__INSTR_SET__', instr_set) }}"
   when: 'uses_apk is defined and feed_version is defined'
 
 - name: Add falter APK feed to image
@@ -163,16 +163,7 @@
     line: "{{ item }}::askfirst:/usr/libexec/login.sh"
   loop: "{{ additional_serial_ports | default([]) }}"
 
-- name: Generate Imagebuilder command
-  set_fact:
-    make_command: >
-      make image
-      PROFILE='{{ override_target | default(model) }}'
-      PACKAGES='{{ packages | join(" ") }}'
-      DISABLED_SERVICES='{{ disabled_services | join(" ") }}'
-      FILES='{{ configs_dir }}' 1>&2
-
-- name: Debug Imagebuilder command
+- name: Debug Imagebuilder command again
   debug:
     var: make_command
 

roles/cfg_openwrt/tasks/main.yml

@@ -6,25 +6,39 @@
       tags: always
   tags: always
 
+- name: Prepare directories variables
+  set_fact:
+    configs_dir: "{{ playbook_dir }}/tmp/configs/{{ inventory_hostname }}"
+    dl_dir: "{{ playbook_dir }}/tmp/dl"
+    build_dir: "{{ playbook_dir }}/tmp/build/{{ inventory_hostname }}"
+    images_dir: "{{ playbook_dir }}/tmp/images"
+    wikiupdater_dir: "{{ playbook_dir }}/tmp/wikiupdater"
+  tags: always
+
+- name: Create directories
+  file:
+    path: "{{ item }}"
+    state: directory
+    mode: "755"
+  loop:
+    - "{{ configs_dir }}"
+    - "{{ dl_dir }}"
+    - "{{ build_dir }}"
+    - "{{ images_dir }}"
+    - "{{ wikiupdater_dir }}"
+  tags: always
+
 - name: Include tasks for conditional packages
   include_tasks:
     file: conditional_packages.yml
     apply:
       tags: always
   tags: always
 
-- name: Prepare some variables (1)
-  set_fact:
-    basedir: "{{ playbook_dir }}/tmp"
-  tags: always
-
-- name: Prepare some variables
-  set_fact:
-    configs_dir: "{{ basedir }}/configs/{{ inventory_hostname }}"
-    dl_dir: "{{ basedir }}/dl/"
-    build_dir: "{{ basedir }}/build/{{ inventory_hostname }}"
-    images_dir: "{{ basedir }}/images/"
-    wikiupdater_dir: "{{ basedir }}/wikiupdater/"
+- name: Debug hostvars
+  copy:
+    dest: "{{ images_dir }}/{{ inventory_hostname }}.json"
+    content: "{{ hostvars[inventory_hostname] | to_json(indent=2) }}"
   tags: always
 
 - name: Create directory
@@ -80,6 +94,21 @@
       tags: always
   tags: always
 
+- name: Generate Imagebuilder command
+  set_fact:
+    make_command: >
+      make image
+      PROFILE='{{ override_target | default(model) }}'
+      PACKAGES='{{ packages | join(" ") }}'
+      DISABLED_SERVICES='{{ disabled_services | join(" ") }}'
+      FILES='{{ configs_dir }}' 1>&2
+  tags: always
+
+- name: Debug Imagebuilder command
+  debug:
+    var: make_command
+  tags: always
+
 - name: Include image generation
   include_tasks:
     file: imagebuilder.yml