diff options
| author | Arnout Vandecappelle <arnout@mind.be> | 2017-08-16 00:45:45 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-08-16 22:53:59 +0200 |
| commit | 4867d07d354a0f2edb9df37c0dc9b64e840aa8d9 (patch) | |
| tree | 3efddbbba077389415fb7b03f193ed3523c74663 /boot/syslinux/0004-memdisk-Force-ld-output-format-to-32-bits.patch | |
| parent | 95e8c5eb6f15712ce0f40dbc0f806a95f40d3b95 (diff) | |
| download | buildroot-4867d07d354a0f2edb9df37c0dc9b64e840aa8d9.tar.gz buildroot-4867d07d354a0f2edb9df37c0dc9b64e840aa8d9.zip | |
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/syslinux/0004-memdisk-Force-ld-output-format-to-32-bits.patch')
| -rw-r--r-- | boot/syslinux/0004-memdisk-Force-ld-output-format-to-32-bits.patch | 32 |
1 files changed, 0 insertions, 32 deletions
diff --git a/boot/syslinux/0004-memdisk-Force-ld-output-format-to-32-bits.patch b/boot/syslinux/0004-memdisk-Force-ld-output-format-to-32-bits.patch deleted file mode 100644 index 4eedf4973e..0000000000 --- a/boot/syslinux/0004-memdisk-Force-ld-output-format-to-32-bits.patch +++ /dev/null @@ -1,32 +0,0 @@ -From c0287594239d5af2082cac20817f8e8b11a4b1b2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Beno=C3=AEt=20Allard?= <benoit.allard@greenbone.net> -Date: Wed, 5 Apr 2017 14:18:09 +0200 -Subject: [PATCH] memdisk: Force ld output format to 32-bits -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -On toolchains where the default output is x86_64, we need to be -consistent with the other .o files - -Signed-off-by: Benoît Allard <benoit.allard@greenbone.net> ---- - memdisk/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/memdisk/Makefile b/memdisk/Makefile -index e6557d8..06613ff 100644 ---- a/memdisk/Makefile -+++ b/memdisk/Makefile -@@ -78,7 +78,7 @@ memdisk16.o: memdisk16.asm - $(NASM) -f bin $(NASMOPT) $(NFLAGS) $(NINCLUDE) -o $@ -l $*.lst $< - - memdisk_%.o: memdisk_%.bin -- $(LD) -r -b binary -o $@ $< -+ $(LD) --oformat elf32-i386 -r -b binary -o $@ $< - - memdisk16.elf: $(OBJS16) - $(LD) -Ttext 0 -o $@ $^ --- -2.7.4 - |
