From ae6742b64de8fb97c909a2f5f97a960e62cf11a4ffb2b4992bb7ec092a479781 Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Fri, 16 Feb 2024 07:02:37 +0000 Subject: [PATCH 1/2] Accepting request 1144993 from home:bmwiedemann:branches:Base:System Sort tar file order for reproducible builds OBS-URL: https://build.opensuse.org/request/show/1144993 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=486 --- grub2.changes | 5 +++++ grub2.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/grub2.changes b/grub2.changes index a6c949b..68788f8 100644 --- a/grub2.changes +++ b/grub2.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 7 18:33:58 UTC 2024 - Bernhard Wiedemann + +- Sort tar file order for reproducible builds + ------------------------------------------------------------------- Tue Feb 6 07:19:27 UTC 2024 - Michael Chang diff --git a/grub2.spec b/grub2.spec index 5fa7229..b58e161 100644 --- a/grub2.spec +++ b/grub2.spec @@ -742,7 +742,7 @@ mkdir -p ./fonts cp %{_datadir}/%{name}/themes/*/*.pf2 ./fonts cp ./unicode.pf2 ./fonts %if 0%{?suse_version} > 1500 -tar -cf - ./fonts | mksquashfs - memdisk.sqsh -tar -comp xz -quiet -no-progress +tar -sort=name -cf - ./fonts | mksquashfs - memdisk.sqsh -tar -comp xz -quiet -no-progress %else mksquashfs ./fonts memdisk.sqsh -keep-as-directory -comp xz -quiet -no-progress %endif From e149769ddfa8bca2644f66c8c7c54e978a33060f766eedbf007a5c6d9c92b54d Mon Sep 17 00:00:00 2001 From: Michael Chang Date: Fri, 16 Feb 2024 07:14:59 +0000 Subject: [PATCH 2/2] Accepting request 1147016 from home:michael-chang:branches:Base:System correct previous commit, tar might not work witj -sort=, use --sort= OBS-URL: https://build.opensuse.org/request/show/1147016 OBS-URL: https://build.opensuse.org/package/show/Base:System/grub2?expand=0&rev=487 --- grub2.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/grub2.spec b/grub2.spec index b58e161..e790f8a 100644 --- a/grub2.spec +++ b/grub2.spec @@ -742,7 +742,7 @@ mkdir -p ./fonts cp %{_datadir}/%{name}/themes/*/*.pf2 ./fonts cp ./unicode.pf2 ./fonts %if 0%{?suse_version} > 1500 -tar -sort=name -cf - ./fonts | mksquashfs - memdisk.sqsh -tar -comp xz -quiet -no-progress +tar --sort=name -cf - ./fonts | mksquashfs - memdisk.sqsh -tar -comp xz -quiet -no-progress %else mksquashfs ./fonts memdisk.sqsh -keep-as-directory -comp xz -quiet -no-progress %endif