On 2022-03-25, Felix Zielcke wrote: > Am Mittwoch, dem 23.02.2022 um 09:36 +0100 schrieb Thomas Schmitt: > I totally forgot about this. Sorry! > > I just tried to test it with TZ set. > But I always get the same binaries. No matter to what I change TZ or > /etc/timezone between the builds. > > So is this just a bullseye problem? unstable has a newer mtools > > I'll try to test this in stable chroot the next days
I can reproduce the issue in a debian sid chroot with pcmemtest 1.5-3 from debian, using: reprotest --verbose --min-cpus=1 --vary=-user_group,-domain_host,-fileordering auto -- null Passing TZ=UTC in three different ways, exporting TZ=UTC from debian/rules, exporting TZ=UTC from the upstream Makefiles, and prepending the mcopy calls in the upstream Makefiles. All three approaches are below: diff --git a/debian/rules b/debian/rules index 9477c3e..860be75 100755 --- a/debian/rules +++ b/debian/rules @@ -1,5 +1,7 @@ #!/usr/bin/make -f +export TZ=UTC + %: dh $@ Alternately, by patching the upstream Makefiles: diff --git a/build32/Makefile b/build32/Makefile index 1d47859..93a671f 100644 --- a/build32/Makefile +++ b/build32/Makefile @@ -47,6 +47,8 @@ APP_OBJS = app/badram.o \ OBJS = boot/startup.o boot/efisetup.o $(SYS_OBJS) $(LIB_OBJS) $(TST_OBJS) $(APP_OBJS) +export TZ=UTC + all: memtest.bin memtest.efi -include boot/efisetup.d diff --git a/build64/Makefile b/build64/Makefile index 24e1ddc..0094868 100644 --- a/build64/Makefile +++ b/build64/Makefile @@ -46,6 +46,8 @@ APP_OBJS = app/badram.o \ OBJS = boot/startup.o boot/efisetup.o $(SYS_OBJS) $(LIB_OBJS) $(TST_OBJS) $(APP_OBJS) +export TZ=UTC + all: memtest.bin memtest.efi -include boot/efisetup.d Or patching upstream Makefile to only set the timezone on the mcopy calls: diff --git a/build32/Makefile b/build32/Makefile index 1d47859..38324a5 100644 --- a/build32/Makefile +++ b/build32/Makefile @@ -120,7 +120,7 @@ esp.img: memtest.efi cp memtest.efi iso/EFI/BOOT/bootia32.efi @rm -f esp.img /sbin/mkdosfs -i 12345678 --invariant -n MEMTEST-ESP -F12 -C esp.img 4096 - mcopy -s -i esp.img iso/EFI :: + TZ=UTC mcopy -s -i esp.img iso/EFI :: iso: memtest.mbr floppy.img esp.img @mkdir -p iso/boot diff --git a/build64/Makefile b/build64/Makefile index 24e1ddc..faa6402 100644 --- a/build64/Makefile +++ b/build64/Makefile @@ -119,7 +119,7 @@ esp.img: memtest.efi cp memtest.efi iso/EFI/BOOT/bootx64.efi @rm -f esp.img /sbin/mkdosfs -i 12345678 --invariant -n MEMTEST-ESP -F12 -C esp.img 4096 - mcopy -s -i esp.img iso/EFI :: + TZ=UTC mcopy -s -i esp.img iso/EFI :: memtest.iso: memtest.mbr floppy.img esp.img @mkdir -p iso/boot @@ -169,7 +169,7 @@ grub-esp.img: memtest.efi grub-bootx64.efi grub/grub-efi.cfg cp $(GRUB_LIB_DIR)/x86_64-efi/*.mod grub-iso/EFI/BOOT/grub/x86_64-efi/ @rm -f grub-esp.img /sbin/mkdosfs -n MEMTEST-ESP -F12 -C grub-esp.img 8192 - mcopy -s -i grub-esp.img grub-iso/EFI :: + TZ=UTC mcopy -s -i grub-esp.img grub-iso/EFI :: grub-memtest.iso: memtest.bin grub-eltorito.img grub/grub-legacy.cfg grub-esp.img @mkdir -p grub-iso/boot/grub/i386-pc grub-iso/boot/grub/fonts live well, vagrant
signature.asc
Description: PGP signature