mirror of
https://git.yoctoproject.org/poky
synced 2026-09-16 09:49:35 +02:00
package_rpm: Remove unused definitions
Some local variables defined in do_package_rpm() are not referenced, so remove such dead code lines. (From OE-Core rev: 5d387bc9001726937ffa7d3cfc333cfa31b681fb) Signed-off-by: Niko Mauno <niko.mauno@vaisala.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
acf1c821b6
commit
6df9e7c895
@@ -633,7 +633,6 @@ python do_package_rpm () {
|
|||||||
workdir = d.getVar('WORKDIR')
|
workdir = d.getVar('WORKDIR')
|
||||||
tmpdir = d.getVar('TMPDIR')
|
tmpdir = d.getVar('TMPDIR')
|
||||||
pkgd = d.getVar('PKGD')
|
pkgd = d.getVar('PKGD')
|
||||||
pkgdest = d.getVar('PKGDEST')
|
|
||||||
if not workdir or not pkgd or not tmpdir:
|
if not workdir or not pkgd or not tmpdir:
|
||||||
bb.error("Variables incorrectly set, unable to package")
|
bb.error("Variables incorrectly set, unable to package")
|
||||||
return
|
return
|
||||||
@@ -660,8 +659,6 @@ python do_package_rpm () {
|
|||||||
|
|
||||||
# Setup the rpmbuild arguments...
|
# Setup the rpmbuild arguments...
|
||||||
rpmbuild = d.getVar('RPMBUILD')
|
rpmbuild = d.getVar('RPMBUILD')
|
||||||
targetsys = d.getVar('TARGET_SYS')
|
|
||||||
targetvendor = d.getVar('HOST_VENDOR')
|
|
||||||
|
|
||||||
# Too many places in dnf stack assume that arch-independent packages are "noarch".
|
# Too many places in dnf stack assume that arch-independent packages are "noarch".
|
||||||
# Let's not fight against this.
|
# Let's not fight against this.
|
||||||
@@ -669,7 +666,6 @@ python do_package_rpm () {
|
|||||||
if package_arch == "all":
|
if package_arch == "all":
|
||||||
package_arch = "noarch"
|
package_arch = "noarch"
|
||||||
|
|
||||||
sdkpkgsuffix = (d.getVar('SDKPKGSUFFIX') or "nativesdk").replace("-", "_")
|
|
||||||
d.setVar('PACKAGE_ARCH_EXTEND', package_arch)
|
d.setVar('PACKAGE_ARCH_EXTEND', package_arch)
|
||||||
pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}')
|
pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}')
|
||||||
d.setVar('RPM_PKGWRITEDIR', pkgwritedir)
|
d.setVar('RPM_PKGWRITEDIR', pkgwritedir)
|
||||||
|
|||||||
Reference in New Issue
Block a user