diff options
| author | Francis Rowe <info@gluglug.org.uk> | 2016-03-11 05:26:38 +0000 |
|---|---|---|
| committer | Francis Rowe <info@gluglug.org.uk> | 2016-03-11 05:26:38 +0000 |
| commit | de41363b4bb5416fc2ab2abc9bfd5d52df63457b (patch) | |
| tree | 2b634c989a5d0bb4849437626d638424c8f82c70 /resources/grub/patch/reproducible | |
| parent | 464076335d6ca5e6f801f863e95dc3847616a595 (diff) | |
| download | librebootfr-de41363b4bb5416fc2ab2abc9bfd5d52df63457b.tar.gz librebootfr-de41363b4bb5416fc2ab2abc9bfd5d52df63457b.zip | |
Update to GRUB 7f2a856faec951b7ab816880bd26e1e10b17a596
Diffstat (limited to 'resources/grub/patch/reproducible')
3 files changed, 8 insertions, 8 deletions
diff --git a/resources/grub/patch/reproducible/0001-mkstandalone-add-argument-fixed-time-to-override-mti.patch b/resources/grub/patch/reproducible/0001-mkstandalone-add-argument-fixed-time-to-override-mti.patch index 939512ab..1d537e87 100644 --- a/resources/grub/patch/reproducible/0001-mkstandalone-add-argument-fixed-time-to-override-mti.patch +++ b/resources/grub/patch/reproducible/0001-mkstandalone-add-argument-fixed-time-to-override-mti.patch @@ -1,7 +1,7 @@ -From 21ae195006adf67a6c6a0de007e7149e6d3dbcf3 Mon Sep 17 00:00:00 2001 +From 8dde1d7be2dd321a375570b7ff7e22bb01293044 Mon Sep 17 00:00:00 2001 From: Alexander Couzens <lynxis@fe80.eu> Date: Fri, 4 Dec 2015 17:10:42 +0100 -Subject: [PATCH 08/11] mkstandalone: add argument --fixed-time to override +Subject: [PATCH 08/10] mkstandalone: add argument --fixed-time to override mtime of files mkstandalone adds several files to an archive. Doing this it uses the diff --git a/resources/grub/patch/reproducible/0002-mkrescue-add-argument-fixed-time-to-get-reproducible.patch b/resources/grub/patch/reproducible/0002-mkrescue-add-argument-fixed-time-to-get-reproducible.patch index 3d3ab6ea..0612ade0 100644 --- a/resources/grub/patch/reproducible/0002-mkrescue-add-argument-fixed-time-to-get-reproducible.patch +++ b/resources/grub/patch/reproducible/0002-mkrescue-add-argument-fixed-time-to-get-reproducible.patch @@ -1,7 +1,7 @@ -From 1ad8a4c5d0d6003954d37c4f7eeca0514971f8b4 Mon Sep 17 00:00:00 2001 +From 0f1e1a29d4d019e7b2b1a3ac3db7ca22c75e8d88 Mon Sep 17 00:00:00 2001 From: Alexander Couzens <lynxis@fe80.eu> Date: Fri, 4 Dec 2015 17:10:43 +0100 -Subject: [PATCH 09/11] mkrescue: add argument --fixed-time to get reproducible +Subject: [PATCH 09/10] mkrescue: add argument --fixed-time to get reproducible uuids The uuid generation is based on the time. diff --git a/resources/grub/patch/reproducible/0003-Makefile-use-FIXED_TIMESTAMP-for-mkstandalone-if-set.patch b/resources/grub/patch/reproducible/0003-Makefile-use-FIXED_TIMESTAMP-for-mkstandalone-if-set.patch index 4386f0f0..f06dbfb5 100644 --- a/resources/grub/patch/reproducible/0003-Makefile-use-FIXED_TIMESTAMP-for-mkstandalone-if-set.patch +++ b/resources/grub/patch/reproducible/0003-Makefile-use-FIXED_TIMESTAMP-for-mkstandalone-if-set.patch @@ -1,7 +1,7 @@ -From 58d54ff1514d83d9e4f77d4374635b1bf705ed81 Mon Sep 17 00:00:00 2001 +From 57174ed960905be4f9c229bbf3913b25745dbfd9 Mon Sep 17 00:00:00 2001 From: Alexander Couzens <lynxis@fe80.eu> Date: Fri, 4 Dec 2015 17:10:44 +0100 -Subject: [PATCH 10/11] Makefile: use FIXED_TIMESTAMP for mkstandalone if set +Subject: [PATCH 10/10] Makefile: use FIXED_TIMESTAMP for mkstandalone if set mkstandalone sets timestamps for files which can be overriden by a fixed_timestamp. This makes it possible to build reproducible builds for coreboot. @@ -13,13 +13,13 @@ make default_payload.elf FIXED_TIMESTAMP=1134242 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am -index 288e621..6c786b7 100644 +index 00a9663..ed7f148 100644 --- a/Makefile.am +++ b/Makefile.am @@ -411,7 +411,7 @@ bootcheck: $(BOOTCHECKS) if COND_i386_coreboot default_payload.elf: grub-mkstandalone grub-mkimage FORCE - rm $@ + test -f $@ && rm $@ || true - pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata ehci uhci ohci usb_keyboard usbms part_msdos ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --install-modules='ls linux search configfile normal cbtime cbls memrw iorw minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test serial multiboot cbmemc linux16 gzio echo help syslinuxcfg xnu $(shell cat grub-core/fs.lst) password_pbkdf2 $(EXTRA_PAYLOAD_MODULES)' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg + pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata ehci uhci ohci usb_keyboard usbms part_msdos ext2 fat at_keyboard part_gpt usbserial_usbdebug cbfs' --install-modules='ls linux search configfile normal cbtime cbls memrw iorw minicmd lsmmap lspci halt reboot hexdump pcidump regexp setpci lsacpi chain test serial multiboot cbmemc linux16 gzio echo help syslinuxcfg xnu $(shell cat grub-core/fs.lst) password_pbkdf2 $(EXTRA_PAYLOAD_MODULES)' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg $(if $(FIXED_TIMESTAMP),-t $(FIXED_TIMESTAMP)) endif |