diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-10-09 20:59:25 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-10-15 15:44:24 +0300 |
| commit | 6ef3265d2b0f8bc55c5d3fffa253e961ab31b041 (patch) | |
| tree | 554e9b914035d95e21c187e75c2ff4396821a49e /poky/bitbake | |
| parent | c3966252f9945108d27845e12b7732a825a9ca4e (diff) | |
| download | openbmc-6ef3265d2b0f8bc55c5d3fffa253e961ab31b041.tar.xz | |
poky: sumo refresh 3b8dc3a88e..36d5cee56b
Update poky to sumo HEAD.
Andreas Müller (1):
libsdl2: Fix left rotated display for RaspPi/VC4/GLES2
Anuj Mittal (2):
qemux86-directdisk: remove mem= parameter
initramfs-framework/udev: call settle before kill
Armin Kuster (1):
libcroco: CVE-2017-7961
Awais Belal (1):
bitbake: toaster: Fix bitbake flexible path error from Bugzilla #12891
Chong Yi Chai (1):
mkefidisk: fix installation of kernel image
Paulo Neves (1):
bitbake: fetcher: Fixed remote removal not throwing exception.
Richard Purdie (1):
bitbake: main: Fix environment handling for UI module imports
Ross Burton (2):
security_flags: disable static PIE in glibc
cmake: put cmake.m4 and toolchain file in PN
Sinan Kaya (1):
gnupg: CVE-2018-9234
Change-Id: Ia9ff256122334cf5f1fb8d377ac3f295605ac68b
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'poky/bitbake')
| -rw-r--r-- | poky/bitbake/lib/bb/fetch2/git.py | 7 | ||||
| -rwxr-xr-x | poky/bitbake/lib/bb/main.py | 7 |
2 files changed, 7 insertions, 7 deletions
diff --git a/poky/bitbake/lib/bb/fetch2/git.py b/poky/bitbake/lib/bb/fetch2/git.py index 3de83bed1..7b618c6fb 100644 --- a/poky/bitbake/lib/bb/fetch2/git.py +++ b/poky/bitbake/lib/bb/fetch2/git.py @@ -354,10 +354,9 @@ class Git(FetchMethod): if not self._contains_ref(ud, d, name, ud.clonedir): needupdate = True if needupdate: - try: - runfetchcmd("%s remote rm origin" % ud.basecmd, d, workdir=ud.clonedir) - except bb.fetch2.FetchError: - logger.debug(1, "No Origin") + output = runfetchcmd("%s remote" % ud.basecmd, d, quiet=True, workdir=ud.clonedir) + if "origin" in output: + runfetchcmd("%s remote rm origin" % ud.basecmd, d, workdir=ud.clonedir) runfetchcmd("%s remote add --mirror=fetch origin %s" % (ud.basecmd, repourl), d, workdir=ud.clonedir) fetch_cmd = "LANG=C %s fetch -f --prune --progress %s refs/*:refs/*" % (ud.basecmd, repourl) diff --git a/poky/bitbake/lib/bb/main.py b/poky/bitbake/lib/bb/main.py index f4474e410..732a31540 100755 --- a/poky/bitbake/lib/bb/main.py +++ b/poky/bitbake/lib/bb/main.py @@ -405,9 +405,6 @@ def setup_bitbake(configParams, configuration, extrafeatures=None): # In status only mode there are no logs and no UI logger.addHandler(handler) - # Clear away any spurious environment variables while we stoke up the cooker - cleanedvars = bb.utils.clean_environment() - if configParams.server_only: featureset = [] ui_module = None @@ -423,6 +420,10 @@ def setup_bitbake(configParams, configuration, extrafeatures=None): server_connection = None + # Clear away any spurious environment variables while we stoke up the cooker + # (done after import_extension_module() above since for example import gi triggers env var usage) + cleanedvars = bb.utils.clean_environment() + if configParams.remote_server: # Connect to a remote XMLRPC server server_connection = bb.server.xmlrpcclient.connectXMLRPC(configParams.remote_server, featureset, |