mLinux 6

7 files changed, 393 insertions, 0 deletions

diff --git a/patches/bitbake_checksumwarningsuppress.patch b/patches/bitbake_checksumwarningsuppress.patch
new file mode 100644
index 0000000..438a6f2
--- /dev/null
+++ b/patches/bitbake_checksumwarningsuppress.patch
@@ -0,0 +1,18 @@
+diff --git a/bitbake/lib/bb/fetch2/__init__.py b/bitbake/lib/bb/fetch2/__init__.py
+index dc99914c..f622fc7b 100644
+--- a/bitbake/lib/bb/fetch2/__init__.py
++++ b/bitbake/lib/bb/fetch2/__init__.py
+@@ -1188,11 +1188,12 @@ def get_checksum_file_list(d):
+ 
+         if ud and isinstance(ud.method, local.Local):
+             paths = ud.method.localpaths(ud, d)
++            strict = d.getVar("BB_STRICT_CHECKSUM", True) or "0"
+             for f in paths:
+                 pth = ud.decodedurl
+                 if '*' in pth:
+                     f = os.path.join(os.path.abspath(f), pth)
+-                if f.startswith(dl_dir):
++                if f.startswith(dl_dir) and (strict == "1"):
+                     # The local fetcher's behaviour is to return a path under DL_DIR if it couldn't find the file anywhere else
+                     if os.path.exists(f):
+                         bb.warn("Getting checksum for %s SRC_URI entry %s: file not found except in DL_DIR" % (d.getVar('PN'), os.path.basename(f)))
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..6946535
--- /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 112b833f..8c6d04d9 100644
+--- a/bitbake/lib/bb/fetch2/git.py
++++ b/bitbake/lib/bb/fetch2/git.py
+@@ -129,6 +129,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
+@@ -229,16 +242,52 @@ class Git(FetchMethod):
+ 
+         ud.setup_revisions(d)
+ 
++        # EARLY_GITSRCNAME start
++        gitsrcname = '%s%s' % (ud.host.replace(':', '.'), ud.path.replace('/', '.').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('*', '.').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
+@@ -248,10 +297,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/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/meta-openembedded-github-https.patch b/patches/meta-openembedded-github-https.patch
new file mode 100644
index 0000000..9a49b85
--- /dev/null
+++ b/patches/meta-openembedded-github-https.patch
@@ -0,0 +1,171 @@
+github no longer allows clear git protocol, so switch to https
+===============================================================
+diff --git a/layers/meta-openembedded/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_git.bb b/layers/meta-openembedded/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_git.bb
+index 23583650b..ed003ee7b 100644
+--- a/layers/meta-openembedded/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_git.bb
++++ b/layers/meta-openembedded/meta-filesystems/recipes-utils/ufs-utils/ufs-utils_git.bb
+@@ -8,7 +8,7 @@ BRANCH ?= "dev"
+ 
+ SRCREV = "a3cf93b66f4606a46354cf884d24aa966661f848"
+ 
+-SRC_URI = "git://github.com/westerndigitalcorporation/ufs-utils.git;protocol=git;branch=${BRANCH} \
++SRC_URI = "git://github.com/westerndigitalcorporation/ufs-utils.git;protocol=https;branch=${BRANCH} \
+            file://0001-Replace-u_intXX_t-with-kernel-typedefs.patch \
+ "
+ 
+diff --git a/layers/meta-openembedded/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb b/layers/meta-openembedded/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb
+index d7911681c..c499119c6 100644
+--- a/layers/meta-openembedded/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb
++++ b/layers/meta-openembedded/meta-multimedia/recipes-multimedia/fdk-aac/fdk-aac_2.0.1.bb
+@@ -11,7 +11,7 @@ LICENSE = "Fraunhofer_FDK_AAC_Codec_Library_for_Android"
+ LICENSE_FLAGS = "commercial"
+ LIC_FILES_CHKSUM = "file://NOTICE;md5=5985e1e12f4afa710d64ed7bfd291875"
+ 
+-SRC_URI = "git://github.com/mstorsjo/fdk-aac.git;protocol=git;branch=master"
++SRC_URI = "git://github.com/mstorsjo/fdk-aac.git;protocol=https;branch=master"
+ SRCREV = "d387d3b6ed79ff9a82c60440bdd86e6e5e324bec"
+ 
+ S = "${WORKDIR}/git"
+diff --git a/layers/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb b/layers/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb
+index 6dd15ad9f..46b50c26b 100644
+--- a/layers/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb
++++ b/layers/meta-openembedded/meta-networking/recipes-protocols/babeld/babeld_1.9.1.bb
+@@ -12,7 +12,7 @@ SECTION = "net"
+ LICENSE = "MIT"
+ LIC_FILES_CHKSUM = "file://LICENCE;md5=411a48ac3c2e9e0911b8dd9aed26f754"
+ 
+-SRC_URI = "git://github.com/jech/babeld.git;protocol=git"
++SRC_URI = "git://github.com/jech/babeld.git;protocol=https"
+ SRCREV = "0835d5d894ea016ab7b81562466cade2c51a12d4"
+ 
+ UPSTREAM_CHECK_GITTAGREGEX = "babeld-(?P<pver>\d+(\.\d+)+)"
+diff --git a/layers/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.4.4.bb b/layers/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.4.4.bb
+index 0b63f79ac..d8a1f6140 100644
+--- a/layers/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.4.4.bb
++++ b/layers/meta-openembedded/meta-networking/recipes-support/smcroute/smcroute_2.4.4.bb
+@@ -6,7 +6,7 @@ LICENSE = "GPLv2+"
+ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
+ 
+ SRCREV = "a8e5847e5f7e411be424f9b52a6cdf9d2ed4aeb5"
+-SRC_URI = "git://github.com/troglobit/smcroute.git;branch=master;protocol=git"
++SRC_URI = "git://github.com/troglobit/smcroute.git;branch=master;protocol=https"
+ 
+ S = "${WORKDIR}/git"
+ 
+diff --git a/layers/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb b/layers/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb
+index c8e81a412..f0e928d0d 100644
+--- a/layers/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb
++++ b/layers/meta-openembedded/meta-oe/recipes-core/sdbus-c++/sdbus-c++-libsystemd_243.bb
+@@ -12,7 +12,7 @@ DEPENDS += "gperf-native gettext-native util-linux libcap"
+ 
+ SRCREV = "efb536d0cbe2e58f80e501d19999928c75e08f6a"
+ SRCBRANCH = "v243-stable"
+-SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}"
++SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH}"
+ 
+ SRC_URI += "file://static-libsystemd-pkgconfig.patch"
+ 
+diff --git a/layers/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb b/layers/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb
+index 29f8de8d2..b2f38728d 100644
+--- a/layers/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb
++++ b/layers/meta-openembedded/meta-oe/recipes-extended/hiredis/hiredis_0.14.0.bb
+@@ -6,7 +6,7 @@ DEPENDS = "redis"
+ 
+ LIC_FILES_CHKSUM = "file://COPYING;md5=d84d659a35c666d23233e54503aaea51"
+ SRCREV = "685030652cd98c5414ce554ff5b356dfe8437870"
+-SRC_URI = "git://github.com/redis/hiredis;protocol=git \
++SRC_URI = "git://github.com/redis/hiredis;protocol=https \
+            file://0001-Makefile-remove-hardcoding-of-CC.patch"
+ 
+ S = "${WORKDIR}/git"
+diff --git a/layers/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb b/layers/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb
+index 519368817..5015ac53b 100644
+--- a/layers/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb
++++ b/layers/meta-openembedded/meta-oe/recipes-extended/socketcan/can-utils_git.bb
+@@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://include/linux/can.h;endline=44;md5=a9e1169c6c9a114a61
+ 
+ DEPENDS = "libsocketcan"
+ 
+-SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=git"
++SRC_URI = "git://github.com/linux-can/${BPN}.git;protocol=https"
+ 
+ SRCREV = "da65fdfe0d1986625ee00af0b56ae17ec132e700"
+ 
+diff --git a/layers/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb b/layers/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb
+index 3800d147f..37631acae 100644
+--- a/layers/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb
++++ b/layers/meta-openembedded/meta-oe/recipes-support/gpm/gpm_git.bb
+@@ -13,7 +13,7 @@ SRCREV = "1fd19417b8a4dd9945347e98dfa97e4cfd798d77"
+ 
+ DEPENDS = "ncurses bison-native"
+ 
+-SRC_URI = "git://github.com/telmich/gpm;protocol=git \
++SRC_URI = "git://github.com/telmich/gpm;protocol=https \
+            file://init \
+            file://gpm.service.in \
+            file://0001-Use-sigemptyset-API-instead-of-__sigemptyset.patch \
+diff --git a/layers/meta-openembedded/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb b/layers/meta-openembedded/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb
+index 3a437659e..0e3e5ff73 100644
+--- a/layers/meta-openembedded/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb
++++ b/layers/meta-openembedded/meta-oe/recipes-support/pidgin/funyahoo-plusplus_git.bb
+@@ -7,7 +7,7 @@ DEPENDS = "pidgin json-glib glib-2.0"
+ 
+ inherit pkgconfig
+ 
+-SRC_URI = "git://github.com/EionRobb/funyahoo-plusplus;branch=master;protocol=git"
++SRC_URI = "git://github.com/EionRobb/funyahoo-plusplus;branch=master;protocol=https"
+ SRCREV = "fbbd9c591100aa00a0487738ec7b6acd3d924b3f"
+ 
+ S = "${WORKDIR}/git"
+diff --git a/layers/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb b/layers/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb
+index 092e6059b..854920d2e 100644
+--- a/layers/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb
++++ b/layers/meta-openembedded/meta-oe/recipes-support/pidgin/purple-skypeweb_git.bb
+@@ -7,7 +7,7 @@ DEPENDS = "pidgin json-glib glib-2.0 zlib"
+ 
+ inherit pkgconfig
+ 
+-SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=git"
++SRC_URI = "git://github.com/EionRobb/skype4pidgin;branch=master;protocol=https"
+ SRCREV = "14f1b69b6292bbdc98cca484b050ec8359394c4e"
+ 
+ S = "${WORKDIR}/git"
+diff --git a/layers/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/layers/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
+index 33f5dccca..6fe8aa76f 100644
+--- a/layers/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
++++ b/layers/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb
+@@ -25,7 +25,7 @@ RDEPENDS_${PN} = "rsync \
+ SRCREV = "a9e29850fc33c503c289e245c7bad350eed746d9"
+ PV = "1.4.3+git${SRCPV}"
+ 
+-SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=git \
++SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=https \
+            file://configure-fix-cmd_rsync.patch \
+           "
+ 
+diff --git a/layers/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb b/layers/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb
+index 39629cce0..9294d1a70 100644
+--- a/layers/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb
++++ b/layers/meta-openembedded/meta-oe/recipes-support/spdlog/spdlog_1.5.0.bb
+@@ -4,7 +4,7 @@ LICENSE = "MIT"
+ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/files/common-licenses/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+ 
+ SRCREV = "cf6f1dd01e660d5865d68bf5fa78f6376b89470a"
+-SRC_URI = "git://github.com/gabime/spdlog.git;protocol=git;branch=v1.x;"
++SRC_URI = "git://github.com/gabime/spdlog.git;protocol=https;branch=v1.x;"
+ 
+ S = "${WORKDIR}/git"
+ 
+diff --git a/layers/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb b/layers/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb
+index 625756873..31c87c96f 100644
+--- a/layers/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb
++++ b/layers/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb
+@@ -10,7 +10,7 @@ SRCREV = "4a36a84f7df291ddaebd397aecf0c8515256a8e0"
+ 
+ S = "${WORKDIR}/git"
+ 
+-SRC_URI = "git://github.com/cpb-/spi-tools.git;protocol=git"
++SRC_URI = "git://github.com/cpb-/spi-tools.git;protocol=https"
+ 
+ 
+ inherit autotools
diff --git a/patches/no_net_check.patch b/patches/no_net_check.patch
new file mode 100644
index 0000000..4c9e306
--- /dev/null
+++ b/patches/no_net_check.patch
@@ -0,0 +1,12 @@
+diff --git a/layers/openembedded-core/meta/classes/sanity.bbclass b/layers/openembedded-core/meta/classes/sanity.bbclass
+index 2325ee2..5d2a8d4 100644
+--- a/layers/openembedded-core/meta/classes/sanity.bbclass
++++ b/layers/openembedded-core/meta/classes/sanity.bbclass
+@@ -367,6 +367,7 @@ def check_connectivity(d):
+     # URI's to check can be set in the CONNECTIVITY_CHECK_URIS variable
+     # using the same syntax as for SRC_URI. If the variable is not set
+     # the check is skipped
++    return ""
+     test_uris = (d.getVar('CONNECTIVITY_CHECK_URIS') or "").split()
+     retval = ""
+ 
diff --git a/patches/openembedded-core-github-https.patch b/patches/openembedded-core-github-https.patch
new file mode 100644
index 0000000..bbeea1d
--- /dev/null
+++ b/patches/openembedded-core-github-https.patch
@@ -0,0 +1,14 @@
+github no longer allows clear git protocol, so switch to https
+===============================================================
+diff --git a/layers/openembedded-core/meta/recipes-core/systemd/systemd.inc b/layers/openembedded-core/meta/recipes-core/systemd/systemd.inc
+index 3165d13f03..8b5260bb0d 100644
+--- a/layers/openembedded-core/meta/recipes-core/systemd/systemd.inc
++++ b/layers/openembedded-core/meta/recipes-core/systemd/systemd.inc
+@@ -16,6 +16,6 @@ LIC_FILES_CHKSUM = "file://LICENSE.GPL2;md5=751419260aa954499f7abaabaa882bbe \
+ 
+ SRCREV = "3ceaa81c61b654ebf562464d142675bd4d57d7b6"
+ SRCBRANCH = "v244-stable"
+-SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=git;branch=${SRCBRANCH}"
++SRC_URI = "git://github.com/systemd/systemd-stable.git;protocol=https;branch=${SRCBRANCH}"
+ 
+ S = "${WORKDIR}/git"
diff --git a/patches/rename-mtr-conflicts-with-mtr-product.patch b/patches/rename-mtr-conflicts-with-mtr-product.patch
new file mode 100644
index 0000000..1a07a37
--- /dev/null
+++ b/patches/rename-mtr-conflicts-with-mtr-product.patch
@@ -0,0 +1,58 @@
+diff -Naru orig/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.93.bb new/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.93.bb
+--- orig/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.93.bb	2021-07-14 14:05:59.000000000 -0500
++++ new/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr_0.93.bb	1969-12-31 18:00:00.000000000 -0600
+@@ -1,25 +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/"
+-SECTION = "net"
+-DEPENDS = "ncurses"
+-
+-LICENSE = "GPLv2"
+-LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
+-                    file://ui/mtr.c;beginline=5;endline=16;md5=00a894a39d53726a27386534d1c4e468"
+-
+-SRCREV = "304349bad86229aedbc62c07d5e98a8292967991"
+-SRC_URI = "git://github.com/traviscross/mtr"
+-
+-S = "${WORKDIR}/git"
+-
+-inherit autotools pkgconfig
+-
+-EXTRA_OECONF = "--without-gtk"
+-
+-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 -Naru orig/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr-conflicts-with-mtr-product_0.93.bb new/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr-conflicts-with-mtr-product_0.93.bb
+--- orig/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr-conflicts-with-mtr-product_0.93.bb	1969-12-31 18:00:00.000000000 -0600
++++ new/layers/meta-openembedded/meta-networking/recipes-support/mtr/mtr-conflicts-with-mtr-product_0.93.bb	2021-07-14 14:05:59.000000000 -0500
+@@ -0,0 +1,25 @@
++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/"
++SECTION = "net"
++DEPENDS = "ncurses"
++
++LICENSE = "GPLv2"
++LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
++                    file://ui/mtr.c;beginline=5;endline=16;md5=00a894a39d53726a27386534d1c4e468"
++
++SRCREV = "304349bad86229aedbc62c07d5e98a8292967991"
++SRC_URI = "git://github.com/traviscross/mtr"
++
++S = "${WORKDIR}/git"
++
++inherit autotools pkgconfig
++
++EXTRA_OECONF = "--without-gtk"
++
++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/"