From 684dfc79ffa3ef3c2e266076d95f3fc54d84c68b Mon Sep 17 00:00:00 2001 From: Fawzi KHABER Date: Wed, 29 Mar 2023 10:57:56 +0200 Subject: 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 (From OE-Core rev: c6cdb13c8cf31dd2613817b0dab9599f77f59921) Signed-off-by: Fawzi KHABER Signed-off-by: Richard Purdie (cherry picked from commit f6cb63d3a871c4eef52d981131a56bf41aa1dcdf) Signed-off-by: Steve Sakoman --- meta/classes-global/package.bbclass | 9 +++++++++ 1 file changed, 9 insertions(+) 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 ########################################################################### -- cgit v1.2.3-54-g00ecf