General isar-build improvements

kas/ci/fast.yml

@@ -19,5 +19,5 @@ header:
 target:
   - mc:nanopi-neo:mtda-image
   - mc:rpi4b:mtda-image
-  - mc:debian-qemu-amd64:mtda-packages
+  - mc:debian-qemu-amd64:mtda
   - mc:debian-qemu-amd64:qemu-packages

kas/ci/full.yml

@@ -21,7 +21,7 @@ target:
   - mc:nanopi-neo:mtda-image
   - mc:nanopi-r1:mtda-image
   - mc:rpi4b:mtda-image
-  - mc:debian-qemu-amd64:mtda-packages
+  - mc:debian-qemu-amd64:mtda
   - mc:debian-qemu-amd64:qemu-packages
-  - mc:ubuntu-qemu-amd64:mtda-packages
+  - mc:ubuntu-qemu-amd64:mtda
   - mc:ubuntu-qemu-amd64:qemu-packages

kas/common/base.yml

@@ -21,7 +21,7 @@ repos:
       meta-isar:
   isar:
     url: https://github.com/ilbers/isar.git
-    commit: b5f7aef4e4fd26d852f8b09e545d5ade551224df
+    commit: d46adc844a74ba55c4b9521b7d7da9b5a47b489e
     layers:
       meta:
       meta-isar:

meta-isar/recipes-core/images/mtda-image.bb

@@ -16,10 +16,6 @@ PV = "1.0"
 
 ISAR_RELEASE_CMD = "git -C ${LAYERDIR_mtda} describe --tags --dirty --match 'v[0-9].[0-9]*'"
 
-# Build and deploy our MTDA packages
-DEPENDS += "mtda-packages"
-do_build[deptask] += "do_deploy_deb"
-
 # We suffix u-boot-script with DISTRO and MACHINE, remove the non-suffixed
 # version of the package
 IMAGE_INSTALL:remove = "u-boot-script"
@@ -35,6 +31,8 @@ DEPENDS:append:nanopi-r1 = " u-boot-nanopi-r1"
 IMAGE_INSTALL:append:nanopi-r1 = " u-boot-script-${DISTRO}-${MACHINE}"
 
 IMAGE_INSTALL += "                       \
+    mtda                                 \
+    mtda-www                             \
     mtda-hostname                        \
     mtda-network                         \
     mtda-repo                            \
@@ -47,8 +45,6 @@ IMAGE_PREINSTALL += "                    \
     isc-dhcp-client                      \
     mjpg-streamer                        \
     ustreamer                            \
-    mtda                                 \
-    mtda-www                             \
     pdudaemon-client                     \
     sd-mux-ctrl                          \
     ssh                                  \
@@ -74,13 +70,12 @@ IMAGE_PREINSTALL:append:lava = " lava-dispatcher"
 IMAGE_INSTALL:append = " expand-on-first-boot "
 
 # Create a "mtda" user account with "mtda" as the default password
-# hash created with: python3 -c 'import crypt; print(crypt.crypt("mtda", crypt.mksalt(crypt.METHOD_SHA512)))'
 USERS += "mtda"
 GROUPS += "mtda"
 USER_mtda[gid] = "mtda"
 USER_mtda[home] = "/home/mtda"
 USER_mtda[comment] = "Multi-Tenant Device Access"
-USER_mtda[flags] = "system create-home"
+USER_mtda[flags] = "system create-home clear-text-password"
 USER_mtda[groups] = "mtda sudo"
-USER_mtda[password] ??= "$6$uaP1WXXu/joK8zxJ$LONexagmcWBKkY/HRQe0fVjY7n06FkX1qJUjigQ.4JVYxC9/OfBu3iJrF8hugMo2CaIh1sIOxDdpXvWWIjhfQ1"
+USER_mtda[password] ??= "mtda"
 USER_mtda[shell] = "/bin/bash"

meta-isar/recipes-python/mtda/mtda_git.bb

@@ -29,6 +29,26 @@ MTDA_FILES = " \
     tox.ini \
     "
 
+# Here's our list of custom packages
+RDEPENDS:${PN} = "                       \
+    python3-hap-python                   \
+    mjpg-streamer                        \
+    mtda                                 \
+    sd-mux-ctrl                          \
+"
+# Ubuntu noble ships sd-mux-ctrl package
+RDEPENDS:${PN}:remove:noble = "sd-mux-ctrl"
+
+PROVIDES += "                            \
+    mtda-service                         \
+    mtda-client                          \
+    mtda-common                          \
+    mtda-docker                          \
+    mtda-kvm                             \
+    mtda-pytest                          \
+    mtda-www                             \
+"
+
 SRC_URI += "${@' '.join(['file://' + d.getVar('LAYERDIR_mtda') + '/../' + file for file in d.getVar('MTDA_FILES').split()])}"
 
 S = "${WORKDIR}/working-repo"