From 6b8813eb55bc52eb7e5b214759a97876a2bc651f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= Date: Sat, 27 Apr 2013 17:46:56 +0200 Subject: [PATCH] Do not guarantee trailing slash in path variables. Do not guarantee that ROOT, EROOT, D or ED ends with a trailing slash. Instead, warn that the former could be empty. This is the first step towards making those variables actually slash-free for improved consistence. --- ebuild-env-vars.tex | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/ebuild-env-vars.tex b/ebuild-env-vars.tex index 8969dd8..0944890 100644 --- a/ebuild-env-vars.tex +++ b/ebuild-env-vars.tex @@ -102,12 +102,12 @@ variable. The absolute path to the root directory into which the package is to be merged. Phases which run with full filesystem access must not touch any files outside of the directory given in \t{ROOT}\@. Also of note is that in a cross-compiling environment, binaries inside of \t{ROOT} - will not be executable on the build machine, so ebuilds must not call them. \t{ROOT} must be - non-empty and end in a trailing slash. \\ + will not be executable on the build machine, so ebuilds must not call them. Note that \t{ROOT} + may be either empty or equal to \t{/} if it refers to the system root directory. \\ \t{EROOT} & \t{pkg\_*} & No & - Contains the path \t{\$\{ROOT\%/\}\$\{EPREFIX\}/} for convenience. See also the + Contains the concatenation of \t{ROOT} and \t{EPREFIX} paths for convenience. See also the \t{EPREFIX} variable. Only for EAPIs listed in table~\ref{tab:offset-env-vars-table} as supporting \t{EROOT}. \\ \t{T} & @@ -139,7 +139,7 @@ variable. \t{src\_install} & No & Contains the full path to the image directory into which the package should be installed. - Must be non-empty and end in a trailing slash. \\ + Must be non-empty. \\ \t{D} (continued) & \t{pkg\_preinst}, \t{pkg\_postinst} & Yes & @@ -148,7 +148,7 @@ variable. \t{ED} & \t{src\_install}, \t{pkg\_preinst}, \t{pkg\_postinst} & See \t{D} & - Contains the path \t{\$\{D\%/\}\$\{EPREFIX\}/} for convenience. See also the + Contains the concatenation of \t{D} and \t{EPREFIX} paths for convenience. See also the \t{EPREFIX} variable. Only for EAPIs listed in table~\ref{tab:offset-env-vars-table} as supporting \t{ED}. \\ \t{DESTTREE} & -- 1.8.2.1