summaryrefslogtreecommitdiffstats
path: root/resources/grub/patch/reproducible
diff options
context:
space:
mode:
authorFrancis Rowe <info@gluglug.org.uk>2016-02-20 23:23:55 (EST)
committer Francis Rowe <info@gluglug.org.uk>2016-02-20 23:23:55 (EST)
commitd4f967a1a5aecf96518e32987a2a3e9ae3795ded (patch)
tree99d18dd6970155227cf731e7a32e19edad8f45dd /resources/grub/patch/reproducible
parent1d4ecda3f59df844d28c93cc756a447adb65ce16 (diff)
downloadlibreboot-d4f967a1a5aecf96518e32987a2a3e9ae3795ded.zip
libreboot-d4f967a1a5aecf96518e32987a2a3e9ae3795ded.tar.gz
libreboot-d4f967a1a5aecf96518e32987a2a3e9ae3795ded.tar.bz2
Update to latest GRUB
secfix directory removed (patches merged upstream)
Diffstat (limited to 'resources/grub/patch/reproducible')
-rw-r--r--resources/grub/patch/reproducible/0001-mkstandalone-add-argument-fixed-time-to-override-mti.patch6
-rw-r--r--resources/grub/patch/reproducible/0002-mkrescue-add-argument-fixed-time-to-get-reproducible.patch8
-rw-r--r--resources/grub/patch/reproducible/0003-Makefile-use-FIXED_TIMESTAMP-for-mkstandalone-if-set.patch16
3 files changed, 15 insertions, 15 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 c19dd06..939512a 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,8 +1,8 @@
-From bf482ae6b4ff54265294e138ac73e8a716023f79 Mon Sep 17 00:00:00 2001
+From 21ae195006adf67a6c6a0de007e7149e6d3dbcf3 Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Fri, 4 Dec 2015 17:10:42 +0100
-Subject: [PATCH 1/3] mkstandalone: add argument --fixed-time to override mtime
- of files
+Subject: [PATCH 08/11] mkstandalone: add argument --fixed-time to override
+ mtime of files
mkstandalone adds several files to an archive. Doing this it uses the
mtime to give these files a timestamp.
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 24ac1d3..3d3ab6e 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 aeb2681fdf889be9725ab8d64896fade960f8bd1 Mon Sep 17 00:00:00 2001
+From 1ad8a4c5d0d6003954d37c4f7eeca0514971f8b4 Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Fri, 4 Dec 2015 17:10:43 +0100
-Subject: [PATCH 2/3] mkrescue: add argument --fixed-time to get reproducible
+Subject: [PATCH 09/11] mkrescue: add argument --fixed-time to get reproducible
uuids
The uuid generation is based on the time.
@@ -10,7 +10,7 @@ The uuid generation is based on the time.
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git a/util/grub-mkrescue.c b/util/grub-mkrescue.c
-index 4511826..164c4e1 100644
+index 238d484..a3e0155 100644
--- a/util/grub-mkrescue.c
+++ b/util/grub-mkrescue.c
@@ -52,6 +52,7 @@ static int xorriso_arg_alloc;
@@ -54,7 +54,7 @@ index 4511826..164c4e1 100644
default:
return ARGP_ERR_UNKNOWN;
}
-@@ -541,7 +554,7 @@ main (int argc, char *argv[])
+@@ -542,7 +555,7 @@ main (int argc, char *argv[])
{
time_t tim;
struct tm *tmm;
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 c91dcdd..4386f0f 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 0a19e32fbb62df69e0dfeb80f0a0672b09930f00 Mon Sep 17 00:00:00 2001
+From 58d54ff1514d83d9e4f77d4374635b1bf705ed81 Mon Sep 17 00:00:00 2001
From: Alexander Couzens <lynxis@fe80.eu>
Date: Fri, 4 Dec 2015 17:10:44 +0100
-Subject: [PATCH 3/3] Makefile: use FIXED_TIMESTAMP for mkstandalone if set
+Subject: [PATCH 10/11] 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,15 +13,15 @@ make default_payload.elf FIXED_TIMESTAMP=1134242
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Makefile.am b/Makefile.am
-index 994ebbd..37a7cc4 100644
+index 288e621..6c786b7 100644
--- a/Makefile.am
+++ b/Makefile.am
-@@ -403,7 +403,7 @@ bootcheck: $(BOOTCHECKS)
-
+@@ -411,7 +411,7 @@ bootcheck: $(BOOTCHECKS)
if COND_i386_coreboot
- default_payload.elf: grub-mkstandalone grub-mkimage
-- pkgdatadir=. ./grub-mkstandalone --grub-mkimage=./grub-mkimage -O i386-coreboot -o $@ --modules='ahci pata ehci uhci ohci usb_keyboard usbms part_msdos xfs 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' --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 xfs 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' --fonts= --themes= --locales= -d grub-core/ /boot/grub/grub.cfg=$(srcdir)/coreboot.cfg $(if $(FIXED_TIMESTAMP),-t $(FIXED_TIMESTAMP))
+ default_payload.elf: grub-mkstandalone grub-mkimage FORCE
+ rm $@
+- 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
endif