diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-27 14:46:43 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-01-29 21:21:53 +0000 |
commit | cff7db890cdfab41cc8f74e3dc378660d9b6219e (patch) | |
tree | 44b13c5bc5ce4b39f75aa47592717c63caac3a4f | |
parent | b033409243932a1d4e565d87154a436fa8531f1f (diff) | |
download | poky-cff7db890cdfab41cc8f74e3dc378660d9b6219e.tar.gz |
bitbake.conf/python: Drop setting RDEPENDS/RPROVIDES default
We never recommend setting RDEPENDS or RPROVIDES without a package name
against them. The default in bitbake.conf is legacy only, drop it.
The python recipe was trying to add to the empty variable in the native case
fix that too.
(From OE-Core rev: b8bbc1bbe282cce2ea4d0ff293f931f6caf6153b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/conf/bitbake.conf | 2 | ||||
-rw-r--r-- | meta/recipes-devtools/python/python3_3.9.1.bb | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf index 74976ac05c..3438be92b7 100644 --- a/meta/conf/bitbake.conf +++ b/meta/conf/bitbake.conf | |||
@@ -272,10 +272,8 @@ DEPCHAIN_PRE = "" | |||
272 | DEPCHAIN_POST = "-dev -dbg" | 272 | DEPCHAIN_POST = "-dev -dbg" |
273 | 273 | ||
274 | DEPENDS = "" | 274 | DEPENDS = "" |
275 | RDEPENDS = "" | ||
276 | PROVIDES = "" | 275 | PROVIDES = "" |
277 | PROVIDES_prepend = "${PN} " | 276 | PROVIDES_prepend = "${PN} " |
278 | RPROVIDES = "" | ||
279 | 277 | ||
280 | MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/nativesdk-libintl virtual/xserver virtual/update-alternatives-native virtual/update-alternatives" | 278 | MULTI_PROVIDER_WHITELIST = "virtual/libintl virtual/libintl-native virtual/nativesdk-libintl virtual/xserver virtual/update-alternatives-native virtual/update-alternatives" |
281 | 279 | ||
diff --git a/meta/recipes-devtools/python/python3_3.9.1.bb b/meta/recipes-devtools/python/python3_3.9.1.bb index a89122f949..a2dc572672 100644 --- a/meta/recipes-devtools/python/python3_3.9.1.bb +++ b/meta/recipes-devtools/python/python3_3.9.1.bb | |||
@@ -240,7 +240,7 @@ python(){ | |||
240 | # First set RPROVIDES for -native case | 240 | # First set RPROVIDES for -native case |
241 | # Hardcoded since it cant be python3-native-foo, should be python3-foo-native | 241 | # Hardcoded since it cant be python3-native-foo, should be python3-foo-native |
242 | pn = 'python3' | 242 | pn = 'python3' |
243 | rprovides = d.getVar('RPROVIDES').split() | 243 | rprovides = (d.getVar('RPROVIDES') or "").split() |
244 | 244 | ||
245 | # ${PN}-misc-native is not in the manifest | 245 | # ${PN}-misc-native is not in the manifest |
246 | rprovides.append(pn + '-misc-native') | 246 | rprovides.append(pn + '-misc-native') |