1/2] package-manager: Allow for package manager user fields.
PATCH 1/1 1/2] package-manager: Allow for package manager user fields.
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.
--- meta/lib/oe/package_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
meta/lib/oe/package_manager.py +1 -1
@@ -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)
Signature · 1 line
2.20.1
PATCH 1/1 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata.
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"
--- 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(-)
meta/classes/package.bbclass +2 -2
@@ -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")
meta/classes/package_deb.bbclass +1 -1
@@ -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")
meta/classes/package_ipk.bbclass +1 -1
@@ -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")
meta/classes/package_rpm.bbclass +3 -2
@@ -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)
Signature · 1 line
2.20.1
Re: [OE-core] [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata.
Should there be a test for this functionality? Somewhere in oe-selftest perhaps where various package manager features are tested?
Alex
Quoted 108 lines · Paulo Neve
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 <[email protected]>--- 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(-)meta/classes/package.bbclass +0
-0@@ -637,9 +637,9 @@ def get_package_mapping (pkg, basepkg, d,depversions=None):
return pkg
meta/classes/package.bbclass +2
-2-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):
ifd.getVar(key, False)is None:
continue
d.setVarFlag(key, "type", "list")meta/classes/package_deb.bbclass +1
-1@@ -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")meta/classes/package_ipk.bbclass +1
-1@@ -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")meta/classes/package_rpm.bbclass +2
-1@@ -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)meta/classes/package_rpm.bbclass +1
-1@@ -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
Re: [OE-core] [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata.
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.
Quoted 101 lines · Alexander Kanavin
Should there be a test for this functionality? Somewhere in oe-selftest perhaps where various package manager features are tested?
Alex
Quoted 95 lines · Paulo Neve
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 <[email protected]>--- 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(-)meta/classes/package.bbclass +2
-2@@ -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")meta/classes/package_deb.bbclass +1
-1@@ -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")meta/classes/package_ipk.bbclass +1
-1@@ -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")meta/classes/package_rpm.bbclass +3
-3@@ -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
Re: [OE-core] [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata.
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).
Quoted 124 lines · Paulo Neve
Is
./meta/lib/oeqa/selftest/cases/package.pythe 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.Quoted 2 lines · Alexander Kanavin
Should there be a test for this functionality? Somewhere in oe-selftest
perhaps where various package manager features are tested?
Quoted 23 lines
Alex
Quoted 19 lines · Paulo Neve
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 <[email protected]>--- 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(-)Quoted 5 lines
meta/classes/package.bbclass def get_package_mapping (pkg, basepkg, d,
Quoted 5 lines
meta/classes/package.bbclass +0
-0@@ -637,9 +637,9 @@ def get_package_mapping (pkg, basepkg, d,depversions=None):
Quoted 8 lines
meta/classes/package.bbclass def get_package_mapping (pkg, basepkg, d, depversions=None):
Quoted 8 lines
meta/classes/package.bbclass +2
-2return 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):Quoted 4 lines
Review
Quoted 4 lines
meta/classes/package.bbclass +0
-0if d.getVar(key, False) is None: continue d.setVarFlag(key, "type", "list")(quoted diff) +0
-0b/meta/classes/package_deb.bbclass
Quoted 8 lines
meta/classes/package_deb.bbclass def deb_write_pkg(pkg, d): · line 170
Quoted 8 lines
index
790b26aef2..6ef9c8cb3a100644meta/classes/package_deb.bbclass +0
-1@@ -167,7 +167,7 @@ def deb_write_pkg(pkg, d): # more fields - custom_fields_chunk = get_package_additional_metadata("deb",localdata)
Quoted 1 line
meta/classes/package_deb.bbclass def deb_write_pkg(pkg, d): · line 170
Quoted 1 line
meta/classes/package_deb.bbclass +1
-0+ custom_fields_chunk = get_package_additional_metadata("deb",pkgname, localdata)
Quoted 4 lines
Review
Quoted 4 lines
meta/classes/package_deb.bbclass +0
-0if custom_fields_chunk: ctrlfile.write(custom_fields_chunk) ctrlfile.write("\n")(quoted diff) +0
-0b/meta/classes/package_ipk.bbclass
Quoted 8 lines
meta/classes/package_ipk.bbclass def ipk_write_pkg(pkg, d): · line 158
Quoted 8 lines
index
c008559e4a..f78cec7a70100644meta/classes/package_ipk.bbclass +0
-1@@ -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)
Quoted 1 line
meta/classes/package_ipk.bbclass def ipk_write_pkg(pkg, d): · line 158
Quoted 1 line
meta/classes/package_ipk.bbclass +1
-0+ custom_fields_chunk = get_package_additional_metadata("ipk",pkgname, localdata)
Quoted 4 lines
Review
Quoted 4 lines
meta/classes/package_ipk.bbclass +0
-0if custom_fields_chunk is not None: ctrlfile.write(custom_fields_chunk) ctrlfile.write("\n")(quoted diff) +0
-0b/meta/classes/package_rpm.bbclass
Quoted 9 lines
Quoted 9 lines
index
9145717f98..ab019192da100644meta/classes/package_rpm.bbclass +0
-1@@ -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)Quoted 8 lines
meta/classes/package_rpm.bbclass python write_specfile () { · line 336
Quoted 8 lines
meta/classes/package_rpm.bbclass +2
-0srcdepends = 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)
Quoted 3 lines
meta/classes/package_rpm.bbclass python write_specfile () {
Quoted 3 lines
meta/classes/package_rpm.bbclass +0
-0localdata.setVar('PKG', pkgname) localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) +":" + pkg)
Quoted 5 lines
meta/classes/package_rpm.bbclass python write_specfile () { · line 354
Quoted 5 lines
meta/classes/package_rpm.bbclass +0
-1@@ -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)
Quoted 1 line
meta/classes/package_rpm.bbclass python write_specfile () { · line 355
Quoted 1 line
meta/classes/package_rpm.bbclass +1
-0+ splitcustomtagschunk = get_package_additional_metadata("rpm",pkgname, localdata)
Quoted 7 lines
Quoted 7 lines
meta/classes/package_rpm.bbclass +0
-1translate_vers('RDEPENDS', localdata) translate_vers('RRECOMMENDS', localdata) --2.20.1
Re: [OE-core] [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata.
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 inoe.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
Quoted 137 lines · Michael Ho
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_xxxis set, it overridesPACKAGE_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 packagesI 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).
Quoted 110 lines · Paulo Neve
Is
./meta/lib/oeqa/selftest/cases/package.pythe 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.Quoted 101 lines · Alexander Kanavin
Should there be a test for this functionality? Somewhere in oe-selftest perhaps where various package manager features are tested?
Alex
Quoted 95 lines · Paulo Neve
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 <[email protected]>--- 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(-)meta/classes/package.bbclass +2
-2@@ -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")meta/classes/package_deb.bbclass +1
-1@@ -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")meta/classes/package_ipk.bbclass +1
-1@@ -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")meta/classes/package_rpm.bbclass +3
-3@@ -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
Re: [OE-core] [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata.
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
Quoted 194 lines · Paulo Neves
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):
ifd.getVar(key, False)is None:
continue
d.setVarFlag(key, "type", "list")
ifd.getVarFlag(key, "separator")is None:
d.setVarFlag(key, "separator", "\\n")
metadata_fields= [field.strip()for field inoe.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 NevesQuoted 4 lines · Michael Ho
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.
Quoted 1 line
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).
Quoted 2 lines
eg.
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_ipk.bbclass
at line 72 sets the local overrides so ifPACKAGE_ADD_METADATA_IPK_xxxis set, it overridesPACKAGE_ADD_METADATA_IPK.Quoted 3 lines
For rpm, see
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n298
where the recipe wide variable is fetchedQuoted 1 line
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n338
where the local override is also setQuoted 1 line
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n354
where the package specific variables are fetchedQuoted 1 line
http://git.yoctoproject.org/cgit/cgit.cgi/poky/tree/meta/classes/package_rpm.bbclass#n436
where the package specific variables are applied to rpm packagesQuoted 7 lines
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?
Quoted 5 lines
Kind regards,
Michael(sorry if this shows up as a triple email, my mail client wasn't
cooperating).
Quoted 8 lines · Paulo Neve
Quoted 6 lines
Is
./meta/lib/oeqa/selftest/cases/package.pythe 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.Quoted 4 lines
Quoted 4 lines
Quoted 2 lines · Alexander Kanavin
Should there be a test for this functionality? Somewhere in
oe-selftest perhaps where various package manager features are tested?
Quoted 23 lines
Quoted 23 lines
Quoted 23 lines
Alex
Quoted 19 lines · Paulo Neve
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 <[email protected]>--- 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(-)Quoted 1 line
Quoted 1 line
Quoted 1 line
Review
Quoted 1 line
(quoted diff) +0
-0b/meta/classes/package.bbclass
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
meta/classes/package.bbclass def get_package_mapping (pkg, basepkg, d,
Quoted 4 lines
index
0b5cf47749..1678e0d794100644meta/classes/package.bbclass +0
-0@@ -637,9 +637,9 @@ def get_package_mapping (pkg, basepkg, d,depversions=None):
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta/classes/package.bbclass def get_package_mapping (pkg, basepkg, d, depversions=None):
Quoted 8 lines
meta/classes/package.bbclass +2
-2return 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):Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Review
Quoted 4 lines
meta/classes/package.bbclass +0
-0if d.getVar(key, False) is None: continue d.setVarFlag(key, "type", "list")(quoted diff) +0
-0b/meta/classes/package_deb.bbclass
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta/classes/package_deb.bbclass def deb_write_pkg(pkg, d): · line 170
Quoted 8 lines
index
790b26aef2..6ef9c8cb3a100644meta/classes/package_deb.bbclass +0
-1@@ -167,7 +167,7 @@ def deb_write_pkg(pkg, d): # more fields - custom_fields_chunk =
get_package_additional_metadata("deb", localdata)Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/classes/package_deb.bbclass def deb_write_pkg(pkg, d): · line 170
Quoted 1 line
meta/classes/package_deb.bbclass +1
-0+ custom_fields_chunk =
get_package_additional_metadata("deb", pkgname, localdata)Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Review
Quoted 4 lines
meta/classes/package_deb.bbclass +0
-0if custom_fields_chunk: ctrlfile.write(custom_fields_chunk) ctrlfile.write("\n")(quoted diff) +0
-0b/meta/classes/package_ipk.bbclass
Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta/classes/package_ipk.bbclass def ipk_write_pkg(pkg, d): · line 158
Quoted 8 lines
index
c008559e4a..f78cec7a70100644meta/classes/package_ipk.bbclass +0
-1@@ -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)Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/classes/package_ipk.bbclass def ipk_write_pkg(pkg, d): · line 158
Quoted 1 line
meta/classes/package_ipk.bbclass +1
-0+ custom_fields_chunk =
get_package_additional_metadata("ipk", pkgname, localdata)Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
Review
Quoted 4 lines
meta/classes/package_ipk.bbclass +0
-0if custom_fields_chunk is not None: ctrlfile.write(custom_fields_chunk) ctrlfile.write("\n")(quoted diff) +0
-0b/meta/classes/package_rpm.bbclass
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
Quoted 9 lines
index
9145717f98..ab019192da100644meta/classes/package_rpm.bbclass +0
-1@@ -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)Quoted 8 lines
Quoted 8 lines
Quoted 8 lines
meta/classes/package_rpm.bbclass python write_specfile () { · line 336
Quoted 8 lines
meta/classes/package_rpm.bbclass +2
-0srcdepends = 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)
Quoted 3 lines
Quoted 3 lines
Quoted 3 lines
meta/classes/package_rpm.bbclass python write_specfile () {
Quoted 3 lines
meta/classes/package_rpm.bbclass +0
-0localdata.setVar('PKG', pkgname) localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False)+ ":" + pkg)
Quoted 5 lines
Quoted 5 lines
Quoted 5 lines
meta/classes/package_rpm.bbclass python write_specfile () { · line 354
Quoted 5 lines
meta/classes/package_rpm.bbclass +0
-1@@ -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)Quoted 1 line
Quoted 1 line
Quoted 1 line
meta/classes/package_rpm.bbclass python write_specfile () { · line 355
Quoted 1 line
meta/classes/package_rpm.bbclass +1
-0+ splitcustomtagschunk =
get_package_additional_metadata("rpm", pkgname, localdata)Quoted 8 lines
Quoted 8 lines
Quoted 7 lines
Quoted 7 lines
meta/classes/package_rpm.bbclass +0
-1translate_vers('RDEPENDS', localdata) translate_vers('RRECOMMENDS', localdata) --2.20.1
Re: [OE-core] [meta-oe][PATCH] 2/2] package_{ipk, deb, rpm}.bbclass: support per package user-defined metadata.
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
Quoted 190 lines · Michael Ho
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,
MichaelQuoted 163 lines · Paulo Neves
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):
ifd.getVar(key, False)is None:
continue
d.setVarFlag(key, "type", "list")
ifd.getVarFlag(key, "separator")is None:
d.setVarFlag(key, "separator", "\\n")
metadata_fields= [field.strip()for field inoe.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 NevesQuoted 137 lines · Michael Ho
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_xxxis set, it overridesPACKAGE_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 packagesI 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).
Quoted 110 lines · Paulo Neve
Is
./meta/lib/oeqa/selftest/cases/package.pythe 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.Quoted 101 lines · Alexander Kanavin
Should there be a test for this functionality? Somewhere in oe-selftest perhaps where various package manager features are tested?
Alex
Quoted 95 lines · Paulo Neve
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 <[email protected]>--- 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(-)meta/classes/package.bbclass +2
-2@@ -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")meta/classes/package_deb.bbclass +1
-1@@ -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")meta/classes/package_ipk.bbclass +1
-1@@ -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")meta/classes/package_rpm.bbclass +3
-3@@ -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