2 files changed, 12 insertions, 3 deletions

diff --git a/recipes-sota/rvi-sota-client/rvi-sota-client.inc b/recipes-sota/rvi-sota-client/rvi-sota-client.inc
index 00709af..6718bab 100644
--- a/recipes-sota/rvi-sota-client/rvi-sota-client.inc
+++ b/recipes-sota/rvi-sota-client/rvi-sota-client.inc
@@ -13,11 +13,12 @@ SRC_URI[index.md5sum] = "6a635e8a081b4d4ba4cebffd721c2d7d"
 SRC_URI[index.sha256sum] = "1913c41d4b8de89a931b6f9e418f83e70a083e12e6c247e8510ee932571ebae2"
 
 # also update PV and SRC_URI crates when updating SRCREV
-SRCREV = "5b335cd46c5848d8012ef03f06b50a63fdac4f7c"
+SRCREV = "d41540a54ee7bba20835b337f3a477d5f1386c76"
+
 PR = "1"
 
 # generate with: `make package-version`
-PV = "0.2.33-66-g5b335cd"
+PV = "0.2.33-76-gd41540a"
 
 # generate with: `make yocto-version`
 SRC_URI = " \
diff --git a/scripts/envsetup.sh b/scripts/envsetup.sh
index ff78681..260b048 100755
--- a/scripts/envsetup.sh
+++ b/scripts/envsetup.sh
@@ -24,7 +24,15 @@ fi
 METADIR="${SOURCEDIR}/../.."
 
 if [[ ! -f "${BUILDDIR}/conf/local.conf" ]]; then
-  source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
+  if [ -z "$TEMPLATECONF" ] && [ -d ${METADIR}/meta-updater-${MACHINE}/conf ]; then
+    # Use the template configurations for the specified machine
+    TEMPLATECONF=${METADIR}/meta-updater-${MACHINE}/conf
+    source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
+    unset TEMPLATECONF
+  else
+    # Use the default configurations or TEMPLATECONF set by the user
+    source "$METADIR/poky/oe-init-build-env" "$BUILDDIR"
+  fi
   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