mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-20 09:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

package_rpm.bbclass: respect package overrides for the main package

Browse Source 
Apply ${PN} to OVERRIDES when determining the base package spec variables.
Without this, there is a mismatch in behaviour where overrides for the base
package have no effect while overrides for subpackages do. The subpackages
should not be affected by this override as they apply their own package
overrides and will by default fetch the base variables and apply them in
the spec file.

This makes the behaviour for package overrides match the implementation
in package_deb.bbclass and package_ipk.bbclass.

(From OE-Core rev: b438a90fa4644dd3e5355f82730257ef579ceda9)

Signed-off-by: Michael Ho <Michael.Ho@bmw.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Michael Ho
2020-05-25 09:45:49 +02:00
committed by Richard Purdie
parent b38f320a3c
commit c03dbb5afd
1 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
meta/classes/package_rpm.bbclass
View File

@@ -286,16 +286,18 @@ python write_specfile () {
# Construct the SPEC file...
srcname = d.getVar('PN')
srcsummary = (d.getVar('SUMMARY') or d.getVar('DESCRIPTION') or ".")
srcversion = d.getVar('PKGV').replace('-', '+')
srcrelease = d.getVar('PKGR')
srcepoch = (d.getVar('PKGE') or "")
srclicense = d.getVar('LICENSE')
srcsection = d.getVar('SECTION')
srcmaintainer = d.getVar('MAINTAINER')
srchomepage = d.getVar('HOMEPAGE')
srcdescription = d.getVar('DESCRIPTION') or "."
srccustomtagschunk = get_package_additional_metadata("rpm", d)
localdata = bb.data.createCopy(d)
localdata.setVar('OVERRIDES', d.getVar("OVERRIDES", False) + ":" + srcname)
srcsummary = (localdata.getVar('SUMMARY') or localdata.getVar('DESCRIPTION') or ".")
srcversion = localdata.getVar('PKGV').replace('-', '+')
srcrelease = localdata.getVar('PKGR')
srcepoch = (localdata.getVar('PKGE') or "")
srclicense = localdata.getVar('LICENSE')
srcsection = localdata.getVar('SECTION')
srcmaintainer = localdata.getVar('MAINTAINER')
srchomepage = localdata.getVar('HOMEPAGE')
srcdescription = localdata.getVar('DESCRIPTION') or "."
srccustomtagschunk = get_package_additional_metadata("rpm", localdata)
srcdepends = d.getVar('DEPENDS')
srcrdepends = []