From 6714fdfb94107ac49a482680be5d66176ddf33d3 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 1 Jan 2021 03:38:21 +0000 Subject: [PATCH 1/4] gfxboot: pass --reproducible and --owner to cpio. Apply fixes for reproducibilty, similar to: https://github.com/openSUSE/gfxboot/pull/35 See also: https://bugs.debian.org/978946 https://tests.reproducible-builds.org/debian/issues/unstable/users_and_groups_in_cpio_archive_issue.html --- gfxboot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gfxboot b/gfxboot index f597c4f..4a4dc0e 100755 --- a/gfxboot +++ b/gfxboot @@ -2616,7 +2616,7 @@ sub pack_archive } if(@pack_list) { - open $f, "| ( cd $dir ; cpio --quiet -o ) >$file/$archive"; + open $f, "| ( cd $dir ; cpio --quiet --reproducible --owner=+0:+0 -o ) >$file/$archive"; print $f join("\n", @pack_list); close $f; } @@ -2625,7 +2625,7 @@ sub pack_archive else { $file = $gfxboot_tmp->file; - $i = system "cd $dir ; find . | cpio --quiet -o >$file 2>/dev/null"; + $i = system "cd $dir ; find . | cpio --quiet --reproducible --owner=+0:+0 -o >$file 2>/dev/null"; die "$file: failed to create archive\n" if $i; } From 11c095f024aea201da2c7fc10e102cfd857542e6 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Sun, 3 Jan 2021 03:21:23 +0000 Subject: [PATCH 2/4] gfxboot: avoid including the "." directory in the cpio archive. The "." directory is at best extraneous, and is a little trickier to avoid a resulting embedded timestamp. See also: https://bugs.debian.org/978946 https://tests.reproducible-builds.org/debian/issues/unstable/timestamps_in_cpio_archive_issue.html --- gfxboot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gfxboot b/gfxboot index 4a4dc0e..cc1c681 100755 --- a/gfxboot +++ b/gfxboot @@ -2625,7 +2625,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 . -mindepth 1 | cpio --quiet --reproducible --owner=+0:+0 -o >$file 2>/dev/null"; die "$file: failed to create archive\n" if $i; } From f4111961561613e0259acf2684ce0fc0d59b6c04 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Fri, 1 Jan 2021 04:09:40 +0000 Subject: [PATCH 3/4] themes/example*/Makefile: Set time on files in example themes using Makefile as a reference time. Similar to fixes applied in other themes: https://github.com/openSUSE/gfxboot/pull/35 See also: https://bugs.debian.org/978946 https://tests.reproducible-builds.org/debian/issues/unstable/timestamps_in_cpio_archive_issue.html --- themes/example_01/Makefile | 1 + themes/example_02/Makefile | 1 + themes/example_03/Makefile | 1 + themes/example_04/Makefile | 1 + themes/example_05/Makefile | 1 + themes/example_06/Makefile | 1 + themes/example_07/Makefile | 1 + 7 files changed, 7 insertions(+) diff --git a/themes/example_01/Makefile b/themes/example_01/Makefile index a3d1be4..c54659d 100644 --- a/themes/example_01/Makefile +++ b/themes/example_01/Makefile @@ -12,6 +12,7 @@ bootlogo: example_*.bc @rm -rf $@.dir @mkdir $@.dir $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init + touch --reference Makefile $@.dir/* $(GFXBOOT) --archive $@.dir --pack-archive $@ clean: diff --git a/themes/example_02/Makefile b/themes/example_02/Makefile index 0fb4640..422a4a6 100644 --- a/themes/example_02/Makefile +++ b/themes/example_02/Makefile @@ -13,6 +13,7 @@ bootlogo: example_*.bc font @mkdir $@.dir $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init @cp font.fnt $@.dir + touch --reference Makefile $@.dir/* $(GFXBOOT) --archive $@.dir --pack-archive $@ font: diff --git a/themes/example_03/Makefile b/themes/example_03/Makefile index cffce2e..2150acf 100644 --- a/themes/example_03/Makefile +++ b/themes/example_03/Makefile @@ -13,6 +13,7 @@ bootlogo: example_*.bc font @mkdir $@.dir $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init @cp clouds.jpg font.fnt $@.dir + touch --reference Makefile $@.dir/* $(GFXBOOT) --archive $@.dir --pack-archive $@ font: diff --git a/themes/example_04/Makefile b/themes/example_04/Makefile index 07357a5..b2abe27 100644 --- a/themes/example_04/Makefile +++ b/themes/example_04/Makefile @@ -13,6 +13,7 @@ bootlogo: example_*.bc font @mkdir $@.dir $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init @cp clouds.jpg font.fnt $@.dir + touch --reference Makefile $@.dir/* $(GFXBOOT) --archive $@.dir --pack-archive $@ font: diff --git a/themes/example_05/Makefile b/themes/example_05/Makefile index 07357a5..b2abe27 100644 --- a/themes/example_05/Makefile +++ b/themes/example_05/Makefile @@ -13,6 +13,7 @@ bootlogo: example_*.bc font @mkdir $@.dir $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init @cp clouds.jpg font.fnt $@.dir + touch --reference Makefile $@.dir/* $(GFXBOOT) --archive $@.dir --pack-archive $@ font: diff --git a/themes/example_06/Makefile b/themes/example_06/Makefile index bf21c5d..62ab7db 100644 --- a/themes/example_06/Makefile +++ b/themes/example_06/Makefile @@ -16,6 +16,7 @@ bootlogo: example_*.bc font @mkdir $@.dir $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init @cp $(FILES) $@.dir + touch --reference Makefile $@.dir/* $(GFXBOOT) --archive $@.dir --pack-archive $@ @ln -snf bootlogo message diff --git a/themes/example_07/Makefile b/themes/example_07/Makefile index bf21c5d..62ab7db 100644 --- a/themes/example_07/Makefile +++ b/themes/example_07/Makefile @@ -16,6 +16,7 @@ bootlogo: example_*.bc font @mkdir $@.dir $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init @cp $(FILES) $@.dir + touch --reference Makefile $@.dir/* $(GFXBOOT) --archive $@.dir --pack-archive $@ @ln -snf bootlogo message From 93ccb20be27579a22e780481a4ef242a9a6b2379 Mon Sep 17 00:00:00 2001 From: Vagrant Cascadian Date: Mon, 4 Jan 2021 17:51:30 +0000 Subject: [PATCH 4/4] themes/example*/Makefile: Use the .bc files as a reference date. (Closes: #978946) Apparently the Makefile might be modified during the build. --- themes/example_01/Makefile | 2 +- themes/example_02/Makefile | 2 +- themes/example_03/Makefile | 2 +- themes/example_04/Makefile | 2 +- themes/example_05/Makefile | 2 +- themes/example_06/Makefile | 2 +- themes/example_07/Makefile | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/themes/example_01/Makefile b/themes/example_01/Makefile index c54659d..746bc4c 100644 --- a/themes/example_01/Makefile +++ b/themes/example_01/Makefile @@ -12,7 +12,7 @@ bootlogo: example_*.bc @rm -rf $@.dir @mkdir $@.dir $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init - touch --reference Makefile $@.dir/* + touch --reference example_01.bc $@.dir/* $(GFXBOOT) --archive $@.dir --pack-archive $@ clean: diff --git a/themes/example_02/Makefile b/themes/example_02/Makefile index 422a4a6..958f1b0 100644 --- a/themes/example_02/Makefile +++ b/themes/example_02/Makefile @@ -13,7 +13,7 @@ bootlogo: example_*.bc font @mkdir $@.dir $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init @cp font.fnt $@.dir - touch --reference Makefile $@.dir/* + touch --reference example_02.bc $@.dir/* $(GFXBOOT) --archive $@.dir --pack-archive $@ font: diff --git a/themes/example_03/Makefile b/themes/example_03/Makefile index 2150acf..0950fa0 100644 --- a/themes/example_03/Makefile +++ b/themes/example_03/Makefile @@ -13,7 +13,7 @@ bootlogo: example_*.bc font @mkdir $@.dir $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init @cp clouds.jpg font.fnt $@.dir - touch --reference Makefile $@.dir/* + touch --reference example_03.bc $@.dir/* $(GFXBOOT) --archive $@.dir --pack-archive $@ font: diff --git a/themes/example_04/Makefile b/themes/example_04/Makefile index b2abe27..949a934 100644 --- a/themes/example_04/Makefile +++ b/themes/example_04/Makefile @@ -13,7 +13,7 @@ bootlogo: example_*.bc font @mkdir $@.dir $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init @cp clouds.jpg font.fnt $@.dir - touch --reference Makefile $@.dir/* + touch --reference example_04.bc $@.dir/* $(GFXBOOT) --archive $@.dir --pack-archive $@ font: diff --git a/themes/example_05/Makefile b/themes/example_05/Makefile index b2abe27..1f74aed 100644 --- a/themes/example_05/Makefile +++ b/themes/example_05/Makefile @@ -13,7 +13,7 @@ bootlogo: example_*.bc font @mkdir $@.dir $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init @cp clouds.jpg font.fnt $@.dir - touch --reference Makefile $@.dir/* + touch --reference example_05.bc $@.dir/* $(GFXBOOT) --archive $@.dir --pack-archive $@ font: diff --git a/themes/example_06/Makefile b/themes/example_06/Makefile index 62ab7db..0c403a7 100644 --- a/themes/example_06/Makefile +++ b/themes/example_06/Makefile @@ -16,7 +16,7 @@ bootlogo: example_*.bc font @mkdir $@.dir $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init @cp $(FILES) $@.dir - touch --reference Makefile $@.dir/* + touch --reference example_06.bc $@.dir/* $(GFXBOOT) --archive $@.dir --pack-archive $@ @ln -snf bootlogo message diff --git a/themes/example_07/Makefile b/themes/example_07/Makefile index 62ab7db..539d913 100644 --- a/themes/example_07/Makefile +++ b/themes/example_07/Makefile @@ -16,7 +16,7 @@ bootlogo: example_*.bc font @mkdir $@.dir $(GFXBOOT_COMPILE) $(BFLAGS) -l $@.log -c $< $@.dir/init @cp $(FILES) $@.dir - touch --reference Makefile $@.dir/* + touch --reference example_07.bc $@.dir/* $(GFXBOOT) --archive $@.dir --pack-archive $@ @ln -snf bootlogo message