summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorFawzi KHABER <fawzi.khaber@smile.fr>2023-03-29 10:57:56 +0200
committerSteve Sakoman <steve@sakoman.com>2023-04-14 06:30:29 -1000
commit684dfc79ffa3ef3c2e266076d95f3fc54d84c68b (patch)
treeddfe9ac6e550a6ac9080a3ba9569e214a93c37c8 /meta
parent517c97a80ebc4d95176dfc238faced7fbfd28964 (diff)
downloadpoky-684dfc79ffa3ef3c2e266076d95f3fc54d84c68b.tar.gz
package.bbclass: check packages name conflict in do_package
It is possible to rename packages with the macro PKG:${PN} and result in a package name conflict if the target name exists already. Add a fatal check to prevent this issue to go unnoticed. Fix [Yocto #12060] Reviewed-by: Yoann CONGAL <yoann.congal@smile.fr> (From OE-Core rev: c6cdb13c8cf31dd2613817b0dab9599f77f59921) Signed-off-by: Fawzi KHABER <fawzi.khaber@smile.fr> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit f6cb63d3a871c4eef52d981131a56bf41aa1dcdf) Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes-global/package.bbclass9
1 files changed, 9 insertions, 0 deletions
diff --git a/meta/classes-global/package.bbclass b/meta/classes-global/package.bbclass
index 7a0a428b30..a47da14ea5 100644
--- a/meta/classes-global/package.bbclass
+++ b/meta/classes-global/package.bbclass
@@ -2449,6 +2449,15 @@ python do_package () {
2449 2449
2450 bb.build.exec_func("package_convert_pr_autoinc", d) 2450 bb.build.exec_func("package_convert_pr_autoinc", d)
2451 2451
2452 # Check for conflict between renamed packages and existing ones
2453 # for each package in PACKAGES, check if it will be renamed to an existing one
2454 for p in packages:
2455 localdata = bb.data.createCopy(d)
2456 localdata.setVar('OVERRIDES', p)
2457 rename = localdata.getVar('PKG')
2458 if (rename != None) and rename in packages:
2459 bb.fatal('package "%s" is renamed to "%s" using PKG:%s, but package name already exists'%(p,rename,p))
2460
2452 ########################################################################### 2461 ###########################################################################
2453 # Optimisations 2462 # Optimisations
2454 ########################################################################### 2463 ###########################################################################