commit: 9f24a6cf60c7de22c6ab22ae18f3f01c7242a44d Author: Ulrich Müller <ulm <AT> gentoo <DOT> org> AuthorDate: Sun May 16 18:22:15 2021 +0000 Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org> CommitDate: Sun May 16 18:22:15 2021 +0000 URL: https://gitweb.gentoo.org/proj/pms.git/commit/?id=9f24a6cf
EAPI 8 has dosym -r Bug: https://bugs.gentoo.org/708360 Signed-off-by: Ulrich Müller <ulm <AT> gentoo.org> eapi-differences.tex | 4 ++++ pkg-mgr-commands.tex | 38 +++++++++++++++++++++++++++++++++++--- 2 files changed, 39 insertions(+), 3 deletions(-) diff --git a/eapi-differences.tex b/eapi-differences.tex index 5efe389..1e6e951 100644 --- a/eapi-differences.tex +++ b/eapi-differences.tex @@ -286,6 +286,9 @@ Output commands use stdout & \compactfeatureref{output-no-stdout} & \t{domo} destination path & \compactfeatureref{domo-path} & \t{\$\{DESTTREE\}} & \t{\$\{DESTTREE\}} & \t{\$\{DESTTREE\}} & \t{/usr} & \t{/usr} \\ +\t{dosym -r} \compactfeatureref{dosym-relative} & + No & No & No & No & Yes \\ + \t{new*} support stdin & \compactfeatureref{newfoo-stdin} & No & Yes & Yes & Yes & Yes \\ @@ -524,6 +527,7 @@ EAPI 8 is EAPI 7 with the following changes: \item \t{insopts} no longer affects \t{doconfd}, \t{doenvd} and \t{doheader}, \featureref{insopts}. \item \t{exeopts} no longer affects \t{doinitd}, \featureref{exeopts}. \item Less strict naming rules for files in \t{updates} directory, \featureref{updates-filenames}. +\item \t{dosym} can create relative paths, \featureref{dosym-relative}. \end{compactitem} \ChangeWhenAddingAnEAPI{8} diff --git a/pkg-mgr-commands.tex b/pkg-mgr-commands.tex index 171a341..8d5c903 100644 --- a/pkg-mgr-commands.tex +++ b/pkg-mgr-commands.tex @@ -599,9 +599,27 @@ the current phase function has returned. \item[dosbin] As \t{dobin}, but installs to \t{DESTTREE/sbin}. -\item[dosym] Creates a symbolic link named as for its second parameter, pointing to the first. If - the directory containing the new link does not exist, creates it. Failure behaviour is EAPI - dependent as per section~\ref{sec:failure-behaviour}. +\item[dosym] Creates a symbolic link named as for its second parameter, pointing to the first. + If the directory containing the new link does not exist, creates it. + + \featurelabel{dosym-relative} When called with option \t{-r} in EAPIs listed in + table~\ref{tab:dosym-r} as supporting creation of relative paths, expands the first parameter + relative to the apparent path of the directory containing the first parameter. The algorithm + must return a result identical to the one returned by the function in listing~\ref{lst:dosym-r}, + with \t{realpath} and \t{dirname} from GNU coreutils version~8.32. Specifying option \t{-r} + together with a relative path as first (target) parameter is an error. + + Failure behaviour is EAPI dependent as per section~\ref{sec:failure-behaviour}. + +\begin{listing}[h] +\caption{Create a relative path for \t{dosym}} \label{lst:dosym-r} +\begin{verbatim} +dosym_relative_path() { + local link=$(realpath -m -s "/${2#/}") + realpath -m -s --relative-to="$(dirname "${link}")" "$1" +} +\end{verbatim} +\end{listing} \item[fowners] Acts as for \t{chown}, but takes paths relative to the image directory. Failure behaviour is EAPI dependent as per section~\ref{sec:failure-behaviour}. @@ -729,6 +747,20 @@ the current phase function has returned. \end{tabular} \end{centertable} +\ChangeWhenAddingAnEAPI{8} +\begin{centertable}{EAPIs supporting \t{dosym -r}} + \label{tab:dosym-r} + \begin{tabular}{ll} + \toprule + \multicolumn{1}{c}{\textbf{EAPI}} & + \multicolumn{1}{c}{\textbf{\t{dosym} supports creation of relative paths?}} \\ + \midrule + 0, 1, 2, 3, 4, 5, 6, 7 & No \\ + 8 & Yes \\ + \bottomrule + \end{tabular} +\end{centertable} + \subsection{Commands affecting install destinations} The following commands are used to set the various destination trees and options used by the above installation commands. They must be shell functions or aliases, due to the need to set variables
