diff options
Diffstat (limited to 'poky/scripts')
| -rwxr-xr-x | poky/scripts/install-buildtools | 4 | ||||
| -rw-r--r-- | poky/scripts/lib/devtool/__init__.py | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/poky/scripts/install-buildtools b/poky/scripts/install-buildtools index 7118f48be9..8554a5db67 100755 --- a/poky/scripts/install-buildtools +++ b/poky/scripts/install-buildtools @@ -57,9 +57,9 @@ logger = scriptutils.logger_create(PROGNAME, stream=sys.stdout) DEFAULT_INSTALL_DIR = os.path.join(os.path.split(scripts_path)[0],'buildtools') DEFAULT_BASE_URL = 'http://downloads.yoctoproject.org/releases/yocto' -DEFAULT_RELEASE = 'yocto-3.2_M1' +DEFAULT_RELEASE = 'yocto-3.2_M3' DEFAULT_INSTALLER_VERSION = '3.1+snapshot' -DEFAULT_BUILDDATE = '20200617' +DEFAULT_BUILDDATE = '20200923' # Python version sanity check if not (sys.version_info.major == 3 and sys.version_info.minor >= 4): diff --git a/poky/scripts/lib/devtool/__init__.py b/poky/scripts/lib/devtool/__init__.py index 6ebe368a9e..702db669de 100644 --- a/poky/scripts/lib/devtool/__init__.py +++ b/poky/scripts/lib/devtool/__init__.py @@ -212,8 +212,13 @@ def setup_git_repo(repodir, version, devbranch, basetag='devtool-base', d=None): bb.process.run(commit_cmd, cwd=repodir) # Ensure singletask.lock (as used by externalsrc.bbclass) is ignored by git + gitinfodir = os.path.join(repodir, '.git', 'info') + try: + os.mkdir(gitinfodir) + except FileExistsError: + pass excludes = [] - excludefile = os.path.join(repodir, '.git', 'info', 'exclude') + excludefile = os.path.join(gitinfodir, 'exclude') try: with open(excludefile, 'r') as f: excludes = f.readlines() |