diff options
author | Martin Jansa <martin.jansa@gmail.com> | 2024-02-01 11:45:02 +0100 |
---|---|---|
committer | Martin Jansa <martin.jansa@gmail.com> | 2024-02-01 12:55:24 +0100 |
commit | 6d26f0ebdbe46cc1dc8e0278493a2601af79e640 (patch) | |
tree | 38913bb08a2ac4cd6e1e6da532c6ca17e927d4df | |
parent | b40bc4ad79d2087966aea6785792bb018bce1912 (diff) | |
download | openembedded-core-contrib-jansa/rpm-user-defined.tar.gz |
package_rpm: add RPMBUILD_EXTRA_PARAMS variablejansa/rpm-user-defined
* e.g. for DISTROs which define extra user-defined fields with
PACKAGE_ADD_METADATA/PACKAGE_ADD_METADATA_RPM
as undefined fields in packagedata are fatal error for rpmbuild:
"error: line 9: Unknown tag: Author: Unspecified"
as shown in:
http://errors.yoctoproject.org/Errors/Details/751706/
with "Author" field added with:
PACKAGE_CLASSES = "package_rpm"
PACKAGE_ADD_AUTHOR_METADATA = "test-author"
PACKAGE_ADD_METADATA = "Author: ${PACKAGE_ADD_AUTHOR_METADATA}"
to fix rpm build you can use:
RPMBUILD_EXTRA_PARAMS = " --define '_Author Author'"
keep in mind that this doesn't cause this Author field to be
added in .rpm, it just avoids the BUILDSPEC failure.
and for ipk build:
OPKG_MAKE_INDEX_EXTRA_PARAMS = "-f"
alternatively you can avoid additional packagedata fields ending
in the package manager (if you use them only with buildhistory
or packagedata) with:
PACKAGE_ADD_METADATA_RPM = ""
PACKAGE_ADD_METADATA_IPK = ""
PACKAGE_ADD_METADATA_DEP = ""
Signed-off-by: Martin Jansa <martin.jansa@gmail.com>
-rw-r--r-- | meta/classes-global/package_rpm.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index e0f4de42a1..968ebdb62a 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass @@ -683,6 +683,7 @@ python do_package_rpm () { # Setup the rpmbuild arguments... rpmbuild = d.getVar('RPMBUILD') rpmbuild_compmode = d.getVar('RPMBUILD_COMPMODE') + rpmbuild_extra_params = d.getVar('RPMBUILD_EXTRA_PARAMS') # Too many places in dnf stack assume that arch-independent packages are "noarch". # Let's not fight against this. @@ -724,6 +725,7 @@ python do_package_rpm () { cmd = cmd + " --define '_use_weak_usergroup_deps 1'" cmd = cmd + " --define '_passwd_path " + "/completely/bogus/path" + "'" cmd = cmd + " --define '_group_path " + "/completely/bogus/path" + "'" + cmd = cmd + rpmbuild_extra_params if d.getVarFlag('ARCHIVER_MODE', 'srpm') == '1' and bb.data.inherits_class('archiver', d): cmd = cmd + " --define '_sourcedir " + d.getVar('ARCHIVER_OUTDIR') + "'" cmdsrpm = cmd + " --define '_srcrpmdir " + d.getVar('ARCHIVER_RPMOUTDIR') + "'" |