base: use recipe specific PREFERRED_PROVIDER
PATCH 1/1 base: use recipe specific PREFERRED_PROVIDER
From: Chen Qi <[email protected]>
This patch adjusts Richard's patch a little bit:
https://lists.openembedded.org/g/openembedded-core/message/209927
The adjustments mainly includes:
1) Use bb.event.RecipeTaskPreProcess to do the replacement.
2) Do replacements for every task's "[depends]".
3) Use "virtual/nativesdk-cross-" instead of "virtual/cross-sdk-".
--- meta/classes-global/base.bbclass | 28 ++++++++++++++++++- meta/classes-global/staging.bbclass | 2 +- meta/classes/multilib_global.bbclass | 6 ++++ .../conf/distro/include/default-providers.inc | 1 + meta/conf/distro/include/tcmode-default.inc | 10 +++---- .../binutils/binutils-cross-canadian.inc | 2 +- .../binutils/binutils-cross.inc | 1 - .../binutils/binutils-crosssdk_2.43.1.bb | 2 -- .../gcc/gcc-cross-canadian.inc | 2 +- meta/recipes-devtools/gcc/gcc-cross.inc | 1 - meta/recipes-devtools/gcc/gcc-crosssdk.inc | 4 +-- meta/recipes-devtools/gcc/gcc-runtime.inc | 2 +- .../gdb/gdb-cross-canadian.inc | 2 +- .../recipes-devtools/go/go-cross-canadian.inc | 2 +- meta/recipes-devtools/go/go-crosssdk.inc | 2 +- .../rust/rust-cross-canadian.inc | 2 +- 16 files changed, 49 insertions(+), 20 deletions(-)
meta/classes-global/base.bbclass +27 -1
@@ -267,10 +267,36 @@ def buildcfg_neededvars(d): bb.fatal('The following variable(s) were not set: %s\nPlease set them directly, or choose a MACHINE or DISTRO that sets them.' % ', '.join(pesteruser)) addhandler base_eventhandler -base_eventhandler[eventmask] = "bb.event.ConfigParsed bb.event.MultiConfigParsed bb.event.BuildStarted bb.event.RecipePreFinalise bb.event.RecipeParsed" +base_eventhandler[eventmask] = "bb.event.ConfigParsed bb.event.MultiConfigParsed bb.event.BuildStarted bb.event.RecipeTaskPreProcess bb.event.RecipeParsed" python base_eventhandler() { import bb.runqueue + if isinstance(e, bb.event.RecipeTaskPreProcess): + # remapping virtual/xxx + pn = d.getVar("PN") + virtprovs = (d.getVar("RECIPE_VIRTUAL_PROVIDERS") or "").split() + depends = (d.getVar("DEPENDS") or "").split() + newdeps = [] + for dep in depends: + if dep in virtprovs: + newdep = d.getVar("PREFERRED_PROVIDER_" + dep) + if not newdep: + bb.fatal("PREFERRED_PROVIDER_%s not set" % dep) + else: + newdep = dep + newdeps.append(newdep) + d.setVar("DEPENDS", " ".join(newdeps)) + tasks = d.getVar("__BBTASKS", False) + for task in tasks: + task_deps = (d.getVarFlag(task, "depends") or "").split() + remapped_deps = [] + for task_dep in task_deps: + r, t = task_dep.split(":") + if r in virtprovs: + r = d.getVar("PREFERRED_PROVIDER_" + r) + remapped_deps.append("%s:%s" % (r, t)) + d.setVarFlag(task, "depends", " ".join(remapped_deps)) + if isinstance(e, bb.event.ConfigParsed): if not d.getVar("NATIVELSBSTRING", False): d.setVar("NATIVELSBSTRING", lsb_distro_identifier(d))
meta/classes-global/staging.bbclass +1 -1
@@ -127,7 +127,7 @@ do_populate_sysroot[vardepsexclude] += "BB_MULTI_PROVIDER_ALLOWED" POPULATESYSROOTDEPS = "" POPULATESYSROOTDEPS:class-target = "virtual/cross-binutils:do_populate_sysroot" -POPULATESYSROOTDEPS:class-nativesdk = "virtual/sdk-binutils:do_populate_sysroot" +POPULATESYSROOTDEPS:class-nativesdk = "virtual/nativesdk-cross-binutils:do_populate_sysroot" do_populate_sysroot[depends] += "${POPULATESYSROOTDEPS}" SSTATETASKS += "do_populate_sysroot"
meta/classes/multilib_global.bbclass +6 -0
@@ -155,6 +155,12 @@ def preferred_ml_updates(d): extramp.append(translate_provide(pref, p)) d.setVar("BB_MULTI_PROVIDER_ALLOWED", " ".join(mp + extramp)) + virtprovs = d.getVar("RECIPE_VIRTUAL_PROVIDERS").split() + for p in virtprovs.copy(): + for pref in prefixes: + virtprovs.append(translate_provide(pref, p)) + d.setVar("RECIPE_VIRTUAL_PROVIDERS", " ".join(virtprovs)) + abisafe = (d.getVar("SIGGEN_EXCLUDERECIPES_ABISAFE") or "").split() extras = [] for p in prefixes:
meta/conf/distro/include/default-providers.inc +1 -0
@@ -1,6 +1,7 @@ # # Default virtual providers # +RECIPE_VIRTUAL_PROVIDERS = "virtual/cross-cc virtual/cross-c++ virtual/cross-binutils virtual/compilerlibs virtual/nativesdk-cross-cc virtual/nativesdk-cross-c++ virtual/nativesdk-cross-binutils virtual/nativesdk-compilerlibs" PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" PREFERRED_PROVIDER_virtual/egl ?= "mesa"
meta/conf/distro/include/tcmode-default.inc +5 -5
@@ -5,17 +5,17 @@ PREFERRED_PROVIDER_virtual/cross-binutils = "${MLPREFIX}binutils-cross-${TARGET_ARCH}" PREFERRED_PROVIDER_virtual/cross-cc = "${MLPREFIX}gcc-cross-${TARGET_ARCH}" PREFERRED_PROVIDER_virtual/cross-c++ = "${MLPREFIX}gcc-cross-${TARGET_ARCH}" -PREFERRED_PROVIDER_virtual/compilerlibs = "gcc-runtime" +PREFERRED_PROVIDER_virtual/compilerlibs = "${MLPREFIX}gcc-runtime" PREFERRED_PROVIDER_gdb = "gdb" PREFERRED_PROVIDER_virtual/cross-binutils:class-nativesdk ?= "binutils-crosssdk-${SDK_SYS}" PREFERRED_PROVIDER_virtual/cross-cc:class-nativesdk = "gcc-crosssdk-${SDK_SYS}" PREFERRED_PROVIDER_virtual/cross-c++:class-nativesdk = "gcc-crosssdk-${SDK_SYS}" -PREFERRED_PROVIDER_virtual/cross-sdk-binutils ?= "binutils-crosssdk-${SDK_SYS}" -PREFERRED_PROVIDER_virtual/cross-sdk-cc = "gcc-crosssdk-${SDK_SYS}" -PREFERRED_PROVIDER_virtual/cross-sdk-c++ = "gcc-crosssdk-${SDK_SYS}" -PREFERRED_PROVIDER_virtual/sdk-compilerlibs = "nativesdk-gcc-runtime" +PREFERRED_PROVIDER_virtual/nativesdk-cross-binutils ?= "binutils-crosssdk-${SDK_SYS}" +PREFERRED_PROVIDER_virtual/nativesdk-cross-cc = "gcc-crosssdk-${SDK_SYS}" +PREFERRED_PROVIDER_virtual/nativesdk-cross-c++ = "gcc-crosssdk-${SDK_SYS}" +PREFERRED_PROVIDER_virtual/nativesdk-compilerlibs = "nativesdk-gcc-runtime" # Default libc config PREFERRED_PROVIDER_virtual/gettext ??= "gettext"
meta/recipes-devtools/binutils/binutils-cross-canadian.inc +1 -1
@@ -4,7 +4,7 @@ SUMMARY = "GNU binary utilities (cross-canadian for ${TARGET_ARCH} target)" PN = "binutils-cross-canadian-${TRANSLATED_TARGET_ARCH}" BPN = "binutils" -DEPENDS = "flex-native bison-native virtual/cross-sdk-cc virtual/nativesdk-libc nativesdk-zlib nativesdk-gettext nativesdk-flex" +DEPENDS = "flex-native bison-native virtual/nativesdk-cross-cc virtual/nativesdk-libc nativesdk-zlib nativesdk-gettext nativesdk-flex" EXTRA_OECONF += "--with-sysroot=${SDKPATH}/sysroots/${TUNE_PKGARCH}${TARGET_VENDOR}-${TARGET_OS} \ --enable-poison-system-directories \ "
meta/recipes-devtools/binutils/binutils-cross.inc +0 -1
@@ -1,5 +1,4 @@ inherit cross -PROVIDES = "virtual/cross-binutils" PN = "binutils-cross-${TARGET_ARCH}" BPN = "binutils"
meta/recipes-devtools/binutils/binutils-crosssdk_2.43.1.bb +0 -2
@@ -1,7 +1,5 @@ require binutils-cross_${PV}.bb -PROVIDES = "virtual/cross-sdk-binutils" - inherit crosssdk PN = "binutils-crosssdk-${SDK_SYS}"
meta/recipes-devtools/gcc/gcc-cross-canadian.inc +1 -1
@@ -3,7 +3,7 @@ inherit cross-canadian SUMMARY = "GNU cc and gcc C compilers (cross-canadian for ${TARGET_ARCH} target)" PN = "gcc-cross-canadian-${TRANSLATED_TARGET_ARCH}" -DEPENDS = "virtual/cross-sdk-cc virtual/cross-cc virtual/cross-sdk-binutils virtual/nativesdk-libc nativesdk-gettext flex-native virtual/libc" +DEPENDS = "virtual/nativesdk-cross-cc virtual/cross-cc virtual/nativesdk-cross-binutils virtual/nativesdk-libc nativesdk-gettext flex-native virtual/libc" GCCMULTILIB = "--enable-multilib"
meta/recipes-devtools/gcc/gcc-cross.inc +0 -1
@@ -3,7 +3,6 @@ inherit cross INHIBIT_DEFAULT_DEPS = "1" EXTRADEPENDS = "" DEPENDS = "virtual/cross-binutils ${EXTRADEPENDS} ${NATIVEDEPS}" -PROVIDES = "virtual/cross-cc virtual/c++" python () { if d.getVar("TARGET_OS").startswith("linux"): d.setVar("EXTRADEPENDS", "linux-libc-headers")
meta/recipes-devtools/gcc/gcc-crosssdk.inc +2 -2
@@ -8,7 +8,7 @@ SYSTEMLIBS1 = "${SDKPATHNATIVE}${libdir_nativesdk}/" GCCMULTILIB = "--disable-multilib" -DEPENDS = "virtual/cross-sdk-binutils gettext-native ${NATIVEDEPS}" -PROVIDES = "virtual/cross-sdk-cc virtual/cross-sdk-c++" +DEPENDS = "virtual/nativesdk-cross-binutils gettext-native ${NATIVEDEPS}" +PROVIDES = "virtual/nativesdk-cross-cc virtual/nativesdk-cross-c++" gcc_multilib_setup[vardepsexclude] = "MULTILIB_VARIANTS"
meta/recipes-devtools/gcc/gcc-runtime.inc +1 -1
@@ -157,7 +157,7 @@ do_install:append:class-target () { INHIBIT_DEFAULT_DEPS = "1" DEPENDS = "virtual/cross-cc virtual/cross-c++ ${MLPREFIX}libgcc virtual/${MLPREFIX}libc" -DEPENDS:class-nativesdk = "virtual/cross-sdk-cc virtual/cross-sdk-c++ ${MLPREFIX}libgcc virtual/${MLPREFIX}libc" +DEPENDS:class-nativesdk = "virtual/nativesdk-cross-cc virtual/nativesdk-cross-c++ ${MLPREFIX}libgcc virtual/${MLPREFIX}libc" PROVIDES = "virtual/${MLPREFIX}compilerlibs" BBCLASSEXTEND = "nativesdk"
meta/recipes-devtools/gdb/gdb-cross-canadian.inc +1 -1
@@ -7,7 +7,7 @@ PN = "gdb-cross-canadian-${TRANSLATED_TARGET_ARCH}" BPN = "gdb" DEPENDS = "nativesdk-ncurses nativesdk-expat nativesdk-gettext nativesdk-gmp nativesdk-mpfr \ - virtual/cross-sdk-cc virtual/cross-sdk-binutils virtual/nativesdk-libc" + virtual/nativesdk-cross-cc virtual/nativesdk-cross-binutils virtual/nativesdk-libc" GDBPROPREFIX = "--program-prefix='${TARGET_PREFIX}'"
meta/recipes-devtools/go/go-cross-canadian.inc +1 -1
@@ -1,7 +1,7 @@ inherit cross-canadian DEPENDS = "go-native virtual/${HOST_PREFIX}go virtual/nativesdk-${HOST_PREFIX}go-runtime \ - virtual/cross-sdk-cc virtual/nativesdk-libc \ + virtual/nativesdk-cross-cc virtual/nativesdk-libc \ virtual/nativesdk-compilerlibs" PN = "go-cross-canadian-${TRANSLATED_TARGET_ARCH}"
meta/recipes-devtools/go/go-crosssdk.inc +1 -1
@@ -1,6 +1,6 @@ inherit crosssdk -DEPENDS = "go-native virtual/cross-sdk-cc virtual/nativesdk-compilerlibs virtual/cross-sdk-binutils" +DEPENDS = "go-native virtual/nativesdk-cross-cc virtual/nativesdk-compilerlibs virtual/nativesdk-cross-binutils" PN = "go-crosssdk-${SDK_SYS}" PROVIDES = "virtual/${TARGET_PREFIX}go"
meta/recipes-devtools/rust/rust-cross-canadian.inc +1 -1
@@ -9,7 +9,7 @@ LICENSE = "MIT" MODIFYTOS = "0" -DEPENDS += "virtual/cross-sdk-cc virtual/nativesdk-libc virtual/nativesdk-compilerlibs" +DEPENDS += "virtual/nativesdk-cross-cc virtual/nativesdk-libc virtual/nativesdk-compilerlibs" SRC_URI += "file://target-rust-ccld.c" LIC_FILES_CHKSUM = "file://target-rust-ccld.c;md5=af4e0e29f81a34cffe05aa07c89e93e9;endline=7"
Signature · 1 line
2.25.1
Patchtest results for [OE-core][master-next][PATCH] base: use recipe specific PREFERRED_PROVIDER
Thank you for your submission. Patchtest identified one or more issues with the patch. Please see the log below for more information:
---
Testing patch /home/patchtest/share/mboxes/master-next-base-use-recipe-specific-PREFERRED_PROVIDER.patch
FAIL: test max line length: Patch line too long (current length 226, maximum is 200) (test_metadata.TestMetadata.test_max_line_length)
PASS: pretest src uri left files (test_metadata.TestMetadata.pretest_src_uri_left_files)
PASS: test CVE check ignore (test_metadata.TestMetadata.test_cve_check_ignore)
PASS: test Signed-off-by presence (test_mbox.TestMbox.test_signed_off_by_presence)
PASS: test author valid (test_mbox.TestMbox.test_author_valid)
PASS: test commit message presence (test_mbox.TestMbox.test_commit_message_presence)
PASS: test commit message user tags (test_mbox.TestMbox.test_commit_message_user_tags)
PASS: test lic files chksum modified not mentioned (test_metadata.TestMetadata.test_lic_files_chksum_modified_not_mentioned)
PASS: test mbox format (test_mbox.TestMbox.test_mbox_format)
PASS: test non-AUH upgrade (test_mbox.TestMbox.test_non_auh_upgrade)
PASS: test shortlog format (test_mbox.TestMbox.test_shortlog_format)
PASS: test shortlog length (test_mbox.TestMbox.test_shortlog_length)
PASS: test src uri left files (test_metadata.TestMetadata.test_src_uri_left_files)
PASS: test target mailing list (test_mbox.TestMbox.test_target_mailing_list)
SKIP: pretest pylint: No python related patches, skipping test (test_python_pylint.PyLint.pretest_pylint)
SKIP: test CVE tag format: No new CVE patches introduced (test_patch.TestPatch.test_cve_tag_format)
SKIP: test Signed-off-by presence: No new CVE patches introduced (test_patch.TestPatch.test_signed_off_by_presence)
SKIP: test Upstream-Status presence: No new CVE patches introduced (test_patch.TestPatch.test_upstream_status_presence_format)
SKIP: test bugzilla entry format: No bug ID found (test_mbox.TestMbox.test_bugzilla_entry_format)
SKIP: test lic files chksum presence: No added recipes, skipping test (test_metadata.TestMetadata.test_lic_files_chksum_presence)
SKIP: test license presence: No added recipes, skipping test (test_metadata.TestMetadata.test_license_presence)
SKIP: test pylint: No python related patches, skipping test (test_python_pylint.PyLint.test_pylint)
SKIP: test series merge on head: Merge test is disabled for now (test_mbox.TestMbox.test_series_merge_on_head)
SKIP: test summary presence: No added recipes, skipping test (test_metadata.TestMetadata.test_summary_presence)
---
Please address the issues identified and
submit a new revision of the patch, or alternatively, reply to this email with an explanation of why the patch should be accepted. If you believe these results are due to an error in patchtest, please submit a bug at https://bugzilla.yoctoproject.org/ (use the 'Patchtest' category under 'Yocto Project Subprojects'). For more information on specific failures, see: https://wiki.yoctoproject.org/wiki/Patchtest. Thank you!