Message ID | 20250602102917.2424749-2-samanfatimarehman@gmail.com |
---|---|
State | New |
Headers | show |
Series | Corrected license paths | expand |
Hi Khalil, On 6/2/25 12:29 PM, Khalil via lists.openembedded.org wrote: > [You don't often get email from samanfatimarehman=gmail.com@lists.openembedded.org. Learn why this is important at https://aka.ms/LearnAboutSenderIdentification ] > Please provide some context here in the commit log. What are you fixing? How can one reproduce the bug themselves? etc... Also, we probably need some oe-selftest to make sure this bug doesn't appear again? Cheers, Quentin
> -----Original Message----- > From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Khalil via lists.openembedded.org > Sent: den 2 juni 2025 12:29 > To: openembedded-core@lists.openembedded.org > Cc: samanfatimarehman@gmail.com > Subject: [OE-core] [PATCH 1/1] Rectified license file paths for final images The subject shall always be prefixed by a relevant context, typically the name of the recipe, bbclass, etc. And of course we need an explanation of what the patch is actually trying to achieve. > > Signed-off-by: Saman Fatima <samanfatimarehman@gmail.com> > --- > meta/classes-recipe/license_image.bbclass | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/meta/classes-recipe/license_image.bbclass b/meta/classes-recipe/license_image.bbclass > index 19b3dc55ba..b5eb27fe3b 100644 > --- a/meta/classes-recipe/license_image.bbclass > +++ b/meta/classes-recipe/license_image.bbclass > @@ -219,7 +219,7 @@ def license_deployed_manifest(d): > " ".join(get_deployed_files(dep_dic[dep])) > > for pkgarch in pkgarchs: > - licfile = os.path.join(lic_dir, pkgarch, dep, "recipeinfo") > + licfile = os.path.join(lic_dir, dep, "recipeinfo") The pkgarch level of the directory structure was added in commit 1a4ab9fc26659507e678e87312b514e8ea515673 (license/license_image: Fix license file layout to avoid overlapping files) and removing it again is not the correct thing to do. What problems are you actually trying to solve? > if os.path.exists(licfile): > break > if not os.path.exists(licfile): //Peter
diff --git a/meta/classes-recipe/license_image.bbclass b/meta/classes-recipe/license_image.bbclass index 19b3dc55ba..b5eb27fe3b 100644 --- a/meta/classes-recipe/license_image.bbclass +++ b/meta/classes-recipe/license_image.bbclass @@ -219,7 +219,7 @@ def license_deployed_manifest(d): " ".join(get_deployed_files(dep_dic[dep])) for pkgarch in pkgarchs: - licfile = os.path.join(lic_dir, pkgarch, dep, "recipeinfo") + licfile = os.path.join(lic_dir, dep, "recipeinfo") if os.path.exists(licfile): break if not os.path.exists(licfile):
Signed-off-by: Saman Fatima <samanfatimarehman@gmail.com> --- meta/classes-recipe/license_image.bbclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)