summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Ho <Michael.Ho@bmw.de>2020-05-25 10:23:00 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-05-25 22:25:53 +0100
commit16421f5af14dc67bffb38e4ad9886bcf821f4e3f (patch)
tree880453ea41e574663a8c511ead7b67b61c7bf573
parent4fd59ec033a1432fbdc3a4f0fb4ce529afec470e (diff)
downloadpoky-16421f5af14dc67bffb38e4ad9886bcf821f4e3f.tar.gz
package_deb.bbclass: add PACKAGE_ADD_METADATA_DEB to sstate variables
Refactor the addition of vardeps for this package class to use DEBEXTRAVARS and pass the items through gen_packagevar so package name specific overrides are accounted for. This matches the style used in package_ipk.bbclass. Additionally add PACKAGE_ADD_METADATA_DEB to the DEBEXTRAVARS list so the packaging is redone if the variable changes value. (From OE-Core rev: e669141ccaeff346896f67f72b33c6aeae5cba46) Signed-off-by: Michael Ho <Michael.Ho@bmw.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/package_deb.bbclass5
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass
index 790b26aef2..cb723fc1d6 100644
--- a/meta/classes/package_deb.bbclass
+++ b/meta/classes/package_deb.bbclass
@@ -283,8 +283,9 @@ def deb_write_pkg(pkg, d):
283# Otherwise allarch packages may change depending on override configuration 283# Otherwise allarch packages may change depending on override configuration
284deb_write_pkg[vardepsexclude] = "OVERRIDES" 284deb_write_pkg[vardepsexclude] = "OVERRIDES"
285 285
286# Indirect references to these vars 286# Have to list any variables referenced as X_<pkg> that aren't in pkgdata here
287do_package_write_deb[vardeps] += "PKGV PKGR PKGV DESCRIPTION SECTION PRIORITY MAINTAINER DPKG_ARCH PN HOMEPAGE" 287DEBEXTRAVARS = "PKGV PKGR PKGV DESCRIPTION SECTION PRIORITY MAINTAINER DPKG_ARCH PN HOMEPAGE PACKAGE_ADD_METADATA_DEB"
288do_package_write_deb[vardeps] += "${@gen_packagevar(d, 'DEBEXTRAVARS')}"
288 289
289SSTATETASKS += "do_package_write_deb" 290SSTATETASKS += "do_package_write_deb"
290do_package_write_deb[sstate-inputdirs] = "${PKGWRITEDIRDEB}" 291do_package_write_deb[sstate-inputdirs] = "${PKGWRITEDIRDEB}"