Skip to content

Commit

Permalink
[vigiles.bbclass] Rename function to avoid conflict between vigiles.b…
Browse files Browse the repository at this point in the history
…bclass and create-spdx.bbclass

The function "collect_package_providers" in vigiles.bbclass has been renamed to "vigiles_collect_package_providers"
to prevent conflicts with the same function in create-spdx.bbclass.
This change was made to avoid issues since create-spdx.bbclass is inherited by default in poky.conf after the commit at
yoctoproject/poky@581edf2
  • Loading branch information
indresh-timesys committed Jun 28, 2023
1 parent 6fec865 commit ac5010b
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions classes/vigiles.bbclass
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ addtask do_collect_build_deps after do_package do_packagedata do_unpack before d
do_collect_build_deps[nostamp] = "1"
do_collect_build_deps[deptask] = "do_collect_build_deps"

def collect_package_providers(d):
def vigiles_collect_package_providers(d):
import oe.packagedata
providers = {}

Expand All @@ -138,7 +138,7 @@ def collect_package_providers(d):

return providers

collect_package_providers[vardepsexclude] += "BB_TASKDEPDATA"
vigiles_collect_package_providers[vardepsexclude] += "BB_TASKDEPDATA"


def parse_rdeps(pkg, rdep_dict):
Expand All @@ -156,7 +156,7 @@ def parse_rdeps(pkg, rdep_dict):

python do_collect_runtime_deps() {
is_native = bb.data.inherits_class("native", d) or bb.data.inherits_class("cross", d)
providers = collect_package_providers(d)
providers = vigiles_collect_package_providers(d)
pn = d.getVar("PN")
if not is_native:
bb.build.exec_func("read_subpackage_metadata", d)
Expand Down

0 comments on commit ac5010b

Please sign in to comment.