| 1 |
On Sun, Aug 15, 2021 at 6:55 AM Ulrich Müller <ulm@g.o> wrote: |
| 2 |
> |
| 3 |
> Eclass documentation and the elog message indicate that the expected |
| 4 |
> location to install the file is /usr/share/doc/${PF}/README.gentoo, |
| 5 |
> not the location of the ebuild's last docinto call. |
| 6 |
> |
| 7 |
> Signed-off-by: Ulrich Müller <ulm@g.o> |
| 8 |
> --- |
| 9 |
> eclass/readme.gentoo-r1.eclass | 5 ++++- |
| 10 |
> 1 file changed, 4 insertions(+), 1 deletion(-) |
| 11 |
> |
| 12 |
> diff --git a/eclass/readme.gentoo-r1.eclass b/eclass/readme.gentoo-r1.eclass |
| 13 |
> index 69d0e1c5c6b4..bebdba5b705a 100644 |
| 14 |
> --- a/eclass/readme.gentoo-r1.eclass |
| 15 |
> +++ b/eclass/readme.gentoo-r1.eclass |
| 16 |
> @@ -76,7 +76,10 @@ readme.gentoo_create_doc() { |
| 17 |
> die "You are not specifying README.gentoo contents!" |
| 18 |
> fi |
| 19 |
> |
| 20 |
> - dodoc "${T}"/README.gentoo |
| 21 |
> + ( # subshell to avoid pollution of calling environment |
| 22 |
> + docinto . |
| 23 |
> + dodoc "${T}"/README.gentoo |
| 24 |
> + ) |
| 25 |
|
| 26 |
I believe the current handling "die" in subshells terminates execution |
| 27 |
at the end of the current phase. |
| 28 |
|
| 29 |
Maybe add "|| die" after the subshell so that execution stops |
| 30 |
immediately if dodoc fails. |
Archives