15 files changed, 15 insertions, 20 deletions

diff --git a/README.adoc b/README.adoc
index f8e8ada..e26497c 100644
--- a/README.adoc
+++ b/README.adoc
@@ -18,7 +18,7 @@ If you already have a Yocto-based project and you want to add atomic filesystem
 
 1.  Clone the `meta-updater` layer and add it to your https://www.yoctoproject.org/docs/2.1/ref-manual/ref-manual.html#structure-build-conf-bblayers.conf[bblayers.conf].
 2.  Clone BSP integration layer (meta-updater-$\{PLATFORM}, e.g. https://github.com/advancedtelematic/meta-updater-raspberrypi[meta-updater-raspberrypi]) and add it to your conf/bblayers.conf. If your board isn't supported yet, you could write a BSP integration for it yourself. See the <<Adding support for your board>> section for the details.
-3.  Set up your https://www.yoctoproject.org/docs/2.1/ref-manual/ref-manual.html#var-DISTRO[distro]. If you are using "poky", the default distro in Yocto, you can change it in your conf/local.conf to "poky-sota". Alternatively, if you are using your own or third party distro configuration, you can add 'require conf/distro/sota.conf.inc' to it, thus combining capabilities of your distro with meta-updater features.
+3.  Set up your https://www.yoctoproject.org/docs/2.1/ref-manual/ref-manual.html#var-DISTRO[distro]. If you are using "poky", the default distro in Yocto, you can change it in your conf/local.conf to "poky-sota". Alternatively, if you are using your own or third party distro configuration, you can add 'INHERIT += " sota"' to it, thus combining capabilities of your distro with meta-updater features.
 
 You can then build your image as usual, with bitbake. After building the root file system, bitbake will then create an https://ostree.readthedocs.io/en/latest/manual/adapting-existing/[OSTree-enabled version] of it, commit it to your local OSTree repo and (optionally) push it to a remote server. Additionally, a live disk image will be created (normally named $\{IMAGE_NAME}.-sdimg-ota e.g. core-image-raspberrypi3.rpi-sdimg-ota). You can control this behaviour through <<variables in your local.conf,OSTree-related variables in your local.conf>>.
 
diff --git a/conf/distro/sota.conf.inc b/classes/sota.bbclass
index 20946a6..0697932 100644
--- a/conf/distro/sota.conf.inc
+++ b/classes/sota.bbclass
@@ -23,3 +23,11 @@ OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image"
 
 # Prelinking increases the size of downloads and causes build errors
 USER_CLASSES_remove = "image-prelink"
+
+SOTA_MACHINE ?= "none"
+SOTA_MACHINE_raspberrypi = "raspberrypi"
+SOTA_MACHINE_raspberrypi3 = "raspberrypi"
+SOTA_MACHINE_porter = "porter"
+SOTA_MACHINE_intel-corei7-64 = "minnowboard"
+SOTA_MACHINE_qemux86-64 = "qemux86-64"
+inherit sota_${SOTA_MACHINE}
diff --git a/conf/include/local/sota_bleeding.inc b/classes/sota_bleeding.inc
index fc5947d..fc5947d 100644
--- a/conf/include/local/sota_bleeding.inc
+++ b/classes/sota_bleeding.inc
diff --git a/conf/include/local/sota_minnowboard.inc b/classes/sota_minnowboard.bbclass
index 36d1a17..970bd6a 100644
--- a/conf/include/local/sota_minnowboard.inc
+++ b/classes/sota_minnowboard.bbclass
@@ -1,5 +1,3 @@
-MACHINE = "intel-corei7-64"
-
 OSTREE_BOOTLOADER ?= "grub"
 EFI_PROVIDER = "grub-efi"
 
diff --git a/conf/include/local/sota_minnowboard_uboot.inc b/classes/sota_minnowboard_uboot.inc
index e64f7eb..5097e9d 100644
--- a/conf/include/local/sota_minnowboard_uboot.inc
+++ b/classes/sota_minnowboard_uboot.inc
@@ -1,5 +1,3 @@
-MACHINE = "intel-corei7-64"
-
 PREFERRED_PROVIDER_virtual/bootloader = "u-boot-ota"
 UBOOT_MACHINE = "minnowmax_defconfig"
 
diff --git a/classes/sota_none.bbclass b/classes/sota_none.bbclass
new file mode 100644
index 0000000..dc72a07
--- /dev/null
+++ b/classes/sota_none.bbclass
@@ -0,0 +1 @@
+# null machine it's here to make bitbake happy when SOTA_MACHINE is undefined
diff --git a/conf/include/local/sota_porter.inc b/classes/sota_porter.bbclass
index 9828248..a8f5ba1 100644
--- a/conf/include/local/sota_porter.inc
+++ b/classes/sota_porter.bbclass
@@ -1,5 +1,3 @@
-MACHINE = "porter"
-
 # Commit united image to OSTree, not just uImage
 OSTREE_KERNEL = "uImage+dtb"
 
diff --git a/conf/include/local/sota_qemux86-64.inc b/classes/sota_qemux86-64.bbclass
index b03631b..533c11c 100644
--- a/conf/include/local/sota_qemux86-64.inc
+++ b/classes/sota_qemux86-64.bbclass
@@ -1,5 +1,3 @@
-MACHINE = "qemux86-64"
-
 # See https://advancedtelematic.atlassian.net/browse/PRO-2693
 PREFERRED_VERSION_linux-yocto_qemux86-64_sota = "4.4%"
 
diff --git a/conf/include/local/sota_raspberrypi.inc b/classes/sota_raspberrypi.bbclass
index ae13b8e..1d23d1f 100644
--- a/conf/include/local/sota_raspberrypi.inc
+++ b/classes/sota_raspberrypi.bbclass
@@ -1,5 +1,3 @@
-MACHINE ?= "raspberrypi3"
-
 IMAGE_CLASSES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'image_types_uboot sdcard_image-rpi-ota', '', d)}"
 IMAGE_FSTYPES += "${@bb.utils.contains('DISTRO_FEATURES', 'sota', 'rpi-sdimg-ota', 'rpi-sdimg', d)}"
 
diff --git a/conf/distro/poky-sota-systemd.conf b/conf/distro/poky-sota-systemd.conf
index 85744ea..e6f43f7 100644
--- a/conf/distro/poky-sota-systemd.conf
+++ b/conf/distro/poky-sota-systemd.conf
@@ -1,5 +1,4 @@
 require conf/distro/poky.conf
-require conf/distro/sota.conf.inc
 
 DISTRO = "poky-sota"
 DISTRO_NAME = "OTA-enabled Linux"
@@ -9,4 +8,5 @@ DISTRO_CODENAME = "sota"
 DISTRO_FEATURES_append = " systemd"
 VIRTUAL-RUNTIME_init_manager = "systemd"
 
+INHERIT += " sota"
 IMAGE_INSTALL_append = " connman connman-client rvi-sota-client"
diff --git a/conf/distro/poky-sota.conf b/conf/distro/poky-sota.conf
index 2bbc62b..6972a94 100644
--- a/conf/distro/poky-sota.conf
+++ b/conf/distro/poky-sota.conf
@@ -1,9 +1,9 @@
 require conf/distro/poky.conf
-require conf/distro/sota.conf.inc
 
 DISTRO = "poky-sota"
 DISTRO_NAME = "OTA-enabled Linux"
 DISTRO_VERSION = "1.0"
 DISTRO_CODENAME = "sota"
 
+INHERIT += " sota"
 IMAGE_INSTALL_append = " connman connman-client"
diff --git a/conf/include/bblayers/sota_minnowboard.inc b/conf/include/bblayers/sota_intel-corei7-64.inc
index 1771e6c..1771e6c 100644
--- a/conf/include/bblayers/sota_minnowboard.inc
+++ b/conf/include/bblayers/sota_intel-corei7-64.inc
diff --git a/conf/include/bblayers/sota_raspberrypi.inc b/conf/include/bblayers/sota_raspberrypi2.inc
index 11ede20..11ede20 100644
--- a/conf/include/bblayers/sota_raspberrypi.inc
+++ b/conf/include/bblayers/sota_raspberrypi2.inc
diff --git a/conf/include/bblayers/sota_raspberrypi3.inc b/conf/include/bblayers/sota_raspberrypi3.inc
new file mode 100644
index 0000000..11ede20
--- /dev/null
+++ b/conf/include/bblayers/sota_raspberrypi3.inc
@@ -0,0 +1,2 @@
+
+BBLAYERS += " ${METADIR}/meta-updater-raspberrypi ${METADIR}/meta-raspberrypi " 
diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
index 6c01d5b..5adf319 100755
--- a/scripts/envsetup.sh
+++ b/scripts/envsetup.sh
@@ -35,11 +35,6 @@ fi
 SCRIPTDIR=$(cd $(dirname $BASH_SOURCE) && pwd -P)
 METADIR=$(cd $(dirname $BASH_SOURCE)/../.. && pwd -P)
 
-if ! [[ -e ${SCRIPTDIR}/../conf/include/local/sota_${MACHINE}.inc && -e ${SCRIPTDIR}/../conf/include/bblayers/sota_${MACHINE}.inc ]]; then
-        echo "Error: invalid machine: ${MACHINE}" >&2
-        return -1
-fi
-
 if [ -e ${BUILDDIR}/conf/local.conf ]; then
         source $METADIR/poky/oe-init-build-env ${BUILDDIR}
 else
@@ -47,8 +42,7 @@ else
         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
-        echo "include conf/include/local/sota_${MACHINE}.inc" >> conf/local.conf
-        echo "include conf/distro/sota.conf.inc" >> conf/local.conf
+        echo "MACHINE = \"${MACHINE}\"" >> conf/local.conf
         echo "DISTRO = \"poky-sota-systemd\"" >> conf/local.conf
 fi