diff options
author | Fawzi KHABER <fawzi.khaber@smile.fr> | 2023-03-29 10:57:56 +0200 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2023-04-05 06:24:00 -1000 |
commit | c6cdb13c8cf31dd2613817b0dab9599f77f59921 (patch) | |
tree | f50677d7fa79f1b4eb6aa1eb6bb6e7f0b6405525 | |
parent | 8362859236d7b9f312f2d36f2437f4abbdeb5716 (diff) | |
download | openembedded-core-contrib-c6cdb13c8cf31dd2613817b0dab9599f77f59921.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>
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>
-rw-r--r-- | meta/classes-global/package.bbclass | 9 |
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 () { bb.build.exec_func("package_convert_pr_autoinc", d) + # Check for conflict between renamed packages and existing ones + # for each package in PACKAGES, check if it will be renamed to an existing one + for p in packages: + localdata = bb.data.createCopy(d) + localdata.setVar('OVERRIDES', p) + rename = localdata.getVar('PKG') + if (rename != None) and rename in packages: + bb.fatal('package "%s" is renamed to "%s" using PKG:%s, but package name already exists'%(p,rename,p)) + ########################################################################### # Optimisations ########################################################################### |