aboutsummaryrefslogtreecommitdiff
path: root/boot
diff options
context:
space:
mode:
authorGravatar Arnout Vandecappelle <arnout@mind.be>2017-08-16 00:45:45 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2017-08-16 22:53:59 +0200
commit4867d07d354a0f2edb9df37c0dc9b64e840aa8d9 (patch)
tree3efddbbba077389415fb7b03f193ed3523c74663 /boot
parent95e8c5eb6f15712ce0f40dbc0f806a95f40d3b95 (diff)
downloadbuildroot-4867d07d354a0f2edb9df37c0dc9b64e840aa8d9.tar.gz
buildroot-4867d07d354a0f2edb9df37c0dc9b64e840aa8d9.tar.bz2
boot/syslinux: renumber patches
Also the last two are regenerated, their context has changed due to the patches that have been removed earlier. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'boot')
-rw-r--r--boot/syslinux/0003-memdisk-Force-ld-output-format-to-32-bits.patch (renamed from boot/syslinux/0004-memdisk-Force-ld-output-format-to-32-bits.patch)0
-rw-r--r--boot/syslinux/0004-utils-Use-the-host-toolchain-to-build.patch (renamed from boot/syslinux/0005-utils-Use-the-host-toolchain-to-build.patch)0
-rw-r--r--boot/syslinux/0005-lzo-Use-the-host-toolchain-for-prepcore.patch (renamed from boot/syslinux/0006-lzo-Use-the-host-toolchain-for-prepcore.patch)0
-rw-r--r--boot/syslinux/0006-The-VPrint-definition-is-now-part-of-the-exports-of-.patch (renamed from boot/syslinux/0007-The-VPrint-definition-is-now-part-of-the-exports-of-.patch)0
-rw-r--r--boot/syslinux/0007-Update-the-longjump-calls-to-fit-the-new-declaration.patch (renamed from boot/syslinux/0009-Update-the-longjump-calls-to-fit-the-new-declaration.patch)12
-rw-r--r--boot/syslinux/0008-efi-wrapper-build-it-with-the-host-toolchain.patch (renamed from boot/syslinux/0010-efi-wrapper-build-it-with-the-host-toolchain.patch)8
6 files changed, 10 insertions, 10 deletions
diff --git a/boot/syslinux/0004-memdisk-Force-ld-output-format-to-32-bits.patch b/boot/syslinux/0003-memdisk-Force-ld-output-format-to-32-bits.patch
index 4eedf4973e..4eedf4973e 100644
--- a/boot/syslinux/0004-memdisk-Force-ld-output-format-to-32-bits.patch
+++ b/boot/syslinux/0003-memdisk-Force-ld-output-format-to-32-bits.patch
diff --git a/boot/syslinux/0005-utils-Use-the-host-toolchain-to-build.patch b/boot/syslinux/0004-utils-Use-the-host-toolchain-to-build.patch
index e091a3a89d..e091a3a89d 100644
--- a/boot/syslinux/0005-utils-Use-the-host-toolchain-to-build.patch
+++ b/boot/syslinux/0004-utils-Use-the-host-toolchain-to-build.patch
diff --git a/boot/syslinux/0006-lzo-Use-the-host-toolchain-for-prepcore.patch b/boot/syslinux/0005-lzo-Use-the-host-toolchain-for-prepcore.patch
index c6fa7febf7..c6fa7febf7 100644
--- a/boot/syslinux/0006-lzo-Use-the-host-toolchain-for-prepcore.patch
+++ b/boot/syslinux/0005-lzo-Use-the-host-toolchain-for-prepcore.patch
diff --git a/boot/syslinux/0007-The-VPrint-definition-is-now-part-of-the-exports-of-.patch b/boot/syslinux/0006-The-VPrint-definition-is-now-part-of-the-exports-of-.patch
index c376010232..c376010232 100644
--- a/boot/syslinux/0007-The-VPrint-definition-is-now-part-of-the-exports-of-.patch
+++ b/boot/syslinux/0006-The-VPrint-definition-is-now-part-of-the-exports-of-.patch
diff --git a/boot/syslinux/0009-Update-the-longjump-calls-to-fit-the-new-declaration.patch b/boot/syslinux/0007-Update-the-longjump-calls-to-fit-the-new-declaration.patch
index cb369981a9..90d0b81f06 100644
--- a/boot/syslinux/0009-Update-the-longjump-calls-to-fit-the-new-declaration.patch
+++ b/boot/syslinux/0007-Update-the-longjump-calls-to-fit-the-new-declaration.patch
@@ -1,4 +1,4 @@
-From db49dbac8a0c563fb6d07c348873e8ae50fee2a6 Mon Sep 17 00:00:00 2001
+From 3bd5c2d951421a89f76b2423e5810862f53486c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Allard?= <benoit.allard@greenbone.net>
Date: Fri, 9 Jun 2017 11:59:43 +0200
Subject: [PATCH] Update the longjump calls to fit the new declaration
@@ -12,7 +12,7 @@ Signed-off-by: Benoît Allard <benoit.allard@greenbone.net>
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/efi/main.c b/efi/main.c
-index fd95f5c..b5383cd 100644
+index 208fee4f..71d31a5c 100644
--- a/efi/main.c
+++ b/efi/main.c
@@ -10,7 +10,6 @@
@@ -23,15 +23,15 @@ index fd95f5c..b5383cd 100644
#include "efi.h"
#include "fio.h"
-@@ -31,7 +30,7 @@ uint32_t timer_irq;
+@@ -30,7 +29,7 @@ uint32_t timer_irq;
__export uint8_t KbdMap[256];
char aux_seg[256];
-static jmp_buf load_error_buf;
+static jmp_buf *load_error_buf;
- EFI_HANDLE image_handle, image_device_handle, mnpsb_handle;
-
+ static inline EFI_STATUS
+ efi_close_protocol(EFI_HANDLE handle, EFI_GUID *guid, EFI_HANDLE agent,
--
-2.1.4
+2.13.3
diff --git a/boot/syslinux/0010-efi-wrapper-build-it-with-the-host-toolchain.patch b/boot/syslinux/0008-efi-wrapper-build-it-with-the-host-toolchain.patch
index c8ff9ebe34..9ec12a1791 100644
--- a/boot/syslinux/0010-efi-wrapper-build-it-with-the-host-toolchain.patch
+++ b/boot/syslinux/0008-efi-wrapper-build-it-with-the-host-toolchain.patch
@@ -1,4 +1,4 @@
-From 755c947e9166366bd1a78efb1e0c7d6e6e2daa07 Mon Sep 17 00:00:00 2001
+From ca8aaded0c7c3900397029bd9520132b62629308 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Beno=C3=AEt=20Allard?= <benoit.allard@greenbone.net>
Date: Mon, 12 Jun 2017 14:59:16 +0200
Subject: [PATCH] efi/wrapper: build it with the host toolchain.
@@ -15,10 +15,10 @@ Signed-off-by: Benoît Allard <benoit.allard@greenbone.net>
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/efi/Makefile b/efi/Makefile
-index d3788d9..a17258a 100644
+index d5443bd5..d24d16db 100644
--- a/efi/Makefile
+++ b/efi/Makefile
-@@ -78,7 +78,7 @@ syslinux.so: $(OBJS) $(CORE_OBJS) $(LIB_OBJS)
+@@ -79,7 +79,7 @@ syslinux.so: $(OBJS) $(CORE_OBJS) $(LIB_OBJS)
# cp $^ $@
wrapper: wrapper.c
@@ -28,5 +28,5 @@ index d3788d9..a17258a 100644
#
# Build the wrapper app and wrap our .so to produce a .efi
--
-2.1.4
+2.13.3