diff options
author | Patrick Williams <patrick@stwcx.xyz> | 2022-04-02 16:58:32 +0300 |
---|---|---|
committer | Patrick Williams <patrick@stwcx.xyz> | 2022-04-04 20:54:11 +0300 |
commit | 45852739b8823d99a818e714b72961886759fe2e (patch) | |
tree | 92fc4d26b025440bff29a7b0cbf204c7f5cca151 /poky/meta/classes | |
parent | e9c4c65544ebd9f2c5772936c9fe0552d5e6d5b0 (diff) | |
download | openbmc-45852739b8823d99a818e714b72961886759fe2e.tar.xz |
subtree updates
meta-openembedded: 9a52bfc4a6..af11f6ce73:
Andreas Müller (4):
nautilus: Add a packageconfig for libportal - disabled by default
gtk4: upgrade 4.4.0 -> 4.6.2
libadwaita: initial add 1.1.0
gtksourceview5: upgrade 5.2.0 -> 5.4.0
Carlos Rafael Giani (3):
libopenmpt: Remove unnecessary python code block
pipewire: Upgrade to version 0.3.49
wireplumber: Upgrade to version 0.4.9
Kai Kang (4):
wxwidgets: 3.1.4 -> 3.1.5
python3-wxgtk4: add recipe
wxwidgets: fix typo
mcelog: fix compile error
Khem Raj (1):
python3-wxgtk4: Use cross prefix with native wx-config
Matthias Klein (1):
paho-mqtt-c: upgrade 1.3.9 -> 1.3.10
Mingli Yu (1):
mariadb: increase MY_AES_CTX_SIZE
Potin Lai (4):
libimobiledevice-glue: add recipe
libimobiledevice-glue: fix undefined bswap error
libirecovery: add recipe
idevicerestore: add recipe
S. Lockwood-Childs (1):
python3-evdev: fix host header contamination
Yi Zhao (2):
strongswan: 5.9.4 -> 5.9.5
libnetfilter-conntrack: upgrade 1.0.8 -> 1.0.9
meta-raspberrypi: c06ae5eacf..31c33d155c:
Khem Raj (3):
linux-raspberrypi_5.15.bb: Upgrade to 5.15.32
raspberrypi-firmware: Update to match 5.15.32
armstubs: Upgrade to 20211101
poky: 5fe3689f4f..1976521190:
Chen Qi (1):
gobject-introspection: fix default search path for girdir
Daniel Ammann (2):
overview-manual: Fix reference
ref-manual: Add vfat in list of filesystems supported by kickstart
Jagadeesh Krishnanjanappa (1):
cmake: support to create per-toolchain cmake file in SDK
Khem Raj (2):
weston: Add a knob to control simple clients
meson: Robustify compiler detection logic
Marta Rybczynska (1):
doc: migration-3.5: extend the section on inclusive language
Michael Halstead (1):
releases: update to include 3.4.3
Michael Opdenacker (4):
overview-manual: add missing upper case
docs: add poky.yaml and sphinx-static/switchers.js to "make clean"
manuals: fix quoting of double dashes
migration-guides: preliminary description for 3.5
Oleksandr Kravchuk (1):
python3: update to 3.10.4
Peter Kjellerstedt (1):
ref-manual: Remove references to AVAILABLE_LICENSES
Rasmus Villemoes (1):
git: make expat and curl into PACKAGECONFIG items
Richard Purdie (11):
set_versions/switchers: Drop versions shown to the active releases
mirrors: Add missing gitsm entries for yocto/oe mirrors
base: Don't add duplicates to sys.path
base: Clean up module import compatibility code
modutils-initscripts: Change license PD -> MIT
keymaps: Clean up license handling
initscripts: Clean up license handling/identifiers
bitbake: cooker: Further fixes to inotify to fix memres bitbake issues
bitbake: cooker: Restore sys.path and sys.modules between parses
bitbake: cooker: Ensure any existing hashserv connection is closed
bitbake: cooker: Avoid error if siggen wasn't setup
Ross Burton (24):
ref-manual: update Python class documentation
buildtools-tarball: include nativesdk-python3-pyyaml
image_types: hddimg and iso only work on x86
oeqa/selftest/devtool: ensure Git username is set before upgrade tests
oeqa/selftest/wic: use os.rename instead of bb.utils.rename
oeqa/selftest/wic: remove redundant asserts
oeqa/selftest/wic: clean up only_for_arch decorator
oeqa/selftest/wic: don't hardcode kernel image type in test_wic_rm
oeqa/selftest/wic: add more arch-specific annotations
oeqa/selftest/buildoptions: set PACKAGE_CLASSES in test_arch_work_dir_and_export_source
oeqa/runtime/decorator/package.py: remove use of strToSet
oeqa/core/decorator: remove redundant code
testimage: inline updateTestData()
oeqa/core/utils/misc: remove redundant file
oeqa/selftest: remove unused imports
oeqa/core/decorators/data: improve has_* logic
oeqa/selftest: tag tests that use runqemu
oeqa: rationalise skipifqemu decorators
oeqa/selftest/oescripts: refactor skipping logic
oeqa/selftest/wic: cleanup WicTestCase.setUpLocal
oeqa/selftest/wic: rearrange tests
oeqa/selftest/wic: use os.path.join to join paths
oeqa/selftest/wic: use self.td instead of get_bb_var to save on bitbake calls
oeqa/selftest: generalise test_devtool_virtual_kernel_modify
Simon Kuhnle (1):
convert-variable-renames: Fix typo in description
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: Ic8359fe5772351a45a3154c6a7f5042a88ff934c
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 |