* [meta-oe][PATCH] 1/2] package-manager: Allow for package manager user fields.
@ 2020-05-22 15:13 Paulo Neve
2020-05-22 15:13 ` [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata Paulo Neve
0 siblings, 1 reply; 8+ messages in thread
From: Paulo Neve @ 2020-05-22 15:13 UTC (permalink / raw)
To: openembedded-core; +Cc: Paulo Neves
We want the user metadata added on the packages but
if the index generator filters them they are useless
as they get to the index.
Allow user fields when populating the package index.
Signed-off-by: Paulo Neves <ptsneves@gmail.com>
---
meta/lib/oe/package_manager.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meta/lib/oe/package_manager.py b/meta/lib/oe/package_manager.py
index c055d2b0f7..b4b3324d0a 100644
--- a/meta/lib/oe/package_manager.py
+++ b/meta/lib/oe/package_manager.py
@@ -218,7 +218,7 @@ class OpkgIndexer(Indexer):
if not os.path.exists(pkgs_file):
open(pkgs_file, "w").close()
- index_cmds.add('%s --checksum md5 --checksum sha256 -r %s -p %s -m %s' %
+ index_cmds.add('%s --checksum md5 -f --checksum sha256 -r %s -p %s -m %s' %
(opkg_index_cmd, pkgs_file, pkgs_file, pkgs_dir))
index_sign_files.add(pkgs_file)
--
2.20.1
^ permalink raw reply related [flat|nested] 8+ messages in thread* [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata. 2020-05-22 15:13 [meta-oe][PATCH] 1/2] package-manager: Allow for package manager user fields Paulo Neve @ 2020-05-22 15:13 ` Paulo Neve 2020-05-22 15:22 ` [OE-core] " Alexander Kanavin 0 siblings, 1 reply; 8+ messages in thread From: Paulo Neve @ 2020-05-22 15:13 UTC (permalink / raw) To: openembedded-core; +Cc: Paulo Neves Up to now the user defined metadata was set recipe wide, meaning all the packages generated in a recipe where the variable was set would get the same metadata. That is not always ideal and is counter to the per package control that is usually available. Keep support for package agnostic metadata but also add option to add it to a specific option like: PACKAGE_ADD_METADATA_${PN}_IPK = "mymeta: myvalue" Signed-off-by: Paulo Neves <ptsneves@gmail.com> --- meta/classes/package.bbclass | 4 ++-- meta/classes/package_deb.bbclass | 2 +- meta/classes/package_ipk.bbclass | 2 +- meta/classes/package_rpm.bbclass | 5 +++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass index 0b5cf47749..1678e0d794 100644 --- a/meta/classes/package.bbclass +++ b/meta/classes/package.bbclass @@ -637,9 +637,9 @@ def get_package_mapping (pkg, basepkg, d, depversions=None): return pkg -def get_package_additional_metadata (pkg_type, d): +def get_package_additional_metadata (pkg_type, pkg_name, d): base_key = "PACKAGE_ADD_METADATA" - for key in ("%s_%s" % (base_key, pkg_type.upper()), base_key): + for key in ("%s_%s" % (base_key, pkg_type.upper()), "%s_%s_%s" % (base_key, pkg_name, pkg_type.upper()), base_key): if d.getVar(key, False) is None: continue d.setVarFlag(key, "type", "list") diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index 790b26aef2..6ef9c8cb3a 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -167,7 +167,7 @@ def deb_write_pkg(pkg, d): # more fields - custom_fields_chunk = get_package_additional_metadata("deb", localdata) + custom_fields_chunk = get_package_additional_metadata("deb", pkgname, localdata) if custom_fields_chunk: ctrlfile.write(custom_fields_chunk) ctrlfile.write("\n") diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass index c008559e4a..f78cec7a70 100644 --- a/meta/classes/package_ipk.bbclass +++ b/meta/classes/package_ipk.bbclass @@ -155,7 +155,7 @@ def ipk_write_pkg(pkg, d): else: ctrlfile.write(c % tuple(pullData(fs, localdata))) - custom_fields_chunk = get_package_additional_metadata("ipk", localdata) + custom_fields_chunk = get_package_additional_metadata("ipk", pkgname, localdata) if custom_fields_chunk is not None: ctrlfile.write(custom_fields_chunk) ctrlfile.write("\n") diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 9145717f98..ab019192da 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -295,7 +295,6 @@ python write_specfile () { srcmaintainer = d.getVar('MAINTAINER') srchomepage = d.getVar('HOMEPAGE') srcdescription = d.getVar('DESCRIPTION') or "." - srccustomtagschunk = get_package_additional_metadata("rpm", d) srcdepends = d.getVar('DEPENDS') srcrdepends = [] @@ -333,6 +332,8 @@ python write_specfile () { pkgname = localdata.getVar('PKG_%s' % pkg) if not pkgname: pkgname = pkg + + srccustomtagschunk = get_package_additional_metadata("rpm", pkgname, d) localdata.setVar('PKG', pkgname) localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg) @@ -351,7 +352,7 @@ python write_specfile () { splitlicense = (localdata.getVar('LICENSE') or "") splitsection = (localdata.getVar('SECTION') or "") splitdescription = (localdata.getVar('DESCRIPTION') or ".") - splitcustomtagschunk = get_package_additional_metadata("rpm", localdata) + splitcustomtagschunk = get_package_additional_metadata("rpm", pkgname, localdata) translate_vers('RDEPENDS', localdata) translate_vers('RRECOMMENDS', localdata) -- 2.20.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [OE-core] [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata. 2020-05-22 15:13 ` [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata Paulo Neve @ 2020-05-22 15:22 ` Alexander Kanavin 2020-05-22 15:28 ` Paulo Neve 0 siblings, 1 reply; 8+ messages in thread From: Alexander Kanavin @ 2020-05-22 15:22 UTC (permalink / raw) To: Paulo Neve; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 4512 bytes --] Should there be a test for this functionality? Somewhere in oe-selftest perhaps where various package manager features are tested? Alex On Fri, 22 May 2020 at 17:13, Paulo Neve <ptsneves@gmail.com> wrote: > Up to now the user defined metadata was set recipe wide, > meaning all the packages generated in a recipe where the > variable was set would get the same metadata. That is not > always ideal and is counter to the per package control that > is usually available. > > Keep support for package agnostic metadata but also add option > to add it to a specific option like: > PACKAGE_ADD_METADATA_${PN}_IPK = "mymeta: myvalue" > > Signed-off-by: Paulo Neves <ptsneves@gmail.com> > --- > meta/classes/package.bbclass | 4 ++-- > meta/classes/package_deb.bbclass | 2 +- > meta/classes/package_ipk.bbclass | 2 +- > meta/classes/package_rpm.bbclass | 5 +++-- > 4 files changed, 7 insertions(+), 6 deletions(-) > > diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass > index 0b5cf47749..1678e0d794 100644 > --- a/meta/classes/package.bbclass > +++ b/meta/classes/package.bbclass > @@ -637,9 +637,9 @@ def get_package_mapping (pkg, basepkg, d, > depversions=None): > > return pkg > > -def get_package_additional_metadata (pkg_type, d): > +def get_package_additional_metadata (pkg_type, pkg_name, d): > base_key = "PACKAGE_ADD_METADATA" > - for key in ("%s_%s" % (base_key, pkg_type.upper()), base_key): > + for key in ("%s_%s" % (base_key, pkg_type.upper()), "%s_%s_%s" % > (base_key, pkg_name, pkg_type.upper()), base_key): > if d.getVar(key, False) is None: > continue > d.setVarFlag(key, "type", "list") > diff --git a/meta/classes/package_deb.bbclass > b/meta/classes/package_deb.bbclass > index 790b26aef2..6ef9c8cb3a 100644 > --- a/meta/classes/package_deb.bbclass > +++ b/meta/classes/package_deb.bbclass > @@ -167,7 +167,7 @@ def deb_write_pkg(pkg, d): > > # more fields > > - custom_fields_chunk = get_package_additional_metadata("deb", > localdata) > + custom_fields_chunk = get_package_additional_metadata("deb", > pkgname, localdata) > if custom_fields_chunk: > ctrlfile.write(custom_fields_chunk) > ctrlfile.write("\n") > diff --git a/meta/classes/package_ipk.bbclass > b/meta/classes/package_ipk.bbclass > index c008559e4a..f78cec7a70 100644 > --- a/meta/classes/package_ipk.bbclass > +++ b/meta/classes/package_ipk.bbclass > @@ -155,7 +155,7 @@ def ipk_write_pkg(pkg, d): > else: > ctrlfile.write(c % tuple(pullData(fs, localdata))) > > - custom_fields_chunk = get_package_additional_metadata("ipk", > localdata) > + custom_fields_chunk = get_package_additional_metadata("ipk", > pkgname, localdata) > if custom_fields_chunk is not None: > ctrlfile.write(custom_fields_chunk) > ctrlfile.write("\n") > diff --git a/meta/classes/package_rpm.bbclass > b/meta/classes/package_rpm.bbclass > index 9145717f98..ab019192da 100644 > --- a/meta/classes/package_rpm.bbclass > +++ b/meta/classes/package_rpm.bbclass > @@ -295,7 +295,6 @@ python write_specfile () { > srcmaintainer = d.getVar('MAINTAINER') > srchomepage = d.getVar('HOMEPAGE') > srcdescription = d.getVar('DESCRIPTION') or "." > - srccustomtagschunk = get_package_additional_metadata("rpm", d) > > srcdepends = d.getVar('DEPENDS') > srcrdepends = [] > @@ -333,6 +332,8 @@ python write_specfile () { > pkgname = localdata.getVar('PKG_%s' % pkg) > if not pkgname: > pkgname = pkg > + > + srccustomtagschunk = get_package_additional_metadata("rpm", > pkgname, d) > localdata.setVar('PKG', pkgname) > > localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" > + pkg) > @@ -351,7 +352,7 @@ python write_specfile () { > splitlicense = (localdata.getVar('LICENSE') or "") > splitsection = (localdata.getVar('SECTION') or "") > splitdescription = (localdata.getVar('DESCRIPTION') or ".") > - splitcustomtagschunk = get_package_additional_metadata("rpm", > localdata) > + splitcustomtagschunk = get_package_additional_metadata("rpm", > pkgname, localdata) > > translate_vers('RDEPENDS', localdata) > translate_vers('RRECOMMENDS', localdata) > -- > 2.20.1 > > > [-- Attachment #2: Type: text/html, Size: 5568 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [OE-core] [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata. 2020-05-22 15:22 ` [OE-core] " Alexander Kanavin @ 2020-05-22 15:28 ` Paulo Neve 2020-05-22 18:00 ` Michael Ho 0 siblings, 1 reply; 8+ messages in thread From: Paulo Neve @ 2020-05-22 15:28 UTC (permalink / raw) To: Alexander Kanavin; +Cc: OE-core Is ./meta/lib/oeqa/selftest/cases/package.py the right place? If yes i can work on it. Note that this functionality is not used anywhere in poky and is not documented at all. It just happened to exist for a long time and be useful for my case. On Fri, May 22, 2020 at 5:22 PM Alexander Kanavin <alex.kanavin@gmail.com> wrote: > > Should there be a test for this functionality? Somewhere in oe-selftest perhaps where various package manager features are tested? > > Alex > > On Fri, 22 May 2020 at 17:13, Paulo Neve <ptsneves@gmail.com> wrote: >> >> Up to now the user defined metadata was set recipe wide, >> meaning all the packages generated in a recipe where the >> variable was set would get the same metadata. That is not >> always ideal and is counter to the per package control that >> is usually available. >> >> Keep support for package agnostic metadata but also add option >> to add it to a specific option like: >> PACKAGE_ADD_METADATA_${PN}_IPK = "mymeta: myvalue" >> >> Signed-off-by: Paulo Neves <ptsneves@gmail.com> >> --- >> meta/classes/package.bbclass | 4 ++-- >> meta/classes/package_deb.bbclass | 2 +- >> meta/classes/package_ipk.bbclass | 2 +- >> meta/classes/package_rpm.bbclass | 5 +++-- >> 4 files changed, 7 insertions(+), 6 deletions(-) >> >> diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass >> index 0b5cf47749..1678e0d794 100644 >> --- a/meta/classes/package.bbclass >> +++ b/meta/classes/package.bbclass >> @@ -637,9 +637,9 @@ def get_package_mapping (pkg, basepkg, d, depversions=None): >> >> return pkg >> >> -def get_package_additional_metadata (pkg_type, d): >> +def get_package_additional_metadata (pkg_type, pkg_name, d): >> base_key = "PACKAGE_ADD_METADATA" >> - for key in ("%s_%s" % (base_key, pkg_type.upper()), base_key): >> + for key in ("%s_%s" % (base_key, pkg_type.upper()), "%s_%s_%s" % (base_key, pkg_name, pkg_type.upper()), base_key): >> if d.getVar(key, False) is None: >> continue >> d.setVarFlag(key, "type", "list") >> diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass >> index 790b26aef2..6ef9c8cb3a 100644 >> --- a/meta/classes/package_deb.bbclass >> +++ b/meta/classes/package_deb.bbclass >> @@ -167,7 +167,7 @@ def deb_write_pkg(pkg, d): >> >> # more fields >> >> - custom_fields_chunk = get_package_additional_metadata("deb", localdata) >> + custom_fields_chunk = get_package_additional_metadata("deb", pkgname, localdata) >> if custom_fields_chunk: >> ctrlfile.write(custom_fields_chunk) >> ctrlfile.write("\n") >> diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass >> index c008559e4a..f78cec7a70 100644 >> --- a/meta/classes/package_ipk.bbclass >> +++ b/meta/classes/package_ipk.bbclass >> @@ -155,7 +155,7 @@ def ipk_write_pkg(pkg, d): >> else: >> ctrlfile.write(c % tuple(pullData(fs, localdata))) >> >> - custom_fields_chunk = get_package_additional_metadata("ipk", localdata) >> + custom_fields_chunk = get_package_additional_metadata("ipk", pkgname, localdata) >> if custom_fields_chunk is not None: >> ctrlfile.write(custom_fields_chunk) >> ctrlfile.write("\n") >> diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass >> index 9145717f98..ab019192da 100644 >> --- a/meta/classes/package_rpm.bbclass >> +++ b/meta/classes/package_rpm.bbclass >> @@ -295,7 +295,6 @@ python write_specfile () { >> srcmaintainer = d.getVar('MAINTAINER') >> srchomepage = d.getVar('HOMEPAGE') >> srcdescription = d.getVar('DESCRIPTION') or "." >> - srccustomtagschunk = get_package_additional_metadata("rpm", d) >> >> srcdepends = d.getVar('DEPENDS') >> srcrdepends = [] >> @@ -333,6 +332,8 @@ python write_specfile () { >> pkgname = localdata.getVar('PKG_%s' % pkg) >> if not pkgname: >> pkgname = pkg >> + >> + srccustomtagschunk = get_package_additional_metadata("rpm", pkgname, d) >> localdata.setVar('PKG', pkgname) >> >> localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg) >> @@ -351,7 +352,7 @@ python write_specfile () { >> splitlicense = (localdata.getVar('LICENSE') or "") >> splitsection = (localdata.getVar('SECTION') or "") >> splitdescription = (localdata.getVar('DESCRIPTION') or ".") >> - splitcustomtagschunk = get_package_additional_metadata("rpm", localdata) >> + splitcustomtagschunk = get_package_additional_metadata("rpm", pkgname, localdata) >> >> translate_vers('RDEPENDS', localdata) >> translate_vers('RRECOMMENDS', localdata) >> -- >> 2.20.1 >> >> ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [OE-core] [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata. 2020-05-22 15:28 ` Paulo Neve @ 2020-05-22 18:00 ` Michael Ho 2020-05-22 18:09 ` Paulo Neve 0 siblings, 1 reply; 8+ messages in thread From: Michael Ho @ 2020-05-22 18:00 UTC (permalink / raw) To: Paulo Neve; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 6799 bytes --] Hi Paulo, I actually have some patches in my "to send upstream list" to address the documentation and some sstate-caching bugs with these variables so it's fresh to me at the moment. Correct me if I'm wrong but I think this is already available in the code (applying metadata specific to a certain package in a recipe, that is). eg. http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_ipk.bbclass at line 72 sets the local overrides so if PACKAGE_ADD_METADATA_IPK_xxx is set, it overrides PACKAGE_ADD_METADATA_IPK. For rpm, see http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n298 where the recipe wide variable is fetched http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n338 where the local override is also set http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n354 where the package specific variables are fetched http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n436 where the package specific variables are applied to rpm packages I tested the zip recipe by applying these two lines: PACKAGE_ADD_METADATA_RPM = "Vendor: None" PACKAGE_ADD_METADATA_RPM_zip-dbg = "Vendor: Not you!" and could see differing results in the two rpm files produced. I think this covers the use case you're showing in your patches already, what do you think? Kind regards, Michael (sorry if this shows up as a triple email, my mail client wasn't cooperating). On Fri, May 22, 2020 at 5:29 PM Paulo Neve <ptsneves@gmail.com> wrote: > Is ./meta/lib/oeqa/selftest/cases/package.py the right place? > If yes i can work on it. Note that this functionality is not used > anywhere in poky and is not documented at all. It just happened to > exist for a long time and be useful for my case. > > On Fri, May 22, 2020 at 5:22 PM Alexander Kanavin > <alex.kanavin@gmail.com> wrote: > > > > Should there be a test for this functionality? Somewhere in oe-selftest > perhaps where various package manager features are tested? > > > > Alex > > > > On Fri, 22 May 2020 at 17:13, Paulo Neve <ptsneves@gmail.com> wrote: > >> > >> Up to now the user defined metadata was set recipe wide, > >> meaning all the packages generated in a recipe where the > >> variable was set would get the same metadata. That is not > >> always ideal and is counter to the per package control that > >> is usually available. > >> > >> Keep support for package agnostic metadata but also add option > >> to add it to a specific option like: > >> PACKAGE_ADD_METADATA_${PN}_IPK = "mymeta: myvalue" > >> > >> Signed-off-by: Paulo Neves <ptsneves@gmail.com> > >> --- > >> meta/classes/package.bbclass | 4 ++-- > >> meta/classes/package_deb.bbclass | 2 +- > >> meta/classes/package_ipk.bbclass | 2 +- > >> meta/classes/package_rpm.bbclass | 5 +++-- > >> 4 files changed, 7 insertions(+), 6 deletions(-) > >> > >> diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass > >> index 0b5cf47749..1678e0d794 100644 > >> --- a/meta/classes/package.bbclass > >> +++ b/meta/classes/package.bbclass > >> @@ -637,9 +637,9 @@ def get_package_mapping (pkg, basepkg, d, > depversions=None): > >> > >> return pkg > >> > >> -def get_package_additional_metadata (pkg_type, d): > >> +def get_package_additional_metadata (pkg_type, pkg_name, d): > >> base_key = "PACKAGE_ADD_METADATA" > >> - for key in ("%s_%s" % (base_key, pkg_type.upper()), base_key): > >> + for key in ("%s_%s" % (base_key, pkg_type.upper()), "%s_%s_%s" % > (base_key, pkg_name, pkg_type.upper()), base_key): > >> if d.getVar(key, False) is None: > >> continue > >> d.setVarFlag(key, "type", "list") > >> diff --git a/meta/classes/package_deb.bbclass > b/meta/classes/package_deb.bbclass > >> index 790b26aef2..6ef9c8cb3a 100644 > >> --- a/meta/classes/package_deb.bbclass > >> +++ b/meta/classes/package_deb.bbclass > >> @@ -167,7 +167,7 @@ def deb_write_pkg(pkg, d): > >> > >> # more fields > >> > >> - custom_fields_chunk = get_package_additional_metadata("deb", > localdata) > >> + custom_fields_chunk = get_package_additional_metadata("deb", > pkgname, localdata) > >> if custom_fields_chunk: > >> ctrlfile.write(custom_fields_chunk) > >> ctrlfile.write("\n") > >> diff --git a/meta/classes/package_ipk.bbclass > b/meta/classes/package_ipk.bbclass > >> index c008559e4a..f78cec7a70 100644 > >> --- a/meta/classes/package_ipk.bbclass > >> +++ b/meta/classes/package_ipk.bbclass > >> @@ -155,7 +155,7 @@ def ipk_write_pkg(pkg, d): > >> else: > >> ctrlfile.write(c % tuple(pullData(fs, localdata))) > >> > >> - custom_fields_chunk = get_package_additional_metadata("ipk", > localdata) > >> + custom_fields_chunk = get_package_additional_metadata("ipk", > pkgname, localdata) > >> if custom_fields_chunk is not None: > >> ctrlfile.write(custom_fields_chunk) > >> ctrlfile.write("\n") > >> diff --git a/meta/classes/package_rpm.bbclass > b/meta/classes/package_rpm.bbclass > >> index 9145717f98..ab019192da 100644 > >> --- a/meta/classes/package_rpm.bbclass > >> +++ b/meta/classes/package_rpm.bbclass > >> @@ -295,7 +295,6 @@ python write_specfile () { > >> srcmaintainer = d.getVar('MAINTAINER') > >> srchomepage = d.getVar('HOMEPAGE') > >> srcdescription = d.getVar('DESCRIPTION') or "." > >> - srccustomtagschunk = get_package_additional_metadata("rpm", d) > >> > >> srcdepends = d.getVar('DEPENDS') > >> srcrdepends = [] > >> @@ -333,6 +332,8 @@ python write_specfile () { > >> pkgname = localdata.getVar('PKG_%s' % pkg) > >> if not pkgname: > >> pkgname = pkg > >> + > >> + srccustomtagschunk = get_package_additional_metadata("rpm", > pkgname, d) > >> localdata.setVar('PKG', pkgname) > >> > >> localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + > ":" + pkg) > >> @@ -351,7 +352,7 @@ python write_specfile () { > >> splitlicense = (localdata.getVar('LICENSE') or "") > >> splitsection = (localdata.getVar('SECTION') or "") > >> splitdescription = (localdata.getVar('DESCRIPTION') or ".") > >> - splitcustomtagschunk = get_package_additional_metadata("rpm", > localdata) > >> + splitcustomtagschunk = get_package_additional_metadata("rpm", > pkgname, localdata) > >> > >> translate_vers('RDEPENDS', localdata) > >> translate_vers('RRECOMMENDS', localdata) > >> -- > >> 2.20.1 > >> > >> > > [-- Attachment #2: Type: text/html, Size: 9483 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [OE-core] [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata. 2020-05-22 18:00 ` Michael Ho @ 2020-05-22 18:09 ` Paulo Neve 2020-05-22 19:31 ` Michael Ho 0 siblings, 1 reply; 8+ messages in thread From: Paulo Neve @ 2020-05-22 18:09 UTC (permalink / raw) To: Michael Ho; +Cc: OE-core Hello Michael, The behavior you describe is indeed what i wanted. If you say this is already working then my patches are redundant. Even so i am surprised it is working. Is it done automatically by the getVar function? def get_package_additional_metadata (pkg_type, d): base_key = "PACKAGE_ADD_METADATA" for key in ("%s_%s" % (base_key, pkg_type.upper()), base_key): if d.getVar(key, False) is None: continue d.setVarFlag(key, "type", "list") if d.getVarFlag(key, "separator") is None: d.setVarFlag(key, "separator", "\\n") metadata_fields = [field.strip() for field in oe.data.typed_value(key, d)] return "\n".join(metadata_fields).strip() From my understanding, i do not see how the per package override happens. Do you have the test for this functionality in oe-selftest? Grateful for the feedback Paulo Neves On Fri, May 22, 2020 at 8:00 PM Michael Ho <michael.ho@ieee.org> wrote: > > Hi Paulo, > > I actually have some patches in my "to send upstream list" to address the documentation and some sstate-caching bugs with these variables so it's fresh to me at the moment. > Correct me if I'm wrong but I think this is already available in the code (applying metadata specific to a certain package in a recipe, that is). > > eg. http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_ipk.bbclass at line 72 sets the local overrides so if PACKAGE_ADD_METADATA_IPK_xxx is set, it overrides PACKAGE_ADD_METADATA_IPK. > > For rpm, see > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n298 where the recipe wide variable is fetched > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n338 where the local override is also set > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n354 where the package specific variables are fetched > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n436 where the package specific variables are applied to rpm packages > > I tested the zip recipe by applying these two lines: > PACKAGE_ADD_METADATA_RPM = "Vendor: None" > PACKAGE_ADD_METADATA_RPM_zip-dbg = "Vendor: Not you!" > and could see differing results in the two rpm files produced. > > I think this covers the use case you're showing in your patches already, what do you think? > > Kind regards, > Michael > > (sorry if this shows up as a triple email, my mail client wasn't cooperating). > > On Fri, May 22, 2020 at 5:29 PM Paulo Neve <ptsneves@gmail.com> wrote: >> >> Is ./meta/lib/oeqa/selftest/cases/package.py the right place? >> If yes i can work on it. Note that this functionality is not used >> anywhere in poky and is not documented at all. It just happened to >> exist for a long time and be useful for my case. >> >> On Fri, May 22, 2020 at 5:22 PM Alexander Kanavin >> <alex.kanavin@gmail.com> wrote: >> > >> > Should there be a test for this functionality? Somewhere in oe-selftest perhaps where various package manager features are tested? >> > >> > Alex >> > >> > On Fri, 22 May 2020 at 17:13, Paulo Neve <ptsneves@gmail.com> wrote: >> >> >> >> Up to now the user defined metadata was set recipe wide, >> >> meaning all the packages generated in a recipe where the >> >> variable was set would get the same metadata. That is not >> >> always ideal and is counter to the per package control that >> >> is usually available. >> >> >> >> Keep support for package agnostic metadata but also add option >> >> to add it to a specific option like: >> >> PACKAGE_ADD_METADATA_${PN}_IPK = "mymeta: myvalue" >> >> >> >> Signed-off-by: Paulo Neves <ptsneves@gmail.com> >> >> --- >> >> meta/classes/package.bbclass | 4 ++-- >> >> meta/classes/package_deb.bbclass | 2 +- >> >> meta/classes/package_ipk.bbclass | 2 +- >> >> meta/classes/package_rpm.bbclass | 5 +++-- >> >> 4 files changed, 7 insertions(+), 6 deletions(-) >> >> >> >> diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass >> >> index 0b5cf47749..1678e0d794 100644 >> >> --- a/meta/classes/package.bbclass >> >> +++ b/meta/classes/package.bbclass >> >> @@ -637,9 +637,9 @@ def get_package_mapping (pkg, basepkg, d, depversions=None): >> >> >> >> return pkg >> >> >> >> -def get_package_additional_metadata (pkg_type, d): >> >> +def get_package_additional_metadata (pkg_type, pkg_name, d): >> >> base_key = "PACKAGE_ADD_METADATA" >> >> - for key in ("%s_%s" % (base_key, pkg_type.upper()), base_key): >> >> + for key in ("%s_%s" % (base_key, pkg_type.upper()), "%s_%s_%s" % (base_key, pkg_name, pkg_type.upper()), base_key): >> >> if d.getVar(key, False) is None: >> >> continue >> >> d.setVarFlag(key, "type", "list") >> >> diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass >> >> index 790b26aef2..6ef9c8cb3a 100644 >> >> --- a/meta/classes/package_deb.bbclass >> >> +++ b/meta/classes/package_deb.bbclass >> >> @@ -167,7 +167,7 @@ def deb_write_pkg(pkg, d): >> >> >> >> # more fields >> >> >> >> - custom_fields_chunk = get_package_additional_metadata("deb", localdata) >> >> + custom_fields_chunk = get_package_additional_metadata("deb", pkgname, localdata) >> >> if custom_fields_chunk: >> >> ctrlfile.write(custom_fields_chunk) >> >> ctrlfile.write("\n") >> >> diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass >> >> index c008559e4a..f78cec7a70 100644 >> >> --- a/meta/classes/package_ipk.bbclass >> >> +++ b/meta/classes/package_ipk.bbclass >> >> @@ -155,7 +155,7 @@ def ipk_write_pkg(pkg, d): >> >> else: >> >> ctrlfile.write(c % tuple(pullData(fs, localdata))) >> >> >> >> - custom_fields_chunk = get_package_additional_metadata("ipk", localdata) >> >> + custom_fields_chunk = get_package_additional_metadata("ipk", pkgname, localdata) >> >> if custom_fields_chunk is not None: >> >> ctrlfile.write(custom_fields_chunk) >> >> ctrlfile.write("\n") >> >> diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass >> >> index 9145717f98..ab019192da 100644 >> >> --- a/meta/classes/package_rpm.bbclass >> >> +++ b/meta/classes/package_rpm.bbclass >> >> @@ -295,7 +295,6 @@ python write_specfile () { >> >> srcmaintainer = d.getVar('MAINTAINER') >> >> srchomepage = d.getVar('HOMEPAGE') >> >> srcdescription = d.getVar('DESCRIPTION') or "." >> >> - srccustomtagschunk = get_package_additional_metadata("rpm", d) >> >> >> >> srcdepends = d.getVar('DEPENDS') >> >> srcrdepends = [] >> >> @@ -333,6 +332,8 @@ python write_specfile () { >> >> pkgname = localdata.getVar('PKG_%s' % pkg) >> >> if not pkgname: >> >> pkgname = pkg >> >> + >> >> + srccustomtagschunk = get_package_additional_metadata("rpm", pkgname, d) >> >> localdata.setVar('PKG', pkgname) >> >> >> >> localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg) >> >> @@ -351,7 +352,7 @@ python write_specfile () { >> >> splitlicense = (localdata.getVar('LICENSE') or "") >> >> splitsection = (localdata.getVar('SECTION') or "") >> >> splitdescription = (localdata.getVar('DESCRIPTION') or ".") >> >> - splitcustomtagschunk = get_package_additional_metadata("rpm", localdata) >> >> + splitcustomtagschunk = get_package_additional_metadata("rpm", pkgname, localdata) >> >> >> >> translate_vers('RDEPENDS', localdata) >> >> translate_vers('RRECOMMENDS', localdata) >> >> -- >> >> 2.20.1 >> >> >> >> >> ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [OE-core] [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata. 2020-05-22 18:09 ` Paulo Neve @ 2020-05-22 19:31 ` Michael Ho 2020-05-23 17:40 ` Paulo Neve 0 siblings, 1 reply; 8+ messages in thread From: Michael Ho @ 2020-05-22 19:31 UTC (permalink / raw) To: Paulo Neves; +Cc: OE-core [-- Attachment #1: Type: text/plain, Size: 9092 bytes --] Hi Paulo, Yes, this is handled by the bitbake data handlers automatically. You can check this by trying the following: python do_test() { d.setVar("HELLO", "world!") d.setVar("HELLO_space", "space!") bb.warn("HELLO: %s" % d.getVar("HELLO", True)) d.setVar("OVERRIDES", "space") bb.warn("HELLO: %s" % d.getVar("HELLO", True)) } addtask test Then calling this task with bitbake: $ bitbake zip -c test | tee ... WARNING: zip-3.0-r2 do_test: HELLO: world! WARNING: zip-3.0-r2 do_test: HELLO: space! I don't know the code or tests in oe that implement this functionality off the top of my head so I can't point you to the oe.selftest coverage. Kind regards, Michael On Fri, May 22, 2020 at 8:09 PM Paulo Neves <ptsneves@gmail.com> wrote: > Hello Michael, > > The behavior you describe is indeed what i wanted. If you say this is > already working then my patches are redundant. Even so i am surprised > it is working. Is it done automatically by the getVar function? > > def get_package_additional_metadata (pkg_type, d): > base_key = "PACKAGE_ADD_METADATA" > for key in ("%s_%s" % (base_key, pkg_type.upper()), base_key): > if d.getVar(key, False) is None: > continue > d.setVarFlag(key, "type", "list") > if d.getVarFlag(key, "separator") is None: > d.setVarFlag(key, "separator", "\\n") > metadata_fields = [field.strip() for field in > oe.data.typed_value(key, d)] > return "\n".join(metadata_fields).strip() > > From my understanding, i do not see how the per package override > happens. Do you have the test for this functionality in oe-selftest? > > Grateful for the feedback > Paulo Neves > > On Fri, May 22, 2020 at 8:00 PM Michael Ho <michael.ho@ieee.org> wrote: > > > > Hi Paulo, > > > > I actually have some patches in my "to send upstream list" to address > the documentation and some sstate-caching bugs with these variables so it's > fresh to me at the moment. > > Correct me if I'm wrong but I think this is already available in the > code (applying metadata specific to a certain package in a recipe, that is). > > > > eg. > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_ipk.bbclass > at line 72 sets the local overrides so if PACKAGE_ADD_METADATA_IPK_xxx is > set, it overrides PACKAGE_ADD_METADATA_IPK. > > > > For rpm, see > > > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n298 > where the recipe wide variable is fetched > > > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n338 > where the local override is also set > > > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n354 > where the package specific variables are fetched > > > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n436 > where the package specific variables are applied to rpm packages > > > > I tested the zip recipe by applying these two lines: > > PACKAGE_ADD_METADATA_RPM = "Vendor: None" > > PACKAGE_ADD_METADATA_RPM_zip-dbg = "Vendor: Not you!" > > and could see differing results in the two rpm files produced. > > > > I think this covers the use case you're showing in your patches already, > what do you think? > > > > Kind regards, > > Michael > > > > (sorry if this shows up as a triple email, my mail client wasn't > cooperating). > > > > On Fri, May 22, 2020 at 5:29 PM Paulo Neve <ptsneves@gmail.com> wrote: > >> > >> Is ./meta/lib/oeqa/selftest/cases/package.py the right place? > >> If yes i can work on it. Note that this functionality is not used > >> anywhere in poky and is not documented at all. It just happened to > >> exist for a long time and be useful for my case. > >> > >> On Fri, May 22, 2020 at 5:22 PM Alexander Kanavin > >> <alex.kanavin@gmail.com> wrote: > >> > > >> > Should there be a test for this functionality? Somewhere in > oe-selftest perhaps where various package manager features are tested? > >> > > >> > Alex > >> > > >> > On Fri, 22 May 2020 at 17:13, Paulo Neve <ptsneves@gmail.com> wrote: > >> >> > >> >> Up to now the user defined metadata was set recipe wide, > >> >> meaning all the packages generated in a recipe where the > >> >> variable was set would get the same metadata. That is not > >> >> always ideal and is counter to the per package control that > >> >> is usually available. > >> >> > >> >> Keep support for package agnostic metadata but also add option > >> >> to add it to a specific option like: > >> >> PACKAGE_ADD_METADATA_${PN}_IPK = "mymeta: myvalue" > >> >> > >> >> Signed-off-by: Paulo Neves <ptsneves@gmail.com> > >> >> --- > >> >> meta/classes/package.bbclass | 4 ++-- > >> >> meta/classes/package_deb.bbclass | 2 +- > >> >> meta/classes/package_ipk.bbclass | 2 +- > >> >> meta/classes/package_rpm.bbclass | 5 +++-- > >> >> 4 files changed, 7 insertions(+), 6 deletions(-) > >> >> > >> >> diff --git a/meta/classes/package.bbclass > b/meta/classes/package.bbclass > >> >> index 0b5cf47749..1678e0d794 100644 > >> >> --- a/meta/classes/package.bbclass > >> >> +++ b/meta/classes/package.bbclass > >> >> @@ -637,9 +637,9 @@ def get_package_mapping (pkg, basepkg, d, > depversions=None): > >> >> > >> >> return pkg > >> >> > >> >> -def get_package_additional_metadata (pkg_type, d): > >> >> +def get_package_additional_metadata (pkg_type, pkg_name, d): > >> >> base_key = "PACKAGE_ADD_METADATA" > >> >> - for key in ("%s_%s" % (base_key, pkg_type.upper()), base_key): > >> >> + for key in ("%s_%s" % (base_key, pkg_type.upper()), "%s_%s_%s" > % (base_key, pkg_name, pkg_type.upper()), base_key): > >> >> if d.getVar(key, False) is None: > >> >> continue > >> >> d.setVarFlag(key, "type", "list") > >> >> diff --git a/meta/classes/package_deb.bbclass > b/meta/classes/package_deb.bbclass > >> >> index 790b26aef2..6ef9c8cb3a 100644 > >> >> --- a/meta/classes/package_deb.bbclass > >> >> +++ b/meta/classes/package_deb.bbclass > >> >> @@ -167,7 +167,7 @@ def deb_write_pkg(pkg, d): > >> >> > >> >> # more fields > >> >> > >> >> - custom_fields_chunk = > get_package_additional_metadata("deb", localdata) > >> >> + custom_fields_chunk = > get_package_additional_metadata("deb", pkgname, localdata) > >> >> if custom_fields_chunk: > >> >> ctrlfile.write(custom_fields_chunk) > >> >> ctrlfile.write("\n") > >> >> diff --git a/meta/classes/package_ipk.bbclass > b/meta/classes/package_ipk.bbclass > >> >> index c008559e4a..f78cec7a70 100644 > >> >> --- a/meta/classes/package_ipk.bbclass > >> >> +++ b/meta/classes/package_ipk.bbclass > >> >> @@ -155,7 +155,7 @@ def ipk_write_pkg(pkg, d): > >> >> else: > >> >> ctrlfile.write(c % tuple(pullData(fs, localdata))) > >> >> > >> >> - custom_fields_chunk = > get_package_additional_metadata("ipk", localdata) > >> >> + custom_fields_chunk = > get_package_additional_metadata("ipk", pkgname, localdata) > >> >> if custom_fields_chunk is not None: > >> >> ctrlfile.write(custom_fields_chunk) > >> >> ctrlfile.write("\n") > >> >> diff --git a/meta/classes/package_rpm.bbclass > b/meta/classes/package_rpm.bbclass > >> >> index 9145717f98..ab019192da 100644 > >> >> --- a/meta/classes/package_rpm.bbclass > >> >> +++ b/meta/classes/package_rpm.bbclass > >> >> @@ -295,7 +295,6 @@ python write_specfile () { > >> >> srcmaintainer = d.getVar('MAINTAINER') > >> >> srchomepage = d.getVar('HOMEPAGE') > >> >> srcdescription = d.getVar('DESCRIPTION') or "." > >> >> - srccustomtagschunk = get_package_additional_metadata("rpm", d) > >> >> > >> >> srcdepends = d.getVar('DEPENDS') > >> >> srcrdepends = [] > >> >> @@ -333,6 +332,8 @@ python write_specfile () { > >> >> pkgname = localdata.getVar('PKG_%s' % pkg) > >> >> if not pkgname: > >> >> pkgname = pkg > >> >> + > >> >> + srccustomtagschunk = get_package_additional_metadata("rpm", > pkgname, d) > >> >> localdata.setVar('PKG', pkgname) > >> >> > >> >> localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) > + ":" + pkg) > >> >> @@ -351,7 +352,7 @@ python write_specfile () { > >> >> splitlicense = (localdata.getVar('LICENSE') or "") > >> >> splitsection = (localdata.getVar('SECTION') or "") > >> >> splitdescription = (localdata.getVar('DESCRIPTION') or ".") > >> >> - splitcustomtagschunk = > get_package_additional_metadata("rpm", localdata) > >> >> + splitcustomtagschunk = > get_package_additional_metadata("rpm", pkgname, localdata) > >> >> > >> >> translate_vers('RDEPENDS', localdata) > >> >> translate_vers('RRECOMMENDS', localdata) > >> >> -- > >> >> 2.20.1 > >> >> > >> >> > >> > [-- Attachment #2: Type: text/html, Size: 12989 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [OE-core] [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata. 2020-05-22 19:31 ` Michael Ho @ 2020-05-23 17:40 ` Paulo Neve 0 siblings, 0 replies; 8+ messages in thread From: Paulo Neve @ 2020-05-23 17:40 UTC (permalink / raw) To: Michael Ho; +Cc: OE-core I was in the middle of making a test set based on Alexander suggestion but it seems i need to redo all my workspace every time i run the tests, which is terrible for iteration. Am i missing something? oe-selftest -r package.PackageTests.test_custom_metadata_is_in_package_indexcd ../poky-selftest-st/ 2020-05-22 23:27:52,286 - oe-selftest - ERROR - Not found package.PackageTests.test_custom_metadata_is_in_package_indexcd in loaded test cases On Fri, May 22, 2020 at 9:31 PM Michael Ho <michael.ho@ieee.org> wrote: > > Hi Paulo, > > Yes, this is handled by the bitbake data handlers automatically. You can check this by trying the following: > > python do_test() { > d.setVar("HELLO", "world!") > d.setVar("HELLO_space", "space!") > bb.warn("HELLO: %s" % d.getVar("HELLO", True)) > d.setVar("OVERRIDES", "space") > bb.warn("HELLO: %s" % d.getVar("HELLO", True)) > } > addtask test > > Then calling this task with bitbake: > > $ bitbake zip -c test | tee > ... > WARNING: zip-3.0-r2 do_test: HELLO: world! > WARNING: zip-3.0-r2 do_test: HELLO: space! > > I don't know the code or tests in oe that implement this functionality off the top of my head so I can't point you to the oe.selftest coverage. > > Kind regards, > Michael > > On Fri, May 22, 2020 at 8:09 PM Paulo Neves <ptsneves@gmail.com> wrote: >> >> Hello Michael, >> >> The behavior you describe is indeed what i wanted. If you say this is >> already working then my patches are redundant. Even so i am surprised >> it is working. Is it done automatically by the getVar function? >> >> def get_package_additional_metadata (pkg_type, d): >> base_key = "PACKAGE_ADD_METADATA" >> for key in ("%s_%s" % (base_key, pkg_type.upper()), base_key): >> if d.getVar(key, False) is None: >> continue >> d.setVarFlag(key, "type", "list") >> if d.getVarFlag(key, "separator") is None: >> d.setVarFlag(key, "separator", "\\n") >> metadata_fields = [field.strip() for field in >> oe.data.typed_value(key, d)] >> return "\n".join(metadata_fields).strip() >> >> From my understanding, i do not see how the per package override >> happens. Do you have the test for this functionality in oe-selftest? >> >> Grateful for the feedback >> Paulo Neves >> >> On Fri, May 22, 2020 at 8:00 PM Michael Ho <michael.ho@ieee.org> wrote: >> > >> > Hi Paulo, >> > >> > I actually have some patches in my "to send upstream list" to address the documentation and some sstate-caching bugs with these variables so it's fresh to me at the moment. >> > Correct me if I'm wrong but I think this is already available in the code (applying metadata specific to a certain package in a recipe, that is). >> > >> > eg. http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_ipk.bbclass at line 72 sets the local overrides so if PACKAGE_ADD_METADATA_IPK_xxx is set, it overrides PACKAGE_ADD_METADATA_IPK. >> > >> > For rpm, see >> > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n298 where the recipe wide variable is fetched >> > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n338 where the local override is also set >> > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n354 where the package specific variables are fetched >> > http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n436 where the package specific variables are applied to rpm packages >> > >> > I tested the zip recipe by applying these two lines: >> > PACKAGE_ADD_METADATA_RPM = "Vendor: None" >> > PACKAGE_ADD_METADATA_RPM_zip-dbg = "Vendor: Not you!" >> > and could see differing results in the two rpm files produced. >> > >> > I think this covers the use case you're showing in your patches already, what do you think? >> > >> > Kind regards, >> > Michael >> > >> > (sorry if this shows up as a triple email, my mail client wasn't cooperating). >> > >> > On Fri, May 22, 2020 at 5:29 PM Paulo Neve <ptsneves@gmail.com> wrote: >> >> >> >> Is ./meta/lib/oeqa/selftest/cases/package.py the right place? >> >> If yes i can work on it. Note that this functionality is not used >> >> anywhere in poky and is not documented at all. It just happened to >> >> exist for a long time and be useful for my case. >> >> >> >> On Fri, May 22, 2020 at 5:22 PM Alexander Kanavin >> >> <alex.kanavin@gmail.com> wrote: >> >> > >> >> > Should there be a test for this functionality? Somewhere in oe-selftest perhaps where various package manager features are tested? >> >> > >> >> > Alex >> >> > >> >> > On Fri, 22 May 2020 at 17:13, Paulo Neve <ptsneves@gmail.com> wrote: >> >> >> >> >> >> Up to now the user defined metadata was set recipe wide, >> >> >> meaning all the packages generated in a recipe where the >> >> >> variable was set would get the same metadata. That is not >> >> >> always ideal and is counter to the per package control that >> >> >> is usually available. >> >> >> >> >> >> Keep support for package agnostic metadata but also add option >> >> >> to add it to a specific option like: >> >> >> PACKAGE_ADD_METADATA_${PN}_IPK = "mymeta: myvalue" >> >> >> >> >> >> Signed-off-by: Paulo Neves <ptsneves@gmail.com> >> >> >> --- >> >> >> meta/classes/package.bbclass | 4 ++-- >> >> >> meta/classes/package_deb.bbclass | 2 +- >> >> >> meta/classes/package_ipk.bbclass | 2 +- >> >> >> meta/classes/package_rpm.bbclass | 5 +++-- >> >> >> 4 files changed, 7 insertions(+), 6 deletions(-) >> >> >> >> >> >> diff --git a/meta/classes/package.bbclass b/meta/classes/package.bbclass >> >> >> index 0b5cf47749..1678e0d794 100644 >> >> >> --- a/meta/classes/package.bbclass >> >> >> +++ b/meta/classes/package.bbclass >> >> >> @@ -637,9 +637,9 @@ def get_package_mapping (pkg, basepkg, d, depversions=None): >> >> >> >> >> >> return pkg >> >> >> >> >> >> -def get_package_additional_metadata (pkg_type, d): >> >> >> +def get_package_additional_metadata (pkg_type, pkg_name, d): >> >> >> base_key = "PACKAGE_ADD_METADATA" >> >> >> - for key in ("%s_%s" % (base_key, pkg_type.upper()), base_key): >> >> >> + for key in ("%s_%s" % (base_key, pkg_type.upper()), "%s_%s_%s" % (base_key, pkg_name, pkg_type.upper()), base_key): >> >> >> if d.getVar(key, False) is None: >> >> >> continue >> >> >> d.setVarFlag(key, "type", "list") >> >> >> diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass >> >> >> index 790b26aef2..6ef9c8cb3a 100644 >> >> >> --- a/meta/classes/package_deb.bbclass >> >> >> +++ b/meta/classes/package_deb.bbclass >> >> >> @@ -167,7 +167,7 @@ def deb_write_pkg(pkg, d): >> >> >> >> >> >> # more fields >> >> >> >> >> >> - custom_fields_chunk = get_package_additional_metadata("deb", localdata) >> >> >> + custom_fields_chunk = get_package_additional_metadata("deb", pkgname, localdata) >> >> >> if custom_fields_chunk: >> >> >> ctrlfile.write(custom_fields_chunk) >> >> >> ctrlfile.write("\n") >> >> >> diff --git a/meta/classes/package_ipk.bbclass b/meta/classes/package_ipk.bbclass >> >> >> index c008559e4a..f78cec7a70 100644 >> >> >> --- a/meta/classes/package_ipk.bbclass >> >> >> +++ b/meta/classes/package_ipk.bbclass >> >> >> @@ -155,7 +155,7 @@ def ipk_write_pkg(pkg, d): >> >> >> else: >> >> >> ctrlfile.write(c % tuple(pullData(fs, localdata))) >> >> >> >> >> >> - custom_fields_chunk = get_package_additional_metadata("ipk", localdata) >> >> >> + custom_fields_chunk = get_package_additional_metadata("ipk", pkgname, localdata) >> >> >> if custom_fields_chunk is not None: >> >> >> ctrlfile.write(custom_fields_chunk) >> >> >> ctrlfile.write("\n") >> >> >> diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass >> >> >> index 9145717f98..ab019192da 100644 >> >> >> --- a/meta/classes/package_rpm.bbclass >> >> >> +++ b/meta/classes/package_rpm.bbclass >> >> >> @@ -295,7 +295,6 @@ python write_specfile () { >> >> >> srcmaintainer = d.getVar('MAINTAINER') >> >> >> srchomepage = d.getVar('HOMEPAGE') >> >> >> srcdescription = d.getVar('DESCRIPTION') or "." >> >> >> - srccustomtagschunk = get_package_additional_metadata("rpm", d) >> >> >> >> >> >> srcdepends = d.getVar('DEPENDS') >> >> >> srcrdepends = [] >> >> >> @@ -333,6 +332,8 @@ python write_specfile () { >> >> >> pkgname = localdata.getVar('PKG_%s' % pkg) >> >> >> if not pkgname: >> >> >> pkgname = pkg >> >> >> + >> >> >> + srccustomtagschunk = get_package_additional_metadata("rpm", pkgname, d) >> >> >> localdata.setVar('PKG', pkgname) >> >> >> >> >> >> localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + pkg) >> >> >> @@ -351,7 +352,7 @@ python write_specfile () { >> >> >> splitlicense = (localdata.getVar('LICENSE') or "") >> >> >> splitsection = (localdata.getVar('SECTION') or "") >> >> >> splitdescription = (localdata.getVar('DESCRIPTION') or ".") >> >> >> - splitcustomtagschunk = get_package_additional_metadata("rpm", localdata) >> >> >> + splitcustomtagschunk = get_package_additional_metadata("rpm", pkgname, localdata) >> >> >> >> >> >> translate_vers('RDEPENDS', localdata) >> >> >> translate_vers('RRECOMMENDS', localdata) >> >> >> -- >> >> >> 2.20.1 >> >> >> >> >> >> >> >> ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2020-05-23 17:41 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-05-22 15:13 [meta-oe][PATCH] 1/2] package-manager: Allow for package manager user fields Paulo Neve
2020-05-22 15:13 ` [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata Paulo Neve
2020-05-22 15:22 ` [OE-core] " Alexander Kanavin
2020-05-22 15:28 ` Paulo Neve
2020-05-22 18:00 ` Michael Ho
2020-05-22 18:09 ` Paulo Neve
2020-05-22 19:31 ` Michael Ho
2020-05-23 17:40 ` Paulo Neve
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.