| 1 |
On Sat, 18 Apr 2020 11:15:49 -0400 |
| 2 |
David Michael <fedora.dm0@×××××.com> wrote: |
| 3 |
|
| 4 |
> The build system's rpm2tar command is executed during unpack, so it |
| 5 |
> must be install in /. |
| 6 |
> |
| 7 |
> Signed-off-by: David Michael <fedora.dm0@×××××.com> |
| 8 |
> --- |
| 9 |
> |
| 10 |
> This patch fixes failures like this: |
| 11 |
> >>> Unpacking source... |
| 12 |
> >>> Unpacking urw-fonts-2.4-9.fc13.src.rpm to /var/tmp/portage/media-fonts/urw-fonts-2.4.9/work |
| 13 |
> /var/tmp/portage/media-fonts/urw-fonts-2.4.9/temp/environment: line 850: rpm2tar: command not found |
| 14 |
> |
| 15 |
> eclass/rpm.eclass | 5 ++++- |
| 16 |
> 1 file changed, 4 insertions(+), 1 deletion(-) |
| 17 |
> |
| 18 |
> diff --git a/eclass/rpm.eclass b/eclass/rpm.eclass |
| 19 |
> index 3a29c7e9f76..d27f0a386c7 100644 |
| 20 |
> --- a/eclass/rpm.eclass |
| 21 |
> +++ b/eclass/rpm.eclass |
| 22 |
> @@ -8,7 +8,10 @@ |
| 23 |
> |
| 24 |
> inherit estack eutils |
| 25 |
> |
| 26 |
> -DEPEND=">=app-arch/rpm2targz-9.0.0.3g" |
| 27 |
> +case "${EAPI:-0}" in |
| 28 |
> + [0-6]) DEPEND=">=app-arch/rpm2targz-9.0.0.3g" ;; |
| 29 |
> + *) BDEPEND=">=app-arch/rpm2targz-9.0.0.3g" ;; |
| 30 |
> +esac |
| 31 |
> |
| 32 |
> # @FUNCTION: rpm_unpack |
| 33 |
> # @USAGE: <rpms> |
| 34 |
|
| 35 |
+1 |
| 36 |
|
| 37 |
-- |
| 38 |
James Le Cuirot (chewi) |
| 39 |
Gentoo Linux Developer |
Archives