summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-19 14:21:40 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-01-19 23:03:44 +0000
commit2a5dcb0662054c1d6bbe5ffe1c48fee10be30bd0 (patch)
tree2aaddf09a62d73803078aeb3ed01d1b1477347cc
parentcf43eccc5c4da3e1e5bd1e20d595f4b225cf005f (diff)
downloadpoky-2a5dcb0662054c1d6bbe5ffe1c48fee10be30bd0.tar.gz
poky-2a5dcb0662054c1d6bbe5ffe1c48fee10be30bd0.tar.bz2
poky-2a5dcb0662054c1d6bbe5ffe1c48fee10be30bd0.zip
crate-fetch: Switch to version contained in bitbake
This avoids various sstate fetch errors from weird silent failures in the sstate archive testing code caused by lack of srcrev support in the crate fetcher. (From OE-Core rev: 8205668a339946974b4460cf1ca7e6e7a645479b) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/cargo_common.bbclass1
-rw-r--r--meta/classes/crate-fetch.bbclass28
-rw-r--r--meta/lib/crate.py149
3 files changed, 0 insertions, 178 deletions
diff --git a/meta/classes/cargo_common.bbclass b/meta/classes/cargo_common.bbclass
index 23d82aa6ab..90fad75415 100644
--- a/meta/classes/cargo_common.bbclass
+++ b/meta/classes/cargo_common.bbclass
@@ -9,7 +9,6 @@
##
# add crate fetch support
-inherit crate-fetch
inherit rust-common
# Where we download our registry and dependencies to
diff --git a/meta/classes/crate-fetch.bbclass b/meta/classes/crate-fetch.bbclass
deleted file mode 100644
index a7fa22b2a0..0000000000
--- a/meta/classes/crate-fetch.bbclass
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# crate-fetch class
-#
-# Registers 'crate' method for Bitbake fetch2.
-#
-# Adds support for following format in recipe SRC_URI:
-# crate://<packagename>/<version>
-#
-
-def import_crate(d):
- import crate
- if not getattr(crate, 'imported', False):
- bb.fetch2.methods.append(crate.Crate())
- crate.imported = True
-
-python crate_import_handler() {
- import_crate(d)
-}
-
-addhandler crate_import_handler
-crate_import_handler[eventmask] = "bb.event.RecipePreFinalise"
-
-def crate_get_srcrev(d):
- import_crate(d)
- return bb.fetch2.get_srcrev(d)
-
-# Override SRCPV to make sure it imports the fetcher first
-SRCPV = "${@crate_get_srcrev(d)}"
diff --git a/meta/lib/crate.py b/meta/lib/crate.py
deleted file mode 100644
index d10f441875..0000000000
--- a/meta/lib/crate.py
+++ /dev/null
@@ -1,149 +0,0 @@
-# ex:ts=4:sw=4:sts=4:et
-# -*- tab-width: 4; c-basic-offset: 4; indent-tabs-mode: nil -*-
-"""
-BitBake 'Fetch' implementation for crates.io
-"""
-
-# Copyright (C) 2016 Doug Goldstein
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License version 2 as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-#
-# Based on functions from the base bb module, Copyright 2003 Holger Schurig
-
-import hashlib
-import json
-import os
-import shutil
-import subprocess
-import bb
-from bb.fetch2 import logger, subprocess_setup, UnpackError
-from bb.fetch2.wget import Wget
-
-
-class Crate(Wget):
-
- """Class to fetch crates via wget"""
-
- def _cargo_bitbake_path(self, rootdir):
- return os.path.join(rootdir, "cargo_home", "bitbake")
-
- def supports(self, ud, d):
- """
- Check to see if a given url is for this fetcher
- """
- return ud.type in ['crate']
-
- def recommends_checksum(self, urldata):
- return False
-
- def urldata_init(self, ud, d):
- """
- Sets up to download the respective crate from crates.io
- """
-
- if ud.type == 'crate':
- self._crate_urldata_init(ud, d)
-
- super(Crate, self).urldata_init(ud, d)
-
- def _crate_urldata_init(self, ud, d):
- """
- Sets up the download for a crate
- """
-
- # URL syntax is: crate://NAME/VERSION
- # break the URL apart by /
- parts = ud.url.split('/')
- if len(parts) < 5:
- raise bb.fetch2.ParameterError("Invalid URL: Must be crate://HOST/NAME/VERSION", ud.url)
-
- # last field is version
- version = parts[len(parts) - 1]
- # second to last field is name
- name = parts[len(parts) - 2]
- # host (this is to allow custom crate registries to be specified
- host = '/'.join(parts[2:len(parts) - 2])
-
- # if using upstream just fix it up nicely
- if host == 'crates.io':
- host = 'crates.io/api/v1/crates'
-
- ud.url = "https://%s/%s/%s/download" % (host, name, version)
- ud.parm['downloadfilename'] = "%s-%s.crate" % (name, version)
- ud.parm['name'] = name
-
- logger.debug(2, "Fetching %s to %s" % (ud.url, ud.parm['downloadfilename']))
-
- def unpack(self, ud, rootdir, d):
- """
- Uses the crate to build the necessary paths for cargo to utilize it
- """
- if ud.type == 'crate':
- return self._crate_unpack(ud, rootdir, d)
- else:
- super(Crate, self).unpack(ud, rootdir, d)
-
- def _crate_unpack(self, ud, rootdir, d):
- """
- Unpacks a crate
- """
- thefile = ud.localpath
-
- # possible metadata we need to write out
- metadata = {}
-
- # change to the rootdir to unpack but save the old working dir
- save_cwd = os.getcwd()
- os.chdir(rootdir)
-
- pn = d.getVar('BPN')
- if pn == ud.parm.get('name'):
- cmd = "tar -xz --no-same-owner -f %s" % thefile
- else:
- cargo_bitbake = self._cargo_bitbake_path(rootdir)
-
- cmd = "tar -xz --no-same-owner -f %s -C %s" % (thefile, cargo_bitbake)
-
- # ensure we've got these paths made
- bb.utils.mkdirhier(cargo_bitbake)
-
- # generate metadata necessary
- with open(thefile, 'rb') as f:
- # get the SHA256 of the original tarball
- tarhash = hashlib.sha256(f.read()).hexdigest()
-
- metadata['files'] = {}
- metadata['package'] = tarhash
-
- # path it
- path = d.getVar('PATH')
- if path:
- cmd = "PATH=\"%s\" %s" % (path, cmd)
- bb.note("Unpacking %s to %s/" % (thefile, os.getcwd()))
-
- ret = subprocess.call(cmd, preexec_fn=subprocess_setup, shell=True)
-
- os.chdir(save_cwd)
-
- if ret != 0:
- raise UnpackError("Unpack command %s failed with return value %s" % (cmd, ret), ud.url)
-
- # if we have metadata to write out..
- if len(metadata) > 0:
- cratepath = os.path.splitext(os.path.basename(thefile))[0]
- bbpath = self._cargo_bitbake_path(rootdir)
- mdfile = '.cargo-checksum.json'
- mdpath = os.path.join(bbpath, cratepath, mdfile)
- with open(mdpath, "w") as f:
- json.dump(metadata, f)