diff options
author | Niko Mauno <niko.mauno@vaisala.com> | 2023-10-21 15:51:13 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2023-10-26 15:29:35 +0100 |
commit | 6df9e7c895a9d4d773ae713f28888407fdf6dbdc (patch) | |
tree | d089c375214ff6b0a18d4a64fa8769b8fc35aebe /meta/classes-global/package_rpm.bbclass | |
parent | acf1c821b65433320a441375c798aca04aec7b0a (diff) | |
download | poky-6df9e7c895a9d4d773ae713f28888407fdf6dbdc.tar.gz |
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>
Diffstat (limited to 'meta/classes-global/package_rpm.bbclass')
-rw-r--r-- | meta/classes-global/package_rpm.bbclass | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/meta/classes-global/package_rpm.bbclass b/meta/classes-global/package_rpm.bbclass index 402fa5c4e8..246106ea4f 100644 --- a/meta/classes-global/package_rpm.bbclass +++ b/meta/classes-global/package_rpm.bbclass | |||
@@ -633,7 +633,6 @@ python do_package_rpm () { | |||
633 | workdir = d.getVar('WORKDIR') | 633 | workdir = d.getVar('WORKDIR') |
634 | tmpdir = d.getVar('TMPDIR') | 634 | tmpdir = d.getVar('TMPDIR') |
635 | pkgd = d.getVar('PKGD') | 635 | pkgd = d.getVar('PKGD') |
636 | pkgdest = d.getVar('PKGDEST') | ||
637 | if not workdir or not pkgd or not tmpdir: | 636 | if not workdir or not pkgd or not tmpdir: |
638 | bb.error("Variables incorrectly set, unable to package") | 637 | bb.error("Variables incorrectly set, unable to package") |
639 | return | 638 | return |
@@ -660,8 +659,6 @@ python do_package_rpm () { | |||
660 | 659 | ||
661 | # Setup the rpmbuild arguments... | 660 | # Setup the rpmbuild arguments... |
662 | rpmbuild = d.getVar('RPMBUILD') | 661 | rpmbuild = d.getVar('RPMBUILD') |
663 | targetsys = d.getVar('TARGET_SYS') | ||
664 | targetvendor = d.getVar('HOST_VENDOR') | ||
665 | 662 | ||
666 | # Too many places in dnf stack assume that arch-independent packages are "noarch". | 663 | # Too many places in dnf stack assume that arch-independent packages are "noarch". |
667 | # Let's not fight against this. | 664 | # Let's not fight against this. |
@@ -669,7 +666,6 @@ python do_package_rpm () { | |||
669 | if package_arch == "all": | 666 | if package_arch == "all": |
670 | package_arch = "noarch" | 667 | package_arch = "noarch" |
671 | 668 | ||
672 | sdkpkgsuffix = (d.getVar('SDKPKGSUFFIX') or "nativesdk").replace("-", "_") | ||
673 | d.setVar('PACKAGE_ARCH_EXTEND', package_arch) | 669 | d.setVar('PACKAGE_ARCH_EXTEND', package_arch) |
674 | pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}') | 670 | pkgwritedir = d.expand('${PKGWRITEDIRRPM}/${PACKAGE_ARCH_EXTEND}') |
675 | d.setVar('RPM_PKGWRITEDIR', pkgwritedir) | 671 | d.setVar('RPM_PKGWRITEDIR', pkgwritedir) |