diff options
| author |   Michael Ho <Michael.Ho@bmw.de> | 2020-05-25 10:23:01 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-05-25 22:25:27 +0100 |
| commit | 9e1907d7bd5f825d5ccca1da2a1e6ccc494088dd (patch) | |
| tree | ae5799efc8661b0313ed978a3552d7a8c7813a35 /meta/classes/package_rpm.bbclass | |
| parent | e669141ccaeff346896f67f72b33c6aeae5cba46 (diff) | |
| download | openembedded-core-contrib-9e1907d7bd5f825d5ccca1da2a1e6ccc494088dd.tar.gz | |
package_rpm.bbclass: add PACKAGE_ADD_METADATA_RPM to sstate variables
Refactor the addition of vardeps for this package class to use RPMEXTRAVARS
and pass the items through gen_packagevar so package name specific overrides
are accounted for. This matches the style used in package_ipk.bbclass. Since
do_package_write_rpm does not have any "extra vars" that affect the rpm
packaging yet, this commit has to add the variable.
This refactoring is needed to add PACKAGE_ADD_METADATA_RPM to RPMEXTRAVARS
so it affects the sstate hash of do_package_write_rpm.
Signed-off-by: Michael Ho <Michael.Ho@bmw.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/package_rpm.bbclass')
| -rw-r--r-- | meta/classes/package_rpm.bbclass | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/meta/classes/package_rpm.bbclass b/meta/classes/package_rpm.bbclass index 56c1b66938..519c22be47 100644 --- a/meta/classes/package_rpm.bbclass +++ b/meta/classes/package_rpm.bbclass @@ -623,6 +623,10 @@ python write_specfile () { # Otherwise allarch packages may change depending on override configuration write_specfile[vardepsexclude] = "OVERRIDES" +# Have to list any variables referenced as X_<pkg> that aren't in pkgdata here +RPMEXTRAVARS = "PACKAGE_ADD_METADATA_RPM" +write_specfile[vardeps] += "${@gen_packagevar(d, 'RPMEXTRAVARS')}" + python do_package_rpm () { workdir = d.getVar('WORKDIR') tmpdir = d.getVar('TMPDIR') |