Start moving everything for new directory structure

90 files changed, 13 insertions, 13 deletions

diff --git a/conf/include/bblayers/sota_intel-corei7-64.inc b/conf/include/bblayers/sota_intel-corei7-64.inc
deleted file mode 100644
index 1771e6c..0000000
--- a/conf/include/bblayers/sota_intel-corei7-64.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-
-BBLAYERS += " ${METADIR}/meta-updater-minnowboard ${METADIR}/meta-intel "
diff --git a/conf/include/bblayers/sota_qemux86-64.inc b/conf/include/bblayers/sota_qemux86-64.inc
deleted file mode 100644
index 12d32ff..0000000
--- a/conf/include/bblayers/sota_qemux86-64.inc
+++ /dev/null
@@ -1 +0,0 @@
-BBLAYERS += " ${METADIR}/meta-updater-qemux86-64 " 
diff --git a/conf/include/bblayers/sota_raspberrypi2.inc b/conf/include/bblayers/sota_raspberrypi2.inc
deleted file mode 100644
index cc26679..0000000
--- a/conf/include/bblayers/sota_raspberrypi2.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-BBLAYERS += " ${METADIR}/meta-openembedded/meta-python "
-
-BBLAYERS += " ${METADIR}/meta-updater-raspberrypi ${METADIR}/meta-raspberrypi " 
diff --git a/conf/include/bblayers/sota_raspberrypi3.inc b/conf/include/bblayers/sota_raspberrypi3.inc
deleted file mode 100644
index cc26679..0000000
--- a/conf/include/bblayers/sota_raspberrypi3.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-BBLAYERS += " ${METADIR}/meta-openembedded/meta-python "
-
-BBLAYERS += " ${METADIR}/meta-updater-raspberrypi ${METADIR}/meta-raspberrypi " 
diff --git a/classes/image_repo_manifest.bbclass b/meta-sota/classes/image_repo_manifest.bbclass
index 467fd9a..467fd9a 100644
--- a/classes/image_repo_manifest.bbclass
+++ b/meta-sota/classes/image_repo_manifest.bbclass
diff --git a/classes/image_types_ostree.bbclass b/meta-sota/classes/image_types_ostree.bbclass
index bc44e33..bc44e33 100644
--- a/classes/image_types_ostree.bbclass
+++ b/meta-sota/classes/image_types_ostree.bbclass
diff --git a/classes/image_types_ota.bbclass b/meta-sota/classes/image_types_ota.bbclass
index 9581971..9581971 100644
--- a/classes/image_types_ota.bbclass
+++ b/meta-sota/classes/image_types_ota.bbclass
diff --git a/classes/sota.bbclass b/meta-sota/classes/sota.bbclass
index 38d4ce5..38d4ce5 100644
--- a/classes/sota.bbclass
+++ b/meta-sota/classes/sota.bbclass
diff --git a/classes/sota_am335x-evm-wifi.bbclass b/meta-sota/classes/sota_am335x-evm-wifi.bbclass
index adefb47..adefb47 100644
--- a/classes/sota_am335x-evm-wifi.bbclass
+++ b/meta-sota/classes/sota_am335x-evm-wifi.bbclass
diff --git a/classes/sota_bleeding.inc b/meta-sota/classes/sota_bleeding.inc
index fc5947d..fc5947d 100644
--- a/classes/sota_bleeding.inc
+++ b/meta-sota/classes/sota_bleeding.inc
diff --git a/classes/sota_m3ulcb.bbclass b/meta-sota/classes/sota_m3ulcb.bbclass
index 6b63af4..6b63af4 100644
--- a/classes/sota_m3ulcb.bbclass
+++ b/meta-sota/classes/sota_m3ulcb.bbclass
diff --git a/classes/sota_minnowboard.bbclass b/meta-sota/classes/sota_minnowboard.bbclass
index 63510e3..63510e3 100644
--- a/classes/sota_minnowboard.bbclass
+++ b/meta-sota/classes/sota_minnowboard.bbclass
diff --git a/classes/sota_none.bbclass b/meta-sota/classes/sota_none.bbclass
index c11b070..c11b070 100644
--- a/classes/sota_none.bbclass
+++ b/meta-sota/classes/sota_none.bbclass
diff --git a/classes/sota_porter.bbclass b/meta-sota/classes/sota_porter.bbclass
index 75ae579..75ae579 100644
--- a/classes/sota_porter.bbclass
+++ b/meta-sota/classes/sota_porter.bbclass
diff --git a/classes/sota_qemux86-64.bbclass b/meta-sota/classes/sota_qemux86-64.bbclass
index 15b2043..15b2043 100644
--- a/classes/sota_qemux86-64.bbclass
+++ b/meta-sota/classes/sota_qemux86-64.bbclass
diff --git a/classes/sota_raspberrypi.bbclass b/meta-sota/classes/sota_raspberrypi.bbclass
index a5558b4..a5558b4 100644
--- a/classes/sota_raspberrypi.bbclass
+++ b/meta-sota/classes/sota_raspberrypi.bbclass
diff --git a/conf/distro/poky-sota-systemd.conf b/meta-sota/conf/distro/poky-sota-systemd.conf
index 7d008a9..7d008a9 100644
--- a/conf/distro/poky-sota-systemd.conf
+++ b/meta-sota/conf/distro/poky-sota-systemd.conf
diff --git a/conf/distro/poky-sota.conf b/meta-sota/conf/distro/poky-sota.conf
index 2bbc62b..2bbc62b 100644
--- a/conf/distro/poky-sota.conf
+++ b/meta-sota/conf/distro/poky-sota.conf
diff --git a/conf/distro/sota.conf.inc b/meta-sota/conf/distro/sota.conf.inc
index ea1ca95..ea1ca95 100644
--- a/conf/distro/sota.conf.inc
+++ b/meta-sota/conf/distro/sota.conf.inc
diff --git a/conf/include/bblayers/sota.inc b/meta-sota/conf/include/bblayers/sota.inc
index 26eea22..0e5842a 100644
--- a/conf/include/bblayers/sota.inc
+++ b/meta-sota/conf/include/bblayers/sota.inc
@@ -1,3 +1,3 @@
-BBLAYERS += "${METADIR}/meta-updater"
+BBLAYERS += "${METADIR}/meta-updater/meta-sota"
 BBLAYERS += "${METADIR}/meta-openembedded/meta-filesystems"
 BBLAYERS += "${METADIR}/meta-openembedded/meta-oe"
diff --git a/conf/include/bblayers/sota_am335x-evm.inc b/meta-sota/conf/include/bblayers/sota_am335x-evm.inc
index f2d485d..f2d485d 100644
--- a/conf/include/bblayers/sota_am335x-evm.inc
+++ b/meta-sota/conf/include/bblayers/sota_am335x-evm.inc
diff --git a/meta-sota/conf/include/bblayers/sota_intel-corei7-64.inc b/meta-sota/conf/include/bblayers/sota_intel-corei7-64.inc
new file mode 100644
index 0000000..32bd644
--- /dev/null
+++ b/meta-sota/conf/include/bblayers/sota_intel-corei7-64.inc
@@ -0,0 +1,2 @@
+
+BBLAYERS += " ${METADIR}/meta-updater/meta-sota-minnowboard ${METADIR}/meta-intel "
diff --git a/conf/include/bblayers/sota_m3ulcb.inc b/meta-sota/conf/include/bblayers/sota_m3ulcb.inc
index 04f78e4..04f78e4 100644
--- a/conf/include/bblayers/sota_m3ulcb.inc
+++ b/meta-sota/conf/include/bblayers/sota_m3ulcb.inc
diff --git a/conf/include/bblayers/sota_porter.inc b/meta-sota/conf/include/bblayers/sota_porter.inc
index 6964ef0..8fcb12e 100644
--- a/conf/include/bblayers/sota_porter.inc
+++ b/meta-sota/conf/include/bblayers/sota_porter.inc
@@ -1,2 +1,2 @@
 
-BBLAYERS += " ${METADIR}/meta-renesas ${METADIR}/meta-renesas/meta-rcar-gen2 ${METADIR}/meta-openembedded/meta-multimedia ${METADIR}/meta-updater-porter"
+BBLAYERS += " ${METADIR}/meta-renesas ${METADIR}/meta-renesas/meta-rcar-gen2 ${METADIR}/meta-openembedded/meta-multimedia ${METADIR}/meta-sota-porter"
diff --git a/meta-sota/conf/include/bblayers/sota_qemux86-64.inc b/meta-sota/conf/include/bblayers/sota_qemux86-64.inc
new file mode 100644
index 0000000..2b79257
--- /dev/null
+++ b/meta-sota/conf/include/bblayers/sota_qemux86-64.inc
@@ -0,0 +1 @@
+BBLAYERS += " ${METADIR}/meta-updater/meta-sota-qemux86-64 "
diff --git a/meta-sota/conf/include/bblayers/sota_raspberrypi2.inc b/meta-sota/conf/include/bblayers/sota_raspberrypi2.inc
new file mode 100644
index 0000000..726c862
--- /dev/null
+++ b/meta-sota/conf/include/bblayers/sota_raspberrypi2.inc
@@ -0,0 +1,3 @@
+BBLAYERS += " ${METADIR}/meta-openembedded/meta-python "
+
+BBLAYERS += " ${METADIR}/meta-updater/meta-sota-raspberrypi ${METADIR}/meta-raspberrypi "
diff --git a/meta-sota/conf/include/bblayers/sota_raspberrypi3.inc b/meta-sota/conf/include/bblayers/sota_raspberrypi3.inc
new file mode 100644
index 0000000..726c862
--- /dev/null
+++ b/meta-sota/conf/include/bblayers/sota_raspberrypi3.inc
@@ -0,0 +1,3 @@
+BBLAYERS += " ${METADIR}/meta-openembedded/meta-python "
+
+BBLAYERS += " ${METADIR}/meta-updater/meta-sota-raspberrypi ${METADIR}/meta-raspberrypi "
diff --git a/conf/layer.conf b/meta-sota/conf/layer.conf
index 798ceba..798ceba 100644
--- a/conf/layer.conf
+++ b/meta-sota/conf/layer.conf
diff --git a/lib/oeqa/selftest/cases/qemucommand.py b/meta-sota/lib/oeqa/selftest/cases/qemucommand.py
index 075cdb8..075cdb8 120000
--- a/lib/oeqa/selftest/cases/qemucommand.py
+++ b/meta-sota/lib/oeqa/selftest/cases/qemucommand.py
diff --git a/lib/oeqa/selftest/cases/updater.py b/meta-sota/lib/oeqa/selftest/cases/updater.py
index 2efef15..2efef15 100644
--- a/lib/oeqa/selftest/cases/updater.py
+++ b/meta-sota/lib/oeqa/selftest/cases/updater.py
diff --git a/recipes-core/images/initramfs-ostree-image.bb b/meta-sota/recipes-core/images/initramfs-ostree-image.bb
index b2d9e27..b2d9e27 100644
--- a/recipes-core/images/initramfs-ostree-image.bb
+++ b/meta-sota/recipes-core/images/initramfs-ostree-image.bb
diff --git a/recipes-sota/aktualizr/aktualizr-auto-prov.bb b/meta-sota/recipes-sota/aktualizr/aktualizr-auto-prov.bb
index 8deee7e..8deee7e 100644
--- a/recipes-sota/aktualizr/aktualizr-auto-prov.bb
+++ b/meta-sota/recipes-sota/aktualizr/aktualizr-auto-prov.bb
diff --git a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb b/meta-sota/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb
index 319074e..319074e 100644
--- a/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb
+++ b/meta-sota/recipes-sota/aktualizr/aktualizr-ca-implicit-prov.bb
diff --git a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb b/meta-sota/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
index 504f0d8..504f0d8 100644
--- a/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
+++ b/meta-sota/recipes-sota/aktualizr/aktualizr-hsm-prov.bb
diff --git a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb b/meta-sota/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
index dcfaffb..dcfaffb 100644
--- a/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
+++ b/meta-sota/recipes-sota/aktualizr/aktualizr-implicit-prov.bb
diff --git a/recipes-sota/aktualizr/aktualizr_git.bb b/meta-sota/recipes-sota/aktualizr/aktualizr_git.bb
index 2c0d59f..2c0d59f 100755
--- a/recipes-sota/aktualizr/aktualizr_git.bb
+++ b/meta-sota/recipes-sota/aktualizr/aktualizr_git.bb
diff --git a/recipes-sota/aktualizr/credentials.inc b/meta-sota/recipes-sota/aktualizr/credentials.inc
index 256c8ff..256c8ff 100644
--- a/recipes-sota/aktualizr/credentials.inc
+++ b/meta-sota/recipes-sota/aktualizr/credentials.inc
diff --git a/recipes-sota/aktualizr/environment.inc b/meta-sota/recipes-sota/aktualizr/environment.inc
index 16e789e..16e789e 100644
--- a/recipes-sota/aktualizr/environment.inc
+++ b/meta-sota/recipes-sota/aktualizr/environment.inc
diff --git a/recipes-sota/aktualizr/files/LICENSE b/meta-sota/recipes-sota/aktualizr/files/LICENSE
index a612ad9..a612ad9 100644
--- a/recipes-sota/aktualizr/files/LICENSE
+++ b/meta-sota/recipes-sota/aktualizr/files/LICENSE
diff --git a/recipes-sota/aktualizr/files/aktualizr-secondary.service b/meta-sota/recipes-sota/aktualizr/files/aktualizr-secondary.service
index a1e0e1b..a1e0e1b 100644
--- a/recipes-sota/aktualizr/files/aktualizr-secondary.service
+++ b/meta-sota/recipes-sota/aktualizr/files/aktualizr-secondary.service
diff --git a/recipes-sota/aktualizr/files/aktualizr-secondary.socket b/meta-sota/recipes-sota/aktualizr/files/aktualizr-secondary.socket
index da0ee44..da0ee44 100644
--- a/recipes-sota/aktualizr/files/aktualizr-secondary.socket
+++ b/meta-sota/recipes-sota/aktualizr/files/aktualizr-secondary.socket
diff --git a/recipes-sota/aktualizr/files/aktualizr-serialcan.service b/meta-sota/recipes-sota/aktualizr/files/aktualizr-serialcan.service
index b42f348..b42f348 100644
--- a/recipes-sota/aktualizr/files/aktualizr-serialcan.service
+++ b/meta-sota/recipes-sota/aktualizr/files/aktualizr-serialcan.service
diff --git a/recipes-sota/aktualizr/files/aktualizr.service b/meta-sota/recipes-sota/aktualizr/files/aktualizr.service
index 1c2e1df..1c2e1df 100644
--- a/recipes-sota/aktualizr/files/aktualizr.service
+++ b/meta-sota/recipes-sota/aktualizr/files/aktualizr.service
diff --git a/recipes-sota/aktualizr/files/ca.cnf b/meta-sota/recipes-sota/aktualizr/files/ca.cnf
index 352ec38..352ec38 100644
--- a/recipes-sota/aktualizr/files/ca.cnf
+++ b/meta-sota/recipes-sota/aktualizr/files/ca.cnf
diff --git a/recipes-sota/aktualizr/garage-sign-version.inc b/meta-sota/recipes-sota/aktualizr/garage-sign-version.inc
index 66e3ffd..66e3ffd 100644
--- a/recipes-sota/aktualizr/garage-sign-version.inc
+++ b/meta-sota/recipes-sota/aktualizr/garage-sign-version.inc
diff --git a/recipes-sota/asn1c/asn1c.bb b/meta-sota/recipes-sota/asn1c/asn1c.bb
index 9d1517d..9d1517d 100644
--- a/recipes-sota/asn1c/asn1c.bb
+++ b/meta-sota/recipes-sota/asn1c/asn1c.bb
diff --git a/recipes-sota/asn1c/files/skeletons_dir_fix.patch b/meta-sota/recipes-sota/asn1c/files/skeletons_dir_fix.patch
index f1caa2f..f1caa2f 100644
--- a/recipes-sota/asn1c/files/skeletons_dir_fix.patch
+++ b/meta-sota/recipes-sota/asn1c/files/skeletons_dir_fix.patch
diff --git a/recipes-sota/config/aktualizr-disable-send-ip.bb b/meta-sota/recipes-sota/config/aktualizr-disable-send-ip.bb
index cab7696..cab7696 100644
--- a/recipes-sota/config/aktualizr-disable-send-ip.bb
+++ b/meta-sota/recipes-sota/config/aktualizr-disable-send-ip.bb
diff --git a/recipes-sota/config/aktualizr-example-interface.bb b/meta-sota/recipes-sota/config/aktualizr-example-interface.bb
index 37a9184..37a9184 100644
--- a/recipes-sota/config/aktualizr-example-interface.bb
+++ b/meta-sota/recipes-sota/config/aktualizr-example-interface.bb
diff --git a/recipes-sota/config/aktualizr-log-debug.bb b/meta-sota/recipes-sota/config/aktualizr-log-debug.bb
index e628616..e628616 100644
--- a/recipes-sota/config/aktualizr-log-debug.bb
+++ b/meta-sota/recipes-sota/config/aktualizr-log-debug.bb
diff --git a/recipes-sota/config/files/05-log-debug.toml b/meta-sota/recipes-sota/config/files/05-log-debug.toml
index 100a146..100a146 100644
--- a/recipes-sota/config/files/05-log-debug.toml
+++ b/meta-sota/recipes-sota/config/files/05-log-debug.toml
diff --git a/recipes-sota/config/files/30-disable-send-ip.toml b/meta-sota/recipes-sota/config/files/30-disable-send-ip.toml
index 5cd5108..5cd5108 100644
--- a/recipes-sota/config/files/30-disable-send-ip.toml
+++ b/meta-sota/recipes-sota/config/files/30-disable-send-ip.toml
diff --git a/recipes-sota/config/files/30-example-interface.toml b/meta-sota/recipes-sota/config/files/30-example-interface.toml
index fc4e9ec..fc4e9ec 100644
--- a/recipes-sota/config/files/30-example-interface.toml
+++ b/meta-sota/recipes-sota/config/files/30-example-interface.toml
diff --git a/recipes-sota/config/files/LICENSE b/meta-sota/recipes-sota/config/files/LICENSE
index a612ad9..a612ad9 100644
--- a/recipes-sota/config/files/LICENSE
+++ b/meta-sota/recipes-sota/config/files/LICENSE
diff --git a/recipes-sota/ostree-initrd/files/init.sh b/meta-sota/recipes-sota/ostree-initrd/files/init.sh
index d7e0429..d7e0429 100644
--- a/recipes-sota/ostree-initrd/files/init.sh
+++ b/meta-sota/recipes-sota/ostree-initrd/files/init.sh
diff --git a/recipes-sota/ostree-initrd/ostree-initrd.bb b/meta-sota/recipes-sota/ostree-initrd/ostree-initrd.bb
index 6046c81..6046c81 100644
--- a/recipes-sota/ostree-initrd/ostree-initrd.bb
+++ b/meta-sota/recipes-sota/ostree-initrd/ostree-initrd.bb
diff --git a/recipes-sota/ostree/ostree_git.bb b/meta-sota/recipes-sota/ostree/ostree_git.bb
index cdcb485..cdcb485 100644
--- a/recipes-sota/ostree/ostree_git.bb
+++ b/meta-sota/recipes-sota/ostree/ostree_git.bb
diff --git a/recipes-support/ca-certificates/ca-certificates_%.bbappend b/meta-sota/recipes-support/ca-certificates/ca-certificates_%.bbappend
index cc95a68..cc95a68 100644
--- a/recipes-support/ca-certificates/ca-certificates_%.bbappend
+++ b/meta-sota/recipes-support/ca-certificates/ca-certificates_%.bbappend
diff --git a/recipes-support/fuse/fuse_%.bbappend b/meta-sota/recipes-support/fuse/fuse_%.bbappend
index 85bdf50..85bdf50 100644
--- a/recipes-support/fuse/fuse_%.bbappend
+++ b/meta-sota/recipes-support/fuse/fuse_%.bbappend
diff --git a/recipes-support/gpgme/gpgme_%.bbappend b/meta-sota/recipes-support/gpgme/gpgme_%.bbappend
index fccb949..fccb949 100644
--- a/recipes-support/gpgme/gpgme_%.bbappend
+++ b/meta-sota/recipes-support/gpgme/gpgme_%.bbappend
diff --git a/recipes-support/libgsystem/libgsystem_git.bb b/meta-sota/recipes-support/libgsystem/libgsystem_git.bb
index e2b362f..e2b362f 100644
--- a/recipes-support/libgsystem/libgsystem_git.bb
+++ b/meta-sota/recipes-support/libgsystem/libgsystem_git.bb
diff --git a/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch b/meta-sota/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch
index 902352c..902352c 100644
--- a/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch
+++ b/meta-sota/recipes-support/libp11/files/0001-Workaround-for-a-buggy-version-of-openssl-1.0.2m.patch
diff --git a/recipes-support/libp11/libp11_0.4.7.bb b/meta-sota/recipes-support/libp11/libp11_0.4.7.bb
index 02d9e50..02d9e50 100644
--- a/recipes-support/libp11/libp11_0.4.7.bb
+++ b/meta-sota/recipes-support/libp11/libp11_0.4.7.bb
diff --git a/recipes-support/libssh2/libssh2_%.bbappend b/meta-sota/recipes-support/libssh2/libssh2_%.bbappend
index bebaf84..bebaf84 100644
--- a/recipes-support/libssh2/libssh2_%.bbappend
+++ b/meta-sota/recipes-support/libssh2/libssh2_%.bbappend
diff --git a/recipes-support/lshw/files/cross-compile.patch b/meta-sota/recipes-support/lshw/files/cross-compile.patch
index 221b7e5..221b7e5 100644
--- a/recipes-support/lshw/files/cross-compile.patch
+++ b/meta-sota/recipes-support/lshw/files/cross-compile.patch
diff --git a/recipes-support/lshw/files/ldflags.patch b/meta-sota/recipes-support/lshw/files/ldflags.patch
index 83e0410..83e0410 100644
--- a/recipes-support/lshw/files/ldflags.patch
+++ b/meta-sota/recipes-support/lshw/files/ldflags.patch
diff --git a/recipes-support/lshw/lshw_02.16.bb b/meta-sota/recipes-support/lshw/lshw_02.16.bb
index 99901ff..99901ff 100644
--- a/recipes-support/lshw/lshw_02.16.bb
+++ b/meta-sota/recipes-support/lshw/lshw_02.16.bb
diff --git a/recipes-support/python-canonicaljson/python-canonicaljson.bb b/meta-sota/recipes-support/python-canonicaljson/python-canonicaljson.bb
index d8a0728..d8a0728 100644
--- a/recipes-support/python-canonicaljson/python-canonicaljson.bb
+++ b/meta-sota/recipes-support/python-canonicaljson/python-canonicaljson.bb
diff --git a/recipes-support/python-frozendict/python-frozendict.bb b/meta-sota/recipes-support/python-frozendict/python-frozendict.bb
index 79fe5c8..79fe5c8 100644
--- a/recipes-support/python-frozendict/python-frozendict.bb
+++ b/meta-sota/recipes-support/python-frozendict/python-frozendict.bb
diff --git a/recipes-support/python-petname/python-petname.bb b/meta-sota/recipes-support/python-petname/python-petname.bb
index 9abd5d9..9abd5d9 100644
--- a/recipes-support/python-petname/python-petname.bb
+++ b/meta-sota/recipes-support/python-petname/python-petname.bb
diff --git a/recipes-support/sc-hsm-embedded/files/0001-Cross-compilation-tweaks.patch b/meta-sota/recipes-support/sc-hsm-embedded/files/0001-Cross-compilation-tweaks.patch
index b3a7622..b3a7622 100644
--- a/recipes-support/sc-hsm-embedded/files/0001-Cross-compilation-tweaks.patch
+++ b/meta-sota/recipes-support/sc-hsm-embedded/files/0001-Cross-compilation-tweaks.patch
diff --git a/recipes-support/sc-hsm-embedded/sc-hsm-embedded_git.bb b/meta-sota/recipes-support/sc-hsm-embedded/sc-hsm-embedded_git.bb
index 062d514..062d514 100644
--- a/recipes-support/sc-hsm-embedded/sc-hsm-embedded_git.bb
+++ b/meta-sota/recipes-support/sc-hsm-embedded/sc-hsm-embedded_git.bb
diff --git a/recipes-support/slcand-start/files/slcand@.service b/meta-sota/recipes-support/slcand-start/files/slcand@.service
index c539568..c539568 100644
--- a/recipes-support/slcand-start/files/slcand@.service
+++ b/meta-sota/recipes-support/slcand-start/files/slcand@.service
diff --git a/recipes-support/slcand-start/slcand-start.bb b/meta-sota/recipes-support/slcand-start/slcand-start.bb
index dfefaea..dfefaea 100644
--- a/recipes-support/slcand-start/slcand-start.bb
+++ b/meta-sota/recipes-support/slcand-start/slcand-start.bb
diff --git a/recipes-support/softhsm-testtoken/files/createtoken.service b/meta-sota/recipes-support/softhsm-testtoken/files/createtoken.service
index 23317b9..23317b9 100644
--- a/recipes-support/softhsm-testtoken/files/createtoken.service
+++ b/meta-sota/recipes-support/softhsm-testtoken/files/createtoken.service
diff --git a/recipes-support/softhsm-testtoken/files/createtoken.sh b/meta-sota/recipes-support/softhsm-testtoken/files/createtoken.sh
index b01db47..b01db47 100644
--- a/recipes-support/softhsm-testtoken/files/createtoken.sh
+++ b/meta-sota/recipes-support/softhsm-testtoken/files/createtoken.sh
diff --git a/recipes-support/softhsm-testtoken/softhsm-testtoken.bb b/meta-sota/recipes-support/softhsm-testtoken/softhsm-testtoken.bb
index c5691db..c5691db 100644
--- a/recipes-support/softhsm-testtoken/softhsm-testtoken.bb
+++ b/meta-sota/recipes-support/softhsm-testtoken/softhsm-testtoken.bb
diff --git a/recipes-support/softhsm/files/0001-Cross-compilation-tweaks.patch b/meta-sota/recipes-support/softhsm/files/0001-Cross-compilation-tweaks.patch
index b3a7622..b3a7622 100644
--- a/recipes-support/softhsm/files/0001-Cross-compilation-tweaks.patch
+++ b/meta-sota/recipes-support/softhsm/files/0001-Cross-compilation-tweaks.patch
diff --git a/recipes-support/softhsm/softhsm_git.bb b/meta-sota/recipes-support/softhsm/softhsm_git.bb
index c26903d..c26903d 100644
--- a/recipes-support/softhsm/softhsm_git.bb
+++ b/meta-sota/recipes-support/softhsm/softhsm_git.bb
diff --git a/recipes-test/big-update/big-update_1.0.bb b/meta-sota/recipes-test/big-update/big-update_1.0.bb
index 68b9746..68b9746 100644
--- a/recipes-test/big-update/big-update_1.0.bb
+++ b/meta-sota/recipes-test/big-update/big-update_1.0.bb
diff --git a/recipes-test/big-update/big-update_2.0.bb b/meta-sota/recipes-test/big-update/big-update_2.0.bb
index 20c8138..20c8138 100644
--- a/recipes-test/big-update/big-update_2.0.bb
+++ b/meta-sota/recipes-test/big-update/big-update_2.0.bb
diff --git a/recipes-test/big-update/files/rand_file.py b/meta-sota/recipes-test/big-update/files/rand_file.py
index 0f4f16e..0f4f16e 100644
--- a/recipes-test/big-update/files/rand_file.py
+++ b/meta-sota/recipes-test/big-update/files/rand_file.py
diff --git a/recipes-test/demo-network-config/files/25-dhcp-server.network b/meta-sota/recipes-test/demo-network-config/files/25-dhcp-server.network
index 4766f9a..4766f9a 100644
--- a/recipes-test/demo-network-config/files/25-dhcp-server.network
+++ b/meta-sota/recipes-test/demo-network-config/files/25-dhcp-server.network
diff --git a/recipes-test/demo-network-config/files/26-dhcp-client.network b/meta-sota/recipes-test/demo-network-config/files/26-dhcp-client.network
index 319664f..319664f 100644
--- a/recipes-test/demo-network-config/files/26-dhcp-client.network
+++ b/meta-sota/recipes-test/demo-network-config/files/26-dhcp-client.network
diff --git a/recipes-test/demo-network-config/files/27-dhcp-client-external.network b/meta-sota/recipes-test/demo-network-config/files/27-dhcp-client-external.network
index ba49593..ba49593 100644
--- a/recipes-test/demo-network-config/files/27-dhcp-client-external.network
+++ b/meta-sota/recipes-test/demo-network-config/files/27-dhcp-client-external.network
diff --git a/recipes-test/demo-network-config/primary-network-config.bb b/meta-sota/recipes-test/demo-network-config/primary-network-config.bb
index 78678a2..78678a2 100644
--- a/recipes-test/demo-network-config/primary-network-config.bb
+++ b/meta-sota/recipes-test/demo-network-config/primary-network-config.bb
diff --git a/recipes-test/demo-network-config/secondary-network-config.bb b/meta-sota/recipes-test/demo-network-config/secondary-network-config.bb
index 9091c65..9091c65 100644
--- a/recipes-test/demo-network-config/secondary-network-config.bb
+++ b/meta-sota/recipes-test/demo-network-config/secondary-network-config.bb
diff --git a/recipes-test/images/primary-image.bb b/meta-sota/recipes-test/images/primary-image.bb
index 6d2df94..6d2df94 100644
--- a/recipes-test/images/primary-image.bb
+++ b/meta-sota/recipes-test/images/primary-image.bb
diff --git a/recipes-test/images/secondary-image.bb b/meta-sota/recipes-test/images/secondary-image.bb
index 9adbdc5..9adbdc5 100644
--- a/recipes-test/images/secondary-image.bb
+++ b/meta-sota/recipes-test/images/secondary-image.bb
diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
index ff78681..e8f9285 100755
--- a/scripts/envsetup.sh
+++ b/scripts/envsetup.sh
@@ -26,8 +26,8 @@ METADIR="${SOURCEDIR}/../.."
 if [[ ! -f "${BUILDDIR}/conf/local.conf" ]]; then
   source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
   echo "METADIR  := \"\${@os.path.abspath('${METADIR}')}\"" >> conf/bblayers.conf
-  cat "${METADIR}/meta-updater/conf/include/bblayers/sota.inc" >> conf/bblayers.conf
-  cat "${METADIR}/meta-updater/conf/include/bblayers/sota_${MACHINE}.inc" >> conf/bblayers.conf
+  cat "${METADIR}/meta-updater/meta-sota/conf/include/bblayers/sota.inc" >> conf/bblayers.conf
+  cat "${METADIR}/meta-updater/meta-sota/conf/include/bblayers/sota_${MACHINE}.inc" >> conf/bblayers.conf
   echo "MACHINE = \"${MACHINE}\"" >> conf/local.conf
   echo "DISTRO = \"poky-sota-systemd\"" >> conf/local.conf
 else