diff options
| author | jmbills <jason.m.bills@intel.com> | 2021-08-03 01:45:08 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-03 01:45:08 +0300 |
| commit | 10ad77d5bc86709d8ff7f95e7040e39f1c153903 (patch) | |
| tree | 307cedb87f4c0a329740c55ac364ed489d1d8fc2 /poky/meta/classes/native.bbclass | |
| parent | c6b1c6ba7a01b7987d65d61c262c44c320193108 (diff) | |
| parent | 67327ddc580cb9a85219a534844832a1682780d4 (diff) | |
| download | openbmc-10ad77d5bc86709d8ff7f95e7040e39f1c153903.tar.xz | |
Update
Diffstat (limited to 'poky/meta/classes/native.bbclass')
| -rw-r--r-- | poky/meta/classes/native.bbclass | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/poky/meta/classes/native.bbclass b/poky/meta/classes/native.bbclass index a0838e41b..561cc23f6 100644 --- a/poky/meta/classes/native.bbclass +++ b/poky/meta/classes/native.bbclass @@ -119,6 +119,7 @@ python native_virtclass_handler () { pn = e.data.getVar("PN") if not pn.endswith("-native"): return + bpn = e.data.getVar("BPN") # Set features here to prevent appends and distro features backfill # from modifying native distro features @@ -146,7 +147,10 @@ python native_virtclass_handler () { elif "-cross-" in dep: newdeps.append(dep.replace("-cross", "-native")) elif not dep.endswith("-native"): - newdeps.append(dep.replace("-native", "") + "-native") + # Replace ${PN} with ${BPN} in the dependency to make sure + # dependencies on, e.g., ${PN}-foo become ${BPN}-foo-native + # rather than ${BPN}-native-foo-native. + newdeps.append(dep.replace(pn, bpn) + "-native") else: newdeps.append(dep) d.setVar(varname, " ".join(newdeps), parsing=True) @@ -166,7 +170,7 @@ python native_virtclass_handler () { if prov.find(pn) != -1: nprovides.append(prov) elif not prov.endswith("-native"): - nprovides.append(prov.replace(prov, prov + "-native")) + nprovides.append(prov + "-native") else: nprovides.append(prov) e.data.setVar("PROVIDES", ' '.join(nprovides)) |