[pacman-dev] makepkg: add the $startdir to package .BUILDINFO

Message ID 20191112230727.663981-1-eschwartz@archlinux.org
State Superseded, archived
Headers show
Series [pacman-dev] makepkg: add the $startdir to package .BUILDINFO | expand

Commit Message

Eli Schwartz Nov. 12, 2019, 11:07 p.m. UTC
This value is needed for reproducible builds. The reason is because
$BUILDDIR changes its behavior depending on whether it is the same as
$startdir, and the result is that we cannot know whether builddir is
actually 'builddir' or 'builddir' + '/$pkgbase'.

Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
---
 scripts/makepkg.sh.in | 1 +
 1 file changed, 1 insertion(+)

Comments

Allan McRae Nov. 12, 2019, 11:40 p.m. UTC | #1
On 13/11/19 9:07 am, Eli Schwartz wrote:
> This value is needed for reproducible builds. The reason is because
> $BUILDDIR changes its behavior depending on whether it is the same as
> $startdir, and the result is that we cannot know whether builddir is
> actually 'builddir' or 'builddir' + '/$pkgbase'.
> 
> Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
> ---

Man page.

Also bump the specification version to 1.1  (or 2).

>  scripts/makepkg.sh.in | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
> index 2deb61da..f95f7168 100644
> --- a/scripts/makepkg.sh.in
> +++ b/scripts/makepkg.sh.in
> @@ -643,6 +643,7 @@ write_buildinfo() {
>  	write_kv_pair "packager" "${PACKAGER}"
>  	write_kv_pair "builddate" "${SOURCE_DATE_EPOCH}"
>  	write_kv_pair "builddir"  "${BUILDDIR}"
> +	write_kv_pair "startdir"  "${startdir}"
>  	write_kv_pair "buildenv" "${BUILDENV[@]}"
>  	write_kv_pair "options" "${OPTIONS[@]}"
>  
>

Patch

diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 2deb61da..f95f7168 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -643,6 +643,7 @@  write_buildinfo() {
 	write_kv_pair "packager" "${PACKAGER}"
 	write_kv_pair "builddate" "${SOURCE_DATE_EPOCH}"
 	write_kv_pair "builddir"  "${BUILDDIR}"
+	write_kv_pair "startdir"  "${startdir}"
 	write_kv_pair "buildenv" "${BUILDENV[@]}"
 	write_kv_pair "options" "${OPTIONS[@]}"