[pacman-dev] [PATCH 1/2] PKGBUILD.5.txt: Add note about functions starting in $srcdir
From: Johannes Löthberg <johannes@kyriasis.com> Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> --- doc/PKGBUILD.5.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 10980ab..2dba100 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -374,6 +374,9 @@ variables for use during the build and install process: *srcdir*:: This contains the directory where makepkg extracts, or copies, all source files. ++ +All of the above defined packaging functions in PKGBUILDs are run from inside +the `$srcdir` *pkgdir*:: This contains the directory where makepkg bundles the installed package. -- 2.3.0
From: Johannes Löthberg <johannes@kyriasis.com> Reported-by: Florian Pritz <bluewind@xinu.at> Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> --- doc/PKGBUILD.5.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 2dba100..58bb008 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -367,9 +367,9 @@ the `build()` function. `package()` functions. Be sure any exotic commands used are covered by the `checkdepends` array. -All of the above variables such as `$pkgname` and `$pkgver` are available for -use in the `build()` function. In addition, makepkg defines the following -variables for use during the build and install process: +All of the above variables such as `$pkgname` and `$pkgver`, in addition to the +following ones, are avilable for use in all of the above defined packaging +functions. *srcdir*:: This contains the directory where makepkg extracts, or copies, all source -- 2.3.0
On 27. 2. 2015 0:37, "=?UTF-8?q?Johannes=20L=C3=B6thberg?= <johannes"@kyriasis.com wrote:
+following ones, are avilable for use in all of the above defined packaging
avilable -> available -- David Macek
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> --- Remove the 'the' before $srcdir as requested by bluewind doc/PKGBUILD.5.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 10980ab..86bf63a 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -374,6 +374,9 @@ variables for use during the build and install process: *srcdir*:: This contains the directory where makepkg extracts, or copies, all source files. ++ +All of the above defined packaging functions in PKGBUILDs are run from inside +`$srcdir` *pkgdir*:: This contains the directory where makepkg bundles the installed package. -- 2.3.0
Reported-by: Florian Pritz <bluewind@xinu.at> Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> --- Fix 'available' typo. (Gah, that's embarassing.) doc/PKGBUILD.5.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 86bf63a..fed49b9 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -367,9 +367,9 @@ the `build()` function. `package()` functions. Be sure any exotic commands used are covered by the `checkdepends` array. -All of the above variables such as `$pkgname` and `$pkgver` are available for -use in the `build()` function. In addition, makepkg defines the following -variables for use during the build and install process: +All of the above variables such as `$pkgname` and `$pkgver`, in addition to the +following ones, are available for use in all of the above defined packaging +functions. *srcdir*:: This contains the directory where makepkg extracts, or copies, all source -- 2.3.0
On 27/02/15 10:01, Johannes Löthberg wrote:
Reported-by: Florian Pritz <bluewind@xinu.at> Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> --- Fix 'available' typo. (Gah, that's embarassing.) doc/PKGBUILD.5.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 86bf63a..fed49b9 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -367,9 +367,9 @@ the `build()` function. `package()` functions. Be sure any exotic commands used are covered by the `checkdepends` array.
-All of the above variables such as `$pkgname` and `$pkgver` are available for -use in the `build()` function. In addition, makepkg defines the following -variables for use during the build and install process: +All of the above variables such as `$pkgname` and `$pkgver`, in addition to the +following ones, are available for use in all of the above defined packaging +functions.
I think the two sentence version reads more clearly. Also, $pkgdir should only be used in package(), so it is easier not to state where they should be used. How about: All of the above variables such as `$pkgname` and `$pkgver` are available for use in the packaging functions. In addition, makepkg defines the following variables:
*srcdir*:: This contains the directory where makepkg extracts, or copies, all source
On 27/02/15 09:54, Johannes Löthberg wrote:
Signed-off-by: Johannes Löthberg <johannes@kyriasis.com> --- Remove the 'the' before $srcdir as requested by bluewind doc/PKGBUILD.5.txt | 3 +++ 1 file changed, 3 insertions(+)
diff --git a/doc/PKGBUILD.5.txt b/doc/PKGBUILD.5.txt index 10980ab..86bf63a 100644 --- a/doc/PKGBUILD.5.txt +++ b/doc/PKGBUILD.5.txt @@ -374,6 +374,9 @@ variables for use during the build and install process: *srcdir*:: This contains the directory where makepkg extracts, or copies, all source files. ++ +All of the above defined packaging functions in PKGBUILDs are run from inside +`$srcdir`
That does not read well to me. How about: All of the packaging functions defined above are run starting inside $srcdir
*pkgdir*:: This contains the directory where makepkg bundles the installed package.
participants (3)
-
Allan McRae
-
David Macek
-
Johannes Löthberg