From a3cd8fe20607705324af8e64be5ddaf48b6d5137 Mon Sep 17 00:00:00 2001 From: Michael Ho Date: Mon, 25 May 2020 10:23:01 +0200 Subject: 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. (From OE-Core rev: 9e1907d7bd5f825d5ccca1da2a1e6ccc494088dd) Signed-off-by: Michael Ho Signed-off-by: Richard Purdie --- meta/classes/package_rpm.bbclass | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'meta/classes') 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_ 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') -- cgit v1.2.3-54-g00ecf