[oe] [STABLE][PATCH 059/125] package_rpm: fix move wrong generated rpm name - closes #5078

[Koen Kooi]

On 23-06-09 10:56, Marcin Juszkiewicz wrote:
> From: Lynn Lin<lynn.lin at avocent.com>
>
>
> Signed-off-by: Marcin Juszkiewicz<marcin at juszkiewicz.com.pl>

Acked-by: Koen Kooi <koen at openembedded.org>

> ---
>   classes/package_rpm.bbclass |    2 +-
>   1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/classes/package_rpm.bbclass b/classes/package_rpm.bbclass
> index 71fa760..0cebdea 100644
> --- a/classes/package_rpm.bbclass
> +++ b/classes/package_rpm.bbclass
> @@ -136,7 +136,7 @@ python write_specfile() {
>   	bb.build.exec_func('BUILDSPEC', d)
>
>   	# move the rpm into the pkgoutdir
> -	rpm = bb.data.expand('${RPMBUILDPATH}/RPMS/${TARGET_ARCH}/${PKG}-${RPMPV}-${PR}.${TARGET_ARCH}.rpm', d)
> +	rpm = bb.data.expand('${RPMBUILDPATH}/RPMS/${TARGET_ARCH}/${PKG}-${RPMPV}-${PR}${DISTRO_PR}.${TARGET_ARCH}.rpm', d)
>   	outrpm = bb.data.expand('${DEPLOY_DIR_RPM}/${PACKAGE_ARCH}/${PKG}-${RPMPV}-${PR}.${TARGET_ARCH}.rpm', d)
>   	bb.movefile(rpm, outrpm)
>   }