poky: subtree update:a015ed7704..797916f93a
Adrian Bunk (4):
poky-tiny.conf: Remove the removed irda feature from a comment
musl: Add TEMP_FAILURE_RETRY from glibc
systemd: Disable idn properly for musl instead of NI_IDN workarounds
ofono: upgrade 1.25 -> 1.29
Alexander Kanavin (2):
packagegroup-cross-canadian: repackage when TUNE_ARCH changes
qemux86: use a Core 2 Duo CPU instead of the original circa-1993 Pentium
Fabio Berton (1):
mesa: Convert recipe to use meson build system
Haiqing Bai (1):
sysstat: Add PACKAGECONFIG[cron] for '--enable-install-cron' option
Khem Raj (2):
mmc-utils: Fix build with clang
epiphany: Do not bypass initialization of variable with __attribute__((cleanup))
Liwei Song (1):
mdadm: install the systemd service through Makefile
Marco Felsch (1):
mesa: fix imx gallium driver PACKAGECONFIG option
Mark Hatle (1):
bitbake: gitsm: Fix a bug where the wrong path was used for the submodule init
Martin Jansa (2):
grub-efi-cfg, systemd-boot-cfg: use MACHINE_ARCH
tcmode-default.inc: use the same TUNE_PKGARCH variable as PN set in go-cross
Ming Liu (2):
kernel.bbclass: adjust a condition checking
dhcp: fix a NSUPDATE compiling issue
Richard Purdie (2):
gettext/flex/m4/bzip2/gzip/parted/slang/attr: Add make to -ptest packages
apr/apr-util: Add ptest dependency on libgcc
Ross Burton (1):
glib-2.0: add missing libgcc dependency to glib-2.0-ptest
Tim Orling (1):
libtest-needs-perl: upgrade 0.002005 -> 0.002006
Zang Ruochen (1):
libinput: Upgrade 1.13.1 -> 1.13.2
Change-Id: Ic565210b5ca776c937445934910f602f424ecce1
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
diff --git a/poky/bitbake/lib/bb/fetch2/gitsm.py b/poky/bitbake/lib/bb/fetch2/gitsm.py
index 1f03ba7..c622771 100644
--- a/poky/bitbake/lib/bb/fetch2/gitsm.py
+++ b/poky/bitbake/lib/bb/fetch2/gitsm.py
@@ -117,7 +117,7 @@
url += ';protocol=%s' % proto
url += ";name=%s" % module
- url += ";subpath=%s" % paths[module]
+ url += ";subpath=%s" % module
ld = d.createCopy()
# Not necessary to set SRC_URI, since we're passing the URI to
@@ -184,7 +184,7 @@
try:
newfetch = Fetch([url], d, cache=False)
- newfetch.unpack(root=os.path.dirname(os.path.join(repo_conf, 'modules', modpath)))
+ newfetch.unpack(root=os.path.dirname(os.path.join(repo_conf, 'modules', module)))
except Exception as e:
logger.error('gitsm: submodule unpack failed: %s %s' % (type(e).__name__, str(e)))
raise
@@ -199,9 +199,9 @@
# Ensure the submodule repository is NOT set to bare, since we're checking it out...
try:
- runfetchcmd("%s config core.bare false" % (ud.basecmd), d, quiet=True, workdir=os.path.join(repo_conf, 'modules', modpath))
+ runfetchcmd("%s config core.bare false" % (ud.basecmd), d, quiet=True, workdir=os.path.join(repo_conf, 'modules', module))
except:
- logger.error("Unable to set git config core.bare to false for %s" % os.path.join(repo_conf, 'modules', modpath))
+ logger.error("Unable to set git config core.bare to false for %s" % os.path.join(repo_conf, 'modules', module))
raise
Git.unpack(self, ud, destdir, d)
@@ -209,5 +209,7 @@
ret = self.process_submodules(ud, ud.destdir, unpack_submodules, d)
if not ud.bareclone and ret:
- # Run submodule update, this sets up the directories -- without touching the config
+ # All submodules should already be downloaded and configured in the tree. This simply sets
+ # up the configuration and checks out the files. The main project config should remain
+ # unmodified, and no download from the internet should occur.
runfetchcmd("%s submodule update --recursive --no-fetch" % (ud.basecmd), d, quiet=True, workdir=ud.destdir)