Simplify python3-improv: use same filenames in machine override folders

- eink: replace improv-eink.service/onboarding-server-eink.py with
  improv.service and onboarding-server.py in imx93-jaguar-eink/
- INST: add imx8mm-jaguar-inst/ with improv.service and onboarding-server.py
- Recipe: remove all machine-specific SRC_URI, do_install conditionals,
  FILES and SYSTEMD_SERVICE logic; Yocto picks up files from MACHINE/
  when present via FILESEXTRAPATHS
- Update MACHINE_SPECIFIC_FILES.md to describe simplified pattern

Author: Alex J Lennon

recipes-devtools/python/python3-improv/MACHINE_SPECIFIC_FILES.md

@@ -65,27 +65,31 @@ SYSTEMD_SERVICE:${PN} = "${@bb.utils.contains('MACHINE', 'imx93-jaguar-eink', 'm
 ## How It Works
 
 1. **FILESEXTRAPATHS**: Extends the file search path to the recipe directory (`THISDIR`)
-2. **Automatic Lookup**: Yocto automatically looks in `${MACHINE}/` subdirectory first
-3. **Machine-Specific**: For `imx93-jaguar-eink`, files are found in `imx93-jaguar-eink/`
-4. **Other Machines**: For other machines, files are found in the recipe directory root
+2. **Automatic Lookup**: Yocto automatically looks in `${MACHINE}/` subdirectory first, then recipe root
+3. **Same filenames**: Use the same filenames in machine folders (e.g. `improv.service`, `onboarding-server.py`) so the recipe needs no machine-specific SRC_URI, do_install, or SYSTEMD_SERVICE logic
 
 ## Example: python3-improv Recipe
 
 **Structure:**
 ```
 recipes-devtools/python/python3-improv/
-├── improv.service                    (common - all machines)
-├── onboarding-server.py              (common - all machines)
-├── python3-improv_git.bb            (recipe)
-└── imx93-jaguar-eink/               (machine-specific folder)
-    ├── improv-eink.service
-    └── onboarding-server-eink.py
+├── improv.service                    (default - all machines without override)
+├── onboarding-server.py              (default)
+├── python3-improv_git.bb              (recipe in parent directory)
+├── imx93-jaguar-eink/                (machine override - same filenames)
+│   ├── improv.service
+│   └── onboarding-server.py
+└── imx8mm-jaguar-inst/               (machine override - same filenames)
+    ├── improv.service
+    └── onboarding-server.py
 ```
 
 **Result:**
-- `imx93-jaguar-eink`: Uses files from `imx93-jaguar-eink/` subdirectory
-- All other machines (sentai, etc.): Use files from recipe directory root
-- No changes to original files - other machine behavior preserved
+- Yocto picks up `improv.service` and `onboarding-server.py` from `${MACHINE}/` when present; otherwise uses recipe root.
+- `imx93-jaguar-eink`: Uses files from `imx93-jaguar-eink/` (eink-XXXX BLE name, improv-eink connection).
+- `imx8mm-jaguar-inst`: Uses files from `imx8mm-jaguar-inst/` (Improv-Inst BLE, improv-inst connection).
+- All other machines: Use files from recipe directory root.
+- Recipe has no machine-specific SRC_URI, do_install, or SYSTEMD_SERVICE logic.
 
 ## Key Points
 

recipes-devtools/python/python3-improv/imx8mm-jaguar-inst/improv.service

@@ -0,0 +1,17 @@
+[Unit]
+Description=Improv BLE WiFi onboarding service for imx8mm-jaguar-inst (INST)
+Documentation=https://www.improv-wifi.com/ble/
+After=bluetooth.target
+Wants=bluetooth.target
+
+[Service]
+Type=simple
+ExecStart=/usr/share/improv/onboarding-server.py
+Restart=always
+RestartSec=12
+Environment="IMPROV_WIFI_INTERFACE=wlan0"
+Environment="IMPROV_SERVICE_NAME=Improv-Inst"
+Environment="IMPROV_CONNECTION_NAME=improv-inst"
+
+[Install]
+WantedBy=default.target

…93-jaguar-eink/onboarding-server-eink.py …/imx8mm-jaguar-inst/onboarding-server.pyrecipes-devtools/python/python3-improv/imx93-jaguar-eink/onboarding-server-eink.py renamed to recipes-devtools/python/python3-improv/imx8mm-jaguar-inst/onboarding-server.py recipes-devtools/python/python3-improv/imx93-jaguar-eink/onboarding-server-eink.py renamed to recipes-devtools/python/python3-improv/imx8mm-jaguar-inst/onboarding-server.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 # -*- coding: utf-8 -*-
 #
-# Custom Improv onboarding server for imx93-jaguar-eink board
+# Custom Improv onboarding server for imx8mm-jaguar-inst (INST board)
 # Based on onboarding-server.py but with board-specific customizations
 #
 
@@ -20,9 +20,9 @@
 import logging
 import uuid
 import nmcli
+import subprocess
 import os
 import re
-import subprocess
 
 logging.basicConfig(level=logging.DEBUG)
 logger = logging.getLogger(name=__name__)
@@ -82,44 +82,11 @@ def build_gatt():
 The device MUST advertise the Service UUID.
 """
 
-def get_board_id():
-    """Get unique board ID from SOC serial number.
-    
-    Reads the SOC serial number from /sys/devices/soc0/serial_number
-    and extracts the last 4 characters to create a unique board identifier.
-    
-    Returns:
-        str: Board ID in format "XXXX" (4 hex characters), or "0000" if unavailable
-    """
-    try:
-        # Read SOC serial number (32-character hex string)
-        soc_serial_path = "/sys/devices/soc0/serial_number"
-        if os.path.exists(soc_serial_path):
-            with open(soc_serial_path, 'r') as f:
-                serial = f.read().strip()
-                # Extract last 4 characters (most unique portion)
-                # Remove any non-hex characters and take last 4
-                serial_clean = re.sub(r'[^0-9a-fA-F]', '', serial)
-                if len(serial_clean) >= 4:
-                    board_id = serial_clean[-4:].upper()  # Last 4 chars, uppercase
-                    logger.info(f"Board ID from SOC serial: {board_id}")
-                    return board_id
-        logger.warning("SOC serial number not found, using default board ID")
-    except Exception as e:
-        logger.error(f"Error reading board ID: {e}")
-    
-    # Fallback to default if unavailable
-    return "0000"
-
-# Board-specific configuration for imx93-jaguar-eink
-# Can be overridden via environment variables
+# Board-specific configuration for imx8mm-jaguar-inst (overridable via environment)
 SERVER_HOST = os.getenv("IMPROV_SERVER_HOST", "api.co.uk")
-# Generate unique service name from board ID: "eink-XXXX" where XXXX is last 4 chars of SOC serial
-BOARD_ID = get_board_id()
-DEFAULT_SERVICE_NAME = f"eink-{BOARD_ID}"
-SERVICE_NAME = os.getenv("IMPROV_SERVICE_NAME", DEFAULT_SERVICE_NAME)
-CON_NAME = os.getenv("IMPROV_CONNECTION_NAME", "improv-eink")
-INTERFACE = os.getenv("IMPROV_WIFI_INTERFACE", "wlan0")  # imx93-jaguar-eink uses wlan0
+SERVICE_NAME = os.getenv("IMPROV_SERVICE_NAME", "Improv-Inst")
+CON_NAME = os.getenv("IMPROV_CONNECTION_NAME", "improv-inst")
+INTERFACE = os.getenv("IMPROV_WIFI_INTERFACE", "wlan0")
 TIMEOUT = int(os.getenv("IMPROV_CONNECTION_TIMEOUT", "10000"))
 
 # Use new_event_loop() or get_event_loop() depending on Python version
@@ -142,28 +109,23 @@ def wifi_connect(ssid: str, passwd: str) -> Optional[list[str]]:
       print(f'No connection {CON_NAME} to remove')
 
     try:
-      # Create WiFi connection with improved settings for boot-time reliability:
-      # - autoconnect-priority 20 (highest priority - ensures wifi-connect.service selects this connection)
-      #   Higher than GrosnyIoT (10) so Improv-configured networks are preferred
-      # - dhcp-timeout 60 (60 seconds for DHCP, longer than default 45)
-      # - autoconnect-retries -1 (retry connection indefinitely - never give up)
-      # - auth-retries -1 (retry authentication indefinitely - never give up)
+      # Create connection with secrets stored in file (not agent-only)
+      # This prevents "no secrets" errors on headless systems when 4-way handshake fails
+      #
       # ⚠️  CRITICAL: wifi-sec.psk-flags:'0' is REQUIRED for the NetworkManager patch
       # (0001-wifi-dont-clear-secrets-if-stored-in-keyfile.patch) to work correctly.
       # Without this, the patch will not activate and connections may fail permanently
       # after 4-way handshake failures.
       # See: meta-dynamicdevices-distro/recipes-connectivity/networkmanager/networkmanager/README_PATCH_REQUIREMENTS.md
-      nmcli.connection.add('wifi', {
-          'ssid': ssid.decode('utf-8'),
-          'wifi-sec.key-mgmt': 'wpa-psk',
-          'wifi-sec.psk': passwd.decode('utf-8'),
-          'wifi-sec.psk-flags': '0',  # REQUIRED: Store PSK in file, not agent-only (patch requirement)
-          'connection.autoconnect': 'yes',
-          'connection.autoconnect-priority': '20',
-          'connection.autoconnect-retries': '-1',  # Retry connection indefinitely (-1 = unlimited)
-          'connection.auth-retries': '-1',  # Retry authentication indefinitely (-1 = unlimited)
-          'connection.permissions': '',  # Allow system-wide use
-          'ipv4.dhcp-timeout': '60'
+      nmcli.connection.add('wifi', { 
+          'ssid':ssid.decode('utf-8'), 
+          'wifi-sec.key-mgmt':'wpa-psk', 
+          'wifi-sec.psk':passwd.decode('utf-8'),
+          'wifi-sec.psk-flags':'0',  # REQUIRED: Store PSK in file, not agent-only (patch requirement)
+          'connection.autoconnect':'yes',
+          'connection.autoconnect-retries':'-1',  # Retry connection indefinitely (-1 = unlimited)
+          'connection.auth-retries':'-1',  # Retry authentication indefinitely (-1 = unlimited)
+          'connection.permissions':''  # Allow system-wide use
       }, f"{INTERFACE}", f"{CON_NAME}", True)
       logger.info(f"Successfully created WiFi connection {CON_NAME}")
 
@@ -173,93 +135,50 @@ def wifi_connect(ssid: str, passwd: str) -> Optional[list[str]]:
       return None
 
     # CRITICAL: Explicitly add psk-flags=0 to connection file
-    # NetworkManager 1.46.0 may not write psk-flags=0 to the keyfile even when set,
-    # but the NetworkManager patch REQUIRES it to be explicitly in the file to detect
-    # that secrets are stored. Directly edit the file to ensure it's present.
     connection_file = f"/etc/NetworkManager/system-connections/{CON_NAME}.nmconnection"
     try:
         if os.path.exists(connection_file):
-            # Read the file
             with open(connection_file, 'r') as f:
                 content = f.read()
-            
-            # Check if psk-flags=0 is already in the file
             if 'psk-flags=0' not in content and 'psk-flags=0\n' not in content:
-                # Add psk-flags=0 to [wifi-security] section
-                # Find [wifi-security] section and add psk-flags=0 after psk line
                 pattern = r'(\[wifi-security\]\n(?:[^\[]*\n)*?psk=[^\n]+\n)'
                 replacement = r'\1psk-flags=0\n'
                 new_content = re.sub(pattern, replacement, content)
-                
-                # If pattern didn't match, try adding it after [wifi-security]
                 if new_content == content:
                     pattern = r'(\[wifi-security\]\n)'
                     replacement = r'\1psk-flags=0\n'
                     new_content = re.sub(pattern, replacement, content)
-                
-                # Write the file back (requires root, but we're running as root via sudo)
                 if new_content != content:
                     with open(connection_file, 'w') as f:
                         f.write(new_content)
                     logger.info(f"Added psk-flags=0 to connection file {connection_file}")
-                else:
-                    logger.warning(f"Could not find [wifi-security] section to add psk-flags=0")
-            else:
-                logger.debug(f"psk-flags=0 already in connection file")
         else:
             logger.warning(f"Connection file not found at {connection_file} - cannot add psk-flags=0")
     except PermissionError as e:
-        logger.warning(f"Permission denied editing connection file {connection_file}: {e}")
-        # Try nmcli modify as fallback
         try:
             subprocess.run(['nmcli', 'connection', 'modify', f"{CON_NAME}", 
                            '802-11-wireless-security.psk-flags', '0'],
                           check=True, capture_output=True, timeout=5)
-            logger.debug(f"Used nmcli to set psk-flags=0 (file edit failed)")
         except Exception as e2:
             logger.warning(f"nmcli modify also failed: {e2}")
     except Exception as e:
         logger.warning(f"Unexpected error adding psk-flags=0 to file: {e}", exc_info=True)
 
-    # NetworkManager automatically saves connections when created/modified
-    # In NetworkManager 1.46.0+, connections are saved automatically to
-    # /etc/NetworkManager/system-connections/ when created with nmcli.connection.add()
-    # The explicit modify above ensures psk-flags=0 is written to the file.
-    # Use 'reload' to ensure NetworkManager picks up the connection immediately
     try:
         subprocess.run(['nmcli', 'connection', 'reload'], 
                       check=True, capture_output=True, timeout=5)
-        logger.debug(f"Reloaded NetworkManager connections")
-    except subprocess.CalledProcessError as e:
-        logger.debug(f"Could not reload NetworkManager connections (exit code {e.returncode}): {e.stderr.decode() if e.stderr else 'unknown error'}")
-        # Non-critical - connection is already saved automatically
-    except subprocess.TimeoutExpired as e:
-        logger.debug(f"Timeout reloading NetworkManager connections: {e}")
-        # Non-critical - connection is already saved automatically
-    except FileNotFoundError:
-        logger.debug(f"nmcli command not found - cannot reload connections")
-        # Non-critical - connection is already saved automatically
-    except Exception as e:
-        logger.debug(f"Unexpected error reloading connections: {e}")
-        # Non-critical - connection is already saved automatically
+    except Exception:
+        pass
 
-    # Verify connection file exists and has correct settings
     connection_file = f"/etc/NetworkManager/system-connections/{CON_NAME}.nmconnection"
     try:
         if os.path.exists(connection_file):
-            logger.debug(f"Connection file exists: {connection_file}")
-            # Read file to verify psk-flags=0 is set
             with open(connection_file, 'r') as f:
                 content = f.read()
                 if 'psk-flags=0' in content or 'psk-flags=0\n' in content:
                     logger.debug(f"Verified psk-flags=0 in connection file")
-                else:
-                    logger.warning(f"psk-flags=0 not found in connection file - connection may not work correctly")
-        else:
-            logger.warning(f"Connection file not found at {connection_file} - connection may not persist")
     except Exception as e:
         logger.debug(f"Could not verify connection file: {e}")
-        # Non-critical - just for verification
 
     try:
       nmcli.connection.up(f"{CON_NAME}", TIMEOUT)
@@ -356,4 +275,3 @@ async def run(loop):
     logger.debug("Shutting Down")
     trigger.set()
     pass
-

recipes-devtools/python/python3-improv/imx93-jaguar-eink/improv-eink.service

@@ -0,0 +1,18 @@
+[Unit]
+Description=Improv BLE WiFi onboarding service for imx93-jaguar-eink
+Documentation=https://www.improv-wifi.com/ble/
+# CRITICAL: Must start WITHOUT network - this service is used to CONFIGURE WiFi!
+After=bluetooth.target
+Wants=bluetooth.target
+
+[Service]
+Type=simple
+ExecStart=/usr/share/improv/onboarding-server.py
+Restart=always
+RestartSec=12
+Environment="IMPROV_WIFI_INTERFACE=wlan0"
+Environment="IMPROV_SERVICE_NAME=Improv-Eink"
+Environment="IMPROV_CONNECTION_NAME=improv-eink"
+
+[Install]
+WantedBy=default.target