Switch to Yocto Thud branch

23 files changed, 220 insertions, 130 deletions

diff --git a/.gitignore b/.gitignore
index 4f450dc..9c02cf7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ buildhistory
 env-oe.sh
 layers/user-layer
 bitbake.lock
+password.txt
diff --git a/.gitmodules b/.gitmodules
index 53d4ff0..5854f11 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,31 +1,49 @@
 [submodule "bitbake"]
-	path = bitbake
-	url = git://git.openembedded.org/bitbake
-        branch = 1.32
+        path = bitbake
+        url = git://git.openembedded.org/bitbake
+        branch = 1.40
 [submodule "layers/openembedded-core"]
-	path = layers/openembedded-core
-	url = git://git.multitech.net/openembedded-core
-        branch = morty
+        path = layers/openembedded-core
+        url = git://git.openembedded.org/openembedded-core
+        branch = thud
 [submodule "layers/meta-openembedded"]
-	path = layers/meta-openembedded
-	url = git://git.openembedded.org/meta-openembedded
-        branch = morty
+        path = layers/meta-openembedded
+        url = git://git.openembedded.org/meta-openembedded
+        branch = thud
 [submodule "layers/meta-multitech"]
-	path = layers/meta-multitech
+ 	path = layers/meta-multitech
 	url = git://git.multitech.net/meta-multitech.git
 	branch = .
+[submodule "layers/meta-multitech-atmel"]
+    path = layers/meta-multitech-atmel
+	url = git://git.multitech.net/meta-multitech-atmel.git
+	branch = .
 [submodule "layers/meta-java"]
-	path = layers/meta-java
+ 	path = layers/meta-java
 	url = git://git.yoctoproject.org/meta-java
 [submodule "layers/meta-nodejs"]
-	path = layers/meta-nodejs
-	url = https://github.com/imyller/meta-nodejs.git
-        branch = morty
+    path = layers/meta-nodejs
+    url = https://github.com/imyller/meta-nodejs.git
+    branch = morty
 [submodule "layers/meta-mono"]
-	path = layers/meta-mono
+    path = layers/meta-mono
 	url = git://git.yoctoproject.org/meta-mono
-        branch = morty
+    branch = thud
 [submodule "layers/meta-mlinux"]
 	path = layers/meta-mlinux
 	url = git://git.multitech.net/meta-mlinux.git
-        branch = .
+    branch = .
+[submodule "layers/meta-mlinux-atmel"]
+	path = layers/meta-mlinux-atmel
+	url = git://git.multitech.net/meta-mlinux-atmel.git
+    branch = .
+[submodule "layers/meta-selinux"]
+	path = layers/meta-selinux
+	url = git://git.yoctoproject.org/meta-selinux
+        branch = thud
+[submodule "layers/meta-swupdate"]
+	path = layers/meta-swupdate
+	url = https://github.com/sbabic/meta-swupdate
+[submodule "layers/meta-virtualization"]
+	path = layers/meta-virtualization
+	url = git://git.yoctoproject.org/meta-virtualization
diff --git a/README b/README
index 5c74b6c..159fffd 100644
--- a/README
+++ b/README
@@ -6,8 +6,8 @@ MultiConnect Conduit products (MTCDT models).
 

 mLinux utilizes OpenEmbedded-Core, Bitbake, which are part of the Yocto Project.

 

-mLinux currently uses Yocto branch Morty and Atmel Linux

-4.9.87.  This is mLinux 5.x.y

+This branch is based on Yocto Thud.  MTCDT3 is based on kernel 4.19.

+non-MTCDT3 is based on Linux-AT91 4.9.  mLinux 5.3+.y

 

 For more information about mLinux, see http://www.multitech.net

 

diff --git a/conf/bblayers.conf.mlinux b/conf/bblayers.conf.mlinux
index 7590fe9..1150884 100644
--- a/conf/bblayers.conf.mlinux
+++ b/conf/bblayers.conf.mlinux
@@ -4,12 +4,13 @@ BBFILES ?= ""
 BBLAYERS = " \
 			__OEROOT__/layers/user-layer \
 			__OEROOT__/layers/meta-mlinux \
+			__OEROOT__/layers/meta-mlinux-atmel \
 			__OEROOT__/layers/meta-multitech \
+			__OEROOT__/layers/meta-multitech-atmel \
 			__OEROOT__/layers/meta-mono \
 			__OEROOT__/layers/meta-nodejs \
 			__OEROOT__/layers/meta-java \
 			__OEROOT__/layers/meta-openembedded/meta-oe \
-			__OEROOT__/layers/meta-openembedded/meta-ruby \
 			__OEROOT__/layers/meta-openembedded/meta-perl \
 			__OEROOT__/layers/meta-openembedded/meta-python \
 			__OEROOT__/layers/meta-openembedded/meta-networking \
diff --git a/conf/bblayers.conf.sample b/conf/bblayers.conf.sample
index 26f2e46..a8e65be 100644
--- a/conf/bblayers.conf.sample
+++ b/conf/bblayers.conf.sample
@@ -5,12 +5,13 @@ BBFILES ?= ""
 BBLAYERS = " \
 			${TOPDIR}/layers/user-layer \
 			${TOPDIR}/layers/meta-mlinux \
+			${TOPDIR}/layers/meta-mlinux-atmel \
 			${TOPDIR}/layers/meta-multitech \
+			${TOPDIR}/layers/meta-multitech-atmel \
 			${TOPDIR}/layers/meta-mono \
 			${TOPDIR}/layers/meta-nodejs \
 			${TOPDIR}/layers/meta-java \
 			${TOPDIR}/layers/meta-openembedded/meta-oe \
-			${TOPDIR}/layers/meta-openembedded/meta-ruby \
 			${TOPDIR}/layers/meta-openembedded/meta-perl \
 			${TOPDIR}/layers/meta-openembedded/meta-networking \
 			${TOPDIR}/layers/meta-openembedded/meta-webserver \
diff --git a/conf/local.conf.sample b/conf/local.conf.sample
index 1e83060..f798315 100644
--- a/conf/local.conf.sample
+++ b/conf/local.conf.sample
@@ -1,5 +1,5 @@
 # CONF_VERSION is increased each time build/conf/ changes incompatibly
-CONF_VERSION = "1"
+CONF_VERSION = "2"
 
 # Use MultiTech mLinux distribution
 DISTRO = "mlinux"
diff --git a/layers/meta-java b/layers/meta-java
-Subproject a265b31ec7d022be254abdf959360a762420858
+Subproject b0c74493af1415dfd3b6caf77ebc677ed4e0fda
diff --git a/layers/meta-mlinux b/layers/meta-mlinux
-Subproject db088915be6dca3f09dedbcdaa7264d9271b1c7
+Subproject 304f86223b3c595c3b8e61fb5cd111a6e495e9a
diff --git a/layers/meta-mlinux-atmel b/layers/meta-mlinux-atmel
new file mode 160000
+Subproject d75cc859d0009649aa5c97731933b50ba48231b
diff --git a/layers/meta-mono b/layers/meta-mono
-Subproject b8e5da7138c61fb9ade87712a2fc28dc6283ab2
+Subproject 7a1e79ec48508edc19a33e8df567c49d0be3eb8
diff --git a/layers/meta-multitech b/layers/meta-multitech
-Subproject 8b1dc0f25f61f60f8813ca6ff60469a5db3408f
+Subproject c4ea765062db2380cfd0327ccefe00f3848ce76
diff --git a/layers/meta-multitech-atmel b/layers/meta-multitech-atmel
new file mode 160000
+Subproject 4bb6f26b05450777d14aa96e10783066c2503dc
diff --git a/layers/meta-openembedded b/layers/meta-openembedded
-Subproject fe5c83312de11e80b85680ef237f8acb04b4b26
+Subproject 446bd615fd7cb9bc7a159fe5c2019ed08d1a7a9
diff --git a/layers/meta-virtualization b/layers/meta-virtualization
new file mode 160000
+Subproject 7685c7d415e0002c448007960837ae8898cd57a
diff --git a/layers/openembedded-core b/layers/openembedded-core
-Subproject ddf907ca95a19f54785079b4396935273b3747f
+Subproject f162d5bfe6eaeca24f441c83c87252c8d05744f
diff --git a/oe-init-build-env b/oe-init-build-env
index 4a6b304..38d44aa 100755
--- a/oe-init-build-env
+++ b/oe-init-build-env
@@ -53,12 +53,15 @@ export OEROOT
 . $OEROOT/scripts/oe-buildenv-internal
 buildenv=$?
 
+declare -a WlAdditions=("OEROOT" "MTIMG" "SDMFG" "SDFMT" "TI_SECURE_DEV_PKG" "TI_SECURE_DEV_PKG_CAT")
 
-if [ "$(echo "$BB_ENV_EXTRAWHITE" | sed -re 's/[ \t]+/\n/g' | egrep '^OEROOT$')" != "OEROOT" ] ; then
-    echo $BB_ENV_EXTRAWHITE needs correction
-    BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE OEROOT"
-    export BB_ENV_EXTRAWHITE
-fi
+for entry in ${WlAdditions[@]}; do
+    if [ "$(echo "$BB_ENV_EXTRAWHITE" | sed -re 's/[ \t]+/\n/g' | egrep ''^$entry'')" != "$entry" ] ; then
+        echo $BB_ENV_EXTRAWHITE needs correction
+        BB_ENV_EXTRAWHITE="$BB_ENV_EXTRAWHITE $entry"
+        export BB_ENV_EXTRAWHITE
+    fi
+done
 
 [ $buildenv -eq 0 ] &&
     TEMPLATECONF="$TEMPLATECONF" $OEROOT/scripts/oe-setup-builddir || {
@@ -74,13 +77,3 @@ if [ -z "$BBSERVER" ] && [ -f bitbake.lock ]; then
         BBSERVER=$(cat bitbake.lock) bitbake -m
     fi
 fi
-if ! [[ -x ../setkernelversion.sh ]] ; then
-   echo "expect to find ../setkernelversion.sh"
-   echo "Name of .. directory $(cd ..;pwd)"
-   echo "found these files in ..:"
-   ls ..
-   if ! return 1 2>/dev/null ; then
-	exit 1
-   fi
-fi   
-../setkernelversion.sh
diff --git a/patches/dont_use_network_on_unpack_of_tag.patch b/patches/dont_use_network_on_unpack_of_tag.patch
new file mode 100644
index 0000000..562e532
--- /dev/null
+++ b/patches/dont_use_network_on_unpack_of_tag.patch
@@ -0,0 +1,95 @@
+diff --git a/bitbake/lib/bb/fetch2/git.py b/bitbake/lib/bb/fetch2/git.py
+index 59a2ee8f..03611804 100644
+--- a/bitbake/lib/bb/fetch2/git.py
++++ b/bitbake/lib/bb/fetch2/git.py
+@@ -141,6 +141,19 @@ class Git(FetchMethod):
+     def supports_checksum(self, urldata):
+         return False
+ 
++    # git HASH verification code (is the REV a hash or not)
++    def bad_git_hash(self, revision):
++        if not revision or len(revision) != 40 or (False in [c in "abcdef0123456789" for c in revision]):
++            if not revision:
++                bb.note("bad_git_hash: SRCREV is not a defined string")
++            elif len(revision) != 40:
++                bb.debug(2,"bad_git_hash: revision len is not 40: " + str(len(revision)))
++                bb.debug(2,"bad_git_hash: revision dump: %s" % ":".join("{:02x}".format(ord(c)) for c in revision))
++            else:
++                bb.debug(2,"bad_git_hash: revision bad char: %s" % ":".join("{:02x}".format(ord(c)) for c in revision))
++            return True
++        return False
++
+     def urldata_init(self, ud, d):
+         """
+         init git specific variable within url data
+@@ -241,16 +254,52 @@ class Git(FetchMethod):
+ 
+         ud.setup_revisions(d)
+ 
++        # EARLY_GITSRCNAME start
++        gitsrcname = '%s%s' % (ud.host.replace(':', '.'), ud.path.replace('/', '.').replace('*', '.'))
++        if gitsrcname.startswith('.'):
++            gitsrcname = gitsrcname[1:]
++        # EARLY_GITSRCNAME end
++
++        # EARLY_GITDIR start
++        dl_dir = d.getVar("DL_DIR")
++        gitdir = d.getVar("GITDIR") or (dl_dir + "/git2")
++        ud.clonedir = os.path.join(gitdir, gitsrcname)
++        ud.localfile = ud.clonedir
++        # EARLY_GITDIR end
++
+         for name in ud.names:
+             # Ensure anything that doesn't look like a sha256 checksum/revision is translated into one
+-            if not ud.revisions[name] or len(ud.revisions[name]) != 40  or (False in [c in "abcdef0123456789" for c in ud.revisions[name]]):
++            # First try the local repository
++            if self.bad_git_hash(ud.revisions[name]):
+                 if ud.revisions[name]:
+                     ud.unresolvedrev[name] = ud.revisions[name]
+-                ud.revisions[name] = self.latest_revision(ud, d, name)
+-
+-        gitsrcname = '%s%s' % (ud.host.replace(':', '.'), ud.path.replace('/', '.').replace('*', '.'))
+-        if gitsrcname.startswith('.'):
+-            gitsrcname = gitsrcname[1:]
++                    if len(ud.revisions[name]) != 0:
++                        # Assume this is a tag, and retrieve hash from local source,
++                        # if possible.  Deviation from openembedded, which goes to
++                        # remote source for tags.
++                        cmd = "%s rev-parse %s^{}" % (ud.basecmd, ud.revisions[name])
++                        savedrev = ud.revisions[name]
++                        if os.path.isdir(ud.localfile):
++                            try:
++                                # Validate local git repository
++                                cmd = "%s --bare fsck --no-full" % (ud.basecmd)
++                                runfetchcmd(cmd,d,workdir=ud.localfile)
++                                # Valid repository, so see if we can get the hash
++                                cmd = "%s rev-parse %s^{}" % (ud.basecmd, ud.revisions[name])
++                                ud.revisions[name] = runfetchcmd(cmd,d,workdir=ud.localfile).rstrip()
++                            except bb.fetch.FetchError:
++                                bb.note("do_fetch: removing invalid git file system: " + ud.localfile)
++                                cmd = "rm -rf " + ud.localfile + ";rm -f " + ud.localfile + ".done"
++                                ud.revisions[name] = savedrev
++
++                if self.bad_git_hash(ud.revisions[name]):
++                    ud.revisions[name] = self.latest_revision(ud, d, name)
++
++        bb.debug(2,"urldata_init: ud.revisions[name] " + ud.revisions[name])
++        bb.debug(2,"urldata_init: ud.host " + ud.host)
++        bb.debug(2,"urldata_init: ud.path " + ud.path)
++
++        # gitsrcname code purposely moved to EARLY_GITSRCNAME
+ 
+         # for rebaseable git repo, it is necessary to keep mirror tar ball
+         # per revision, so that even the revision disappears from the
+@@ -260,10 +309,7 @@ class Git(FetchMethod):
+             for name in ud.names:
+                 gitsrcname = gitsrcname + '_' + ud.revisions[name]
+ 
+-        dl_dir = d.getVar("DL_DIR")
+-        gitdir = d.getVar("GITDIR") or (dl_dir + "/git2")
+-        ud.clonedir = os.path.join(gitdir, gitsrcname)
+-        ud.localfile = ud.clonedir
++        # gitdir/clonedir/localfile purposely moved to EARLY_GITDIR
+ 
+         mirrortarball = 'git2_%s.tar.gz' % gitsrcname
+         ud.fullmirror = os.path.join(dl_dir, mirrortarball)
diff --git a/patches/git-branch-set-upstream-to.patch b/patches/git-branch-set-upstream-to.patch
deleted file mode 100644
index a4c9996..0000000
--- a/patches/git-branch-set-upstream-to.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-# set-upstream was removed from git in change 52668846ea2d41ffbd87cda7cb8e492dea9f2c4d
-# on 2017-08-17 and first introduced in 2.15.0:
-# https://git.kernel.org/pub/scm/git/git.git/commit/?h=v2.15.0&id=52668846ea2d41ffbd87cda7cb8e492dea9f2c4d
-diff -Naru orig/bitbake/lib/bb/fetch2/git.py new/bitbake/lib/bb/fetch2/git.py
---- orig/bitbake/lib/bb/fetch2/git.py	2018-01-05 12:57:04.963756203 -0600
-+++ new/bitbake/lib/bb/fetch2/git.py	2018-01-05 12:57:32.419755391 -0600
-@@ -327,7 +327,7 @@
-                 branchname =  ud.branches[ud.names[0]]
-                 runfetchcmd("%s checkout -B %s %s" % (ud.basecmd, branchname, \
-                             ud.revisions[ud.names[0]]), d, workdir=destdir)
--                runfetchcmd("%s branch --set-upstream %s origin/%s" % (ud.basecmd, branchname, \
-+                runfetchcmd("%s branch --set-upstream-to origin/%s" % (ud.basecmd, \
-                             branchname), d, workdir=destdir)
-             else:
-                 runfetchcmd("%s checkout %s" % (ud.basecmd, ud.revisions[ud.names[0]]), d, workdir=destdir)
diff --git a/patches/kernel-revision-ext-mod.patch b/patches/kernel-revision-ext-mod.patch
new file mode 100644
index 0000000..c7da73c
--- /dev/null
+++ b/patches/kernel-revision-ext-mod.patch
@@ -0,0 +1,25 @@
+diff -Naru orig/layers/openembedded-core/meta/classes/kernel-module-split.bbclass new/layers/openembedded-core/meta/classes/kernel-module-split.bbclass
+--- orig/layers/openembedded-core/meta/classes/kernel-module-split.bbclass	2020-07-13 17:38:32.148762374 -0500
++++ new/layers/openembedded-core/meta/classes/kernel-module-split.bbclass	2020-07-13 17:36:27.740764540 -0500
+@@ -33,7 +33,7 @@
+ KERNEL_MODULES_META_PACKAGE ?= "${@ d.getVar("KERNEL_PACKAGE_NAME") or "kernel" }-modules"
+ 
+ KERNEL_MODULE_PACKAGE_PREFIX ?= ""
+-KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${KERNEL_VERSION}"
++KERNEL_MODULE_PACKAGE_SUFFIX ?= "-${KERNEL_VERSION}${KERNEL_REVISION}"
+ KERNEL_MODULE_PROVIDE_VIRTUAL ?= "1"
+ 
+ python split_kernel_module_packages () {
+diff -Naru orig/layers/openembedded-core/meta/classes/module-base.bbclass new/layers/openembedded-core/meta/classes/module-base.bbclass
+--- orig/layers/openembedded-core/meta/classes/module-base.bbclass	2020-07-13 17:38:20.708762573 -0500
++++ new/layers/openembedded-core/meta/classes/module-base.bbclass	2020-07-13 17:36:52.756764104 -0500
+@@ -16,6 +16,9 @@
+ export KERNEL_VERSION = "${@oe.utils.read_file('${STAGING_KERNEL_BUILDDIR}/kernel-abiversion')}"
+ KERNEL_OBJECT_SUFFIX = ".ko"
+ 
++# Kernel revision
++export KERNEL_REVISION = "${@oe.utils.read_file('${STAGING_KERNEL_BUILDDIR}/mlinux_pr')}"
++
+ # kernel modules are generally machine specific
+ PACKAGE_ARCH = "${MACHINE_ARCH}"
+ 
diff --git a/patches/perl-sdk-config-pkg-name.patch b/patches/perl-sdk-config-pkg-name.patch
new file mode 100644
index 0000000..c1ee7ca
--- /dev/null
+++ b/patches/perl-sdk-config-pkg-name.patch
@@ -0,0 +1,11 @@
+diff -Naru orig/layers/openembedded-core/meta/recipes-core/meta/target-sdk-provides-dummy.bb new/layers/openembedded-core/meta/recipes-core/meta/target-sdk-provides-dummy.bb
+--- orig/layers/openembedded-core/meta/recipes-core/meta/target-sdk-provides-dummy.bb	2019-10-16 12:33:35.885748272 -0500
++++ new/layers/openembedded-core/meta/recipes-core/meta/target-sdk-provides-dummy.bb	2019-10-16 12:39:00.417738664 -0500
+@@ -20,6 +20,7 @@
+     libxml-parser-perl \
+     perl-module-bytes \
+     perl-module-carp \
++    perl-module-config \
+     perl-module-constant \
+     perl-module-data-dumper \
+     perl-module-errno \
diff --git a/patches/rename-mtr-conflicts-with-mtr-product.patch b/patches/rename-mtr-conflicts-with-mtr-product.patch
index b98a6d9..b7f767f 100644
--- a/patches/rename-mtr-conflicts-with-mtr-product.patch
+++ b/patches/rename-mtr-conflicts-with-mtr-product.patch
@@ -1,8 +1,7 @@
-diff --git a/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.86.bb b/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.86.bb
---- a/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.86.bb
-+++ /dev/null
-diff --git a/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.86.bb b/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.86.bb
-@@ -1,21 +0,0 @@
+diff -Naru orig/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.87.bb new/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.87.bb
+--- orig/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.87.bb	2020-07-14 15:55:52.000000000 -0500
++++ new/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.87.bb	1969-12-31 18:00:00.000000000 -0600
+@@ -1,27 +0,0 @@
 -SUMMARY = "Combined traceroute and ping utility"
 -DESCRIPTION = "mtr combines the functionality of the 'traceroute' and 'ping' programs in a single network diagnostic tool."
 -HOMEPAGE = "http://www.bitwizard.nl/mtr/"
@@ -10,27 +9,30 @@ diff --git a/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.
 -DEPENDS = "ncurses"
 -
 -LICENSE = "GPLv2"
--LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
--                    file://mtr.c;beginline=5;endline=16;md5=af1fafbbfa1bfd48af839f4bb3221106"
+-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+-                    file://ui/mtr.c;beginline=5;endline=16;md5=af1fafbbfa1bfd48af839f4bb3221106"
 -
--SRC_URI = "ftp://ftp.bitwizard.nl/mtr/mtr-${PV}.tar.gz"
+-PV .= "+git${SRCPV}"
 -
--SRC_URI[md5sum] = "8d63592c9d4579ef20cf491b41843eb2"
--SRC_URI[sha256sum] = "c5d948920b641cc35f8b380fc356ddfe07cce6a9c6474afe242fc58113f28c06"
+-SRCREV = "e6d0a7e93129e8023654ebf58dfa8135d1b1af56"
+-SRC_URI = "git://github.com/traviscross/mtr"
 -
--inherit autotools
+-S = "${WORKDIR}/git"
+-
+-inherit autotools pkgconfig
 -
 -EXTRA_OECONF = "--without-gtk"
 -
--PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
+-PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
 -PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-
-diff --git a/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr-conflicts-with-mtr-product_0.86.bb b/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr-conflicts-with-mtr-product_0.86.bb
-new file mode 100644
-index 000000000..1d8a2cf9d
---- /dev/null
-+++ b/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr-conflicts-with-mtr-product_0.86.bb
-@@ -0,0 +1,21 @@
+-
+-PACKAGES += "${PN}-bash-completions"
+-
+-FILES_${PN}-bash-completions = "${datadir}/bash-completion/"
+diff -Naru orig/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr-conflicts-with-mtr-product_0.87.bb new/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr-conflicts-with-mtr-product_0.87.bb
+--- orig/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr-conflicts-with-mtr-product_0.87.bb	1969-12-31 18:00:00.000000000 -0600
++++ new/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr-conflicts-with-mtr-product_0.87.bb	2020-07-14 15:55:52.000000000 -0500
+@@ -0,0 +1,27 @@
 +SUMMARY = "Combined traceroute and ping utility"
 +DESCRIPTION = "mtr combines the functionality of the 'traceroute' and 'ping' programs in a single network diagnostic tool."
 +HOMEPAGE = "http://www.bitwizard.nl/mtr/"
@@ -38,18 +40,23 @@ index 000000000..1d8a2cf9d
 +DEPENDS = "ncurses"
 +
 +LICENSE = "GPLv2"
-+LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
-+                    file://mtr.c;beginline=5;endline=16;md5=af1fafbbfa1bfd48af839f4bb3221106"
++LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
++                    file://ui/mtr.c;beginline=5;endline=16;md5=af1fafbbfa1bfd48af839f4bb3221106"
 +
-+SRC_URI = "ftp://ftp.bitwizard.nl/mtr/mtr-${PV}.tar.gz"
++PV .= "+git${SRCPV}"
 +
-+SRC_URI[md5sum] = "8d63592c9d4579ef20cf491b41843eb2"
-+SRC_URI[sha256sum] = "c5d948920b641cc35f8b380fc356ddfe07cce6a9c6474afe242fc58113f28c06"
++SRCREV = "e6d0a7e93129e8023654ebf58dfa8135d1b1af56"
++SRC_URI = "git://github.com/traviscross/mtr"
 +
-+inherit autotools
++S = "${WORKDIR}/git"
++
++inherit autotools pkgconfig
 +
 +EXTRA_OECONF = "--without-gtk"
 +
-+PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}"
++PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}"
 +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6,"
-
++
++PACKAGES += "${PN}-bash-completions"
++
++FILES_${PN}-bash-completions = "${datadir}/bash-completion/"
diff --git a/setkernelversion.sh b/setkernelversion.sh
deleted file mode 100755
index 7d7c07e..0000000
--- a/setkernelversion.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-# skc Set Kernel Version
-# This sets the kernel version so that we
-# can append/insert the kernel version and 
-# revision to external kernel modules.
-  _skv_BUILDCONF=conf/local.conf
-  _skv_KERNELDIR=../layers/meta-multitech/recipes-kernel/linux
-  _skv_KERNBB=${_skv_KERNELDIR}/linux-at91_*.bb
-  if ! [[ -f $_skv_BUILDCONF ]] ; then
-     echo "Current directory is $(pwd) and must be the build directory."
-     echo "ERROR: Cannot find $_skv_BUILDCONF"
-     unset _skv_BUILDCONF _skv_KERNELDIR _skv_KERNBB
-     if ! return 1 2>/dev/null ; then
-       exit 1
-     fi
-  fi
-  _skv_ex_version=$(egrep '^PR[[:space:]]*=' ${_skv_KERNBB})
-  if ((${#_skv_ex_version})) && [[ $_skv_ex_version =~ =[[:space:]]*([^[:space:]#]*) ]] ; then
-    _skv_MLINUX_KERNEL_EXTRA_VERSION="${BASH_REMATCH[1]}"
-    _skv_repl="MLINUX_KERNEL_EXTRA_VERSION = ${_skv_MLINUX_KERNEL_EXTRA_VERSION}"
-    _skv_old=$(egrep '^MLINUX_KERNEL_EXTRA_VERSION[[:space:]]*=' ${_skv_BUILDCONF} | tail -1)
-    if [[ ${_skv_old} !=  ${_skv_repl} ]] ; then
-      sed -ri '/^MLINUX_KERNEL_EXTRA_VERSION[[:space:]]*=/d' ${_skv_BUILDCONF}
-      echo "MLINUX_KERNEL_EXTRA_VERSION = ${_skv_MLINUX_KERNEL_EXTRA_VERSION}" >>${_skv_BUILDCONF}
-    fi
-  fi
-  if ! [[ -d ${_skv_KERNELDIR} ]] ; then
-    echo "Linux Kernel recipe directory is missing: ${_skv_KERNELDIR}"
-    unset _skv_BUILDCONF _skv_KERNELDIR _skv_KERNBB
-    unset _skv_repl _skv_old _skv_ex_version _skv_MLINUX_KERNEL_EXTRA_VERSION
-    if ! return 1 2>/dev/null ; then
-      exit 1
-    fi
-  fi
-    
-  _skv_krecipe=$(echo $(cd ../layers/meta-multitech/recipes-kernel/linux;echo linux-at91_*.bb))
-  _skv_old=$(egrep '^MLINUX_KERNEL_VERSION[[:space:]]*=' ${_skv_BUILDCONF} | tail -1)
-
-  
-  if ((${#_skv_krecipe})) && [[ $_skv_krecipe =~ linux-at91_(.*).bb$ ]] ; then
-    _skv_MLINUX_KERNEL_VERSION="${BASH_REMATCH[1]}"
-    _skv_repl="MLINUX_KERNEL_VERSION = \"${_skv_MLINUX_KERNEL_VERSION}\""
-    if [[ ${_skv_old} !=  ${_skv_repl} ]] ; then
-        sed -ri '/^MLINUX_KERNEL_VERSION[[:space:]]*=/d' ${_skv_BUILDCONF}
-        echo "${_skv_repl}" >>${_skv_BUILDCONF}
-    fi
-  fi
-  
-  unset _skv_BUILDCONF _skv_KERNELDIR _skv_KERNBB _skv_MLINUX_KERNEL_VERSION
-  unset _skv_repl _skv_old _skv_ex_version _skv_MLINUX_KERNEL_EXTRA_VERSION
diff --git a/setup.sh b/setup.sh
index a1cb664..87d823f 100755
--- a/setup.sh
+++ b/setup.sh
@@ -14,7 +14,7 @@ fi
 
 echo ""
 echo "Updating git submodules..."
-git submodule update --init
+git submodule update --init --recursive
 
 # Apply patches
 for f in $(ls patches) ; do
@@ -23,6 +23,9 @@ for f in $(ls patches) ; do
   fi
 done
 
+# Remove yocto-linux bbappend
+rm -f layers/meta-virtualization/recipes-kernel/linux/linux-yocto_*.bbappend
+
 if [ "$1" != "--update" ]; then
   if [ ! -d build/conf ]; then
     mkdir -p build/conf