Wipe out sota-related codeeel_4.99.3eel_4.99.2eel_4.99.1eel/4.99.3eel/4.99.2eel/4.99.1dab_3.99.1dab/3.99.14.99.34.99.24.99.13.99.1

Moved to meta-updater@github.com/advancedtelenmatic

Change-Id: I7c89d373e43a88a89155c72de87c0b4b5238bc52
Signed-off-by: Anton Gerasimov <anton@advancedtelematic.com>

50 files changed, 0 insertions, 3938 deletions

diff --git a/meta-sota/README.md b/meta-sota/README.md
deleted file mode 100644
index 3bc242f..0000000
--- a/meta-sota/README.md
+++ /dev/null
@@ -1,122 +0,0 @@
-meta-sota
-=========
-
-This layer enables over-the-air updates with OSTree and RVI SOTA client.
-
-[OSTree](https://github.com/ostreedev/ostree) is a tool for atomic full file
-system upgrades with rollback capability.  
-Main advantage of OSTree compared 
-to traditional dual partition model is that OSTree minimizes network bandwidth
-and data storage footprint by sharing files with the same contents across file
-system deployments.
-
-[RVI SOTA client](https://github.com/advancedtelematic/rvi_sota_client) adds
-authentication and provisioning capabilities to OTA and is integrated with
-OSTree.
-
-Build
------
-
-With AGL you can just add agl-sota feature while configuring your build
-environment as in:
-
-```bash
-source meta-agl/scripts/aglsetup.sh -m porter agl-demo agl-appfw-smack agl-devel agl-sota
-```
-
-you can then just run:
-
-```bash
-bitbake agl-demo-platform
-```
-
-and get as a result "ostree_repo" folder in your images directory
-(tmp/deploy/images/${MACHINE}/ostree_repo) containing your OSTree repository
-with rootfs committed as an OSTree deployment, 'otaimg' bootstrap image which
-is an OSTree physical sysroot as a burnable filesystem image and optionally
-some machine-dependent live images (e.g. '*.rpi-sdimg-ota' for Raspberry Pi or
-'*.porter-sdimg-ota' Renesas Porter board).
-
-Although aglsetup.sh hooks provide reasonable defaults for SOTA-related
-variables you may want to tune some of them.
-
-SOTA-related variables in local.conf
-------------------------------------
-
-* OSTREE_REPO - path to your OSTree repository.  
-  Defaults to "${DEPLOY_DIR_IMAGE}/ostree_repo"
-* OSTREE_BRANCHNAME - the branch your rootfs will be committed to.  
-  Defaults to "agl-ota"
-* OSTREE_OSNAME - OS deployment name on your target device.  
-  For more information about deployments and osnames see
-  [OSTree documentation](https://ostree.readthedocs.io/en/latest/manual/deployment/)
-  Defaults to "agl".
-* OSTREE_INITRAMFS_IMAGE - initramfs/initrd image that is used as a proxy while
-  booting into OSTree deployment. Do not change this setting unless you are
-  sure that your initramfs can serve as such proxy.
-* OSTREE_PUSH_CREDENTIALS - when set adds pushing your ostree commit to a remote
-  repo. sota-tools will then use credentials in the file pointed to by this
-  variable.
-
-Usage
------
-
-### OSTree ###
-OSTree includes its own simple http server.  
-It just exposes the whole OSTree
-repository to the network so that any remote device can pull data from it to
-device's local repository.  
-To use OSTree http server you need OSTree installed
-on your build machine. Alternatively, you could run version built inside Yocto
-using bitbake's [devshell](http://www.openembedded.org/wiki/Devshell).
-
-To expose your repo run ostree trivial-httpd using any free port.
-
-```bash
-ostree trivial-httpd tmp/deploy/images/qemux86-64/ostree_repo -P 57556
-```
-
-You can then run from inside your device or QEMU emulation, provided your
-network is set up correctly.
-
-```bash
-# agl-remote identifies the remote server in your local repo
-ostree remote add --no-gpg-verify agl-remote http://192.168.7.1:57556 agl-ota-raspberrypi3
-    
-# agl-ota-raspberrypi3 is a branch name in the remote repo, set in OSTREE_BRANCHNAME
-#   default value for OSTREE_BRANCHNAME is "agl-ota-${MACHINE}"
-ostree pull agl-remote agl-ota-raspberrypi3
-    
-# agl is OS name as set in OSTREE_OSNAME
-ostree admin deploy --os=agl agl-remote:agl-ota-raspberrypi3
-```
-
-After restart you should boot into the newly deployed OS image.
-
-E.g. for the raspberrypi3 you can try this sequence:
-
-```bash
-# add remote
-ostree remote add --no-gpg-verify agl-snapshot https://download.automotivelinux.org/AGL/snapshots/master/latest/raspberrypi3/deploy/images/raspberrypi3/ostree_repo/ agl-ota
- 
-# pull
-ostree pull agl-snapshot agl-ota-raspberrypi3
-    
-# deploy
-ostree admin deploy --os=agl agl-snapshot:agl-ota-raspberrypi3
-```
-
-### SOTA tools ###
-SOTA tools now contains only one tool, garage-push that lets you push the
-changes in OSTree repository generated by bitbake process.  
-It communicates with an http server capable of querying files with HEAD requests and uploading them
-with POST requests.  
-Garage-push is used as following:
-
-```bash
-garage-push --repo=/path/to/ostree-repo --ref=mybranch --credentials=~/.sota-tools.json --user=username --password=
-```
-
-You can set OSTREE_PUSH_CREDENTIALS in your local.conf to make your build
-results be automatically synchronized with a remote server.  
-Credentials are stored in JSON format which is described in [sota-tools documentation](https://github.com/advancedtelematic/sota-tools/blob/master/README.adoc)
diff --git a/meta-sota/classes/image_types_ostree.bbclass b/meta-sota/classes/image_types_ostree.bbclass
deleted file mode 100644
index 1bbeb2d..0000000
--- a/meta-sota/classes/image_types_ostree.bbclass
+++ /dev/null
@@ -1,143 +0,0 @@
-# OSTree deployment
-
-inherit image
-
-IMAGE_DEPENDS_ostree = "ostree-native:do_populate_sysroot \ 
-			virtual/kernel:do_deploy \
-			${OSTREE_INITRAMFS_IMAGE}:do_image_complete"
-
-export OSTREE_REPO
-export OSTREE_BRANCHNAME
-
-RAMDISK_EXT ?= ".ext4.gz"
-RAMDISK_EXT_arm ?= ".ext4.gz.u-boot"
-
-OSTREE_KERNEL ??= "${KERNEL_IMAGETYPE}"
-
-IMAGE_CMD_ostree () {
-	if [ -z "$OSTREE_REPO" ]; then
-		bbfatal "OSTREE_REPO should be set in your local.conf"
-	fi
-
-	if [ -z "$OSTREE_BRANCHNAME" ]; then
-		bbfatal "OSTREE_BRANCHNAME should be set in your local.conf"
-	fi
-
-	OSTREE_ROOTFS=`mktemp -du ${WORKDIR}/ostree-root-XXXXX`
-	cp -a ${IMAGE_ROOTFS} ${OSTREE_ROOTFS}
-	chmod a+rx ${OSTREE_ROOTFS}
-	sync
-
-	cd ${OSTREE_ROOTFS}
-
-	# Create sysroot directory to which physical sysroot will be mounted
-	mkdir sysroot
-	ln -sf sysroot/ostree ostree
-
-	rm -rf tmp/*
-	ln -sf sysroot/tmp tmp
-
-	mkdir -p usr/rootdirs
-
-	mv etc usr/
-	# Implement UsrMove
-	dirs="bin sbin lib"
-
-	for dir in ${dirs} ; do
-		if [ -d ${dir} ] && [ ! -L ${dir} ] ; then 
-			mv ${dir} usr/rootdirs/
-			rm -rf ${dir}
-			ln -sf usr/rootdirs/${dir} ${dir}
-		fi
-	done
-	
-	if [ ! -d "usr/etc/tmpfiles.d" ]; then
-		mkdir usr/etc/tmpfiles.d
-	fi
-	tmpfiles_conf=usr/etc/tmpfiles.d/00ostree-tmpfiles.conf
-
-	echo "d /var/rootdirs 0755 root root -" >>${tmpfiles_conf}
-	echo "L /var/rootdirs/home - - - - /sysroot/home" >>${tmpfiles_conf}
-
-	# Preserve OSTREE_BRANCHNAME for future information
-	mkdir -p usr/share/sota/
-	echo -n "${OSTREE_BRANCHNAME}" > usr/share/sota/branchname
-	# Preserve data in /home to be later copied to /sysroot/home by
-	#   sysroot generating procedure
-	mkdir -p usr/homedirs
-	if [ -d "home" ] && [ ! -L "home" ]; then
-		mv home usr/homedirs/home
-		ln -sf var/rootdirs/home home
-	fi
-
-	# Move persistent directories to /var
-	dirs="opt mnt media srv"
-
-	for dir in ${dirs}; do
-		if [ -d ${dir} ] && [ ! -L ${dir} ]; then
-			if [ "$(ls -A $dir)" ]; then
-				bbwarn "Data in /$dir directory is not preserved by OSTree. Consider moving it under /usr"
-			fi
-			echo "d /var/rootdirs/${dir} 0755 root root -" >>${tmpfiles_conf}
-			rm -rf ${dir}
-			ln -sf var/rootdirs/${dir} ${dir}
-		fi
-	done
-
-	if [ -d root ] && [ ! -L root ]; then
-		if [ "$(ls -A root)" ]; then
-			bberror "Data in /root directory is not preserved by OSTree."
-		fi
-		echo "d /var/roothome 0755 root root -" >>${tmpfiles_conf}
-		rm -rf root
-		ln -sf var/roothome root
-	fi
-
-	# Creating boot directories is required for "ostree admin deploy"
-
-	mkdir -p boot/loader.0
-	mkdir -p boot/loader.1
-	ln -sf boot/loader.0 boot/loader
-
-	checksum=`sha256sum ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} | cut -f 1 -d " "`
-
-	cp ${DEPLOY_DIR_IMAGE}/${OSTREE_KERNEL} boot/vmlinuz-${checksum}
-	cp ${DEPLOY_DIR_IMAGE}/${OSTREE_INITRAMFS_IMAGE}-${MACHINE}${RAMDISK_EXT} boot/initramfs-${checksum}
-
-	# Copy image manifest
-        cat ${IMAGE_MANIFEST} | cut -d " " -f1,3 > usr/package.manifest
-
-	cd ${WORKDIR}
-
-	# Create a tarball that can be then commited to OSTree repo
-	OSTREE_TAR=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.ostree.tar.bz2 
-	tar -C ${OSTREE_ROOTFS} --xattrs --xattrs-include='*' -cjf ${OSTREE_TAR} .
-	sync
-
-	rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2
-	ln -s ${IMAGE_NAME}.rootfs.ostree.tar.bz2 ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2
-	
-	if [ ! -d ${OSTREE_REPO} ]; then
-		ostree --repo=${OSTREE_REPO} init --mode=archive-z2
-	fi
-
-	# Commit the result
-	ostree --repo=${OSTREE_REPO} commit \
-	       --tree=dir=${OSTREE_ROOTFS} \
-	       --skip-if-unchanged \
-	       --branch=${OSTREE_BRANCHNAME} \
-	       --subject="Commit-id: ${IMAGE_NAME}"
-
-	rm -rf ${OSTREE_ROOTFS}
-}
-
-IMAGE_TYPEDEP_ostreepush = "ostree"
-IMAGE_DEPENDS_ostreepush = "sota-tools-native:do_populate_sysroot"
-IMAGE_CMD_ostreepush () {
-	if [ ${OSTREE_PUSH_CREDENTIALS} ]; then
-		garage-push --repo=${OSTREE_REPO} \
-			    --ref=${OSTREE_BRANCHNAME} \
-			    --credentials=${OSTREE_PUSH_CREDENTIALS} \
-			    --cacert=${STAGING_ETCDIR_NATIVE}/ssl/certs/ca-certificates.crt
-	fi
-}
diff --git a/meta-sota/classes/image_types_ota.bbclass b/meta-sota/classes/image_types_ota.bbclass
deleted file mode 100644
index d2d9991..0000000
--- a/meta-sota/classes/image_types_ota.bbclass
+++ /dev/null
@@ -1,127 +0,0 @@
-# Image to use with u-boot as BIOS and OSTree deployment system
-
-#inherit image_types
-
-# Boot filesystem size in MiB
-# OSTree updates may require some space on boot file system for
-# boot scripts, kernel and initramfs images
-#
-
-inherit image
-
-OSTREE_BOOTLOADER ??= 'u-boot'
-
-IMAGE_DEPENDS_otaimg = "e2fsprogs-native:do_populate_sysroot \
-			${@'grub:do_populate_sysroot' if d.getVar('OSTREE_BOOTLOADER', True) == 'grub' else ''} \
-			${@'virtual/bootloader:do_deploy' if d.getVar('OSTREE_BOOTLOADER', True) == 'u-boot' else ''}"
-
-calculate_size () {
-	BASE=$1
-	SCALE=$2
-	MIN=$3
-	MAX=$4
-	EXTRA=$5
-	ALIGN=$6
-
-	SIZE=`echo "$BASE * $SCALE" | bc -l`
-	REM=`echo $SIZE | cut -d "." -f 2`
-	SIZE=`echo $SIZE | cut -d "." -f 1`
-
-	if [ -n "$REM" -o ! "$REM" -eq 0 ]; then
-		SIZE=`expr $SIZE \+ 1`
-	fi
-
-	if [ "$SIZE" -lt "$MIN" ]; then
-		$SIZE=$MIN
-	fi
-
-	SIZE=`expr $SIZE \+ $EXTRA`
-	SIZE=`expr $SIZE \+ $ALIGN \- 1`
-	SIZE=`expr $SIZE \- $SIZE \% $ALIGN`
-
-	if [ -n "$MAX" ]; then
-		if [ "$SIZE" -gt "$MAX" ]; then
-			return -1
-		fi
-	fi
-	
-	echo "${SIZE}"
-}
-
-export OSTREE_OSNAME
-export OSTREE_BRANCHNAME
-export OSTREE_REPO
-export OSTREE_BOOTLOADER
-
-IMAGE_CMD_otaimg () {
-	if ${@bb.utils.contains('IMAGE_FSTYPES', 'otaimg', 'true', 'false', d)}; then
-		if [ -z "$OSTREE_REPO" ]; then
-			bbfatal "OSTREE_REPO should be set in your local.conf"
-		fi
-
-		if [ -z "$OSTREE_OSNAME" ]; then
-			bbfatal "OSTREE_OSNAME should be set in your local.conf"
-		fi
-
-		if [ -z "$OSTREE_BRANCHNAME" ]; then
-			bbfatal "OSTREE_BRANCHNAME should be set in your local.conf"
-		fi
-
-
-		PHYS_SYSROOT=`mktemp -d ${WORKDIR}/ota-sysroot-XXXXX`
-
-		ostree admin --sysroot=${PHYS_SYSROOT} init-fs ${PHYS_SYSROOT}
-		ostree admin --sysroot=${PHYS_SYSROOT} os-init ${OSTREE_OSNAME}
-
-		mkdir -p ${PHYS_SYSROOT}/boot/loader.0
-		ln -s loader.0 ${PHYS_SYSROOT}/boot/loader
-
-		if [ "${OSTREE_BOOTLOADER}" = "grub" ]; then
-			mkdir -p ${PHYS_SYSROOT}/boot/grub2
-			touch ${PHYS_SYSROOT}/boot/grub2/grub.cfg
-		elif [ "${OSTREE_BOOTLOADER}" = "u-boot" ]; then
-			touch ${PHYS_SYSROOT}/boot/loader/uEnv.txt
-		else
-			bberror "Invalid bootloader: ${OSTREE_BOOTLOADER}"
-		fi;
-
-		ostree --repo=${PHYS_SYSROOT}/ostree/repo pull-local --remote=${OSTREE_OSNAME} ${OSTREE_REPO} ${OSTREE_BRANCHNAME}
-		export OSTREE_BOOT_PARTITION="/boot"
-		kargs_list=""
-		for arg in ${OSTREE_KERNEL_ARGS}; do
-			kargs_list="${kargs_list} --karg-append=$arg"
-		done
-
-		ostree admin --sysroot=${PHYS_SYSROOT} deploy ${kargs_list} --os=${OSTREE_OSNAME} ${OSTREE_OSNAME}:${OSTREE_BRANCHNAME}
-
-		# Copy deployment /home and /var/sota to sysroot
-		HOME_TMP=`mktemp -d ${WORKDIR}/home-tmp-XXXXX`
-		tar --xattrs --xattrs-include='*' -C ${HOME_TMP} -xf ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.ostree.tar.bz2 ./usr/homedirs ./var/sota || true
-		mv ${HOME_TMP}/usr/homedirs/home ${PHYS_SYSROOT}/
-		mv ${HOME_TMP}/var/sota ${PHYS_SYSROOT}/ostree/deploy/${OSTREE_OSNAME}/var/ || true
-		rm -rf ${HOME_TMP}
-
-		OTA_ROOTFS_SIZE=$(calculate_size `du -ks $PHYS_SYSROOT | cut -f 1`  "${IMAGE_OVERHEAD_FACTOR}" "${IMAGE_ROOTFS_SIZE}" "${IMAGE_ROOTFS_MAXSIZE}" `expr ${IMAGE_ROOTFS_EXTRA_SPACE}` "${IMAGE_ROOTFS_ALIGNMENT}")
-
-		if [ $OTA_ROOTFS_SIZE -lt 0 ]; then
-			exit -1
-		fi
-		eval local COUNT=\"0\"
-		eval local MIN_COUNT=\"60\"
-		if [ $OTA_ROOTFS_SIZE -lt $MIN_COUNT ]; then
-			eval COUNT=\"$MIN_COUNT\"
-		fi
-
-		rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg
-		sync
-		dd if=/dev/zero of=${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg seek=$OTA_ROOTFS_SIZE count=$COUNT bs=1024
-		mkfs.ext4 -O ^64bit ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.otaimg -d ${PHYS_SYSROOT}
-
-		rm -rf ${PHYS_SYSROOT}
-
-		rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg
-		ln -s ${IMAGE_NAME}.otaimg ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.otaimg
-	fi
-}
-
-IMAGE_TYPEDEP_otaimg = "ostree"
diff --git a/meta-sota/classes/sdcard_image-dra7xx-evm-ota.bbclass b/meta-sota/classes/sdcard_image-dra7xx-evm-ota.bbclass
deleted file mode 100644
index 179ed10..0000000
--- a/meta-sota/classes/sdcard_image-dra7xx-evm-ota.bbclass
+++ /dev/null
@@ -1,75 +0,0 @@
-inherit image_types
-
-# Boot partition volume id
-BOOTDD_VOLUME_ID ?= "${MACHINE}"
-
-# Boot partition size [in KiB] (will be rounded up to IMAGE_ROOTFS_ALIGNMENT)
-BOOT_SPACE ?= "4096"
-
-IMAGE_ROOTFS_ALIGNMENT = "4096"
-SDIMG_OTA_ROOTFS_TYPE ?= "otaimg"
-SDIMG_OTA_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${SDIMG_OTA_ROOTFS_TYPE}"
-
-IMAGE_TYPEDEP_dra7xx-evm-sdimg-ota = "${SDIMG_OTA_ROOTFS_TYPE}"
-IMAGE_DEPENDS_dra7xx-evm-sdimg-ota = " \
-			parted-native \
-			mtools-native \
-			dosfstools-native \
-			"
-
-SDIMG_OTA = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.dra7xx-evm-sdimg-ota"
-
-IMAGE_CMD_dra7xx-evm-sdimg-ota () {
-	OTAROOT_SIZE=`du -Lb ${SDIMG_OTA_ROOTFS} | cut -f1`
-	OTAROOT_SIZE=$(expr ${OTAROOT_SIZE} / 1024 + 1)
-	BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)
-	BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT})
-	SDIMG_OTA_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $OTAROOT_SIZE)
-
-	echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $OTAROOT_SIZE KiB"
-
-	# Initialize sdcard image file
-	dd if=/dev/zero of=${SDIMG_OTA} bs=1024 count=0 seek=${SDIMG_OTA_SIZE}
-
-	# Create partition table
-	parted -s ${SDIMG_OTA} mklabel msdos
-	# Create boot partition and mark it as bootable
-	parted -s ${SDIMG_OTA} unit KiB mkpart primary fat32 ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT})
-	parted -s ${SDIMG_OTA} set 1 boot on
-	# Create rootfs partition to the end of disk
-	parted -s ${SDIMG_OTA} -- unit KiB mkpart primary ext2 $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) -1s
-	parted ${SDIMG_OTA} print
-
-	# Create a vfat image with boot files
-	BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG_OTA} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }')
-	rm -f ${WORKDIR}/boot.img
-	mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
-	sync
-
-	sync
-	#dd if=${WORKDIR}/boot.img of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
-
-	if echo "${SDIMG_OTA_ROOTFS_TYPE}" | egrep -q "*\.xz"
-	then
-		xzcat ${SDIMG_OTA_ROOTFS} | dd of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
-	else
-		dd if=${SDIMG_OTA_ROOTFS} of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
-	fi
-
-	# Optionally apply compression
-	case "${SDIMG_OTA_COMPRESSION}" in
-	"gzip")
-		gzip -k9 "${SDIMG_OTA}"
-		;;
-	"bzip2")
-		bzip2 -k9 "${SDIMG_OTA}"
-		;;
-	"xz")
-		xz -k "${SDIMG_OTA}"
-		;;
-	esac
-
-	rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.dra7xx-evm-sdimg-ota
-	ln -s ${IMAGE_NAME}.rootfs.dra7xx-evm-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.dra7xx-evm-sdimg-ota
-}
-
diff --git a/meta-sota/classes/sdcard_image-porter-ota.bbclass b/meta-sota/classes/sdcard_image-porter-ota.bbclass
deleted file mode 100644
index a9619dc..0000000
--- a/meta-sota/classes/sdcard_image-porter-ota.bbclass
+++ /dev/null
@@ -1,78 +0,0 @@
-inherit image_types
-
-# Boot partition volume id
-BOOTDD_VOLUME_ID ?= "${MACHINE}"
-
-# Boot partition size [in KiB] (will be rounded up to IMAGE_ROOTFS_ALIGNMENT)
-BOOT_SPACE ?= "4096"
-
-IMAGE_ROOTFS_ALIGNMENT = "4096"
-SDIMG_OTA_ROOTFS_TYPE ?= "otaimg"
-SDIMG_OTA_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${SDIMG_OTA_ROOTFS_TYPE}"
-
-IMAGE_TYPEDEP_porter-sdimg-ota = "${SDIMG_OTA_ROOTFS_TYPE}"
-IMAGE_DEPENDS_porter-sdimg-ota = " \
-			parted-native \
-			mtools-native \
-			dosfstools-native \
-			porter-bootfiles \
-			"
-
-SDIMG_OTA = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.porter-sdimg-ota"
-
-IMAGE_CMD_porter-sdimg-ota () {
-	OTAROOT_SIZE=`du -Lb ${SDIMG_OTA_ROOTFS} | cut -f1`
-	OTAROOT_SIZE=$(expr ${OTAROOT_SIZE} / 1024 + 1)
-	BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)
-	BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT})
-	SDIMG_OTA_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $OTAROOT_SIZE)
-
-	echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $OTAROOT_SIZE KiB"
-
-	# Initialize sdcard image file
-	dd if=/dev/zero of=${SDIMG_OTA} bs=1024 count=0 seek=${SDIMG_OTA_SIZE}
-
-	# Create partition table
-	parted -s ${SDIMG_OTA} mklabel msdos
-	# Create boot partition and mark it as bootable
-	parted -s ${SDIMG_OTA} unit KiB mkpart primary fat32 ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT})
-	parted -s ${SDIMG_OTA} set 1 boot on
-	# Create rootfs partition to the end of disk
-	parted -s ${SDIMG_OTA} -- unit KiB mkpart primary ext2 $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) -1s
-	parted ${SDIMG_OTA} print
-
-	# Create a vfat image with boot files
-	BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG_OTA} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }')
-	rm -f ${WORKDIR}/boot.img
-	mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
-	sync
-
-	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/porter-bootfiles/* ::/
-
-	sync
-	dd if=${WORKDIR}/boot.img of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
-
-	if echo "${SDIMG_OTA_ROOTFS_TYPE}" | egrep -q "*\.xz"
-	then
-		xzcat ${SDIMG_OTA_ROOTFS} | dd of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
-	else
-		dd if=${SDIMG_OTA_ROOTFS} of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
-	fi
-
-	# Optionally apply compression
-	case "${SDIMG_OTA_COMPRESSION}" in
-	"gzip")
-		gzip -k9 "${SDIMG_OTA}"
-		;;
-	"bzip2")
-		bzip2 -k9 "${SDIMG_OTA}"
-		;;
-	"xz")
-		xz -k "${SDIMG_OTA}"
-		;;
-	esac
-
-	rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.porter-sdimg-ota
-	ln -s ${IMAGE_NAME}.rootfs.porter-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.porter-sdimg-ota
-}
-
diff --git a/meta-sota/classes/sdcard_image-rpi-ota.bbclass b/meta-sota/classes/sdcard_image-rpi-ota.bbclass
deleted file mode 100644
index deea8d1..0000000
--- a/meta-sota/classes/sdcard_image-rpi-ota.bbclass
+++ /dev/null
@@ -1,196 +0,0 @@
-inherit image_types
-inherit linux-raspberrypi-base
-
-#
-# Create an image that can by written onto a SD card using dd.
-#
-# The disk layout used is:
-#
-#    0                      -> IMAGE_ROOTFS_ALIGNMENT         - reserved for other data
-#    IMAGE_ROOTFS_ALIGNMENT -> BOOT_SPACE                     - bootloader and kernel
-#    BOOT_SPACE             -> SDIMG_OTA_SIZE                 - rootfs
-#
-
-#                                                     Default Free space = 1.3x
-#                                                     Use IMAGE_OVERHEAD_FACTOR to add more space
-#                                                     <--------->
-#            4MiB              40MiB           SDIMG_OTA_ROOTFS
-# <-----------------------> <----------> <---------------------->
-#  ------------------------ ------------ ------------------------
-# | IMAGE_ROOTFS_ALIGNMENT | BOOT_SPACE | OTAROOT_SIZE           |
-#  ------------------------ ------------ ------------------------
-# ^                        ^            ^                        ^
-# |                        |            |                        |
-# 0                      4MiB     4MiB + 40MiB       4MiB + 40Mib + SDIMG_OTA_ROOTFS
-
-# This image depends on the rootfs image
-IMAGE_TYPEDEP_rpi-sdimg-ota = "${SDIMG_OTA_ROOTFS_TYPE}"
-
-# Set kernel and boot loader
-IMAGE_BOOTLOADER ?= "bcm2835-bootfiles"
-
-# Set initramfs extension
-KERNEL_INITRAMFS ?= ""
-
-# Kernel image name
-SDIMG_OTA_KERNELIMAGE_raspberrypi  ?= "kernel.img"
-SDIMG_OTA_KERNELIMAGE_raspberrypi2 ?= "kernel7.img"
-
-# Boot partition volume id
-BOOTDD_VOLUME_ID ?= "${MACHINE}"
-
-# Boot partition size [in KiB] (will be rounded up to IMAGE_ROOTFS_ALIGNMENT)
-BOOT_SPACE ?= "40960"
-
-# Set alignment to 4MB [in KiB]
-IMAGE_ROOTFS_ALIGNMENT = "4096"
-
-# Use an uncompressed ext3 by default as rootfs
-SDIMG_OTA_ROOTFS_TYPE ?= "otaimg"
-SDIMG_OTA_ROOTFS = "${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.${SDIMG_OTA_ROOTFS_TYPE}"
-
-IMAGE_DEPENDS_rpi-sdimg-ota = " \
-			parted-native \
-			mtools-native \
-			dosfstools-native \
-			virtual/kernel:do_deploy \
-			${IMAGE_BOOTLOADER} \
-			u-boot \
-			"
-IMAGE_TYPEDEP_rpi-sdimg-ota = "otaimg"
-
-# SD card image name
-SDIMG_OTA = "${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}.rootfs.rpi-sdimg-ota"
-
-# Compression method to apply to SDIMG_OTA after it has been created. Supported
-# compression formats are "gzip", "bzip2" or "xz". The original .rpi-sdimg-ota file
-# is kept and a new compressed file is created if one of these compression
-# formats is chosen. If SDIMG_OTA_COMPRESSION is set to any other value it is
-# silently ignored.
-#SDIMG_OTA_COMPRESSION ?= ""
-
-# Additional files and/or directories to be copied into the vfat partition from the IMAGE_ROOTFS.
-FATPAYLOAD ?= ""
-
-IMAGEDATESTAMP = "${@time.strftime('%Y.%m.%d',time.gmtime())}"
-IMAGE_CMD_rpi-sdimg-ota[vardepsexclude] += "IMAGEDATESTAMP"
-IMAGE_CMD_rpi-sdimg-ota[vardepsexclude] += "DATETIME"
-
-IMAGE_CMD_rpi-sdimg-ota () {
-
-	# Align partitions
-	OTAROOT_SIZE=`du -Lb ${SDIMG_OTA_ROOTFS} | cut -f1`
-	OTAROOT_SIZE=$(expr ${OTAROOT_SIZE} / 1024 + 1)
-	BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE} + ${IMAGE_ROOTFS_ALIGNMENT} - 1)
-	BOOT_SPACE_ALIGNED=$(expr ${BOOT_SPACE_ALIGNED} - ${BOOT_SPACE_ALIGNED} % ${IMAGE_ROOTFS_ALIGNMENT})
-	SDIMG_OTA_SIZE=$(expr ${IMAGE_ROOTFS_ALIGNMENT} + ${BOOT_SPACE_ALIGNED} + $OTAROOT_SIZE)
-
-	echo "Creating filesystem with Boot partition ${BOOT_SPACE_ALIGNED} KiB and RootFS $OTAROOT_SIZE KiB"
-
-	# Check if we are building with device tree support
-	DTS="${@get_dts(d, None)}"
-
-	# Initialize sdcard image file
-	dd if=/dev/zero of=${SDIMG_OTA} bs=1024 count=0 seek=${SDIMG_OTA_SIZE}
-
-	# Create partition table
-	parted -s ${SDIMG_OTA} mklabel msdos
-	# Create boot partition and mark it as bootable
-	parted -s ${SDIMG_OTA} unit KiB mkpart primary fat32 ${IMAGE_ROOTFS_ALIGNMENT} $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT})
-	parted -s ${SDIMG_OTA} set 1 boot on
-	# Create rootfs partition to the end of disk
-	parted -s ${SDIMG_OTA} -- unit KiB mkpart primary ext2 $(expr ${BOOT_SPACE_ALIGNED} \+ ${IMAGE_ROOTFS_ALIGNMENT}) -1s
-	parted ${SDIMG_OTA} print
-
-	# Create a vfat image with boot files
-	BOOT_BLOCKS=$(LC_ALL=C parted -s ${SDIMG_OTA} unit b print | awk '/ 1 / { print substr($4, 1, length($4 -1)) / 512 /2 }')
-	rm -f ${WORKDIR}/boot.img
-	mkfs.vfat -n "${BOOTDD_VOLUME_ID}" -S 512 -C ${WORKDIR}/boot.img $BOOT_BLOCKS
-	sync
-
-	mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/bcm2835-bootfiles/* ::/
-	
-	if test -n "${DTS}"; then
-		# Device Tree Overlays are assumed to be suffixed by '-overlay.dtb' string and will be put in a dedicated folder
-		DT_OVERLAYS="${@split_overlays(d, 0)}"
-		DT_ROOT="${@split_overlays(d, 1)}"
-
-		# Copy board device trees to root folder
-		for DTB in ${DT_ROOT}; do
-			DTB_BASE_NAME=`basename ${DTB} .dtb`
-
-			mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.dtb ::${DTB_BASE_NAME}.dtb
-		done
-
-		# Copy device tree overlays to dedicated folder
-		mmd -i ${WORKDIR}/boot.img overlays
-		for DTB in ${DT_OVERLAYS}; do
-			DTB_EXT=${DTB##*.}
-			DTB_BASE_NAME=`basename ${DTB} ."${DTB_EXT}"`
-
-			mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${DTB_BASE_NAME}.${DTB_EXT} ::overlays/${DTB_BASE_NAME}.${DTB_EXT}
-		done
-	fi
-
-	case "${KERNEL_IMAGETYPE}" in
-	"uImage")
-		mcopy -i ${WORKDIR}/boot.img -s ${DEPLOY_DIR_IMAGE}/u-boot.bin ::${SDIMG_OTA_KERNELIMAGE}
-		;;
-	*)
-		bbfatal "Kernel uImage is required for OTA image. Please set KERNEL_IMAGETYPE to \"uImage\""
-		;;
-	esac
-
-	if [ -n ${FATPAYLOAD} ] ; then
-		echo "Copying payload into VFAT"
-		for entry in ${FATPAYLOAD} ; do
-				# add the || true to stop aborting on vfat issues like not supporting .~lock files
-				mcopy -i ${WORKDIR}/boot.img -s -v ${IMAGE_ROOTFS}$entry :: || true
-		done
-	fi
-
-	# Add stamp file
-	echo "${IMAGE_NAME}-${IMAGEDATESTAMP}" > ${WORKDIR}/image-version-info
-	mcopy -i ${WORKDIR}/boot.img -v ${WORKDIR}//image-version-info ::
-
-	# Burn Partitions
-	sync
-	dd if=${WORKDIR}/boot.img of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
-	# If SDIMG_OTA_ROOTFS_TYPE is a .xz file use xzcat
-	if echo "${SDIMG_OTA_ROOTFS_TYPE}" | egrep -q "*\.xz"
-	then
-		xzcat ${SDIMG_OTA_ROOTFS} | dd of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
-	else
-		dd if=${SDIMG_OTA_ROOTFS} of=${SDIMG_OTA} conv=notrunc seek=1 bs=$(expr 1024 \* ${BOOT_SPACE_ALIGNED} + ${IMAGE_ROOTFS_ALIGNMENT} \* 1024) && sync && sync
-	fi
-
-	# Optionally apply compression
-	case "${SDIMG_OTA_COMPRESSION}" in
-	"gzip")
-		gzip -k9 "${SDIMG_OTA}"
-		;;
-	"bzip2")
-		bzip2 -k9 "${SDIMG_OTA}"
-		;;
-	"xz")
-		xz -k "${SDIMG_OTA}"
-		;;
-	esac
-
-	rm -f ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.rpi-sdimg-ota
-	ln -s ${IMAGE_NAME}.rootfs.rpi-sdimg-ota ${DEPLOY_DIR_IMAGE}/${IMAGE_LINK_NAME}.rootfs.rpi-sdimg-ota
-}
-
-ROOTFS_POSTPROCESS_COMMAND += " rpi_generate_sysctl_config ; "
-
-rpi_generate_sysctl_config() {
-	# systemd sysctl config
-	test -d ${IMAGE_ROOTFS}${sysconfdir}/sysctl.d && \
-		echo "vm.min_free_kbytes = 8192" > ${IMAGE_ROOTFS}${sysconfdir}/sysctl.d/rpi-vm.conf
-
-	# sysv sysctl config
-	IMAGE_SYSCTL_CONF="${IMAGE_ROOTFS}${sysconfdir}/sysctl.conf"
-	test -e ${IMAGE_ROOTFS}${sysconfdir}/sysctl.conf && \
-		sed -e "/vm.min_free_kbytes/d" -i ${IMAGE_SYSCTL_CONF}
-	echo "" >> ${IMAGE_SYSCTL_CONF} && echo "vm.min_free_kbytes = 8192" >> ${IMAGE_SYSCTL_CONF}
-}
diff --git a/meta-sota/conf/include/agl-sota.inc b/meta-sota/conf/include/agl-sota.inc
deleted file mode 100644
index 9e8e794..0000000
--- a/meta-sota/conf/include/agl-sota.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-DISTRO_FEATURES_append = " agl-ota"
-OVERRIDES .= ":sota"
-
-IMAGE_INSTALL_append = " ostree"
-
-# live image for OSTree-enabled systems
-IMAGE_CLASSES += "image_types_ostree image_types_ota"
-IMAGE_FSTYPES += "ostreepush otaimg wic"
-WKS_FILE = "sdimage-sota.wks"
-do_image_wic[depends] += "${IMAGE_BASENAME}:do_image_otaimg"
-
-# required by wic's partitions.py, but is not pulled properly by bitbake
-EXTRA_IMAGEDEPENDS += " dosfstools-native mtools-native"
-
-# No working WKS for Raspberry Pi yet
-IMAGE_FSTYPES_remove_raspberrypi3 = "wic"
-IMAGE_FSTYPES_remove_raspberrypi2 = "wic"
-
-# Still to be integrared
-IMAGE_FSTYPES_remove_cyclone5 = "wic"
-IMAGE_FSTYPES_remove_dra7xx-evm = "wic"
-IMAGE_FSTYPES_remove_dragonboard-410c = "wic"
-IMAGE_FSTYPES_remove_h3ulcb = "wic"
-IMAGE_FSTYPES_remove_intel-corei7-64 = "wic"
-IMAGE_FSTYPES_remove_joule = "wic"
-IMAGE_FSTYPES_remove_qemux86-64 = "wic"
-IMAGE_FSTYPES_remove_qemux86 = "wic"
-
-# Please redefine OSTREE_REPO in order to have a persistent OSTree repo
-OSTREE_REPO ?= "${DEPLOY_DIR_IMAGE}/ostree_repo"
-OSTREE_BRANCHNAME ?= "agl-ota-${MACHINE}"
-OSTREE_OSNAME ?= "agl"
-OSTREE_INITRAMFS_IMAGE ?= "initramfs-ostree-image"
-
diff --git a/meta-sota/conf/layer.conf b/meta-sota/conf/layer.conf
deleted file mode 100644
index a0ce5fa..0000000
--- a/meta-sota/conf/layer.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# We have a conf and classes directory, add to BBPATH
-BBPATH .= ":${LAYERDIR}"
-
-# We have recipes-* directories, add to BBFILES
-BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \
-	${LAYERDIR}/recipes-*/*/*.bbappend"
-
-BBFILE_COLLECTIONS += "sota"
-BBFILE_PATTERN_sota = "^${LAYERDIR}/"
-BBFILE_PRIORITY_sota = "7"
-
diff --git a/meta-sota/recipes-bsp/u-boot-otascript/u-boot-otascript.bb b/meta-sota/recipes-bsp/u-boot-otascript/u-boot-otascript.bb
deleted file mode 100644
index e2ccc43..0000000
--- a/meta-sota/recipes-bsp/u-boot-otascript/u-boot-otascript.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-DESCRIPTION = "Boot script for launching OTA-enabled images on raspberrypi"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-
-DEPENDS = "u-boot-mkimage-native"
-
-COMPATIBLE_MACHINE = "raspberrypi"
-
-SRC_URI = "file://boot.scr \
-           file://uEnv.txt \
-           file://uEnv.cma.txt \
-           file://0001-fixup-build-with-gcc6.patch \
-          "
-
-S = "${WORKDIR}"
-
-inherit deploy
-
-do_deploy() {
-    install -d ${DEPLOYDIR}/bcm2835-bootfiles
-
-    mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "Ostree boot script" -d ${S}/boot.scr ${DEPLOYDIR}/bcm2835-bootfiles/boot.scr
-    if [ "${ENABLE_CMA}" = "1" ]; then
-        install -m 0755 ${S}/uEnv.cma.txt ${DEPLOYDIR}/bcm2835-bootfiles/uEnv.txt
-    else
-        install -m 0755 ${S}/uEnv.txt ${DEPLOYDIR}/bcm2835-bootfiles/uEnv.txt
-    fi
-}
-
-addtask deploy before do_package after do_install
-do_deploy[dirs] += "${DEPLOYDIR}/bcm2835-bootfiles"
-
-PACKAGE_ARCH = "${MACHINE_ARCH}"
diff --git a/meta-sota/recipes-bsp/u-boot-otascript/u-boot-otascript/0001-fixup-build-with-gcc6.patch b/meta-sota/recipes-bsp/u-boot-otascript/u-boot-otascript/0001-fixup-build-with-gcc6.patch
deleted file mode 100644
index df1f786..0000000
--- a/meta-sota/recipes-bsp/u-boot-otascript/u-boot-otascript/0001-fixup-build-with-gcc6.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From ba619c7ec7820e80d1b5b520440fdb81c31c0baf Mon Sep 17 00:00:00 2001
-From: Ronan Le Martret <ronan.lemartret@iot.bzh>
-Date: Fri, 14 Oct 2016 09:03:11 +0200
-Subject: [PATCH] fix gcc6 build
-
-Signed-off-by: ronan <ronan@linux-pgnz.suse>
----
- include/linux/compiler-gcc6.h | 66 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 66 insertions(+)
- create mode 100644 include/linux/compiler-gcc6.h
-
-diff --git a/include/linux/compiler-gcc6.h b/include/linux/compiler-gcc6.h
-new file mode 100644
-index 0000000..a3d00d8
---- /dev/null
-+++ b/include/linux/compiler-gcc6.h
-@@ -0,0 +1,66 @@
-+#ifndef __LINUX_COMPILER_H
-+#error "Please don't include <linux/compiler-gcc6.h> directly, include <linux/compiler.h> instead."
-+#endif
-+
-+#define __used				__attribute__((__used__))
-+#define __must_check			__attribute__((warn_unused_result))
-+#define __compiler_offsetof(a, b)	__builtin_offsetof(a, b)
-+
-+/* Mark functions as cold. gcc will assume any path leading to a call
-+   to them will be unlikely.  This means a lot of manual unlikely()s
-+   are unnecessary now for any paths leading to the usual suspects
-+   like BUG(), printk(), panic() etc. [but let's keep them for now for
-+   older compilers]
-+
-+   Early snapshots of gcc 4.3 don't support this and we can't detect this
-+   in the preprocessor, but we can live with this because they're unreleased.
-+   Maketime probing would be overkill here.
-+
-+   gcc also has a __attribute__((__hot__)) to move hot functions into
-+   a special section, but I don't see any sense in this right now in
-+   the kernel context */
-+#define __cold			__attribute__((__cold__))
-+
-+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
-+
-+#ifndef __CHECKER__
-+# define __compiletime_warning(message) __attribute__((warning(message)))
-+# define __compiletime_error(message) __attribute__((error(message)))
-+#endif /* __CHECKER__ */
-+
-+/*
-+ * Mark a position in code as unreachable.  This can be used to
-+ * suppress control flow warnings after asm blocks that transfer
-+ * control elsewhere.
-+ *
-+ * Early snapshots of gcc 4.5 don't support this and we can't detect
-+ * this in the preprocessor, but we can live with this because they're
-+ * unreleased.  Really, we need to have autoconf for the kernel.
-+ */
-+#define unreachable() __builtin_unreachable()
-+
-+/* Mark a function definition as prohibited from being cloned. */
-+#define __noclone	__attribute__((__noclone__))
-+
-+/*
-+ * Tell the optimizer that something else uses this function or variable.
-+ */
-+#define __visible __attribute__((externally_visible))
-+
-+/*
-+ * GCC 'asm goto' miscompiles certain code sequences:
-+ *
-+ *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
-+ *
-+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
-+ * Fixed in GCC 4.8.2 and later versions.
-+ *
-+ * (asm goto is automatically volatile - the naming reflects this.)
-+ */
-+#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
-+
-+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
-+#define __HAVE_BUILTIN_BSWAP32__
-+#define __HAVE_BUILTIN_BSWAP64__
-+#define __HAVE_BUILTIN_BSWAP16__
-+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
--- 
-2.6.6
-
diff --git a/meta-sota/recipes-bsp/u-boot-otascript/u-boot-otascript/boot.scr b/meta-sota/recipes-bsp/u-boot-otascript/u-boot-otascript/boot.scr
deleted file mode 100644
index dc13f85..0000000
--- a/meta-sota/recipes-bsp/u-boot-otascript/u-boot-otascript/boot.scr
+++ /dev/null
@@ -1,3 +0,0 @@
-fatload mmc 0:1 $loadaddr /uEnv.txt
-env import -t $loadaddr $filesize
-run bootcmd
diff --git a/meta-sota/recipes-bsp/u-boot-otascript/u-boot-otascript/uEnv.cma.txt b/meta-sota/recipes-bsp/u-boot-otascript/u-boot-otascript/uEnv.cma.txt
deleted file mode 100644
index 611119f..0000000
--- a/meta-sota/recipes-bsp/u-boot-otascript/u-boot-otascript/uEnv.cma.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-fdt_addr_r=0x0c800000
-bootcmd_dtb=fdt addr $fdt_addr_r; fdt get value bootargs_fdt /chosen bootargs
-bootcmd_otenv=ext2load mmc 0:2 $loadaddr /boot/loader/uEnv.txt; env import -t $loadaddr $filesize
-bootcmd_args=setenv bootargs "$bootargs $bootargs_fdt ostree_root=/dev/mmcblk0p2 root=/dev/ram0 rw rootwait rootdelay=2 ramdisk_size=8192 coherent_pool=6M smsc95xx.turbo_mode=N"
-bootcmd_load=ext2load mmc 0:2 $kernel_addr_r "/boot"$kernel_image; ext2load mmc 0:2 $ramdisk_addr_r "/boot"$ramdisk_image
-bootcmd_run=bootm $kernel_addr_r $ramdisk_addr_r $fdt_addr_r
-bootcmd=run bootcmd_dtb; run bootcmd_otenv; run bootcmd_args; run bootcmd_load; run bootcmd_run
diff --git a/meta-sota/recipes-bsp/u-boot-otascript/u-boot-otascript/uEnv.txt b/meta-sota/recipes-bsp/u-boot-otascript/u-boot-otascript/uEnv.txt
deleted file mode 100644
index f6c0570..0000000
--- a/meta-sota/recipes-bsp/u-boot-otascript/u-boot-otascript/uEnv.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-fdt_addr_r=0x0c800000
-bootcmd_dtb=fdt addr $fdt_addr_r; fdt get value bootargs_fdt /chosen bootargs
-bootcmd_otenv=ext2load mmc 0:2 $loadaddr /boot/loader/uEnv.txt; env import -t $loadaddr $filesize
-bootcmd_args=setenv bootargs "$bootargs $bootargs_fdt ostree_root=/dev/mmcblk0p2 root=/dev/ram0 rw rootwait rootdelay=2 ramdisk_size=8192"
-bootcmd_load=ext2load mmc 0:2 $kernel_addr_r "/boot"$kernel_image; ext2load mmc 0:2 $ramdisk_addr_r "/boot"$ramdisk_image
-bootcmd_run=bootm $kernel_addr_r $ramdisk_addr_r $fdt_addr_r
-bootcmd=run bootcmd_dtb; run bootcmd_otenv; run bootcmd_args; run bootcmd_load; run bootcmd_run
diff --git a/meta-sota/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch b/meta-sota/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch
deleted file mode 100644
index 5172fdd..0000000
--- a/meta-sota/recipes-bsp/u-boot/u-boot-ota/0001-Set-up-environment-for-OSTree-integration.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From ebb26338d0c2f436a86fd4d7cb8d723a90d6a369 Mon Sep 17 00:00:00 2001
-From: Anton Gerasimov <anton@advancedtelematic.com>
-Date: Thu, 15 Sep 2016 17:52:41 +0200
-Subject: [PATCH 1/2] Set up environment for OSTree integration
-
----
- include/configs/qemu-x86.h | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/include/configs/qemu-x86.h b/include/configs/qemu-x86.h
-index 78c296f..79df455 100644
---- a/include/configs/qemu-x86.h
-+++ b/include/configs/qemu-x86.h
-@@ -74,4 +74,24 @@
- #undef CONFIG_ENV_IS_IN_SPI_FLASH
- #define CONFIG_ENV_IS_NOWHERE
- 
-+#undef CONFIG_BOOTARGS
-+#define CONFIG_BOOTARGS "root=/dev/hda2 console=ttyS0"
-+
-+#undef CONFIG_BOOTDELAY
-+#define CONFIG_BOOTDELAY 3
-+
-+#undef CONFIG_BOOTCOMMAND
-+#define CONFIG_BOOTCOMMAND "run loadenv;" \
-+			   "setenv bootargs $bootargs\" console=ttyS0 root=/dev/ram0 rw rootfstype=ext4 rootwait rootdelay=2 ostree_root=/dev/hda ramdisk_size=16384 \";" \
-+			   "ext2load ide 0 $loadaddr \"/boot\"$kernel_image;" \
-+			   "ext2load ide 0 $ramdiskaddr \"/boot\"$ramdisk_image;" \
-+			   "zboot $loadaddr - $ramdiskaddr $filesize"
-+
-+#undef CONFIG_EXTRA_ENV_SETTINGS
-+#define CONFIG_EXTRA_ENV_SETTINGS "kernel_image=/bzImage\0" \
-+				  "ramdisk_image=/initrd\0" \
-+				  "ramdiskaddr=0x4000000\0" \
-+				  "bootdelay=3\0" \
-+				  "loadenv=if ext2load ide 0 $loadaddr /boot/loader/uEnv.txt; then env import -t $loadaddr $filesize; fi;" 
-+
- #endif	/* __CONFIG_H */
--- 
-2.9.3
-
diff --git a/meta-sota/recipes-bsp/u-boot/u-boot-ota/0001-fixup-build-with-gcc6.patch b/meta-sota/recipes-bsp/u-boot/u-boot-ota/0001-fixup-build-with-gcc6.patch
deleted file mode 100644
index df1f786..0000000
--- a/meta-sota/recipes-bsp/u-boot/u-boot-ota/0001-fixup-build-with-gcc6.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-From ba619c7ec7820e80d1b5b520440fdb81c31c0baf Mon Sep 17 00:00:00 2001
-From: Ronan Le Martret <ronan.lemartret@iot.bzh>
-Date: Fri, 14 Oct 2016 09:03:11 +0200
-Subject: [PATCH] fix gcc6 build
-
-Signed-off-by: ronan <ronan@linux-pgnz.suse>
----
- include/linux/compiler-gcc6.h | 66 +++++++++++++++++++++++++++++++++++++++++++
- 1 file changed, 66 insertions(+)
- create mode 100644 include/linux/compiler-gcc6.h
-
-diff --git a/include/linux/compiler-gcc6.h b/include/linux/compiler-gcc6.h
-new file mode 100644
-index 0000000..a3d00d8
---- /dev/null
-+++ b/include/linux/compiler-gcc6.h
-@@ -0,0 +1,66 @@
-+#ifndef __LINUX_COMPILER_H
-+#error "Please don't include <linux/compiler-gcc6.h> directly, include <linux/compiler.h> instead."
-+#endif
-+
-+#define __used				__attribute__((__used__))
-+#define __must_check			__attribute__((warn_unused_result))
-+#define __compiler_offsetof(a, b)	__builtin_offsetof(a, b)
-+
-+/* Mark functions as cold. gcc will assume any path leading to a call
-+   to them will be unlikely.  This means a lot of manual unlikely()s
-+   are unnecessary now for any paths leading to the usual suspects
-+   like BUG(), printk(), panic() etc. [but let's keep them for now for
-+   older compilers]
-+
-+   Early snapshots of gcc 4.3 don't support this and we can't detect this
-+   in the preprocessor, but we can live with this because they're unreleased.
-+   Maketime probing would be overkill here.
-+
-+   gcc also has a __attribute__((__hot__)) to move hot functions into
-+   a special section, but I don't see any sense in this right now in
-+   the kernel context */
-+#define __cold			__attribute__((__cold__))
-+
-+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
-+
-+#ifndef __CHECKER__
-+# define __compiletime_warning(message) __attribute__((warning(message)))
-+# define __compiletime_error(message) __attribute__((error(message)))
-+#endif /* __CHECKER__ */
-+
-+/*
-+ * Mark a position in code as unreachable.  This can be used to
-+ * suppress control flow warnings after asm blocks that transfer
-+ * control elsewhere.
-+ *
-+ * Early snapshots of gcc 4.5 don't support this and we can't detect
-+ * this in the preprocessor, but we can live with this because they're
-+ * unreleased.  Really, we need to have autoconf for the kernel.
-+ */
-+#define unreachable() __builtin_unreachable()
-+
-+/* Mark a function definition as prohibited from being cloned. */
-+#define __noclone	__attribute__((__noclone__))
-+
-+/*
-+ * Tell the optimizer that something else uses this function or variable.
-+ */
-+#define __visible __attribute__((externally_visible))
-+
-+/*
-+ * GCC 'asm goto' miscompiles certain code sequences:
-+ *
-+ *   http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
-+ *
-+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
-+ * Fixed in GCC 4.8.2 and later versions.
-+ *
-+ * (asm goto is automatically volatile - the naming reflects this.)
-+ */
-+#define asm_volatile_goto(x...)	do { asm goto(x); asm (""); } while (0)
-+
-+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
-+#define __HAVE_BUILTIN_BSWAP32__
-+#define __HAVE_BUILTIN_BSWAP64__
-+#define __HAVE_BUILTIN_BSWAP16__
-+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
--- 
-2.6.6
-
diff --git a/meta-sota/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch b/meta-sota/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch
deleted file mode 100644
index 7540b74..0000000
--- a/meta-sota/recipes-bsp/u-boot/u-boot-ota/0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From ab0d7e270d89f6eb99582197d2d58bf60c9c3d26 Mon Sep 17 00:00:00 2001
-From: Anton Gerasimov <anton@advancedtelematic.com>
-Date: Thu, 15 Sep 2016 16:49:32 +0200
-Subject: [PATCH 2/2] Replace wraps with built-in code to remove dependency on
- multilib
-
----
- arch/x86/config.mk |   2 --
- arch/x86/lib/gcc.c | 104 ++++++++++++++++++++++++++++++++++++++++++++---------
- 2 files changed, 87 insertions(+), 19 deletions(-)
-
-diff --git a/arch/x86/config.mk b/arch/x86/config.mk
-index 999143e..139576e 100644
---- a/arch/x86/config.mk
-+++ b/arch/x86/config.mk
-@@ -22,5 +22,3 @@ PLATFORM_RELFLAGS += -ffunction-sections -fvisibility=hidden
- PLATFORM_LDFLAGS += --emit-relocs -Bsymbolic -Bsymbolic-functions -m elf_i386
- 
- LDFLAGS_FINAL += --gc-sections -pie
--LDFLAGS_FINAL += --wrap=__divdi3 --wrap=__udivdi3
--LDFLAGS_FINAL += --wrap=__moddi3 --wrap=__umoddi3
-diff --git a/arch/x86/lib/gcc.c b/arch/x86/lib/gcc.c
-index 497ad75..c321b11 100644
---- a/arch/x86/lib/gcc.c
-+++ b/arch/x86/lib/gcc.c
-@@ -19,22 +19,92 @@
- 
- #ifdef __GNUC__
- 
--/*
-- * GCC's libgcc handling is quite broken. While the libgcc functions
-- * are always regparm(0) the code that calls them uses whatever the
-- * compiler call specifies. Therefore we need a wrapper around those
-- * functions. See gcc bug PR41055 for more information.
-- */
--#define WRAP_LIBGCC_CALL(type, name) \
--	type __normal_##name(type a, type b) __attribute__((regparm(0))); \
--	type __wrap_##name(type a, type b); \
--	type __attribute__((no_instrument_function)) \
--		__wrap_##name(type a, type b) \
--		 { return __normal_##name(a, b); }
--
--WRAP_LIBGCC_CALL(long long, __divdi3)
--WRAP_LIBGCC_CALL(unsigned long long, __udivdi3)
--WRAP_LIBGCC_CALL(long long, __moddi3)
--WRAP_LIBGCC_CALL(unsigned long long, __umoddi3)
-+#include <stdint.h>
-+#include <stddef.h>
-+
-+uint64_t __udivmoddi4 ( uint64_t num,
-+                       uint64_t den,
-+                       uint64_t *rem_p )
-+{
-+       uint64_t quot = 0, qbit = 1;
-+
-+       if ( den == 0 ) {
-+               return 1/((unsigned)den); /* Intentional divide by zero, without
-+                                            triggering a compiler warning which
-+                                            would abort the build */
-+       }
-+
-+       /* Left-justify denominator and count shift */
-+       while ( (int64_t)den >= 0 ) {
-+               den <<= 1;
-+               qbit <<= 1;
-+       }
-+
-+       while ( qbit ) {
-+               if ( den <= num ) {
-+                       num -= den;
-+                       quot += qbit;
-+               }
-+               den >>= 1;
-+               qbit >>= 1;
-+       }
-+
-+       if ( rem_p )
-+               *rem_p = num;
-+
-+       return quot;
-+}      
-+uint64_t __udivdi3( uint64_t num, uint64_t den )
-+{
-+       return __udivmoddi4(num, den, NULL);
-+}
-+
-+uint64_t __umoddi3 ( uint64_t num, uint64_t den )
-+{
-+       uint64_t v;
-+
-+       (void) __udivmoddi4(num, den, &v);
-+       return v;
-+}
-+
-+int64_t __divmoddi4 ( int64_t num,
-+               int64_t den,
-+               int64_t* rem_p )
-+{
-+       int minus = 0;
-+       int64_t v;
-+
-+       if ( num < 0 ) {
-+               num = -num;
-+               minus = 1;
-+       }
-+       if ( den < 0 ) {
-+               den = -den;
-+               minus ^= 1;
-+       }
-+
-+       v = __udivmoddi4(num, den, (uint64_t *)rem_p);
-+       if ( minus ) {
-+               v = -v;
-+               if ( rem_p )
-+                       *rem_p = -(*rem_p);
-+       }
-+
-+       return v;
-+}
-+
-+
-+int64_t __moddi3 (int64_t num, int64_t den)
-+{
-+       int64_t v;
-+
-+       (void) __divmoddi4(num, den, &v);
-+       return v;
-+}
-+
-+int64_t __divdi3(int64_t num, int64_t den)
-+{
-+       return __divmoddi4(num, den, NULL);
-+}
- 
- #endif
--- 
-2.9.3
-
diff --git a/meta-sota/recipes-bsp/u-boot/u-boot-ota_2015.07.bb b/meta-sota/recipes-bsp/u-boot/u-boot-ota_2015.07.bb
deleted file mode 100644
index dfa0631..0000000
--- a/meta-sota/recipes-bsp/u-boot/u-boot-ota_2015.07.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-include recipes-bsp/u-boot/u-boot.inc
-DEPENDS += "dtc-native"
-
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://Licenses/README;md5=0507cd7da8e7ad6d6701926ec9b84c95"
-
-# This revision corresponds to the tag "v2015.07"
-# We use the revision in order to avoid having to fetch it from the
-# repo during parse
-SRCREV = "baba2f57e8f4ed3fa67fe213d22da0de5e00f204"
-
-SRC_URI += "file://0001-Set-up-environment-for-OSTree-integration.patch \
-            file://0002-Replace-wraps-with-built-in-code-to-remove-dependenc.patch \
-            file://0001-fixup-build-with-gcc6.patch \
-           "
-
-PV = "v2015.07+git${SRCPV}"
-
-EXTRA_OEMAKE_append = " KCFLAGS=-fgnu89-inline "
-EXTRA_OEMAKE_append_qemux86 = " BUILD_ROM=y"
-EXTRA_OEMAKE_append_qemux86-64 = " BUILD_ROM=y"
-
-UBOOT_SUFFIX = "bin"
-UBOOT_SUFFIX_qemux86 = "rom"
-UBOOT_SUFFIX_qemux86-64 = "rom"
diff --git a/meta-sota/recipes-bsp/u-boot/u-boot_2016.11.bb b/meta-sota/recipes-bsp/u-boot/u-boot_2016.11.bb
deleted file mode 100644
index 2c7cc4b..0000000
--- a/meta-sota/recipes-bsp/u-boot/u-boot_2016.11.bb
+++ /dev/null
@@ -1,13 +0,0 @@
-require recipes-bsp/u-boot/u-boot.inc
-
-DEPENDS += "dtc-native"
-
-SRCREV = "5ea3e51fc481613a8dee8c02848d1b42c81ad892"
-
-PV = "v2016.11+git${SRCPV}"
-
-#This patch is not complacente with u-boot 2016.11
-#Version of u-boot from yocto 2.2 Morty is 2016.03 from:
-# meta/recipes-bsp/u-boot/u-boot_2016.03.bb
-SRC_URI_remove_raspberrypi3 = "file://0003-Include-lowlevel_init.o-for-rpi2.patch"
-SRC_URI_remove_raspberrypi2 = "file://0003-Include-lowlevel_init.o-for-rpi2.patch"
diff --git a/meta-sota/recipes-core/images/initramfs-ostree-image.bb b/meta-sota/recipes-core/images/initramfs-ostree-image.bb
deleted file mode 100644
index 8eea07c..0000000
--- a/meta-sota/recipes-core/images/initramfs-ostree-image.bb
+++ /dev/null
@@ -1,25 +0,0 @@
-# Netboot initramfs image.
-DESCRIPTION = "OSTree initramfs image"
-
-PACKAGE_INSTALL = "ostree-switchroot ostree-initrd busybox base-passwd ${ROOTFS_BOOTSTRAP_INSTALL}"
-
-SYSTEMD_DEFAULT_TARGET = "initrd.target"
-
-# Do not pollute the initrd image with rootfs features
-IMAGE_FEATURES = ""
-
-export IMAGE_BASENAME = "initramfs-ostree-image"
-IMAGE_LINGUAS = ""
-
-LICENSE = "MIT"
-
-IMAGE_FSTYPES = "ext4.gz"
-IMAGE_FSTYPES_append_arm = " ext4.gz.u-boot"
-
-inherit core-image
-
-IMAGE_ROOTFS_SIZE = "8192"
-
-BAD_RECOMMENDATIONS += "busybox-syslog"
-
-
diff --git a/meta-sota/recipes-devtools/pseudo/pseudo_git.bbappend b/meta-sota/recipes-devtools/pseudo/pseudo_git.bbappend
deleted file mode 100644
index a7e7a81..0000000
--- a/meta-sota/recipes-devtools/pseudo/pseudo_git.bbappend
+++ /dev/null
@@ -1,5 +0,0 @@
-
-SRCREV = "efe0be279901006f939cd357ccee47b651c786da"
-PV = "1.8.2+git${SRCPV}"
-
-DEFAULT_PREFERENCE = "1"
diff --git a/meta-sota/recipes-sota/ostree-initrd/files/init.sh b/meta-sota/recipes-sota/ostree-initrd/files/init.sh
deleted file mode 100644
index 806a7b1..0000000
--- a/meta-sota/recipes-sota/ostree-initrd/files/init.sh
+++ /dev/null
@@ -1,84 +0,0 @@
-#!/bin/sh
-
-# global variables
-
-SMACK=n
-DEBUG=n
-
-# -------------------------------------------
-
-log_info() { echo "$0[$$]: $@" >&2; }
-log_error() { echo "$0[$$]: ERROR $@" >&2; }
-
-do_mount_fs() {
-	log_info "mounting FS: $@"
-	[[ -e /proc/filesystems ]] && { grep -q "$1" /proc/filesystems || { log_error "Unknown filesystem"; return 1; } }
-	[[ -d "$2" ]] || mkdir -p "$2"
-	[[ -e /proc/mounts ]] && { grep -q -e "^$1 $2 $1" /proc/mounts && { log_info "$2 ($1) already mounted"; return 0; } }
-	mount -t "$1" "$1" "$2"
-}
-
-bail_out() {
-	log_error "$@"
-	log_info "Rebooting..."
-	#exec reboot -f
-	exec sh
-}
-
-get_ostree_sysroot() {
-	for opt in `cat /proc/cmdline`; do
-		arg=`echo $opt | cut -d'=' -f1`
-		if [ $arg == "ostree_root" ]; then
-			echo $opt | cut -d'=' -f2
-			return
-		fi
-	done
-}
-
-export PATH=/sbin:/usr/sbin:/bin:/usr/bin:/usr/lib/ostree
-
-log_info "starting initrd script"
-
-do_mount_fs proc /proc
-do_mount_fs sysfs /sys
-do_mount_fs devtmpfs /dev
-do_mount_fs devpts /dev/pts
-do_mount_fs tmpfs /dev/shm
-do_mount_fs tmpfs /tmp
-do_mount_fs tmpfs /run
-
-# check if smack is active (and if so, mount smackfs)
-grep -q smackfs /proc/filesystems && {
-	SMACK=y
-
-	do_mount_fs smackfs /sys/fs/smackfs
-
-	# adjust current label and network label
-	echo System >/proc/self/attr/current
-	echo System >/sys/fs/smackfs/ambient
-}
-
-mkdir -p /sysroot
-ostree_sysroot=$(get_ostree_sysroot)
-
-mount $ostree_sysroot /sysroot || bail_out "Unable to mount $ostree_sysroot as physical sysroot"
-ostree-prepare-root /sysroot
-
-# move mounted devices to new root
-cd /sysroot
-for x in dev proc; do
-	log_info "Moving /$x to new rootfs"
-	mount -o move /$x $x
-done
-
-# switch to new rootfs
-log_info "Switching to new rootfs"
-mkdir -p run/initramfs
-
-pivot_root . run/initramfs || bail_out "pivot_root failed."
-
-log_info "Launching target init"
-
-exec chroot . sh -c 'umount /run/initramfs; exec /sbin/init' \
-	  <dev/console >dev/console 2>&1
-
diff --git a/meta-sota/recipes-sota/ostree-initrd/ostree-initrd.bb b/meta-sota/recipes-sota/ostree-initrd/ostree-initrd.bb
deleted file mode 100644
index 5c85bee..0000000
--- a/meta-sota/recipes-sota/ostree-initrd/ostree-initrd.bb
+++ /dev/null
@@ -1,19 +0,0 @@
-SUMMARY = "Extremely basic live image init script"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-SRC_URI = "file://init.sh"
-
-S = "${WORKDIR}"
-
-do_install() {
-	install -dm 0755 ${D}/etc
-	touch ${D}/etc/initrd-release
-	install -dm 0755 ${D}/dev
-	install -dm 0755 ${D}/sbin
-        install -m 0755 ${WORKDIR}/init.sh ${D}/sbin/init
-}
-
-inherit allarch
-
-FILES_${PN} += " /dev /etc/initrd-release /sbin/init "
-
diff --git a/meta-sota/recipes-sota/ostree/ostree_git.bb b/meta-sota/recipes-sota/ostree/ostree_git.bb
deleted file mode 100644
index 674c379..0000000
--- a/meta-sota/recipes-sota/ostree/ostree_git.bb
+++ /dev/null
@@ -1,83 +0,0 @@
-SUMMARY = "Tool for managing bootable, immutable, versioned filesystem trees"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
-
-inherit autotools-brokensep pkgconfig systemd gobject-introspection
-
-INHERIT_remove_class-native = "systemd"
-
-SRC_URI = "gitsm://github.com/ostreedev/ostree.git;branch=master"
-
-SRCREV="3b09620c2738bce4ed45e099cf2e4c5df7671d39"
-
-PV = "2017.3-31-g3b09620c"
-
-S = "${WORKDIR}/git"
-
-BBCLASSEXTEND = "native"
-
-DEPENDS += "attr libarchive glib-2.0 pkgconfig gpgme libgsystem fuse libsoup-2.4 e2fsprogs systemd gtk-doc-native"
-DEPENDS_remove_class-native = "systemd-native"
-
-RDEPENDS_${PN} = "python util-linux-libuuid util-linux-libblkid util-linux-libmount libcap xz bash"
-RDEPENDS_${PN}_remove_class-native = "python-native"
-
-EXTRA_OECONF = "--with-libarchive --disable-gtk-doc --disable-gtk-doc-html --disable-gtk-doc-pdf --disable-man --with-smack --with-builtin-grub2-mkconfig"
-EXTRA_OECONF_append_class-native = " --enable-wrpseudo-compat"
-
-# Path to ${prefix}/lib/ostree/ostree-grub-generator is hardcoded on the
-#  do_configure stage so we do depend on it
-SYSROOT_DIR = "${STAGING_DIR_TARGET}"
-SYSROOT_DIR_class-native = "${STAGING_DIR_NATIVE}"
-do_configure[vardeps] += "SYSROOT_DIR"
-
-SYSTEMD_REQUIRED = "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}"
-SYSTEMD_REQUIRED_class-native = ""
-
-SYSTEMD_SERVICE_${PN} = "ostree-prepare-root.service ostree-remount.service"
-SYSTEMD_SERVICE_${PN}_class-native = ""
-
-PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)}"
-PACKAGECONFIG_class-native = ""
-PACKAGECONFIG[systemd] = "--with-systemdsystemunitdir=${systemd_unitdir}/system/ --with-dracut"
-
-FILES_${PN} += "${libdir}/ostree/ ${libdir}/ostbuild"
-
-export STAGING_INCDIR
-export STAGING_LIBDIR
-
-do_configure() {
- unset docdir
- NOCONFIGURE=1 ./autogen.sh
- oe_runconf
-}
-
-do_compile_prepend() {
- export BUILD_SYS="${BUILD_SYS}"
- export HOST_SYS="${HOST_SYS}"
-}
-
-export SYSTEMD_REQUIRED
-
-do_install_append() {
- if [ -n ${SYSTEMD_REQUIRED} ]; then
-  install -p -D ${S}/src/boot/ostree-prepare-root.service ${D}${systemd_unitdir}/system/ostree-prepare-root.service
-  install -p -D ${S}/src/boot/ostree-remount.service ${D}${systemd_unitdir}/system/ostree-remount.service
- fi
-}
-
-FILES_${PN} += " \
-    ${@'${systemd_unitdir}/system/' if d.getVar('SYSTEMD_REQUIRED', True) else ''} \
-    ${@'${libdir}/dracut/modules.d/98ostree/module-setup.sh' if d.getVar('SYSTEMD_REQUIRED', True) else ''} \
-    ${datadir}/gir-1.0 \
-    ${datadir}/gir-1.0/OSTree-1.0.gir \
-    ${libdir}/girepository-1.0 \
-    ${libdir}/girepository-1.0/OSTree-1.0.typelib \
-"
-
-PACKAGES =+ "${PN}-switchroot"
-
-FILES_${PN}-switchroot = "${libdir}/ostree/ostree-prepare-root"
-RDEPENDS_${PN}-switchroot = ""
-DEPENDS_remove_class-native = "systemd-native"
-
diff --git a/meta-sota/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb b/meta-sota/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
deleted file mode 100644
index 1fe2331..0000000
--- a/meta-sota/recipes-sota/rvi-sota-client/rvi-sota-client_git.bb
+++ /dev/null
@@ -1,201 +0,0 @@
-DESCRIPTION = "sota-client rust recipe"
-HOMEPAGE = "https://github.com/advancedtelematic/rvi_sota_client"
-
-LICENSE = "MPL-2.0"
-LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=65d26fcc2f35ea6a181ac777e42db1ea"
-
-inherit cargo systemd
-
-S = "${WORKDIR}/git"
-
-# When changing this, don't forget to:
-# 1) Update PV
-# 2) Check that Cargo.lock hasn't changed with git diff old..new Cargo.lock
-SRCREV = "878aa386e61bc253e4fae624ae62507710cd23f3"
-
-# Generate with:
-#   git describe --tags | cut -b2-
-# or from the rvi_sota_client repo:
-#   make package-version
-PV = "0.2.32-131-g878aa38"
-
-BBCLASSEXTEND = "native"
-
-FILES_${PN} = " \
-                /lib64 \
-                ${bindir}/canonical_json.py \
-                ${bindir}/sota_client \
-                ${bindir}/sota_sysinfo.sh \
-                ${bindir}/system_info.sh \
-                ${bindir}/sota_ostree.sh \
-                ${bindir}/sota_prov.sh \
-                ${sysconfdir}/sota_client.version \
-                ${sysconfdir}/sota_certificates \
-                /var/sota/sota_provisioning_credentials.p12 \
-                /var/sota/sota_provisioning_url.env \
-                ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/sota_client_autoprovision.service', '', d)} \
-                ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', '${systemd_unitdir}/system/sota_client.service', '', d)} \
-              "
-
-# list of dependencies can be generated from Cargo.lock by running
-#   cat Cargo.lock | sed -e '1,/metadata/ d' Cargo.lock | awk '{print "crate://crates.io/"$2 "/" $3" \\"}'
-SRC_URI = " \
-crate://crates.io/aho-corasick/0.5.3 \
-crate://crates.io/aho-corasick/0.6.3 \
-crate://crates.io/base64/0.4.1 \
-crate://crates.io/bit-set/0.4.0 \
-crate://crates.io/bit-vec/0.4.3 \
-crate://crates.io/bitflags/0.7.0 \
-crate://crates.io/byteorder/1.0.0 \
-crate://crates.io/bytes/0.4.1 \
-crate://crates.io/cfg-if/0.1.0 \
-crate://crates.io/chan/0.1.19 \
-crate://crates.io/chan-signal/0.2.0 \
-crate://crates.io/chrono/0.3.0 \
-crate://crates.io/crossbeam/0.2.10 \
-crate://crates.io/dbus/0.5.2 \
-crate://crates.io/deque/0.3.1 \
-crate://crates.io/dtoa/0.4.1 \
-crate://crates.io/env_logger/0.4.2 \
-crate://crates.io/error-chain/0.7.2 \
-crate://crates.io/foreign-types/0.2.0 \
-crate://crates.io/gcc/0.3.45 \
-crate://crates.io/gdi32-sys/0.2.0 \
-crate://crates.io/getopts/0.2.14 \
-crate://crates.io/httparse/1.2.1 \
-crate://crates.io/hyper/0.10.5 \
-crate://crates.io/idna/0.1.0 \
-crate://crates.io/iovec/0.1.0 \
-crate://crates.io/itoa/0.3.1 \
-crate://crates.io/kernel32-sys/0.2.2 \
-crate://crates.io/language-tags/0.2.2 \
-crate://crates.io/lazy_static/0.2.5 \
-crate://crates.io/libc/0.2.21 \
-crate://crates.io/log/0.3.7 \
-crate://crates.io/matches/0.1.4 \
-crate://crates.io/memchr/0.1.11 \
-crate://crates.io/memchr/1.0.1 \
-crate://crates.io/metadeps/1.1.1 \
-crate://crates.io/mime/0.2.3 \
-crate://crates.io/nom/1.2.4 \
-crate://crates.io/num/0.1.37 \
-crate://crates.io/num-integer/0.1.33 \
-crate://crates.io/num-iter/0.1.33 \
-crate://crates.io/num-traits/0.1.37 \
-crate://crates.io/num_cpus/1.3.0 \
-crate://crates.io/openssl/0.9.10 \
-crate://crates.io/openssl-sys/0.9.10 \
-crate://crates.io/pem/0.2.0 \
-crate://crates.io/pkg-config/0.3.9 \
-crate://crates.io/quote/0.3.15 \
-crate://crates.io/rand/0.3.15 \
-crate://crates.io/rayon/0.6.0 \
-crate://crates.io/redox_syscall/0.1.17 \
-crate://crates.io/regex/0.1.80 \
-crate://crates.io/regex/0.2.1 \
-crate://crates.io/regex-syntax/0.3.9 \
-crate://crates.io/regex-syntax/0.4.0 \
-crate://crates.io/ring/0.7.1 \
-crate://crates.io/rust-crypto/0.2.36 \
-crate://crates.io/rustc-serialize/0.3.23 \
-crate://crates.io/rustc_version/0.1.7 \
-crate://crates.io/semver/0.1.20 \
-crate://crates.io/serde/0.9.11 \
-crate://crates.io/serde_codegen_internals/0.14.1 \
-crate://crates.io/serde_derive/0.9.11 \
-crate://crates.io/serde_json/0.9.9 \
-crate://crates.io/sha1/0.2.0 \
-crate://crates.io/syn/0.11.9 \
-crate://crates.io/synom/0.11.3 \
-crate://crates.io/thread-id/2.0.0 \
-crate://crates.io/thread-id/3.0.0 \
-crate://crates.io/thread_local/0.2.7 \
-crate://crates.io/thread_local/0.3.3 \
-crate://crates.io/time/0.1.36 \
-crate://crates.io/toml/0.2.1 \
-crate://crates.io/toml/0.3.1 \
-crate://crates.io/traitobject/0.1.0 \
-crate://crates.io/tungstenite/0.1.1 \
-crate://crates.io/typeable/0.1.2 \
-crate://crates.io/unicase/1.4.0 \
-crate://crates.io/unicode-bidi/0.2.5 \
-crate://crates.io/unicode-normalization/0.1.4 \
-crate://crates.io/unicode-xid/0.0.4 \
-crate://crates.io/unix_socket/0.5.0 \
-crate://crates.io/unreachable/0.1.1 \
-crate://crates.io/untrusted/0.3.2 \
-crate://crates.io/url/1.4.0 \
-crate://crates.io/user32-sys/0.2.0 \
-crate://crates.io/utf-8/0.7.0 \
-crate://crates.io/utf8-ranges/0.1.3 \
-crate://crates.io/utf8-ranges/1.0.0 \
-crate://crates.io/uuid/0.4.0 \
-crate://crates.io/void/1.0.2 \
-crate://crates.io/winapi/0.2.8 \
-crate://crates.io/winapi-build/0.1.1 \
-git://github.com/advancedtelematic/rvi_sota_client \
-"
-
-SRC_URI[index.md5sum] = "79f10f436dbf26737cc80445746f16b4"
-SRC_URI[index.sha256sum] = "86114b93f1f51aaf0aec3af0751d214b351f4ff9839ba031315c1b19dcbb1913"
-
-SYSTEMD_SERVICE_${PN} = "sota_client.service sota_client_autoprovision.service"
-
-DEPENDS += " openssl openssl-native dbus "
-RDEPENDS_${PN} = " libcrypto \
-                   libssl \
-                   dbus \
-                   bash \
-                   lshw \
-                   jq \
-                   curl \
-                   python \
-                   python-canonicaljson \
-                   python-json \
-                   "
-
-export SOTA_AUTOPROVISION_CREDENTIALS
-export SOTA_AUTOPROVISION_URL
-
-do_compile_prepend() {
-  export SOTA_VERSION=$(make sota-version)
-}
-
-do_install() {
-  install -d ${D}${bindir}
-  install -m 0755 target/${TARGET_SYS}/release/sota_client ${D}${bindir}
-  install -m 0755 ${S}/run/sota_sysinfo.sh ${D}${bindir}
-  ln -fs ${bindir}/sota_sysinfo.sh ${D}${bindir}/system_info.sh  # For compatibilty with old sota.toml files
-  install -m 0755 ${S}/run/sota_ostree.sh ${D}${bindir}
-  install -m 0755 ${S}/run/sota_prov.sh ${D}${bindir}
-  install -m 0755 ${S}/run/canonical_json.py ${D}${bindir}
-
-  if ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'true', 'false', d)}; then
-    install -d ${D}/${systemd_unitdir}/system
-    if [ -n "$SOTA_AUTOPROVISION_CREDENTIALS" ]; then
-      install -c ${S}/run/sota_client_uptane_auto.service ${D}${systemd_unitdir}/system/sota_client.service
-    else
-      install -c ${S}/run/sota_client_ostree.service ${D}${systemd_unitdir}/system/sota_client.service
-    fi
-    install -c ${S}/run/sota_client_autoprovision.service ${D}${systemd_unitdir}/system/sota_client_autoprovision.service
-  fi
-
-  install -d ${D}${sysconfdir}
-  echo `git log -1 --pretty=format:%H` > ${D}${sysconfdir}/sota_client.version
-  install -c ${S}/run/sota_certificates ${D}${sysconfdir}
-  ln -fs /lib ${D}/lib64
-
-  if [ -n "$SOTA_AUTOPROVISION_CREDENTIALS" ]; then
-    EXPDATE=`openssl pkcs12 -in $SOTA_AUTOPROVISION_CREDENTIALS -password "pass:" -nodes 2>/dev/null | openssl x509 -noout -enddate | cut -f2 -d "="`
-
-    if [ `date +%s` -ge `date -d "${EXPDATE}" +%s` ]; then
-      bberror "Certificate ${SOTA_AUTOPROVISION_CREDENTIALS} has expired on ${EXPDATE}"
-    fi
-
-    install -d ${D}/var
-    install -d ${D}/var/sota
-    install -m 0655 $SOTA_AUTOPROVISION_CREDENTIALS ${D}/var/sota/sota_provisioning_credentials.p12
-    echo "SOTA_GATEWAY_URI=$SOTA_AUTOPROVISION_URL" > ${D}/var/sota/sota_provisioning_url.env
-  fi
-
-}
diff --git a/meta-sota/recipes-sota/sota-tools/sota-tools_git.bb b/meta-sota/recipes-sota/sota-tools/sota-tools_git.bb
deleted file mode 100644
index 326ff20..0000000
--- a/meta-sota/recipes-sota/sota-tools/sota-tools_git.bb
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Utility to push data to a server"
-LICENSE = "MPL-2.0"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=65d26fcc2f35ea6a181ac777e42db1ea"
-
-S = "${WORKDIR}/git"
-
-SRC_URI = "gitsm://github.com/advancedtelematic/sota-tools.git;branch=master"
-SRCREV = "4d7f22f50ab43be5bee61ad3e96cd9db4ef3a372"
-
-inherit cmake
-
-DEPENDS = "boost glib-2.0 curl"
-
-BBCLASSEXTEND = "native"
-
-FILES_${PN} = "${bindir}/garage-push"
-
-EXTRA_OECMAKE = "-DWARNING_AS_ERROR=OFF"
-
-do_install() {
-   install -d ${D}/${bindir}
-   install -m 755 garage-push ${D}/${bindir}
-}
diff --git a/meta-sota/recipes-support/fuse/fuse_%.bbappend b/meta-sota/recipes-support/fuse/fuse_%.bbappend
deleted file mode 100644
index 4f23349..0000000
--- a/meta-sota/recipes-support/fuse/fuse_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-BBCLASSEXTEND = "native"
-
-PACKAGES_append_class-native = "fuse-utils-dbg-native fuse-utils-native libulockmgr-native libulockmgr-dev-native libulockmgr-dbg-native"
diff --git a/meta-sota/recipes-support/glib-networking/glib-networking_%.bbappend b/meta-sota/recipes-support/glib-networking/glib-networking_%.bbappend
deleted file mode 100644
index d3267ac..0000000
--- a/meta-sota/recipes-support/glib-networking/glib-networking_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND = "native"
diff --git a/meta-sota/recipes-support/gpgme/gpgme_%.bbappend b/meta-sota/recipes-support/gpgme/gpgme_%.bbappend
deleted file mode 100644
index d3267ac..0000000
--- a/meta-sota/recipes-support/gpgme/gpgme_%.bbappend
+++ /dev/null
@@ -1 +0,0 @@
-BBCLASSEXTEND = "native"
diff --git a/meta-sota/recipes-support/libgsystem/libgsystem_git.bb b/meta-sota/recipes-support/libgsystem/libgsystem_git.bb
deleted file mode 100644
index 2b93191..0000000
--- a/meta-sota/recipes-support/libgsystem/libgsystem_git.bb
+++ /dev/null
@@ -1,39 +0,0 @@
-SUMMARY = "GIO-based library, targeted primarily for use by operating system components"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2"
-
-SRC_URI = "gitsm://github.com/GNOME/libgsystem.git"
-SRCREV="d606bec68ddfea78de4b03c3f3568afb71bdc1ce"
-
-S = "${WORKDIR}/git"
-
-inherit autotools-brokensep gobject-introspection
-
-DEPENDS += "attr glib-2.0 pkgconfig libcap gtk-doc-native gpgme"
-RDEPENDS_${PN} = "xz systemd"
-
-RDEPENDS_${PN}_remove_class-native = "systemd-native"
-
-BBCLASSEXTEND = "native"
-
-export STAGING_INCDIR
-export STAGING_LIBDIR
-
-do_configure() {
- #NOCONFIGURE=true ./autogen.sh
- autoreconf -vfi
- oe_runconf
-}
-
-do_compile_prepend() {
- export BUILD_SYS="${BUILD_SYS}"
- export HOST_SYS="${HOST_SYS}"
-}
-
-FILES_${PN} += " \
-    ${datadir} \
-    ${datadir}/gir-1.0 \
-    ${datadir}/gir-1.0/GSystem-1.0.gir \
-    ${libdir}/girepository-1.0/ \
-    ${libdir}/girepository-1.0/GSystem-1.0.typelib \
-"
diff --git a/meta-sota/recipes-support/libsoup/libsoup-2.4_%.bbappend b/meta-sota/recipes-support/libsoup/libsoup-2.4_%.bbappend
deleted file mode 100644
index ed24273..0000000
--- a/meta-sota/recipes-support/libsoup/libsoup-2.4_%.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-BBCLASSEXTEND = "native"
-
-DEPENDS_append_class-native = " glib-networking-native"
diff --git a/meta-sota/recipes-support/libssh2/libssh2_%.bbappend b/meta-sota/recipes-support/libssh2/libssh2_%.bbappend
deleted file mode 100644
index ce4807e..0000000
--- a/meta-sota/recipes-support/libssh2/libssh2_%.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-# meta-oe/recipes-support/libssh2
-BBCLASSEXTEND = "native"
diff --git a/meta-sota/recipes-support/lshw/files/cross-compile.patch b/meta-sota/recipes-support/lshw/files/cross-compile.patch
deleted file mode 100644
index 221b7e5..0000000
--- a/meta-sota/recipes-support/lshw/files/cross-compile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
----
- src/Makefile      |    2 +-
- src/core/Makefile |    2 +-
- src/gui/Makefile  |    4 ++--
- 3 files changed, 4 insertions(+), 4 deletions(-)
-
---- a/src/Makefile
-+++ b/src/Makefile
-@@ -18,7 +18,7 @@ export MANDIR
- export DATADIR
- export SQLITE
- 
--CXX?=c++
-+CXX?=$(CROSS_COMPILE)c++
- INCLUDES=-I./core/
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
- CXXFLAGS=-g -Wall -g $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
---- a/src/core/Makefile
-+++ b/src/core/Makefile
-@@ -1,6 +1,6 @@
- PACKAGENAME?=lshw
- 
--CXX=c++
-+CXX?=$(CROSS_COMPILE)c++
- INCLUDES=
- DEFINES=-DPREFIX=\"$(PREFIX)\" -DSBINDIR=\"$(SBINDIR)\" -DMANDIR=\"$(MANDIR)\" -DDATADIR=\"$(DATADIR)\"
- CXXFLAGS?=-g -Wall $(INCLUDES) $(DEFINES) $(RPM_OPT_FLAGS)
---- a/src/gui/Makefile
-+++ b/src/gui/Makefile
-@@ -1,7 +1,7 @@
- PACKAGENAME?=lshw
- 
--CXX?=c++
--CC?=cc
-+CXX?=$(CROSS_COMPILE)c++
-+CC?=$(CROSS_COMPILE)cc
- STRIP?=strip
- OBJCOPY?=objcopy
- 
diff --git a/meta-sota/recipes-support/lshw/files/ldflags.patch b/meta-sota/recipes-support/lshw/files/ldflags.patch
deleted file mode 100644
index 83e0410..0000000
--- a/meta-sota/recipes-support/lshw/files/ldflags.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Naur /home/anton/lshw-old/src/Makefile lshw-B.02.16/src/Makefile
---- /home/anton/lshw-old/src/Makefile	2017-02-07 16:21:52.554738182 +0100
-+++ lshw-B.02.16/src/Makefile	2017-02-07 16:22:45.578588072 +0100
-@@ -25,9 +25,9 @@
- ifeq ($(SQLITE), 1)
- 	CXXFLAGS+= -DSQLITE $(shell pkg-config --cflags sqlite3)
- endif
--LDFLAGS=-L./core/ -g
-+LDEXTRAS=-L./core/ -g
- ifneq ($(shell $(LD) --help 2| grep -- --as-needed), )
--	LDFLAGS+= -Wl,--as-needed
-+	LDEXTRAS+= -Wl,--as-needed
- endif
- LDSTATIC=-static
- LIBS=-llshw -lresolv
-@@ -37,7 +37,7 @@
- 
- export CXXFLAGS
- export LIBS
--export LDFLAGS
-+export LDEXTRAS
- 
- DATAFILES = pci.ids usb.ids oui.txt manuf.txt
- 
-@@ -51,7 +51,7 @@
- 	+make -C core all
- 
- $(PACKAGENAME): core $(PACKAGENAME).o
--	$(CXX) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
-+	$(CXX) $(LDFLAGS) ${LDEXTRAS} -o $@ $(PACKAGENAME).o $(LIBS)
- 
- .PHONY: po
- po:
-@@ -69,7 +69,7 @@
- static: $(PACKAGENAME)-static
- 
- $(PACKAGENAME)-static: core core/lib$(PACKAGENAME).a $(PACKAGENAME).o
--	$(CXX) $(LDSTATIC) $(LDFLAGS) -o $@ $(PACKAGENAME).o $(LIBS)
-+	$(CXX) $(LDSTATIC) $(LDFLAGS) ${LDEXTRAS} -o $@ $(PACKAGENAME).o $(LIBS)
- 	$(STRIP) $@
- 
- .PHONY: compressed
diff --git a/meta-sota/recipes-support/lshw/lshw_02.16.bb b/meta-sota/recipes-support/lshw/lshw_02.16.bb
deleted file mode 100644
index 99901ff..0000000
--- a/meta-sota/recipes-support/lshw/lshw_02.16.bb
+++ /dev/null
@@ -1,36 +0,0 @@
-# From meta-linaro
-# http://git.linaro.org/openembedded/meta-linaro.git
-
-DESCRIPTION = "A small tool to provide detailed information on the hardware \
-configuration of the machine. It can report exact memory configuration, \
-firmware version, mainboard configuration, CPU version and speed, cache \
-configuration, bus speed, etc. on DMI-capable or EFI systems."
-SUMMARY = "Hardware lister"
-HOMEPAGE = "http://ezix.org/project/wiki/HardwareLiSter"
-SECTION = "console/tools"
-LICENSE = "GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-DEPENDS = "pciutils \
-    usbutils"
-COMPATIBLE_HOST = "(i.86|x86_64|arm|aarch64).*-linux"
-
-SRC_URI="http://ezix.org/software/files/lshw-B.${PV}.tar.gz \
-    file://cross-compile.patch \
-    file://ldflags.patch \
-    "
-
-SRC_URI[md5sum] = "67479167add605e8f001097c30e96d0d"
-SRC_URI[sha256sum] = "809882429555b93259785cc261dbff04c16c93d064db5f445a51945bc47157cb"
-
-S="${WORKDIR}/lshw-B.${PV}"
-
-do_compile() {
-    # build core only - don't ship gui
-    oe_runmake -C src core
-}
-
-do_install() {
-    oe_runmake install DESTDIR=${D}
-    # data files provided by dependencies
-    rm -rf ${D}/usr/share/lshw
-}
diff --git a/meta-sota/recipes-support/python-canonicaljson/python-canonicaljson.bb b/meta-sota/recipes-support/python-canonicaljson/python-canonicaljson.bb
deleted file mode 100644
index d8a0728..0000000
--- a/meta-sota/recipes-support/python-canonicaljson/python-canonicaljson.bb
+++ /dev/null
@@ -1,18 +0,0 @@
-DESCRIPTION = "python-canonicaljson recipe"
-
-LICENSE = "Apache-2.0"
-LIC_FILES_CHKSUM = "file://${S}/LICENSE;md5=2ee41112a44fe7014dce33e26468ba93"
-
-SRCREV = "92e2c06871cc275c2a8b8e3e899141a212aae0e8"
-SRC_URI = "git://github.com/matrix-org/python-canonicaljson.git"
-S = "${WORKDIR}/git"
-
-# Generate with:
-#   git describe --tags | cut -b2-
-PV = "1.0.0"
-inherit setuptools
-
-RDEPENDS_${PN} = "\
-	python-simplejson \
-	python-frozendict \
-	"
diff --git a/meta-sota/recipes-support/python-frozendict/python-frozendict.bb b/meta-sota/recipes-support/python-frozendict/python-frozendict.bb
deleted file mode 100644
index 79fe5c8..0000000
--- a/meta-sota/recipes-support/python-frozendict/python-frozendict.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-DESCRIPTION = "python-frozendict recipe"
-
-LICENSE = "BSD"
-LIC_FILES_CHKSUM = "file://${S}/LICENSE.txt;md5=f4da037a49c09b456fdbbc7a5bd36132"
-
-SRCREV = "c5d16bafcca7b72ff3e8f40d3a9081e4c9233f1b"
-SRC_URI = "git://github.com/slezica/python-frozendict.git"
-S = "${WORKDIR}/git"
-
-PV = "1.2"
-inherit setuptools
-
diff --git a/meta-sota/recipes-support/util-linux/util-linux_%.bbappend b/meta-sota/recipes-support/util-linux/util-linux_%.bbappend
deleted file mode 100644
index bd3f686..0000000
--- a/meta-sota/recipes-support/util-linux/util-linux_%.bbappend
+++ /dev/null
@@ -1,10 +0,0 @@
-PACKAGES_append_class-native = "util-linux-agetty-native util-linux-fdisk-native util-linux-cfdisk-native util-linux-sfdisk-native \
-             util-linux-swaponoff-native util-linux-losetup-native util-linux-umount-native \
-             util-linux-mount-native util-linux-readprofile-native util-linux-uuidd-native \
-             util-linux-uuidgen-native util-linux-lscpu-native util-linux-fsck-native util-linux-blkid \
-             util-linux-mkfs-native util-linux-mcookie-native util-linux-reset-native \
-             util-linux-mkfs.cramfs-native util-linux-fsck.cramfs-native util-linux-fstrim-native \
-             util-linux-partx-native ${PN}-bash-completion-native util-linux-hwclock \
-             util-linux-findfs-native util-linux-getopt-native util-linux-sulogin-native \
-             ${@bb.utils.contains('PACKAGECONFIG', 'pylibmount', 'util-linux-pylibmount-native', '', d)}"
-
diff --git a/meta-sota/scripts/lib/wic/canned-wks/sdimage-sota.wks b/meta-sota/scripts/lib/wic/canned-wks/sdimage-sota.wks
deleted file mode 100644
index c31c3a5..0000000
--- a/meta-sota/scripts/lib/wic/canned-wks/sdimage-sota.wks
+++ /dev/null
@@ -1,7 +0,0 @@
-# short-description: Create OTA-enabled SD card image
-# long-description: Creates a partitioned SD card image with OSTree
-# physical sysroot as a payload. Boot files are located in the
-# first vfat partition.
-
-part /boot --source bootimg-partition --ondisk mmcblk --fstype=vfat --label boot --active --align 4096 --size 20
-part / --source otaimage --ondisk mmcblk --fstype=ext4 --label root --align 4096
diff --git a/meta-sota/scripts/lib/wic/plugins/source/otaimage.py b/meta-sota/scripts/lib/wic/plugins/source/otaimage.py
deleted file mode 100644
index 4ef3b69..0000000
--- a/meta-sota/scripts/lib/wic/plugins/source/otaimage.py
+++ /dev/null
@@ -1,68 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-
-import os
-
-from wic import msger
-from wic.pluginbase import SourcePlugin
-from wic.utils.oe.misc import get_bitbake_var
-
-class OTAImagePlugin(SourcePlugin):
-    """
-    Add an already existing filesystem image to the partition layout.
-    """
-
-    name = 'otaimage'
-
-    @classmethod
-    def do_install_disk(cls, disk, disk_name, cr, workdir, oe_builddir,
-                        bootimg_dir, kernel_dir, native_sysroot):
-        """
-        Called after all partitions have been prepared and assembled into a
-        disk image. Do nothing.
-        """
-        pass
-
-    @classmethod
-    def do_configure_partition(cls, part, source_params, cr, cr_workdir,
-                               oe_builddir, bootimg_dir, kernel_dir,
-                               native_sysroot):
-        """
-        Called before do_prepare_partition(). Possibly prepare
-        configuration files of some sort.
-        """
-        pass
-
-    @classmethod
-    def do_prepare_partition(cls, part, source_params, cr, cr_workdir,
-                             oe_builddir, bootimg_dir, kernel_dir,
-                             rootfs_dir, native_sysroot):
-        """
-        Called to do the actual content population for a partition i.e. it
-        'prepares' the partition to be incorporated into the image.
-        """
-        if not bootimg_dir:
-            bootimg_dir = get_bitbake_var("DEPLOY_DIR_IMAGE")
-            if not bootimg_dir:
-                msger.error("Couldn't find DEPLOY_DIR_IMAGE, exiting\n")
-
-        msger.debug('Bootimg dir: %s' % bootimg_dir)
-
-        src = bootimg_dir + "/" + get_bitbake_var("IMAGE_LINK_NAME") + ".otaimg"
-
-        msger.debug('Preparing partition using image %s' % (src))
-        part.prepare_rootfs_from_fs_image(cr_workdir, src, "")
diff --git a/meta-sota/scripts/runqemu b/meta-sota/scripts/runqemu
deleted file mode 100755
index b6c9b54..0000000
--- a/meta-sota/scripts/runqemu
+++ /dev/null
@@ -1,575 +0,0 @@
-#!/bin/bash
-#
-# Handle running OE images standalone with QEMU
-#
-# Copyright (C) 2006-2011 Linux Foundation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-usage() {
-    MYNAME=`basename $0`
-cat <<_EOF
-
-Usage: you can run this script with any valid combination
-of the following environment variables (in any order):
-  KERNEL - the kernel image file to use
-  ROOTFS - the rootfs image file or nfsroot directory to use
-  MACHINE - the machine name (optional, autodetected from KERNEL filename if unspecified)
-  Simplified QEMU command-line options can be passed with:
-    nographic - disables video console
-    serial - enables a serial console on /dev/ttyS0
-    kvm - enables KVM when running qemux86/qemux86-64 (VT-capable CPU required)
-    kvm-vhost - enables KVM with vhost support when running qemux86/qemux86-64 (VT-capable CPU required)
-    publicvnc - enable a VNC server open to all hosts
-  qemuparams="xyz" - specify custom parameters to QEMU
-  bootparams="xyz" - specify custom kernel parameters during boot
-
-Examples:
-  $MYNAME qemuarm
-  $MYNAME qemux86-64 core-image-sato ext4
-  $MYNAME qemux86-64 wic-image-minimal wic
-  $MYNAME path/to/bzImage-qemux86.bin path/to/nfsrootdir/ serial
-  $MYNAME qemux86 iso/hddimg/vmdk/qcow2/vdi/ramfs/cpio.gz...
-  $MYNAME qemux86 qemuparams="-m 256"
-  $MYNAME qemux86 bootparams="psplash=false"
-  $MYNAME path/to/<image>-<machine>.vmdk
-  $MYNAME path/to/<image>-<machine>.wic
-_EOF
-    exit 1
-}
-
-if [ "x$1" = "x" ]; then
-    usage
-fi
-
-error() {
-    echo "Error: "$*
-    usage
-}
-
-MACHINE=${MACHINE:=""}
-KERNEL=${KERNEL:=""}
-ROOTFS=${ROOTFS:=""}
-FSTYPE=${FSTYPE:=""}
-LAZY_ROOTFS=""
-SCRIPT_QEMU_OPT=""
-SCRIPT_QEMU_EXTRA_OPT=""
-SCRIPT_KERNEL_OPT=""
-SERIALSTDIO=""
-TCPSERIAL_PORTNUM=""
-KVM_ENABLED="no"
-KVM_ACTIVE="no"
-VHOST_ENABLED="no"
-VHOST_ACTIVE="no"
-IS_VM="false"
-
-# Determine whether the file is a kernel or QEMU image, and set the
-# appropriate variables
-process_filename() {
-    filename=$1
-
-    # Extract the filename extension
-    EXT=`echo $filename | awk -F . '{ print \$NF }'`
-    case /$EXT/ in
-	/bin/)
-		# A file ending in .bin is a kernel
-		[ -z "$KERNEL" ] && KERNEL=$filename || \
-		    error "conflicting KERNEL args [$KERNEL] and [$filename]"
-		;;
-	/ext[234]/|/jffs2/|/btrfs/)
-		# A file ending in a supportted fs type is a rootfs image
-		if [ -z "$FSTYPE" -o "$FSTYPE" = "$EXT" ]; then
-		    FSTYPE=$EXT
-		    ROOTFS=$filename
-		else
-		    error "conflicting FSTYPE types [$FSTYPE] and [$EXT]"
-		fi
-		;;
-	/hddimg/|/hdddirect/|/vmdk/|/wic/|/qcow2/|/vdi/|/otaimg/)
-		FSTYPE=$EXT
-		VM=$filename
-		ROOTFS=$filename
-		IS_VM="true"
-		;;
-	*)
-		error "unknown file arg [$filename]"
-		;;
-    esac
-}
-
-check_fstype_conflicts() {
-    if [ -z "$FSTYPE" -o "$FSTYPE" = "$1" ]; then
-        FSTYPE=$1
-    else
-        error "conflicting FSTYPE types [$FSTYPE] and [$1]"
-    fi
-}
-# Parse command line args without requiring specific ordering. It's a
-# bit more complex, but offers a great user experience.
-while true; do
-    arg=${1}
-    case "$arg" in
-        "qemux86" | "qemux86-64" | "qemuarm" | "qemuarm64" | "qemumips" | "qemumipsel" | \
-        "qemumips64" | "qemush4"  | "qemuppc" | "qemumicroblaze" | "qemuzynq" | "qemuzynqmp")
-            [ -z "$MACHINE" -o "$MACHINE" = "$arg" ] && MACHINE=$arg || \
-                error "conflicting MACHINE types [$MACHINE] and [$arg]"
-            ;;
-        "ext"[234] | "jffs2" | "nfs" | "btrfs")
-            check_fstype_conflicts $arg
-            ;;
-        "hddimg" | "hdddirect" | "wic" | "vmdk" | "qcow2" | "vdi" | "iso" | "otaimg")
-            check_fstype_conflicts $arg
-            IS_VM="true"
-            ;;
-        "ramfs" | "cpio.gz")
-            FSTYPE=cpio.gz
-            ;;
-        "nographic")
-            SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -nographic"
-            SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT console=ttyS0"
-            ;;
-        "serial")
-            SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -serial stdio"
-            SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT console=ttyS0"
-            SERIALSTDIO="1"
-            ;;
-        "tcpserial="*)
-            TCPSERIAL_PORTNUM=${arg##tcpserial=}
-            ;;
-        "biosdir="*)
-            CUSTOMBIOSDIR="${arg##biosdir=}"
-	    ;;
-        "biosfilename="*)
-            SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -bios ${arg##biosfilename=}"
-            ;;
-        "qemuparams="*)
-            SCRIPT_QEMU_EXTRA_OPT="${arg##qemuparams=}"
-
-            # Warn user if they try to specify serial or kvm options
-            # to use simplified options instead
-            serial_option=`expr "$SCRIPT_QEMU_EXTRA_OPT" : '.*\(-serial\)'`
-            kvm_option=`expr "$SCRIPT_QEMU_EXTRA_OPT" : '.*\(-enable-kvm\)'`
-            vga_option=`expr "$SCRIPT_QEMU_EXTRA_OPT" : '.*\(-vga\)'`
-            [ ! -z "$serial_option" -o ! -z "$kvm_option" ] && \
-                echo "Please use simplified serial or kvm options instead"
-            ;;
-        "bootparams="*)
-            SCRIPT_KERNEL_OPT="$SCRIPT_KERNEL_OPT ${arg##bootparams=}"
-            ;;
-        "audio")
-            if [ "x$MACHINE" = "xqemux86" -o "x$MACHINE" = "xqemux86-64" ]; then
-                echo "Enabling audio in qemu."
-                echo "Please install snd_intel8x0 or snd_ens1370 driver in linux guest."
-                QEMU_AUDIO_DRV="alsa"
-                SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -soundhw ac97,es1370"
-            fi
-            ;;
-        "kvm")
-            KVM_ENABLED="yes"
-            KVM_CAPABLE=`grep -q 'vmx\|svm' /proc/cpuinfo && echo 1`
-            ;;
-        "kvm-vhost")
-            KVM_ENABLED="yes"
-            KVM_CAPABLE=`grep -q 'vmx\|svm' /proc/cpuinfo && echo 1`
-            VHOST_ENABLED="yes"
-            ;;
-        "slirp")
-            SLIRP_ENABLED="yes"
-            ;;
-        "publicvnc")
-            SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -vnc :0"
-            ;;
-        *-image*)
-            [ -z "$ROOTFS" ] || \
-        		error "conflicting ROOTFS args [$ROOTFS] and [$arg]"
-            if [ -f "$arg" ]; then
-                process_filename $arg
-            elif [ -d "$arg" ]; then
-                # Handle the case where the nfsroot dir has -image-
-                # in the pathname
-                echo "Assuming $arg is an nfs rootfs"
-                FSTYPE=nfs
-                ROOTFS=$arg
-            else
-                ROOTFS=$arg
-                LAZY_ROOTFS="true"
-            fi
-            ;;
-        "") break ;;
-        *)
-            # A directory name is an nfs rootfs
-            if [ -d "$arg" ]; then
-                echo "Assuming $arg is an nfs rootfs"
-                if [ -z "$FSTYPE" -o "$FSTYPE" = "nfs" ]; then
-                    FSTYPE=nfs
-                else
-                    error "conflicting FSTYPE types [$arg] and nfs"
-                fi
-
-                if [ -z "$ROOTFS" ]; then
-                    ROOTFS=$arg
-                else
-                    error "conflicting ROOTFS args [$ROOTFS] and [$arg]"
-                fi
-            elif [ -f "$arg" ]; then
-                process_filename $arg
-            else
-                error "unable to classify arg [$arg]"
-            fi
-            ;;
-    esac
-    shift
-done
-
-if [ ! -c /dev/net/tun ] ; then
-	echo "TUN control device /dev/net/tun is unavailable; you may need to enable TUN (e.g. sudo modprobe tun)"
-	exit 1
-elif [ ! -w /dev/net/tun ] ; then
-	echo "TUN control device /dev/net/tun is not writable, please fix (e.g. sudo chmod 666 /dev/net/tun)"
-	exit 1
-fi
-
-# Report errors for missing combinations of options
-if [ -z "$MACHINE" -a -z "$KERNEL" -a -z "$VM" -a "$FSTYPE" != "wic" ]; then
-    error "you must specify at least a MACHINE or KERNEL argument"
-fi
-if [ "$FSTYPE" = "nfs" -a -z "$ROOTFS" ]; then
-    error "NFS booting without an explicit ROOTFS path is not yet supported"
-fi
-
-if [ -z "$MACHINE" ]; then
-    if [ "$IS_VM" = "true" ]; then
-        [ "x$FSTYPE" = "xwic" ] && filename=$ROOTFS || filename=$VM
-        MACHINE=`basename $filename | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
-        if [ -z "$MACHINE" ]; then
-            error "Unable to set MACHINE from image filename [$VM]"
-        fi
-        echo "Set MACHINE to [$MACHINE] based on image [$VM]"
-    else
-        MACHINE=`basename $KERNEL | sed -n 's/.*\(qemux86-64\|qemux86\|qemuarm64\|qemuarm\|qemumips64\|qemumips\|qemuppc\|qemush4\).*/\1/p'`
-        if [ -z "$MACHINE" ]; then
-            error "Unable to set MACHINE from kernel filename [$KERNEL]"
-        fi
-        echo "Set MACHINE to [$MACHINE] based on kernel [$KERNEL]"
-    fi
-fi
-
-YOCTO_KVM_WIKI="https://wiki.yoctoproject.org/wiki/How_to_enable_KVM_for_Poky_qemu"
-YOCTO_PARAVIRT_KVM_WIKI="https://wiki.yoctoproject.org/wiki/Running_an_x86_Yocto_Linux_image_under_QEMU_KVM"
-# Detect KVM configuration
-if [ "x$KVM_ENABLED" = "xyes" ]; then
-    if [ -z "$KVM_CAPABLE" ]; then
-        echo "You are trying to enable KVM on a cpu without VT support."
-        echo "Remove kvm from the command-line, or refer"
-        echo "$YOCTO_KVM_WIKI";
-        exit 1;
-    fi
-    if [ "x$MACHINE" != "xqemux86" -a "x$MACHINE" != "xqemux86-64" ]; then
-        echo "KVM only support x86 & x86-64. Remove kvm from the command-line";
-        exit 1;
-    fi
-    if [ ! -e /dev/kvm ]; then
-        echo "Missing KVM device. Have you inserted kvm modules?"
-        echo "For further help see:"
-        echo "$YOCTO_KVM_WIKI";
-        exit 1;
-    fi
-    if [ -w /dev/kvm -a -r /dev/kvm ]; then
-        SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -enable-kvm"
-        KVM_ACTIVE="yes"
-    else
-        echo "You have no rights on /dev/kvm."
-        echo "Please change the ownership of this file as described at:"
-        echo "$YOCTO_KVM_WIKI";
-        exit 1;
-    fi
-    if [ "x$VHOST_ENABLED" = "xyes" ]; then
-        if [ ! -e /dev/vhost-net ]; then
-            echo "Missing virtio net device. Have you inserted vhost-net module?"
-            echo "For further help see:"
-            echo "$YOCTO_PARAVIRT_KVM_WIKI";
-            exit 1;
-        fi
-
-        if [ -w /dev/vhost-net -a -r /dev/vhost-net ]; then
-            VHOST_ACTIVE="yes"
-        else
-            echo "You have no rights on /dev/vhost-net."
-            echo "Please change the ownership of this file as described at:"
-            echo "$YOCTO_KVM_WIKI";
-            exit 1;
-        fi
-    fi
-fi
-
-machine2=`echo $MACHINE | tr 'a-z' 'A-Z' | sed 's/-/_/'`
-# MACHINE is now set for all cases
-
-# Defaults used when these vars need to be inferred
-QEMUX86_DEFAULT_KERNEL=bzImage-qemux86.bin
-QEMUX86_DEFAULT_FSTYPE=ext4
-
-QEMUX86_64_DEFAULT_KERNEL=bzImage-qemux86-64.bin
-QEMUX86_64_DEFAULT_FSTYPE=ext4
-
-QEMUARM_DEFAULT_KERNEL=zImage-qemuarm.bin
-QEMUARM_DEFAULT_FSTYPE=ext4
-
-QEMUARM64_DEFAULT_KERNEL=Image-qemuarm64.bin
-QEMUARM64_DEFAULT_FSTYPE=ext4
-
-QEMUMIPS_DEFAULT_KERNEL=vmlinux-qemumips.bin
-QEMUMIPS_DEFAULT_FSTYPE=ext4
-
-QEMUMIPSEL_DEFAULT_KERNEL=vmlinux-qemumipsel.bin
-QEMUMIPSEL_DEFAULT_FSTYPE=ext4
-
-QEMUMIPS64_DEFAULT_KERNEL=vmlinux-qemumips64.bin
-QEMUMIPS64_DEFAULT_FSTYPE=ext4
-
-QEMUSH4_DEFAULT_KERNEL=vmlinux-qemumips.bin
-QEMUSH4_DEFAULT_FSTYPE=ext4
-
-QEMUPPC_DEFAULT_KERNEL=vmlinux-qemuppc.bin
-QEMUPPC_DEFAULT_FSTYPE=ext4
-
-QEMUMICROBLAZE_DEFAULT_KERNEL=linux.bin.ub
-QEMUMICROBLAZE_DEFAULT_FSTYPE=cpio
-
-QEMUZYNQ_DEFAULT_KERNEL=uImage
-QEMUZYNQ_DEFAULT_FSTYPE=cpio
-
-QEMUZYNQMP_DEFAULT_KERNEL=Image
-QEMUZYNQMP_DEFAULT_FSTYPE=cpio
-
-setup_path_vars() {
-    if [ -z "$OE_TMPDIR" ] ; then
-        PATHS_REQUIRED=true
-    elif [ "$1" = "1" -a -z "$DEPLOY_DIR_IMAGE" ] ; then
-        PATHS_REQUIRED=true
-    else
-        PATHS_REQUIRED=false
-    fi
-
-    if [ "$PATHS_REQUIRED" = "true" ]; then
-        # Try to get the variable values from bitbake
-        type -P bitbake &>/dev/null || {
-            echo "In order for this script to dynamically infer paths";
-            echo "to kernels or filesystem images, you either need";
-            echo "bitbake in your PATH or to source oe-init-build-env";
-            echo "before running this script" >&2;
-            exit 1; }
-
-        # We have bitbake in PATH, get the variable values from bitbake
-        BITBAKE_ENV_TMPFILE=`mktemp --tmpdir runqemu.XXXXXXXXXX`
-        if [ "$?" != "0" ] ; then
-            echo "Error: mktemp failed for bitbake environment output"
-            exit 1
-        fi
-
-        MACHINE=$MACHINE bitbake -e > $BITBAKE_ENV_TMPFILE
-        if [ -z "$OE_TMPDIR" ] ; then
-            OE_TMPDIR=`sed -n 's/^TMPDIR=\"\(.*\)\"/\1/p' $BITBAKE_ENV_TMPFILE`
-        fi
-        if [ -z "$DEPLOY_DIR_IMAGE" ] ; then
-            DEPLOY_DIR_IMAGE=`sed -n 's/^DEPLOY_DIR_IMAGE=\"\(.*\)\"/\1/p' $BITBAKE_ENV_TMPFILE`
-        fi
-        if [ -z "$QEMU_DTB" ] ; then
-            QEMU_DTB=`sed -n 's/^QEMU_DTB=\"\(.*\)\"/\1/p' $BITBAKE_ENV_TMPFILE`
-        fi
-        if [ -z "$OE_TMPDIR" ]; then
-            # Check for errors from bitbake that the user needs to know about
-            BITBAKE_OUTPUT=`cat $BITBAKE_ENV_TMPFILE | wc -l`
-            if [ "$BITBAKE_OUTPUT" -eq "0" ]; then
-                echo "Error: this script needs to be run from your build directory, or you need"
-                echo "to explicitly set OE_TMPDIR and DEPLOY_DIR_IMAGE in your environment"
-            else
-                echo "There was an error running bitbake to determine TMPDIR"
-                echo "Here is the output from 'bitbake -e':"
-                cat $BITBAKE_ENV_TMPFILE
-            fi
-            rm $BITBAKE_ENV_TMPFILE
-            exit 1
-        fi
-        rm $BITBAKE_ENV_TMPFILE
-    fi
-}
-
-setup_sysroot() {
-    # Toolchain installs set up $OECORE_NATIVE_SYSROOT in their
-    # environment script. If that variable isn't set, we're
-    # either in an in-tree build scenario or the environment
-    # script wasn't source'd.
-    if [ -z "$OECORE_NATIVE_SYSROOT" ]; then
-        setup_path_vars
-        BUILD_ARCH=`uname -m`
-        BUILD_OS=`uname | tr '[A-Z]' '[a-z]'`
-        BUILD_SYS="$BUILD_ARCH-$BUILD_OS"
-
-        OECORE_NATIVE_SYSROOT=$OE_TMPDIR/sysroots/$BUILD_SYS
-    fi 
-
-    # Some recipes store the BIOS under $OE_TMPDIR/sysroots/$MACHINE,
-    # now defined as OECORE_MACHINE_SYSROOT. The latter is used when searching
-    # BIOS, VGA BIOS and keymaps.
-    if [ -z "$OECORE_MACHINE_SYSROOT" ]; then
-        OECORE_MACHINE_SYSROOT=$OE_TMPDIR/sysroots/$MACHINE
-    fi
-}
-
-# Locate a rootfs image to boot which matches our expected
-# machine and fstype. 
-findimage() {
-    where=$1
-    machine=$2
-    extension=$3
-
-    # Sort rootfs candidates by modification time - the most
-    # recently created one is the one we most likely want to boot.
-    filename=`ls -t1 $where/*-image*$machine.$extension 2>/dev/null | head -n1`
-    if [ "x$filename" != "x" ]; then
-        ROOTFS=$filename
-        return
-    fi
-
-    echo "Couldn't find a $machine rootfs image in $where."
-    exit 1
-}
-
-# Bios is necessary when using otaimg, look for it
-if [ "$FSTYPE" = "otaimg" ]; then
-    setup_path_vars 1
-    bios_option=`expr "$SCRIPT_QEMU_OPT" : '.*\(-bios\)'`
-    echo "bios_option: $bios_option"
-    if [ -z $bios_option ]; then
-        echo "LOOK FOR BIOS at ${DEPLOY_DIR_IMAGE}"
-        # if -bios wasn't specified explicitly, try to look at the default location
-        if [ -e "${DEPLOY_DIR_IMAGE}/u-boot.rom" ]; then
-            SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -bios ${DEPLOY_DIR_IMAGE}/u-boot.rom"
-        else
-            error "OTA image requires specifying u-boot as BIOS"
-        fi
-    fi
-fi
-
-
-# Kernel command line is stored in compressed format as u-boot environment
-#   which breaks determining drive interface with grep in runqemu-internal
-if [ "$FSTYPE" = "otaimg" ]; then
-    FORCE_DRIVE_IF="ide"
-fi
-
-if [ -e "$ROOTFS" -a -z "$FSTYPE" ]; then
-    # Extract the filename extension
-    EXT=`echo $ROOTFS | awk -F . '{ print \$NF }'`
-    if [ "x$EXT" = "xext2" -o "x$EXT" = "xext3" -o \
-          "x$EXT" = "xjffs2" -o "x$EXT" = "xbtrfs" -o \
-          "x$EXT" = "xext4" ]; then
-        FSTYPE=$EXT
-    else
-        echo "Note: Unable to determine filesystem extension for $ROOTFS"
-        echo "We will use the default FSTYPE for $MACHINE"
-        # ...which is done further below...
-    fi
-fi
-
-if [ -z "$KERNEL" -a "$IS_VM" = "false" ]; then \
-    setup_path_vars 1
-    eval kernel_file=\$${machine2}_DEFAULT_KERNEL
-    KERNEL=$DEPLOY_DIR_IMAGE/$kernel_file
-
-    if [ -z "$KERNEL" ]; then
-        error "Unable to determine default kernel for MACHINE [$MACHINE]"
-    fi
-fi
-# KERNEL is now set for all cases
-
-if [ -z "$FSTYPE" ]; then
-    eval FSTYPE=\$${machine2}_DEFAULT_FSTYPE
-
-    if [ -z "$FSTYPE" ]; then
-        error "Unable to determine default fstype for MACHINE [$MACHINE]"
-    fi
-fi
-
-# FSTYPE is now set for all cases
-
-# Handle cases where a ROOTFS type is given instead of a filename, e.g.
-# core-image-sato
-if [ "$LAZY_ROOTFS" = "true" ]; then
-    setup_path_vars 1
-    echo "Assuming $ROOTFS really means $DEPLOY_DIR_IMAGE/$ROOTFS-$MACHINE.$FSTYPE"
-    if [ "$IS_VM" = "true" ]; then
-        VM=$DEPLOY_DIR_IMAGE/$ROOTFS-$MACHINE.$FSTYPE
-    else
-        ROOTFS=$DEPLOY_DIR_IMAGE/$ROOTFS-$MACHINE.$FSTYPE
-    fi
-fi
-
-if [ -z "$ROOTFS" ]; then
-    setup_path_vars 1
-    T=$DEPLOY_DIR_IMAGE
-    eval rootfs_list=\$${machine2}_DEFAULT_ROOTFS
-    findimage $T $MACHINE $FSTYPE
-
-    if [ -z "$ROOTFS" ]; then
-        error "Unable to determine default rootfs for MACHINE [$MACHINE]"
-    elif [ "$IS_VM" = "true" ]; then
-		VM=$ROOTFS
-    fi
-fi
-# ROOTFS is now set for all cases, now expand it to be an absolute path, it should exist at this point
-
-ROOTFS=`readlink -f $ROOTFS`
-
-echo ""
-echo "Continuing with the following parameters:"
-if [ "$IS_VM" = "false" ]; then
-    echo "KERNEL: [$KERNEL]"
-    echo "ROOTFS: [$ROOTFS]"
-else
-    echo "VM:   [$VM]"
-fi
-echo "FSTYPE: [$FSTYPE]"
-
-setup_sysroot
-# OECORE_NATIVE_SYSROOT and OECORE_MACHINE_SYSROOT are now set for all cases
-
-INTERNAL_SCRIPT="$0-internal"
-if [ ! -f "$INTERNAL_SCRIPT" -o ! -r "$INTERNAL_SCRIPT" ]; then
-INTERNAL_SCRIPT=`which runqemu-internal`
-fi
-
-# Specify directory for BIOS, VGA BIOS and keymaps
-if [ ! -z "$CUSTOMBIOSDIR" ]; then
-    if [ -d "$OECORE_NATIVE_SYSROOT/$CUSTOMBIOSDIR" ]; then
-        echo "Assuming biosdir is $OECORE_NATIVE_SYSROOT/$CUSTOMBIOSDIR"
-        SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -L $OECORE_NATIVE_SYSROOT/$CUSTOMBIOSDIR"
-    elif [ -d "$OECORE_MACHINE_SYSROOT/$CUSTOMBIOSDIR" ]; then
-        echo "Assuming biosdir is $OECORE_MACHINE_SYSROOT/$CUSTOMBIOSDIR"
-        SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -L $OECORE_MACHINE_SYSROOT/$CUSTOMBIOSDIR"
-    else
-        if [ ! -d "$CUSTOMBIOSDIR" ]; then
-            echo "Custom BIOS directory not found. Tried: $CUSTOMBIOSDIR"
-            echo "and $OECORE_NATIVE_SYSROOT/$CUSTOMBIOSDIR"
-            echo "and $OECORE_MACHINE_SYSROOT/$CUSTOMBIOSDIR"
-            exit 1;
-        fi
-        echo "Assuming biosdir is $CUSTOMBIOSDIR"
-        SCRIPT_QEMU_OPT="$SCRIPT_QEMU_OPT -L $CUSTOMBIOSDIR"
-    fi
-fi
-
-. $INTERNAL_SCRIPT
-exit $?
diff --git a/meta-sota/scripts/runqemu-addptable2image b/meta-sota/scripts/runqemu-addptable2image
deleted file mode 100755
index f0195ad..0000000
--- a/meta-sota/scripts/runqemu-addptable2image
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-# Add a partion table to an ext2 image file
-#
-# Copyright (C) 2006-2007 OpenedHand Ltd.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-
-
-IMAGE=$1
-IMAGEOUT=$2
-
-echo $IMAGE
-echo $IMAGEOUT
-
-size=`ls -l $IMAGE | awk '{ print $5}'`
-size2=`expr $size / 512 / 16 / 63`
-
-echo $size
-echo $size2
-
-# MBR Size = 512 * 63 bytes
-dd if=/dev/zero of=$IMAGEOUT count=63
-
-echo "x" > /tmp/fdisk.cmds
-echo "c" >> /tmp/fdisk.cmds
-echo "1024" >> /tmp/fdisk.cmds
-echo "h" >> /tmp/fdisk.cmds
-echo "16" >> /tmp/fdisk.cmds
-echo "r" >> /tmp/fdisk.cmds
-echo "n" >> /tmp/fdisk.cmds
-echo "p" >> /tmp/fdisk.cmds
-echo "1" >> /tmp/fdisk.cmds
-echo "1" >> /tmp/fdisk.cmds
-echo "$size2" >> /tmp/fdisk.cmds
-echo "w" >> /tmp/fdisk.cmds
-
-/sbin/fdisk $IMAGEOUT < /tmp/fdisk.cmds
-cat $IMAGE >> $IMAGEOUT
diff --git a/meta-sota/scripts/runqemu-export-rootfs b/meta-sota/scripts/runqemu-export-rootfs
deleted file mode 100755
index 3dee131..0000000
--- a/meta-sota/scripts/runqemu-export-rootfs
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/bin/bash
-#
-# Copyright (c) 2005-2009 Wind River Systems, Inc.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-usage() {
-	echo "Usage: $0 {start|stop|restart} <nfs-export-dir>"
-}
-
-if [ $# != 2 ]; then
-	usage
-	exit 1
-fi
-
-if [[ "$1" != "start" && "$1" != "stop" && "$1" != "restart" ]]; then
-	echo "Unknown command '$1'"
-	usage
-	exit 1
-fi
-
-if [ ! -d "$2" ]; then
-	echo "Error: '$2' does not exist"
-	usage
-	exit 1
-fi
-# Ensure the nfs-export-dir is an absolute path
-NFS_EXPORT_DIR=$(cd "$2" && pwd)
-
-SYSROOT_SETUP_SCRIPT=`which oe-find-native-sysroot 2> /dev/null`
-if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
-	echo "Error: Unable to find the oe-find-native-sysroot script"
-	echo "Did you forget to source your build environment setup script?"
-	exit 1
-fi
-. $SYSROOT_SETUP_SCRIPT
-
-if [ ! -e "$OECORE_NATIVE_SYSROOT/usr/bin/unfsd" ]; then
-	echo "Error: Unable to find unfsd binary in $OECORE_NATIVE_SYSROOT/usr/bin/"
-
-	if [ "x$OECORE_DISTRO_VERSION" = "x" ]; then
-		echo "Have you run 'bitbake meta-ide-support'?"
-	else
-		echo "This shouldn't happen - something is missing from your toolchain installation"
-	fi
-	exit 1
-fi
-
-if [ ! -d ~/.runqemu-sdk ]; then
-	mkdir -p ~/.runqemu-sdk
-fi
-
-NFS_INSTANCE=${NFS_INSTANCE:=0}
-EXPORTS=~/.runqemu-sdk/exports$NFS_INSTANCE
-RMTAB=~/.runqemu-sdk/rmtab$NFS_INSTANCE
-NFSPID=~/.runqemu-sdk/nfs$NFS_INSTANCE.pid
-MOUNTPID=~/.runqemu-sdk/mount$NFS_INSTANCE.pid
-
-PSEUDO_OPTS="-P $OECORE_NATIVE_SYSROOT/usr"
-PSEUDO_LOCALSTATEDIR="$NFS_EXPORT_DIR/../$(basename $NFS_EXPORT_DIR).pseudo_state"
-export PSEUDO_LOCALSTATEDIR
-
-if [ ! -d "$PSEUDO_LOCALSTATEDIR" ]; then
-	echo "Error: $PSEUDO_LOCALSTATEDIR does not exist."
-	echo "Did you create the export directory using runqemu-extract-sdk?"
-	exit 1	
-fi
-
-# rpc.mountd RPC port
-NFS_MOUNTPROG=$[ 21111 + $NFS_INSTANCE ]
-# rpc.nfsd RPC port
-NFS_NFSPROG=$[ 11111 + $NFS_INSTANCE ]
-# NFS port number
-NFS_PORT=$[ 3049 + 2 * $NFS_INSTANCE ]
-# mountd port number
-MOUNT_PORT=$[ 3048 + 2 * $NFS_INSTANCE ]
-
-## For debugging you would additionally add
-## --debug all
-UNFSD_OPTS="-p -N -i $NFSPID -e $EXPORTS -x $NFS_NFSPROG -n $NFS_PORT -y $NFS_MOUNTPROG -m $MOUNT_PORT"
-
-# Setup the exports file
-if [ "$1" = "start" ]; then
-	echo "Creating exports file..."
-	echo "$NFS_EXPORT_DIR (rw,async,no_root_squash,no_all_squash,insecure)" > $EXPORTS
-fi
-
-# See how we were called.
-case "$1" in
-  start)
-	PORTMAP_RUNNING=`ps -ef | grep portmap | grep -v grep`
-	RPCBIND_RUNNING=`ps -ef | grep rpcbind | grep -v grep`
-	if [[ "x$PORTMAP_RUNNING" = "x" && "x$RPCBIND_RUNNING" = "x" ]]; then
-		echo "======================================================="
-		echo "Error: neither rpcbind nor portmap appear to be running"
-		echo "Please install and start one of these services first"
-		echo "======================================================="
-		echo "Tip: for recent Ubuntu hosts, run:"
-		echo "  sudo apt-get install rpcbind"
-		echo "Then add OPTIONS=\"-i -w\"  to /etc/default/rpcbind and run"
-		echo "  sudo service portmap restart"
-
-		exit 1
-	fi
-
-	echo "Starting User Mode nfsd"
-	echo "  $PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/bin/unfsd $UNFSD_OPTS"
-	$PSEUDO $PSEUDO_OPTS $OECORE_NATIVE_SYSROOT/usr/bin/unfsd $UNFSD_OPTS
-	if [ ! $? = 0 ]; then
-		echo "Error starting nfsd"
-		exit 1
-	fi
-	# Check to make sure everything started ok.
-	if [ ! -f $NFSPID ]; then
-		echo "rpc.nfsd did not start correctly"
-		exit 1
-	fi
-	ps -fp `cat $NFSPID` > /dev/null 2> /dev/null
-	if [ ! $? = 0 ]; then
-		echo "rpc.nfsd did not start correctly"
-		exit 1
-	fi
-	echo " "
-	echo "On your target please remember to add the following options for NFS"
-	echo "nfsroot=IP_ADDRESS:$NFS_EXPORT_DIR,nfsvers=3,port=$NFSD_PORT,mountprog=$MOUNTD_RPCPORT,nfsprog=$NFSD_RPCPORT,udp,mountport=$MOUNTD_PORT"
-	;;
-  stop)
-	if [ -f "$NFSPID" ]; then
-		echo "Stopping rpc.nfsd"
-		kill `cat $NFSPID`
-		rm -f $NFSPID
-	else
-		echo "No PID file, not stopping rpc.nfsd"
-	fi
-	if [ -f "$EXPORTS" ]; then
-		echo "Removing exports file"
-		rm -f $EXPORTS
-	fi
-	;;
-  restart)
-	$0 stop $NFS_EXPORT_DIR
-	$0 start $NFS_EXPORT_DIR 
-	if [ ! $? = 0 ]; then
-		exit 1
-	fi
-	;;
-  *)
-	echo "$0 {start|stop|restart} <nfs-export-dir>"
-	;;
-esac
-
-exit 0
diff --git a/meta-sota/scripts/runqemu-extract-sdk b/meta-sota/scripts/runqemu-extract-sdk
deleted file mode 100755
index 32ddd48..0000000
--- a/meta-sota/scripts/runqemu-extract-sdk
+++ /dev/null
@@ -1,104 +0,0 @@
-#!/bin/bash
-#
-# This utility extracts an SDK image tarball using pseudo, and stores
-# the pseudo database in var/pseudo within the rootfs. If you want to
-# boot QEMU using an nfsroot, you *must* use this script to create the
-# rootfs to ensure it is done correctly with pseudo.
-#
-# Copyright (c) 2010 Intel Corp.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-# See the GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-
-function usage() {
-	echo "Usage: $0 <image-tarball> <extract-dir>"
-}
-
-if [ $# -ne 2 ]; then
-	usage
-	exit 1
-fi
-
-SYSROOT_SETUP_SCRIPT=`which oe-find-native-sysroot 2> /dev/null`
-if [ -z "$SYSROOT_SETUP_SCRIPT" ]; then
-    echo "Error: Unable to find the oe-find-native-sysroot script"
-    echo "Did you forget to source your build system environment setup script?"
-    exit 1
-fi
-. $SYSROOT_SETUP_SCRIPT
-PSEUDO_OPTS="-P $OECORE_NATIVE_SYSROOT/usr"
-
-ROOTFS_TARBALL=$1
-SDK_ROOTFS_DIR=$2
-
-if [ ! -e "$ROOTFS_TARBALL" ]; then
-   	echo "Error: sdk tarball '$ROOTFS_TARBALL' does not exist"
-   	usage
-   	exit 1
-fi
-
-# Convert SDK_ROOTFS_DIR to a full pathname
-if [[ ${SDK_ROOTFS_DIR:0:1} != "/" ]]; then
-	SDK_ROOTFS_DIR=$(readlink -f $(pwd)/$SDK_ROOTFS_DIR)
-fi
-
-TAR_OPTS=""
-if [[ "$ROOTFS_TARBALL" =~ tar\.bz2$ ]]; then
-	TAR_OPTS="--numeric-owner -xjf"
-fi
-if [[ "$ROOTFS_TARBALL" =~ tar\.gz$ ]]; then
-	TAR_OPTS="--numeric-owner -xzf"
-fi
-if [[ "$ROOTFS_TARBALL" =~ \.tar$ ]]; then
-	TAR_OPTS="--numeric-owner -xf"
-fi
-if [ -z "$TAR_OPTS" ]; then
-	echo "Error: Unable to determine sdk tarball format"
-	echo "Accepted types: .tar / .tar.gz / .tar.bz2"
-	exit 1
-fi
-
-if [ ! -d "$SDK_ROOTFS_DIR" ]; then
-	echo "Creating directory $SDK_ROOTFS_DIR"
-	mkdir -p "$SDK_ROOTFS_DIR"
-fi
-
-pseudo_state_dir="$SDK_ROOTFS_DIR/../$(basename "$SDK_ROOTFS_DIR").pseudo_state"
-pseudo_state_dir="$(readlink -f $pseudo_state_dir)"
-
-if [ -e "$pseudo_state_dir" ]; then
-	echo "Error: $pseudo_state_dir already exists!"
-	echo "Please delete the rootfs tree and pseudo directory manually"
-        echo "if this is really what you want."
-	exit 1
-fi
-
-mkdir -p "$pseudo_state_dir"
-touch "$pseudo_state_dir/pseudo.pid"
-PSEUDO_LOCALSTATEDIR="$pseudo_state_dir"
-export PSEUDO_LOCALSTATEDIR
-
-echo "Extracting rootfs tarball using pseudo..."
-echo "$PSEUDO $PSEUDO_OPTS tar -C \"$SDK_ROOTFS_DIR\" $TAR_OPTS \"$ROOTFS_TARBALL\""
-$PSEUDO $PSEUDO_OPTS tar -C "$SDK_ROOTFS_DIR" $TAR_OPTS "$ROOTFS_TARBALL"
-
-DIRCHECK=`ls -l "$SDK_ROOTFS_DIR" | wc -l`
-if [ "$DIRCHECK" -lt 5 ]; then
-	echo "Warning: I don't see many files in $SDK_ROOTFS_DIR"
-	echo "Please double-check the extraction worked as intended"
-	exit 0
-fi
-
-echo "SDK image successfully extracted to $SDK_ROOTFS_DIR"
-
-exit 0
diff --git a/meta-sota/scripts/runqemu-gen-tapdevs b/meta-sota/scripts/runqemu-gen-tapdevs
deleted file mode 100755
index 624deac..0000000
--- a/meta-sota/scripts/runqemu-gen-tapdevs
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/bin/bash
-#
-# Create a "bank" of tap network devices that can be used by the
-# runqemu script. This script needs to be run as root, and will
-# use the tunctl binary from the build system sysroot. Note: many Linux 
-# distros these days still use an older version of tunctl which does not
-# support the group permissions option, hence the need to use the build
-# system provided version.
-#
-# Copyright (C) 2010 Intel Corp.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-usage() {
-	echo "Usage: sudo $0 <uid> <gid> <num> <native-sysroot-basedir>"
-        echo "Where <uid> is the numeric user id the tap devices will be owned by"
-	echo "Where <gid> is the numeric group id the tap devices will be owned by"
-	echo "<num> is the number of tap devices to create (0 to remove all)"
-	echo "<native-sysroot-basedir> is the path to the build system's native sysroot"
-	exit 1
-}
-
-if [ $EUID -ne 0 ]; then
-	echo "Error: This script must be run with root privileges"
-	exit
-fi
-
-if [ $# -ne 4 ]; then
-	echo "Error: Incorrect number of arguments"
-	usage
-fi
-
-TUID=$1
-GID=$2
-COUNT=$3
-SYSROOT=$4
-
-TUNCTL=$SYSROOT/usr/bin/tunctl
-if [[ ! -x "$TUNCTL" || -d "$TUNCTL" ]]; then
-	echo "Error: $TUNCTL is not an executable"
-	usage
-fi
-
-SCRIPT_DIR=`dirname $0`
-RUNQEMU_IFUP="$SCRIPT_DIR/runqemu-ifup"
-if [ ! -x "$RUNQEMU_IFUP" ]; then
-	echo "Error: Unable to find the runqemu-ifup script in $SCRIPT_DIR"
-	exit 1
-fi
-
-IFCONFIG=`which ip 2> /dev/null`
-if [ -z "$IFCONFIG" ]; then
-	# Is it ever anywhere else?
-	IFCONFIG=/sbin/ip
-fi
-if [ ! -x "$IFCONFIG" ]; then
-       echo "$IFCONFIG cannot be executed"
-       exit 1
-fi
-
-# Ensure we start with a clean slate
-for tap in `$IFCONFIG link | grep tap | awk '{ print \$2 }' | sed s/://`; do
-	echo "Note: Destroying pre-existing tap interface $tap..."
-	$TUNCTL -d $tap
-done
-
-echo "Creating $COUNT tap devices for UID: $TUID GID: $GID..."
-for ((index=0; index < $COUNT; index++)); do
-	echo "Creating tap$index"
-	ifup=`$RUNQEMU_IFUP $TUID $GID $SYSROOT 2>&1`
-	if [ $? -ne 0 ]; then
-		echo "Error running tunctl: $ifup"
-		exit 1
-	fi
-done
-
-if [ $COUNT -gt 0 ]; then
-	echo "Note: For systems running NetworkManager, it's recommended"
-	echo "Note: that the tap devices be set as unmanaged in the"
-	echo "Note: NetworkManager.conf file. Add the following lines to"
-	echo "Note: /etc/NetworkManager/NetworkManager.conf"
-	echo "[keyfile]"
-	echo "unmanaged-devices=interface-name:tap*"
-fi
-
-# The runqemu script will check for this file, and if it exists,
-# will use the existing bank of tap devices without creating
-# additional ones via sudo.
-touch /etc/runqemu-nosudo
diff --git a/meta-sota/scripts/runqemu-ifdown b/meta-sota/scripts/runqemu-ifdown
deleted file mode 100755
index 8f66cfa..0000000
--- a/meta-sota/scripts/runqemu-ifdown
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/bin/bash
-#
-# QEMU network configuration script to bring down tap devices. This
-# utility needs to be run as root, and will use the tunctl binary
-# from the native sysroot. 
-#
-# If you find yourself calling this script a lot, you can add the
-# the following to your /etc/sudoers file to be able to run this
-# command without entering your password each time:
-#
-# <my-username> ALL=NOPASSWD: /path/to/runqemu-ifup
-# <my-username> ALL=NOPASSWD: /path/to/runqemu-ifdown
-#
-# Copyright (c) 2006-2011 Linux Foundation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-usage() {
-	echo "sudo $(basename $0) <tap-dev> <native-sysroot-basedir>"
-}
-
-if [ $EUID -ne 0 ]; then
-	echo "Error: This script (runqemu-ifdown) must be run with root privileges"
-	exit 1
-fi
-
-if [ $# -ne 2 ]; then
-	usage
-	exit 1
-fi
-
-TAP=$1
-NATIVE_SYSROOT_DIR=$2
-
-TUNCTL=$NATIVE_SYSROOT_DIR/usr/bin/tunctl
-if [ ! -e "$TUNCTL" ]; then
-	echo "Error: Unable to find tunctl binary in '$NATIVE_SYSROOT_DIR/usr/bin', please bitbake qemu-helper-native"
-	exit 1
-fi
-
-$TUNCTL -d $TAP
-
-# cleanup the remaining iptables rules
-IPTABLES=`which iptables 2> /dev/null`
-if [ "x$IPTABLES" = "x" ]; then
-	IPTABLES=/sbin/iptables
-fi
-if [ ! -x "$IPTABLES" ]; then
-	echo "$IPTABLES cannot be executed"
-	exit 1
-fi
-n=$[ (`echo $TAP | sed 's/tap//'` * 2) + 1 ]
-dest=$[ (`echo $TAP | sed 's/tap//'` * 2) + 2 ]
-$IPTABLES -D POSTROUTING -t nat -j MASQUERADE -s 192.168.7.$n/32
-$IPTABLES -D POSTROUTING -t nat -j MASQUERADE -s 192.168.7.$dest/32
diff --git a/meta-sota/scripts/runqemu-ifup b/meta-sota/scripts/runqemu-ifup
deleted file mode 100755
index d9bd894..0000000
--- a/meta-sota/scripts/runqemu-ifup
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/bash
-#
-# QEMU network interface configuration script. This utility needs to
-# be run as root, and will use the tunctl binary from a native sysroot.
-# Note: many Linux distros these days still use an older version of
-# tunctl which does not support the group permissions option, hence
-# the need to use build system's version.
-#
-# If you find yourself calling this script a lot, you can add the
-# the following to your /etc/sudoers file to be able to run this
-# command without entering your password each time:
-#
-# <my-username> ALL=NOPASSWD: /path/to/runqemu-ifup
-# <my-username> ALL=NOPASSWD: /path/to/runqemu-ifdown
-#
-# If you'd like to create a bank of tap devices at once, you should use
-# the runqemu-gen-tapdevs script instead. If tap devices are set up using
-# that script, the runqemu script will never end up calling this
-# script.
-#
-# Copyright (c) 2006-2011 Linux Foundation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-usage() {
-	echo "sudo $(basename $0) <uid> <gid> <native-sysroot-basedir>"
-}
-
-if [ $EUID -ne 0 ]; then
-	echo "Error: This script (runqemu-ifup) must be run with root privileges"
-	exit 1
-fi
-
-if [ $# -ne 3 ]; then
-	usage
-	exit 1
-fi
-
-USERID="-u $1"
-GROUP="-g $2"
-NATIVE_SYSROOT_DIR=$3
-
-TUNCTL=$NATIVE_SYSROOT_DIR/usr/bin/tunctl
-if [ ! -x "$TUNCTL" ]; then
-       echo "Error: Unable to find tunctl binary in '$NATIVE_SYSROOT_DIR/usr/bin', please bitbake qemu-helper-native"
-	exit 1
-fi
-
-TAP=`$TUNCTL -b $GROUP 2>&1`
-STATUS=$?
-if [ $STATUS -ne 0 ]; then
-# If tunctl -g fails, try using tunctl -u, for older host kernels 
-# which do not support the TUNSETGROUP ioctl
-	TAP=`$TUNCTL -b $USERID 2>&1`
-	STATUS=$?
-	if [ $STATUS -ne 0 ]; then
-		echo "tunctl failed:"
-		exit 1
-	fi
-fi
-
-IFCONFIG=`which ip 2> /dev/null`
-if [ "x$IFCONFIG" = "x" ]; then
-	# better than nothing...
-	IFCONFIG=/sbin/ip
-fi
-if [ ! -x "$IFCONFIG" ]; then
-	echo "$IFCONFIG cannot be executed"
-	exit 1
-fi
-
-IPTABLES=`which iptables 2> /dev/null`
-if [ "x$IPTABLES" = "x" ]; then
-	IPTABLES=/sbin/iptables
-fi
-if [ ! -x "$IPTABLES" ]; then
-	echo "$IPTABLES cannot be executed"
-	exit 1
-fi
-
-n=$[ (`echo $TAP | sed 's/tap//'` * 2) + 1 ]
-$IFCONFIG addr add 192.168.7.$n/32 broadcast 192.168.7.255 dev $TAP
-STATUS=$?
-if [ $STATUS -ne 0 ]; then
-    echo "Failed to set up IP addressing on $TAP"
-    exit 1
-fi
-$IFCONFIG link set dev $TAP up
-STATUS=$?
-if [ $STATUS -ne 0 ]; then
-    echo "Failed to bring up $TAP"
-    exit 1
-fi
-
-dest=$[ (`echo $TAP | sed 's/tap//'` * 2) + 2 ]
-$IFCONFIG route add to 192.168.7.$dest dev $TAP
-STATUS=$?
-if [ $STATUS -ne 0 ]; then
-    echo "Failed to add route to 192.168.7.$dest using $TAP"
-    exit 1
-fi
-
-# setup NAT for tap0 interface to have internet access in QEMU
-$IPTABLES -A POSTROUTING -t nat -j MASQUERADE -s 192.168.7.$n/32
-$IPTABLES -A POSTROUTING -t nat -j MASQUERADE -s 192.168.7.$dest/32
-echo 1 > /proc/sys/net/ipv4/ip_forward
-echo 1 > /proc/sys/net/ipv4/conf/$TAP/proxy_arp
-$IPTABLES -P FORWARD ACCEPT
-
-echo $TAP
diff --git a/meta-sota/scripts/runqemu-internal b/meta-sota/scripts/runqemu-internal
deleted file mode 100755
index 9811cf9..0000000
--- a/meta-sota/scripts/runqemu-internal
+++ /dev/null
@@ -1,760 +0,0 @@
-#!/bin/bash -x
-
-# Handle running OE images under qemu
-#
-# Copyright (C) 2006-2011 Linux Foundation
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-# Call setting:
-#   QEMU_MEMORY (optional) - set the amount of memory in the emualted system.
-#   SERIAL_LOGFILE (optional) - log the serial port output to a file
-#
-# Image options:
-#   MACHINE - the machine to run
-#   FSTYPE - the image type to run
-#   KERNEL - the kernel image file to use
-#   ROOTFS - the disk image file to use
-#
-
-mem_size=-1
-
-#Get rid of <> and get the contents of extra qemu running params
-SCRIPT_QEMU_EXTRA_OPT=`echo $SCRIPT_QEMU_EXTRA_OPT | sed -e 's/<//' -e 's/>//'`
-#if user set qemu memory, eg: -m 256 in qemu extra params, we need to do some 
-# validation check
-mem_set=`expr "$SCRIPT_QEMU_EXTRA_OPT" : '.*\(-m[[:space:]] *[0-9]*\)'`
-if [ ! -z "$mem_set" ] ; then
-#Get memory setting size from user input
-  mem_size=`echo $mem_set | sed 's/-m[[:space:]] *//'`
-fi
-
-# This file is created when runqemu-gen-tapdevs creates a bank of tap
-# devices, indicating that the user should not bring up new ones using
-# sudo.
-NOSUDO_FLAG="/etc/runqemu-nosudo"
-
-QEMUIFUP=`which runqemu-ifup 2> /dev/null`
-QEMUIFDOWN=`which runqemu-ifdown 2> /dev/null`
-if [ -z "$QEMUIFUP" -o ! -x "$QEMUIFUP" ]; then
-       echo "runqemu-ifup cannot be found or executed"
-       exit 1
-fi
-if [ -z "$QEMUIFDOWN" -o ! -x "$QEMUIFDOWN" ]; then
-       echo "runqemu-ifdown cannot be found or executed"
-       exit 1
-fi
-
-NFSRUNNING="false"
-
-#capture original stty values
-ORIG_STTY=$(stty -g)
-
-if [ "$SLIRP_ENABLED" = "yes" ]; then
-    KERNEL_NETWORK_CMD="ip=dhcp"
-    QEMU_TAP_CMD=""
-    QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice tablet"
-    QEMU_NETWORK_CMD=""
-    DROOT="/dev/vda"
-    ROOTFS_OPTIONS="-drive file=$ROOTFS,if=virtio,format=raw"
-else
-        acquire_lock() {
-            lockfile=$1
-            if [ -z "$lockfile" ]; then
-                echo "Error: missing lockfile arg passed to acquire_lock()"
-                return 1
-            fi
-
-            touch $lockfile.lock 2>/dev/null
-            if [ $? -ne 0 ]; then
-                echo "Acquiring lockfile for $lockfile.lock failed"
-                return 1
-            fi
-            exec 8>$lockfile.lock
-            flock -n -x 8
-            if [ $? -ne 0 ]; then
-                exec 8>&-
-                return 1
-            fi
-
-            return 0
-        }
-
-        release_lock() {
-            lockfile=$1
-            if [ -z "$lockfile" ]; then
-                echo "Error: missing lockfile arg passed to release_lock()"
-                return 1
-            fi
-
-            rm -f $lockfile.lock
-            exec  8>&-
-        }
-
-        LOCKDIR="/tmp/qemu-tap-locks"
-        if [ ! -d "$LOCKDIR" ]; then
-            mkdir $LOCKDIR
-            chmod 777 $LOCKDIR
-        fi
-
-        IFCONFIG=`which ip 2> /dev/null`
-        if [ -z "$IFCONFIG" ]; then
-            IFCONFIG=/sbin/ip
-        fi
-        if [ ! -x "$IFCONFIG" ]; then
-               echo "$IFCONFIG cannot be executed"
-               exit 1
-        fi
-
-        POSSIBLE=`$IFCONFIG link | grep 'tap' | awk '{print $2}' | sed -e 's/://' -e 's/@.*//'`
-        TAP=""
-        LOCKFILE=""
-        USE_PRECONF_TAP="no"
-        for tap in $POSSIBLE; do
-            LOCKFILE="$LOCKDIR/$tap"
-            if [ -e "$LOCKFILE.skip" ]; then
-                echo "Found $LOCKFILE.skip, skipping $tap"
-                continue
-            fi
-            echo "Acquiring lockfile for $tap..."
-            acquire_lock $LOCKFILE
-            if [ $? -eq 0 ]; then
-                TAP=$tap
-                USE_PRECONF_TAP="yes"
-                break
-            fi
-        done
-
-        if [ "$TAP" = "" ]; then
-            if [ -e "$NOSUDO_FLAG" ]; then
-                echo "Error: There are no available tap devices to use for networking,"
-                echo "and I see $NOSUDO_FLAG exists, so I am not going to try creating"
-                echo "a new one with sudo."
-                exit 1
-            fi
-
-            GROUPID=`id -g`
-            USERID=`id -u`
-            echo "Setting up tap interface under sudo"
-            # Redirect stderr since we could see a LD_PRELOAD warning here if pseudo is loaded
-            # but inactive. This looks scary but is harmless
-            tap=`sudo $QEMUIFUP $USERID $GROUPID $OECORE_NATIVE_SYSROOT 2> /dev/null`
-            if [ $? -ne 0 ]; then
-                # Re-run standalone to see verbose errors
-                sudo $QEMUIFUP $USERID $GROUPID $OECORE_NATIVE_SYSROOT
-                return 1
-            fi
-            LOCKFILE="$LOCKDIR/$tap"
-            echo "Acquiring lockfile for $tap..."
-            acquire_lock $LOCKFILE
-            if [ $? -eq 0 ]; then
-                TAP=$tap
-            fi 
-        else
-            echo "Using preconfigured tap device '$TAP'"
-            echo "If this is not intended, touch $LOCKFILE.skip to make runqemu skip $TAP."
-        fi
-
-        cleanup() {
-            if [ ! -e "$NOSUDO_FLAG" -a "$USE_PRECONF_TAP" = "no" ]; then
-                # Redirect stderr since we could see a LD_PRELOAD warning here if pseudo is loaded
-                # but inactive. This looks scary but is harmless
-                sudo $QEMUIFDOWN $TAP $OECORE_NATIVE_SYSROOT 2> /dev/null
-            fi
-            echo "Releasing lockfile of preconfigured tap device '$TAP'"
-            release_lock $LOCKFILE
-
-            if [ "$NFSRUNNING" = "true" ]; then
-                echo "Shutting down the userspace NFS server..."
-                echo "runqemu-export-rootfs stop $ROOTFS"
-                runqemu-export-rootfs stop $ROOTFS
-            fi
-            # If QEMU crashes or somehow tty properties are not restored
-            # after qemu exits, we need to run stty sane
-            #stty sane
-
-            #instead of using stty sane we set the original stty values
-            stty ${ORIG_STTY}
-
-        }
-
-
-        n0=$(echo $TAP | sed 's/tap//')
-
-        case $n0 in
-            ''|*[!0-9]*)
-                echo "Error Couldn't turn $TAP into an interface number?"
-                exit 1
-                ;;
-        esac
-
-        n1=$(($n0 * 2 + 1))
-        n2=$(($n1 + 1))
-
-        KERNEL_NETWORK_CMD="ip=192.168.7.$n2::192.168.7.$n1:255.255.255.0"
-        QEMU_TAP_CMD="-net tap,vlan=0,ifname=$TAP,script=no,downscript=no"
-        if [ "$VHOST_ACTIVE" = "yes" ]; then
-            QEMU_NETWORK_CMD="-net nic,model=virtio $QEMU_TAP_CMD,vhost=on"
-        else
-            QEMU_NETWORK_CMD="-net nic,model=virtio $QEMU_TAP_CMD"
-        fi
-        DROOT="/dev/vda"
-        ROOTFS_OPTIONS="-drive file=$ROOTFS,if=virtio,format=raw"
-
-        KERNCMDLINE="mem=$QEMU_MEMORY"
-        QEMU_UI_OPTIONS="-show-cursor -usb -usbdevice tablet"
-
-        NFS_INSTANCE=`echo $TAP | sed 's/tap//'`
-        export NFS_INSTANCE
-
-        SERIALOPTS=""
-        if [ "x$SERIAL_LOGFILE" != "x" ]; then
-            SERIALOPTS="-serial file:$SERIAL_LOGFILE"
-        fi
-fi
-
-if [ ! -f "$KERNEL" -a "$IS_VM" = "false" ]; then
-    echo "Error: Kernel image file $KERNEL doesn't exist"
-    cleanup
-    return 1
-fi
-
-if [ "$FSTYPE" != "nfs" -a "$IS_VM" = "false" -a ! -f "$ROOTFS" ]; then
-    echo "Error: Image file $ROOTFS doesn't exist"
-    cleanup
-    return 1
-fi
-
-if [ "$NFS_SERVER" = "" ]; then
-    NFS_SERVER="192.168.7.1"
-    if [ "$SLIRP_ENABLED" = "yes" ]; then
-	NFS_SERVER="10.0.2.2"
-    fi
-fi
-
-if [ "$FSTYPE" = "nfs" ]; then
-    NFS_DIR=`echo $ROOTFS | sed 's/^[^:]*:\(.*\)/\1/'`
-    if [ "$NFS_INSTANCE" = "" ] ; then
-	NFS_INSTANCE=0
-    fi
-    MOUNTD_RPCPORT=$[ 21111 + $NFS_INSTANCE ]
-    NFSD_RPCPORT=$[ 11111 + $NFS_INSTANCE ]
-    NFSD_PORT=$[ 3049 + 2 * $NFS_INSTANCE ]
-    MOUNTD_PORT=$[ 3048 + 2 * $NFS_INSTANCE ]
-    UNFS_OPTS="nfsvers=3,port=$NFSD_PORT,mountprog=$MOUNTD_RPCPORT,nfsprog=$NFSD_RPCPORT,udp,mountport=$MOUNTD_PORT"
-
-    PSEUDO_LOCALSTATEDIR=~/.runqemu-sdk/pseudo
-    export PSEUDO_LOCALSTATEDIR
-
-    # Start the userspace NFS server
-    echo "runqemu-export-rootfs restart $ROOTFS"
-    runqemu-export-rootfs restart $ROOTFS
-    if [ $? != 0 ]; then
-        return 1
-    fi
-    NFSRUNNING="true"
-fi
-
-
-set_mem_size() {
-    if [ ! -z "$mem_set" ] ; then
-        #Get memory setting size from user input
-        mem_size=`echo $mem_set | sed 's/-m[[:space:]] *//'`
-    else
-        mem_size=$1
-    fi
-    # QEMU_MEMORY has 'M' appended to mem_size
-    QEMU_MEMORY="$mem_size"M
-
-}
-
-config_qemuarm() {
-    set_mem_size 128
-    QEMU=qemu-system-arm
-    MACHINE_SUBTYPE=versatilepb
-    export QEMU_AUDIO_DRV="none"
-    QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
-    if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" -o "$FSTYPE" = "wic" ]; then
-        KERNCMDLINE="root=$DROOT rw console=ttyAMA0,115200 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY highres=off"
-        QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} $ROOTFS_OPTIONS -no-reboot $QEMU_UI_OPTIONS"
-    fi
-    if [ "$FSTYPE" = "nfs" ]; then
-        if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then
-            echo "Error: NFS mount point $ROOTFS doesn't exist"
-            cleanup
-            return 1
-        fi
-        KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw console=ttyAMA0,115200 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
-        QEMUOPTIONS="$QEMU_NETWORK_CMD -M ${MACHINE_SUBTYPE} --no-reboot $QEMU_UI_OPTIONS"
-    fi
-    if [ "$MACHINE" = "qemuarmv6" ]; then
-        QEMUOPTIONS="$QEMUOPTIONS -cpu arm1136"
-    fi
-    if [ "$MACHINE" = "qemuarmv7" ]; then
-        QEMUOPTIONS="$QEMUOPTIONS -cpu cortex-a8"
-    fi
-}
-
-config_qemuarm64() {
-    set_mem_size 512
-    QEMU=qemu-system-aarch64
-
-    QEMU_NETWORK_CMD="-netdev tap,id=net0,ifname=$TAP,script=no,downscript=no -device virtio-net-device,netdev=net0 "
-    DROOT="/dev/vda"
-    ROOTFS_OPTIONS="-drive id=disk0,file=$ROOTFS,if=none,format=raw -device virtio-blk-device,drive=disk0"
-
-    export QEMU_AUDIO_DRV="none"
-    if [ "x$SERIALSTDIO" = "x" ] ; then
-        QEMU_UI_OPTIONS="-nographic"
-    else
-        QEMU_UI_OPTIONS=""
-    fi
-    if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" -o "$FSTYPE" = "wic" ]; then
-        KERNCMDLINE="root=$DROOT rw console=ttyAMA0,38400 mem=$QEMU_MEMORY highres=off $KERNEL_NETWORK_CMD"
-        # qemu-system-aarch64 only support '-machine virt -cpu cortex-a57' for now
-        QEMUOPTIONS="$QEMU_NETWORK_CMD -machine virt -cpu cortex-a57 $ROOTFS_OPTIONS $QEMU_UI_OPTIONS"
-    fi
-    if [ "$FSTYPE" = "nfs" ]; then
-        if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then
-            echo "Error: NFS mount point $ROOTFS doesn't exist"
-            cleanup
-            return 1
-        fi
-        KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw console=ttyAMA0,38400 mem=$QEMU_MEMORY highres=off $KERNEL_NETWORK_CMD"
-        QEMUOPTIONS="$QEMU_NETWORK_CMD -machine virt -cpu cortex-a57 $QEMU_UI_OPTIONS"
-    fi
-}
-
-config_qemux86() {
-    set_mem_size 256
-    QEMU=qemu-system-i386
-    if [ "$KVM_ACTIVE" = "yes" ]; then
-        CPU_SUBTYPE=kvm32
-    else
-        CPU_SUBTYPE=qemu32
-    fi
-    if [ ! -z "$vga_option" ]; then
-        QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
-    else
-        QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware"
-    fi
-    if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" -o "$FSTYPE" = "wic" ]; then
-        KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
-        QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE $ROOTFS_OPTIONS $QEMU_UI_OPTIONS"
-    fi
-    if [ "${FSTYPE:0:4}" = "cpio" ]; then
-        KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=/dev/ram0 rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
-        QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -initrd $ROOTFS $QEMU_UI_OPTIONS"
-    fi
-
-    if [ "$FSTYPE" = "nfs" ]; then
-        if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then
-            echo "Error: NFS mount point $ROOTFS doesn't exist."
-            cleanup
-            return 1
-        fi
-        KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
-        QEMUOPTIONS="$QEMU_NETWORK_CMD $QEMU_UI_OPTIONS"
-    fi
-    if [ "$IS_VM" = "true" ]; then
-        QEMUOPTIONS="$QEMU_NETWORK_CMD $QEMU_UI_OPTIONS"
-    fi
-    # Currently oprofile's event based interrupt mode doesn't work(Bug #828) in
-    # qemux86 and qemux86-64. We can use timer interrupt mode for now.
-    KERNCMDLINE="$KERNCMDLINE oprofile.timer=1"
-}
-
-config_qemux86_64() {
-    set_mem_size 256
-    QEMU=qemu-system-x86_64
-    if [ "$KVM_ACTIVE" = "yes" ]; then
-        CPU_SUBTYPE=kvm64
-    else
-        CPU_SUBTYPE=core2duo
-    fi
-    if [ ! -z "$vga_option" ]; then
-        QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
-    else
-        QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS -vga vmware"
-    fi
-    if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" -o "$FSTYPE" = "wic" ]; then
-        KERNCMDLINE="vga=0 uvesafb.mode_option=640x480-32 root=$DROOT rw mem=$QEMU_MEMORY $KERNEL_NETWORK_CMD"
-        QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE $ROOTFS_OPTIONS $QEMU_UI_OPTIONS"
-    fi
-    if [ "$FSTYPE" = "nfs" ]; then
-        if [ "x$ROOTFS" = "x" ]; then
-            ROOTFS=/srv/nfs/qemux86-64
-        fi
-        if [ ! -d "$ROOTFS" ]; then
-            echo "Error: NFS mount point $ROOTFS doesn't exist."
-            cleanup
-            return 1
-        fi
-        KERNCMDLINE="root=/dev/nfs nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
-        QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE $QEMU_UI_OPTIONS"
-    fi
-    if [ "$IS_VM" = "true" ]; then
-        QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE $QEMU_UI_OPTIONS"
-    fi
-    # Currently oprofile's event based interrupt mode doesn't work(Bug #828) in
-    # qemux86 and qemux86-64. We can use timer interrupt mode for now.
-    KERNCMDLINE="$KERNCMDLINE oprofile.timer=1"
-}
-
-config_qemumips() {
-    set_mem_size 256
-    case "$MACHINE" in
-       qemumips)   QEMU=qemu-system-mips ;;
-       qemumipsel) QEMU=qemu-system-mipsel ;;
-       qemumips64) QEMU=qemu-system-mips64 ;;
-    esac
-    MACHINE_SUBTYPE=malta
-    QEMU_UI_OPTIONS="-vga cirrus $QEMU_UI_OPTIONS"
-    if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" -o "$FSTYPE" = "wic" ]; then
-        #KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
-        KERNCMDLINE="root=$DROOT rw console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
-        QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE $ROOTFS_OPTIONS -no-reboot $QEMU_UI_OPTIONS"
-    fi
-    if [ "$FSTYPE" = "nfs" ]; then
-        if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then
-            echo "Error: NFS mount point $ROOTFS doesn't exist"
-            cleanup
-            return 1
-        fi
-        KERNCMDLINE="root=/dev/nfs console=ttyS0 console=tty nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
-        QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -no-reboot $QEMU_UI_OPTIONS"
-    fi
-}
-
-config_qemuppc() {
-    set_mem_size 256
-    QEMU=qemu-system-ppc
-    MACHINE_SUBTYPE=mac99
-    CPU_SUBTYPE=G4
-    QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
-    if [ "$SLIRP_ENABLED" = "yes" ]; then
-        QEMU_NETWORK_CMD=""
-    else
-        QEMU_NETWORK_CMD="-net nic,model=pcnet $QEMU_TAP_CMD"
-    fi
-    if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" -o "$FSTYPE" = "wic" ]; then
-        KERNCMDLINE="root=$DROOT rw console=ttyS0 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
-        QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE $ROOTFS_OPTIONS -no-reboot $QEMU_UI_OPTIONS"
-    fi
-    if [ "$FSTYPE" = "nfs" ]; then
-        if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then
-            echo "Error: NFS mount point $ROOTFS doesn't exist"
-            cleanup
-            return 1
-        fi
-        KERNCMDLINE="root=/dev/nfs console=ttyS0 console=tty nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
-        QEMUOPTIONS="$QEMU_NETWORK_CMD -cpu $CPU_SUBTYPE -M $MACHINE_SUBTYPE -no-reboot $QEMU_UI_OPTIONS"
-    fi
-}
-
-config_qemush4() {
-    set_mem_size 1024
-    QEMU=qemu-system-sh4
-    MACHINE_SUBTYPE=r2d
-    QEMU_UI_OPTIONS="$QEMU_UI_OPTIONS"
-    if [ "${FSTYPE:0:3}" = "ext" -o "$FSTYPE" = "btrfs" -o "$FSTYPE" = "wic" ]; then
-        #KERNCMDLINE="root=/dev/hda console=ttyS0 console=tty0 $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
-        KERNCMDLINE="root=/dev/hda rw console=ttySC1 noiotrap earlyprintk=sh-sci.1 console=tty $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
-        QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -hda $ROOTFS -no-reboot $QEMU_UI_OPTIONS -monitor null -serial vc -serial stdio"
-        SERIALSTDIO="1"
-    fi
-    if [ "$FSTYPE" = "nfs" ]; then
-        if [ "$NFS_SERVER" = "192.168.7.1" -a ! -d "$NFS_DIR" ]; then
-            echo "Error: NFS mount point $ROOTFS doesn't exist"
-            cleanup
-            return 1
-        fi
-        KERNCMDLINE="root=/dev/nfs console=ttySC1 noiotrap earlyprintk=sh-sci.1 console=tty nfsroot=$NFS_SERVER:$NFS_DIR,$UNFS_OPTS rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
-        QEMUOPTIONS="$QEMU_NETWORK_CMD -M $MACHINE_SUBTYPE -no-reboot $QEMU_UI_OPTIONS -monitor null -serial vc -serial stdio"
-        SERIALSTDIO="1"
-    fi
-}
-
-config_qemuzynq() {
-    set_mem_size 1024
-    QEMU=qemu-system-arm
-    QEMU_NETWORK_CMD="-net nic -net nic $QEMU_TAP_CMD"
-    QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M xilinx-zynq-a9 -serial null -serial mon:stdio -nographic -dtb $KERNEL-$MACHINE.dtb"
-    # zynq serial ports are named 'ttyPS0' and 'ttyPS1', fixup the default values
-    SCRIPT_KERNEL_OPT=$(echo "$SCRIPT_KERNEL_OPT" | sed 's/console=ttyS/console=ttyPS/g')
-    if [ "${FSTYPE:0:3}" = "ext" -o "${FSTYPE:0:4}" = "cpio" ]; then
-        KERNCMDLINE="earlyprintk root=/dev/ram rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
-        QEMUOPTIONS="$QEMU_SYSTEM_OPTIONS -initrd $ROOTFS"
-    fi
-}
-
-config_qemuzynqmp() {
-    set_mem_size 2048
-    QEMU=qemu-system-aarch64
-
-    export QEMU_AUDIO_DRV="none"
-    if [ "x$SERIALSTDIO" = "x" ] ; then
-        QEMU_UI_OPTIONS="-nographic"
-    else
-        QEMU_UI_OPTIONS=""
-    fi
-
-    # Networking and system options required for QEMU ZynqMP machine
-    QEMU_NETWORK_CMD="-net nic -net nic -net nic -net nic -net user,net=10.10.70.0,dhcpstart=10.10.70.1,host=10.10.70.101"
-    QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M xlnx-ep108 -serial mon:stdio -dtb $DEPLOY_DIR_IMAGE/${QEMU_DTB}.dtb"
-
-    QEMUOPTIONS="$QEMU_SYSTEM_OPTIONS $QEMU_UI_OPTIONS -initrd $ROOTFS"
-}
-
-config_qemumicroblaze() {
-    set_mem_size 256
-    QEMU=qemu-system-microblazeel
-    QEMU_SYSTEM_OPTIONS="$QEMU_NETWORK_CMD -M petalogix-ml605 -serial mon:stdio"
-    if [ "${FSTYPE:0:3}" = "ext" -o "${FSTYPE:0:4}" = "cpio" ]; then
-        KERNCMDLINE="earlyprintk root=/dev/ram rw $KERNEL_NETWORK_CMD mem=$QEMU_MEMORY"
-        QEMUOPTIONS="$QEMU_SYSTEM_OPTIONS -initrd $ROOTFS"
-    fi
-}
-
-case "$MACHINE" in
-    "qemuarm" | "qemuarmv6" | "qemuarmv7")
-        config_qemuarm
-        ;;
-    "qemuarm64")
-        config_qemuarm64
-        ;;
-    "qemux86")
-        config_qemux86
-        ;;
-    "qemux86-64")
-        config_qemux86_64
-        ;;
-    "qemumips" | "qemumipsel" | "qemumips64")
-        config_qemumips
-        ;;
-    "qemuppc")
-        config_qemuppc
-        ;;
-    "qemush4")
-        config_qemush4
-        ;;
-    "qemuzynq")
-        config_qemuzynq
-        ;;
-    "qemuzynqmp")
-        config_qemuzynqmp
-        ;;
-    "qemumicroblaze")
-        config_qemumicroblaze
-        ;;
-    *)
-        echo "Error: Unsupported machine type $MACHINE"
-        return 1
-    ;;
-esac
-
-# We need to specify -m <mem_size> to overcome a bug in qemu 0.14.0
-# https://bugs.launchpad.net/ubuntu/+source/qemu-kvm/+bug/584480
-if [ -z "$mem_set" ] ; then
-  SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT -m $mem_size"
-fi
-
-if [ "${FSTYPE:0:3}" = "ext" ]; then
-    KERNCMDLINE="$KERNCMDLINE rootfstype=$FSTYPE"
-fi
-
-if [ "$FSTYPE" = "cpio.gz" ]; then
-    QEMUOPTIONS="-initrd $ROOTFS -nographic"
-    KERNCMDLINE="root=/dev/ram0 console=ttyS0 debugshell"
-fi
-
-if [ "$FSTYPE" = "iso" ]; then
-    QEMUOPTIONS="$QEMU_NETWORK_CMD -cdrom $ROOTFS $QEMU_UI_OPTIONS"
-fi
-
-if [ "x$QEMUOPTIONS" = "x" ]; then
-    echo "Error: Unable to support this combination of options"
-    cleanup
-    return 1
-fi
-
-if [ "$TCPSERIAL_PORTNUM" != "" ]; then
-    if [ "$MACHINE" = "qemuarm64" ]; then
-        SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT -device virtio-serial-device -chardev socket,id=virtcon,port=$TCPSERIAL_PORTNUM,host=127.0.0.1 -device virtconsole,chardev=virtcon"
-    else
-        SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT -serial tcp:127.0.0.1:$TCPSERIAL_PORTNUM"
-    fi
-fi
-
-PATH=$OECORE_NATIVE_SYSROOT/usr/bin:$PATH
-
-QEMUBIN=`which $QEMU 2> /dev/null`
-if [ ! -x "$QEMUBIN" ]; then
-    echo "Error: No QEMU binary '$QEMU' could be found."
-    cleanup
-    return 1
-fi
-
-NEED_GL=`ldd $QEMUBIN/$QEMU 2>&1 | grep libGLU`
-# We can't run without a libGL.so
-if [ "$NEED_GL" != "" ]; then
-    libgl='no'
-
-    [ -e /usr/lib/libGL.so -a -e /usr/lib/libGLU.so ] && libgl='yes'
-    [ -e /usr/lib64/libGL.so -a -e /usr/lib64/libGLU.so ] && libgl='yes'
-    [ -e /usr/lib/*-linux-gnu/libGL.so -a -e /usr/lib/*-linux-gnu/libGLU.so ] && libgl='yes'
-
-    if [ "$libgl" != 'yes' ]; then
-        echo "You need libGL.so and libGLU.so to exist in your library path to run the QEMU emulator.
-        Ubuntu package names are: libgl1-mesa-dev and libglu1-mesa-dev.
-        Fedora package names are: mesa-libGL-devel mesa-libGLU-devel."
-        return 1;
-    fi
-fi
-
-do_quit() {
-    cleanup
-    return 1
-}
-
-trap do_quit INT TERM QUIT
-
-# qemu got segfault if linked with nVidia's libgl
-GL_LD_PRELOAD=$LD_PRELOAD
-
-if ldd $QEMUBIN | grep -i nvidia &> /dev/null
-then
-cat << EOM
-WARNING: nVidia proprietary OpenGL libraries detected.
-nVidia's OpenGL libraries are known to have compatibility issues with qemu,
-resulting in a segfault. Please uninstall these drivers or ensure the mesa libGL
-libraries precede nvidia's via LD_PRELOAD(Already do it on Ubuntu 10).
-EOM
-
-# Automatically use Ubuntu system's mesa libGL, other distro can add its own path
-if grep -i ubuntu /etc/lsb-release &> /dev/null
-then
-    # precede nvidia's driver on Ubuntu 10
-    UBUNTU_MAIN_VERSION=`cat /etc/lsb-release |grep DISTRIB_RELEASE |cut -d=  -f 2| cut -d. -f 1`
-    if [ "$UBUNTU_MAIN_VERSION" = "10" ];
-    then
-        GL_PATH=""
-        if test -e /usr/lib/libGL.so
-        then 
-            GL_PATH="/usr/lib/libGL.so"
-        elif test -e /usr/lib/x86_64-linux-gnu/libGL.so
-        then
-            GL_PATH="/usr/lib/x86_64-linux-gnu/libGL.so"
-        fi
-
-        echo "Skip nVidia's libGL on Ubuntu 10!"
-        GL_LD_PRELOAD="$GL_PATH $LD_PRELOAD"
-    fi
-fi
-fi
-
-if [ "x$SERIALSTDIO" = "x1" ]; then
-        echo "Interrupt character is '^]'"
-        stty intr ^]
-fi
-
-
-# Preserve the multiplexing behavior for the monitor that would be there based
-# on whether nographic is used.
-if echo "$QEMUOPTIONS $SERIALOPTS $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT" | grep -- "-nographic"; then
-    FIRST_SERIAL_OPT="-serial mon:stdio"
-else
-    FIRST_SERIAL_OPT="-serial mon:vc"
-fi
-
-# qemuarm64 uses virtio for any additional serial ports so the normal mechanism
-# of using -serial will not work
-if [ "$MACHINE" = "qemuarm64" ]; then
-    SECOND_SERIAL_OPT="-device virtio-serial-device -chardev null,id=virtcon -device virtconsole,chardev=virtcon"
-else
-    SECOND_SERIAL_OPT="-serial null"
-fi
-
-# We always want a ttyS1. Since qemu by default adds a serial port when
-# nodefaults is not specified, it seems that all that would be needed is to
-# make sure a "-serial" is there. However, it appears that when "-serial" is
-# specified, it ignores the default serial port that is normally added.
-# So here we make sure to add two -serial if there are none. And only one
-# if there is one -serial already.
-NUM_SERIAL_OPTS=`echo $QEMUOPTIONS $SERIALOPTS $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT | sed -e 's/ /\n/g' | grep --count -- -serial`
-
-if [ "$NUM_SERIAL_OPTS" = "0" ]; then
-    SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT $FIRST_SERIAL_OPT $SECOND_SERIAL_OPT"
-elif [ "$NUM_SERIAL_OPTS" = "1" ]; then
-    SCRIPT_QEMU_EXTRA_OPT="$SCRIPT_QEMU_EXTRA_OPT $SECOND_SERIAL_OPT"
-fi
-
-echo "Running $QEMU..."
-# -no-reboot is a mandatory option - see bug #100
-if [ "$IS_VM" = "true" ]; then
-    # Check root=/dev/sdX or root=/dev/vdX
-    [ ! -e "$VM" ] && error "VM image is not found!"
-
-    case "$FORCE_DRIVE_IF" in
-        "ide")
-            echo "Using ide drive"
-            VM_DRIVE="$VM"
-	    ;;
-	"scsi")
-            echo "Using scsi drive"
-            VM_DRIVE="-drive if=none,id=hd,file=$VM -device virtio-scsi-pci,id=scsi -device scsi-hd,drive=hd"
-	    ;;
-	"virtio")
-            echo "Using virtio block drive"
-            VM_DRIVE="-drive if=virtio,file=$VM"
-	    ;;
-	"")
-            if grep -q 'root=/dev/sd' $VM; then
-                echo "Using scsi drive"
-                VM_DRIVE="-drive if=none,id=hd,file=$VM -device virtio-scsi-pci,id=scsi -device scsi-hd,drive=hd"
-            elif grep -q 'root=/dev/hd' $VM; then
-                echo "Using ide drive"
-                VM_DRIVE="$VM"
-            else
-                echo "Using virtio block drive"
-                VM_DRIVE="-drive if=virtio,file=$VM"
-            fi
-	    ;;
-	*)
-	    error "Invalid drive interface: $FORCE_DRIVE_IF"
-        ;;
-    esac
-
-    QEMU_FIRE="$QEMUBIN $VM_DRIVE $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT"
-    echo $QEMU_FIRE
-    LD_PRELOAD="$GL_LD_PRELOAD" $QEMU_FIRE
-elif [ "$FSTYPE" = "iso" -o "$FSTYPE" = "wic" ]; then
-    QEMU_FIRE="$QEMUBIN $QEMUOPTIONS $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT"
-    echo $QEMU_FIRE
-    LD_PRELOAD="$GL_LD_PRELOAD" $QEMU_FIRE
-else
-    QEMU_FIRE="$QEMUBIN -kernel $KERNEL $QEMUOPTIONS $SLIRP_CMD $SERIALOPTS -no-reboot $SCRIPT_QEMU_OPT $SCRIPT_QEMU_EXTRA_OPT"
-    echo $QEMU_FIRE -append '"'$KERNCMDLINE $SCRIPT_KERNEL_OPT'"'
-    LD_PRELOAD="$GL_LD_PRELOAD" $QEMU_FIRE -append "$KERNCMDLINE $SCRIPT_KERNEL_OPT"
-fi
-ret=$?
-if [ "$SLIRP_ENABLED" != "yes" ]; then
-        cleanup
-fi
-
-#set the original stty values before exit
-stty ${ORIG_STTY}
-trap - INT TERM QUIT
-
-return $ret
diff --git a/meta-sota/scripts/runqemu.README b/meta-sota/scripts/runqemu.README
deleted file mode 100644
index 5908d83..0000000
--- a/meta-sota/scripts/runqemu.README
+++ /dev/null
@@ -1,42 +0,0 @@
-Using OE images with QEMU
-=========================
-
-OE-Core can generate qemu bootable kernels and images with can be used 
-on a desktop system. The scripts currently support booting ARM, MIPS, PowerPC
-and x86 (32 and 64 bit) images. The scripts can be used within the OE build 
-system or externaly.
-
-The runqemu script is run as: 
-
-   runqemu <machine> <zimage> <filesystem>
-
-where:
-
-   <machine> is the machine/architecture to use (qemuarm/qemumips/qemuppc/qemux86/qemux86-64)
-   <zimage> is the path to a kernel (e.g. zimage-qemuarm.bin)
-   <filesystem> is the path to an ext2 image (e.g. filesystem-qemuarm.ext2) or an nfs directory
-   
-If <machine> isn't specified, the script will try to detect the machine name 
-from the name of the <zimage> file.
-
-If <filesystem> isn't specified, nfs booting will be assumed.
-
-When used within the build system, it will default to qemuarm, ext2 and the last kernel and 
-core-image-sato-sdk image built by the build system. If an sdk image isn't present it will look
-for sato and minimal images.
-
-Full usage instructions can be seen by running the command with no options specified.
-
-
-Notes
-=====
-
- - The scripts run qemu using sudo. Change perms on /dev/net/tun to 
-   run as non root. The runqemu-gen-tapdevs script can also be used by
-   root to prepopulate the appropriate network devices.
- - You can access the host computer at 192.168.7.1 within the image.
- - Your qemu system will be accessible as 192.16.7.2.
- - The script extracts the root filesystem specified under pseudo and sets up a userspace
-   NFS server to share the image over by default meaning the filesystem can be accessed by
-   both the host and guest systems.
-
diff --git a/templates/feature/agl-sota/50_bblayers.conf.inc b/templates/feature/agl-sota/50_bblayers.conf.inc
deleted file mode 100644
index 0a5440b..0000000
--- a/templates/feature/agl-sota/50_bblayers.conf.inc
+++ /dev/null
@@ -1,7 +0,0 @@
-BBLAYERS =+ " \
-	${METADIR}/meta-agl-extra/meta-sota \
-	${METADIR}/meta-openembedded/meta-filesystems \
-	${METADIR}/meta-openembedded/meta-ruby \
-	${METADIR}/meta-rust \
-	"
-
diff --git a/templates/feature/agl-sota/50_local.conf.inc b/templates/feature/agl-sota/50_local.conf.inc
deleted file mode 100644
index b361016..0000000
--- a/templates/feature/agl-sota/50_local.conf.inc
+++ /dev/null
@@ -1,2 +0,0 @@
-#see meta-agl-extra/meta-sota/conf/include/agl-sota.inc
-require conf/include/agl-sota.inc