2 files changed, 13 insertions, 8 deletions

diff --git a/recipes-test/images/primary-image.bb b/recipes-test/images/primary-image.bb
index 6d2df94..ba1dc1f 100644
--- a/recipes-test/images/primary-image.bb
+++ b/recipes-test/images/primary-image.bb
@@ -2,13 +2,15 @@ include recipes-core/images/core-image-minimal.bb
 
 SUMMARY = "A minimal Uptane Primary image running aktualizr, for testing with a Linux secondary"
 
-LICENSE = "MIT"
+LICENSE = "MPL-2.0"
 
 IMAGE_INSTALL_remove = " \
+                        virtual/network-configuration \
                         "
 
 IMAGE_INSTALL_append = " \
-                        primary-network-config \
+                         primary-network-config \
+                         primary-config \
                        "
 
 # vim:set ts=4 sw=4 sts=4 expandtab:
diff --git a/recipes-test/images/secondary-image.bb b/recipes-test/images/secondary-image.bb
index 61df85b..27d1e3f 100644
--- a/recipes-test/images/secondary-image.bb
+++ b/recipes-test/images/secondary-image.bb
@@ -2,18 +2,20 @@ include recipes-core/images/core-image-minimal.bb
 
 SUMMARY = "A minimal Uptane Secondary image running aktualizr-secondary"
 
-LICENSE = "MIT"
+LICENSE = "MPL-2.0"
 
+SECONDARY_SERIAL_ID ?= ""
+SOTA_HARDWARE_ID ?= "${MACHINE}-sndry"
 
 # Remove default aktualizr primary, and the provisioning configuration (which
 # RDEPENDS on aktualizr)
 IMAGE_INSTALL_remove = " \
                         aktualizr \
-                        aktualizr-auto-prov \
-                        aktualizr-auto-prov-creds \
-                        aktualizr-ca-implicit-prov \
-                        aktualizr-ca-implicit-prov-creds \
-                        aktualizr-hsm-prov \
+                        aktualizr-shared-prov \
+                        aktualizr-shared-prov-creds \
+                        aktualizr-device-prov \
+                        aktualizr-device-prov-creds \
+                        aktualizr-device-prov-hsm \
                         aktualizr-uboot-env-rollback \
                         virtual/network-configuration \
                         "
@@ -21,6 +23,7 @@ IMAGE_INSTALL_remove = " \
 IMAGE_INSTALL_append = " \
                         aktualizr-secondary \
                         secondary-network-config \
+                        secondary-config \
                         "
 
 # vim:set ts=4 sw=4 sts=4 expandtab: