diff options
Diffstat (limited to 'poky/meta/classes')
| -rw-r--r-- | poky/meta/classes/base.bbclass | 15 | ||||
| -rw-r--r-- | poky/meta/classes/image_types.bbclass | 5 | ||||
| -rw-r--r-- | poky/meta/classes/mirrors.bbclass | 2 | ||||
| -rw-r--r-- | poky/meta/classes/testimage.bbclass | 4 | ||||
| -rw-r--r-- | poky/meta/classes/toolchain-scripts.bbclass | 1 |
5 files changed, 12 insertions, 15 deletions
diff --git a/poky/meta/classes/base.bbclass b/poky/meta/classes/base.bbclass index cc81461473..3515720bf9 100644 --- a/poky/meta/classes/base.bbclass +++ b/poky/meta/classes/base.bbclass @@ -20,21 +20,14 @@ PACKAGECONFIG_CONFARGS ??= "" def oe_import(d): import sys - bbpath = d.getVar("BBPATH").split(":") - sys.path[0:0] = [os.path.join(dir, "lib") for dir in bbpath] - - def inject(name, value): - """Make a python object accessible from the metadata""" - if hasattr(bb.utils, "_context"): - bb.utils._context[name] = value - else: - __builtins__[name] = value + bbpath = [os.path.join(dir, "lib") for dir in d.getVar("BBPATH").split(":")] + sys.path[0:0] = [dir for dir in bbpath if dir not in sys.path] import oe.data for toimport in oe.data.typed_value("OE_IMPORTS", d): try: - imported = __import__(toimport) - inject(toimport.split(".", 1)[0], imported) + # Make a python object accessible from the metadata + bb.utils._context[toimport.split(".", 1)[0]] = __import__(toimport) except AttributeError as e: bb.error("Error importing OE modules: %s" % str(e)) return "" diff --git a/poky/meta/classes/image_types.bbclass b/poky/meta/classes/image_types.bbclass index f643ed3ce7..960dab1a60 100644 --- a/poky/meta/classes/image_types.bbclass +++ b/poky/meta/classes/image_types.bbclass @@ -264,8 +264,6 @@ IMAGE_TYPES = " \ ext3 ext3.gz \ ext4 ext4.gz \ btrfs \ - iso \ - hddimg \ squashfs squashfs-xz squashfs-lzo squashfs-lz4 squashfs-zst \ ubi ubifs multiubi \ tar tar.gz tar.bz2 tar.xz tar.lz4 tar.zst \ @@ -275,6 +273,9 @@ IMAGE_TYPES = " \ f2fs \ erofs erofs-lz4 erofs-lz4hc \ " +# These image types are x86 specific as they need syslinux +IMAGE_TYPES:append:x86 = " hddimg iso" +IMAGE_TYPES:append:x86-64 = " hddimg iso" # Compression is a special case of conversion. The old variable # names are still supported for backward-compatibility. When defining diff --git a/poky/meta/classes/mirrors.bbclass b/poky/meta/classes/mirrors.bbclass index 8e7b35d900..37dc449ade 100644 --- a/poky/meta/classes/mirrors.bbclass +++ b/poky/meta/classes/mirrors.bbclass @@ -42,6 +42,7 @@ ftp://sourceware.org/pub http://ftp.gwdg.de/pub/linux/sources.redhat.com/sourcew cvs://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \ svn://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \ git://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \ +gitsm://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \ hg://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \ bzr://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \ p4://.*/.* http://downloads.yoctoproject.org/mirror/sources/ \ @@ -52,6 +53,7 @@ npm://.*/?.* http://downloads.yoctoproject.org/mirror/sources/ \ cvs://.*/.* http://sources.openembedded.org/ \ svn://.*/.* http://sources.openembedded.org/ \ git://.*/.* http://sources.openembedded.org/ \ +gitsm://.*/.* http://sources.openembedded.org/ \ hg://.*/.* http://sources.openembedded.org/ \ bzr://.*/.* http://sources.openembedded.org/ \ p4://.*/.* http://sources.openembedded.org/ \ diff --git a/poky/meta/classes/testimage.bbclass b/poky/meta/classes/testimage.bbclass index 898248992c..8ffaeab284 100644 --- a/poky/meta/classes/testimage.bbclass +++ b/poky/meta/classes/testimage.bbclass @@ -205,7 +205,6 @@ def testimage_main(d): import shutil from bb.utils import export_proxies - from oeqa.core.utils.misc import updateTestData from oeqa.runtime.context import OERuntimeTestContext from oeqa.runtime.context import OERuntimeTestContextExecutor from oeqa.core.target.qemu import supported_fstypes @@ -245,7 +244,8 @@ def testimage_main(d): # Some variables need to be updates (mostly paths) with the # ones of the current environment because some tests require them. - updateTestData(d, td, d.getVar('TESTIMAGE_UPDATE_VARS').split()) + for var in d.getVar('TESTIMAGE_UPDATE_VARS').split(): + td[var] = d.getVar(var) image_manifest = "%s.manifest" % image_name image_packages = OERuntimeTestContextExecutor.readPackagesManifest(image_manifest) diff --git a/poky/meta/classes/toolchain-scripts.bbclass b/poky/meta/classes/toolchain-scripts.bbclass index 8f914cce27..1d7c703748 100644 --- a/poky/meta/classes/toolchain-scripts.bbclass +++ b/poky/meta/classes/toolchain-scripts.bbclass @@ -109,6 +109,7 @@ toolchain_shared_env_script () { echo 'export OECORE_SDK_VERSION="${SDK_VERSION}"' >> $script echo 'export ARCH=${ARCH}' >> $script echo 'export CROSS_COMPILE=${TARGET_PREFIX}' >> $script + echo 'export OECORE_TUNE_CCARGS="${TUNE_CCARGS}"' >> $script cat >> $script <<EOF |