On 2021-01-03, Vagrant Cascadian wrote: > One of the patches removes directories from the cpio archive, as the > example themes only included a "." directory with timestamps. This patch > needs further testing to ensure it behaves properly.
...
> From a94c1e737b8575e44a04d6030801d28763bda983 Mon Sep 17 00:00:00 2001
> From: Vagrant Cascadian <vagr...@reproducible-builds.org>
> Date: Sun, 3 Jan 2021 03:21:23 +0000
> Subject: [PATCH 5/6] gfxboot: do not include directory in cpio archive.
>
> ---
> gfxboot | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/gfxboot b/gfxboot
> index 48e5707..bb5767f 100755
> --- a/gfxboot
> +++ b/gfxboot
> @@ -2606,7 +2606,7 @@ sub pack_archive
> else {
> $file = $gfxboot_tmp->file;
>
> - $i = system "cd $dir ; find . | cpio --quiet --reproducible
> --owner=+0:+0 -o >$file 2>/dev/null";
> + $i = system "cd $dir ; find . -type f | cpio --quiet --reproducible
> --owner=+0:+0 -o >$file 2>/dev/null";
> die "$file: failed to create archive\n" if $i;
> }
>
> --
> 2.30.0
Actually, using "find . -mindepth 1" instead of "find . -type f" seems
safer, as it will only exclude the "." directory, in case a theme makes
use of a subdirectory... though all currently shipped themes do not
appear to include subdirectories.
live well,
vagrant
signature.asc
Description: PGP signature
