summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnuj Mittal <anuj.mittal@intel.com>2019-02-26 21:22:53 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-02-27 18:04:14 +0000
commit6f686a4e5117003d59c8e526246bbc283d4806fd (patch)
treee53abe6107e05ea7b6651d59b478b8080c045a69
parenta189a28dc105ff3f85c1a99591f305897b5770af (diff)
downloadpoky-6f686a4e5117003d59c8e526246bbc283d4806fd.tar.gz
syslinux: upgrade to 6.04-pre2
For changes in this release, see: http://www.syslinux.org/wiki/index.php?title=Syslinux_6_Changelog Backport a patch to fix compilation failures and remove the patches that are not needed anymore. (From OE-Core rev: faeeb918b01f17197c70e304b1eb7a10caba5ef3) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/syslinux/syslinux/0001-install-don-t-install-obsolete-file-com32.ld.patch32
-rw-r--r--meta/recipes-devtools/syslinux/syslinux/0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch44
-rw-r--r--meta/recipes-devtools/syslinux/syslinux/0010-gcc46-compatibility.patch37
-rw-r--r--meta/recipes-devtools/syslinux/syslinux/0011-mk-MMD-does-not-take-any-arguments.patch33
-rw-r--r--meta/recipes-devtools/syslinux/syslinux/syslinux-6.03-sysmacros.patch45
-rw-r--r--meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch35
-rw-r--r--meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch31
-rw-r--r--meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb (renamed from meta/recipes-devtools/syslinux/syslinux_6.03.bb)15
8 files changed, 62 insertions, 210 deletions
diff --git a/meta/recipes-devtools/syslinux/syslinux/0001-install-don-t-install-obsolete-file-com32.ld.patch b/meta/recipes-devtools/syslinux/syslinux/0001-install-don-t-install-obsolete-file-com32.ld.patch
new file mode 100644
index 0000000000..bfd7f41b13
--- /dev/null
+++ b/meta/recipes-devtools/syslinux/syslinux/0001-install-don-t-install-obsolete-file-com32.ld.patch
@@ -0,0 +1,32 @@
1From bf6db5b48ec25f83939f1fdebb59028bc3c40b00 Mon Sep 17 00:00:00 2001
2From: "H. Peter Anvin (Intel)" <hpa@zytor.com>
3Date: Wed, 6 Feb 2019 11:30:51 -0800
4Subject: [PATCH] install: don't install obsolete file com32.ld
5
6com32.ld has been obsolete for a long time, and has been removed now;
7don't install it either.
8
9Reported-by: Joakim Tjernlund <Joakim.Tjernlund@infinera.com>
10Signed-off-by: H. Peter Anvin (Intel) <hpa@zytor.com>
11
12Upstream-Status: Backport
13Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
14---
15 com32/lib/Makefile | 1 -
16 1 file changed, 1 deletion(-)
17
18diff --git a/com32/lib/Makefile b/com32/lib/Makefile
19index 74fff149..6a931492 100644
20--- a/com32/lib/Makefile
21+++ b/com32/lib/Makefile
22@@ -113,7 +113,6 @@ spotless: clean
23
24 install: all
25 mkdir -m 755 -p $(INSTALLROOT)$(COM32DIR)
26- install -m 644 $(SRC)/com32.ld $(INSTALLROOT)$(COM32DIR)
27 -rm -rf $(INSTALLROOT)$(COM32DIR)/include
28 cp -r $(SRC)/../include $(INSTALLROOT)$(COM32DIR)
29
30--
312.17.1
32
diff --git a/meta/recipes-devtools/syslinux/syslinux/0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch b/meta/recipes-devtools/syslinux/syslinux/0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch
index 2400c98d6a..f1d01fa43c 100644
--- a/meta/recipes-devtools/syslinux/syslinux/0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch
+++ b/meta/recipes-devtools/syslinux/syslinux/0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch
@@ -1,8 +1,7 @@
1From 78d76b87a4b855e6b661ae457283a63f385c04c9 Mon Sep 17 00:00:00 2001 1From efce87e5ab98664c57e5f4e3955a2f3747df5737 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com> 2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Fri, 2 Jan 2015 12:26:46 +0800 3Date: Fri, 2 Jan 2015 12:26:46 +0800
4Subject: [PATCH 8/9] libinstaller/syslinuxext: implement 4Subject: [PATCH] libinstaller/syslinuxext: implement syslinux_patch_bootsect()
5 syslinux_patch_bootsect()
6 5
7Move the related from extlinux/main.c to libinstaller/syslinuxext.c, the 6Move the related from extlinux/main.c to libinstaller/syslinuxext.c, the
8syslinux_patch_bootsect() are used by both extlinux/main.c and 7syslinux_patch_bootsect() are used by both extlinux/main.c and
@@ -12,17 +11,21 @@ Upstream-Status: Submitted
12 11
13Signed-off-by: Robert Yang <liezhi.yang@windriver.com> 12Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
14Tested-by: Du Dolpher <dolpher.du@intel.com> 13Tested-by: Du Dolpher <dolpher.du@intel.com>
14
15Edited to include sysmacros.h
16
17Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
15--- 18---
16 extlinux/Makefile | 3 +- 19 extlinux/Makefile | 3 +-
17 extlinux/main.c | 167 +------------------------------------------- 20 extlinux/main.c | 167 +-----------------------------------
18 libinstaller/syslinuxext.c | 170 +++++++++++++++++++++++++++++++++++++++++++++ 21 libinstaller/syslinuxext.c | 171 +++++++++++++++++++++++++++++++++++++
19 3 files changed, 175 insertions(+), 165 deletions(-) 22 3 files changed, 176 insertions(+), 165 deletions(-)
20 23
21diff --git a/extlinux/Makefile b/extlinux/Makefile 24diff --git a/extlinux/Makefile b/extlinux/Makefile
22index 02d1db5..90dd92f 100644 25index 1721ee54..62a49728 100644
23--- a/extlinux/Makefile 26--- a/extlinux/Makefile
24+++ b/extlinux/Makefile 27+++ b/extlinux/Makefile
25@@ -31,7 +31,8 @@ SRCS = main.c \ 28@@ -32,7 +32,8 @@ SRCS = main.c \
26 ../libinstaller/advio.c \ 29 ../libinstaller/advio.c \
27 ../libinstaller/bootsect_bin.c \ 30 ../libinstaller/bootsect_bin.c \
28 ../libinstaller/ldlinuxc32_bin.c \ 31 ../libinstaller/ldlinuxc32_bin.c \
@@ -33,10 +36,10 @@ index 02d1db5..90dd92f 100644
33 36
34 .SUFFIXES: .c .o .i .s .S 37 .SUFFIXES: .c .o .i .s .S
35diff --git a/extlinux/main.c b/extlinux/main.c 38diff --git a/extlinux/main.c b/extlinux/main.c
36index 09740bd..6fe026e 100644 39index ebff7eae..9add50fb 100644
37--- a/extlinux/main.c 40--- a/extlinux/main.c
38+++ b/extlinux/main.c 41+++ b/extlinux/main.c
39@@ -60,6 +60,7 @@ 42@@ -62,6 +62,7 @@
40 #include "setadv.h" 43 #include "setadv.h"
41 #include "syslxopt.h" /* unified options */ 44 #include "syslxopt.h" /* unified options */
42 #include "mountinfo.h" 45 #include "mountinfo.h"
@@ -44,7 +47,7 @@ index 09740bd..6fe026e 100644
44 47
45 #ifdef DEBUG 48 #ifdef DEBUG
46 # define dprintf printf 49 # define dprintf printf
47@@ -67,10 +68,6 @@ 50@@ -69,10 +70,6 @@
48 # define dprintf(...) ((void)0) 51 # define dprintf(...) ((void)0)
49 #endif 52 #endif
50 53
@@ -55,10 +58,11 @@ index 09740bd..6fe026e 100644
55 /* Since we have unused 2048 bytes in the primary AG of an XFS partition, 58 /* Since we have unused 2048 bytes in the primary AG of an XFS partition,
56 * we will use the first 0~512 bytes starting from 2048 for the Syslinux 59 * we will use the first 0~512 bytes starting from 2048 for the Syslinux
57 * boot sector. 60 * boot sector.
58@@ -92,136 +89,6 @@ static char subvol[BTRFS_SUBVOL_MAX]; 61@@ -93,136 +90,6 @@ static char subvol[BTRFS_SUBVOL_MAX];
62 #define BTRFS_ADV_OFFSET (BTRFS_BOOT_AREA_A_OFFSET + BTRFS_BOOT_AREA_A_SIZE \
59 - 2*ADV_SIZE) 63 - 2*ADV_SIZE)
60 64
61 /* 65-/*
62- * Get the size of a block device 66- * Get the size of a block device
63- */ 67- */
64-static uint64_t get_size(int devfd) 68-static uint64_t get_size(int devfd)
@@ -188,11 +192,10 @@ index 09740bd..6fe026e 100644
188- return rv; 192- return rv;
189-} 193-}
190- 194-
191-/* 195 /*
192 * Query the device geometry and put it into the boot sector. 196 * Query the device geometry and put it into the boot sector.
193 * Map the file and put the map in the boot sector and file. 197 * Map the file and put the map in the boot sector and file.
194 * Stick the "current directory" inode number into the file. 198@@ -233,11 +100,8 @@ ok:
195@@ -231,11 +98,8 @@ ok:
196 static int patch_file_and_bootblock(int fd, const char *dir, int devfd) 199 static int patch_file_and_bootblock(int fd, const char *dir, int devfd)
197 { 200 {
198 struct stat dirst, xdst; 201 struct stat dirst, xdst;
@@ -204,7 +207,7 @@ index 09740bd..6fe026e 100644
204 char *dirpath, *subpath, *xdirpath; 207 char *dirpath, *subpath, *xdirpath;
205 int rv; 208 int rv;
206 209
207@@ -279,33 +143,8 @@ static int patch_file_and_bootblock(int fd, const char *dir, int devfd) 210@@ -281,33 +145,8 @@ static int patch_file_and_bootblock(int fd, const char *dir, int devfd)
208 /* Now subpath should contain the path relative to the fs base */ 211 /* Now subpath should contain the path relative to the fs base */
209 dprintf("subpath = %s\n", subpath); 212 dprintf("subpath = %s\n", subpath);
210 213
@@ -241,14 +244,15 @@ index 09740bd..6fe026e 100644
241 /* Construct the boot file map */ 244 /* Construct the boot file map */
242 245
243diff --git a/libinstaller/syslinuxext.c b/libinstaller/syslinuxext.c 246diff --git a/libinstaller/syslinuxext.c b/libinstaller/syslinuxext.c
244index bb54cef..5a4423b 100644 247index bb54cefc..9ae82884 100644
245--- a/libinstaller/syslinuxext.c 248--- a/libinstaller/syslinuxext.c
246+++ b/libinstaller/syslinuxext.c 249+++ b/libinstaller/syslinuxext.c
247@@ -1,7 +1,177 @@ 250@@ -1,7 +1,178 @@
248 #define _GNU_SOURCE 251 #define _GNU_SOURCE
249 252
250+#include <sys/stat.h> 253+#include <sys/stat.h>
251+#include <sys/types.h> 254+#include <sys/types.h>
255+#include <sys/sysmacros.h>
252+#include <getopt.h> 256+#include <getopt.h>
253+#include <ext2fs/ext2fs.h> 257+#include <ext2fs/ext2fs.h>
254+ 258+
@@ -423,5 +427,5 @@ index bb54cef..5a4423b 100644
423 } 427 }
424 428
425-- 429--
4261.9.1 4302.17.1
427 431
diff --git a/meta/recipes-devtools/syslinux/syslinux/0010-gcc46-compatibility.patch b/meta/recipes-devtools/syslinux/syslinux/0010-gcc46-compatibility.patch
deleted file mode 100644
index 6279258c2e..0000000000
--- a/meta/recipes-devtools/syslinux/syslinux/0010-gcc46-compatibility.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1don't break with old compilers and -DGNU_EFI_USE_MS_ABI
2It's entirely legitimate to request GNU_EFI_USE_MS_ABI even if the current
3compiler doesn't support it, and gnu-efi should transparently fall back to
4using legacy techniques to set the calling convention. We don't get type
5checking, but at least it will still compile.
6
7Adapted from gnu-efi
8
9Author: Steve Langasek <steve.langasek@ubuntu.com>
10Upstream-Status: Pending
11
12Index: syslinux-6.03/efi64/include/efi/x86_64/efibind.h
13===================================================================
14--- syslinux-6.03.orig/efi64/include/efi/x86_64/efibind.h
15+++ syslinux-6.03/efi64/include/efi/x86_64/efibind.h
16@@ -25,8 +25,6 @@ Revision History
17 #if defined(GNU_EFI_USE_MS_ABI)
18 #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
19 #define HAVE_USE_MS_ABI 1
20- #else
21- #error Compiler is too old for GNU_EFI_USE_MS_ABI
22 #endif
23 #endif
24
25Index: syslinux-6.03/gnu-efi/gnu-efi-3.0/inc/x86_64/efibind.h
26===================================================================
27--- syslinux-6.03.orig/gnu-efi/gnu-efi-3.0/inc/x86_64/efibind.h
28+++ syslinux-6.03/gnu-efi/gnu-efi-3.0/inc/x86_64/efibind.h
29@@ -25,8 +25,6 @@ Revision History
30 #if defined(GNU_EFI_USE_MS_ABI)
31 #if defined(__GNUC__) && (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 7))
32 #define HAVE_USE_MS_ABI 1
33- #else
34- #error Compiler is too old for GNU_EFI_USE_MS_ABI
35 #endif
36 #endif
37
diff --git a/meta/recipes-devtools/syslinux/syslinux/0011-mk-MMD-does-not-take-any-arguments.patch b/meta/recipes-devtools/syslinux/syslinux/0011-mk-MMD-does-not-take-any-arguments.patch
deleted file mode 100644
index 443c1ccc58..0000000000
--- a/meta/recipes-devtools/syslinux/syslinux/0011-mk-MMD-does-not-take-any-arguments.patch
+++ /dev/null
@@ -1,33 +0,0 @@
1From 0f3d83c25491951f1fa84c7957358ef3d1bcd8a9 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 9 Sep 2015 17:39:22 +0000
4Subject: [PATCH] mk: -MMD does not take any arguments
5
6Specify -Wp for each option, clang seems to not accept
7-Wp,-x,y,-a,b
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10---
11Upstream-Status: Pending
12
13 mk/syslinux.mk | 4 ++--
14 1 file changed, 2 insertions(+), 2 deletions(-)
15
16Index: syslinux-6.03/mk/syslinux.mk
17===================================================================
18--- syslinux-6.03.orig/mk/syslinux.mk
19+++ syslinux-6.03/mk/syslinux.mk
20@@ -82,11 +82,11 @@ ARCH ?= $(strip $(SUBARCH))
21 GCCWARN = -W -Wall -Wstrict-prototypes $(DEBUGOPT)
22
23 # Common stanza to make gcc generate .*.d dependency files
24-MAKEDEPS = -Wp,-MT,$@,-MD,$(dir $@).$(notdir $@).d
25+MAKEDEPS = -MT $@ -MD
26
27 # Dependencies that exclude system headers; use whenever we use
28 # header files from the platform.
29-UMAKEDEPS = -Wp,-MT,$@,-MMD,$(dir $@).$(notdir $@).d
30+UMAKEDEPS = -MT $@ -MMD
31
32 # Items that are only appropriate during development; this file is
33 # removed when tarballs are generated.
diff --git a/meta/recipes-devtools/syslinux/syslinux/syslinux-6.03-sysmacros.patch b/meta/recipes-devtools/syslinux/syslinux/syslinux-6.03-sysmacros.patch
deleted file mode 100644
index 3ce46da103..0000000000
--- a/meta/recipes-devtools/syslinux/syslinux/syslinux-6.03-sysmacros.patch
+++ /dev/null
@@ -1,45 +0,0 @@
1https://bugs.gentoo.org/579928
2
3From d84db34dbe39d55b4d7e868764c056689aa0793b Mon Sep 17 00:00:00 2001
4From: Mike Frysinger <vapier@gentoo.org>
5Date: Tue, 19 Apr 2016 01:56:41 -0400
6Subject: [PATCH] extlinux: pull in sys/sysmacros.h for major/minor/makedev
7
8These functions are defined in sys/sysmacros.h, so add the include to
9main.c. This is already handled correctly in mountinfo.c. Otherwise
10we get build failures like:
11
12main.o: In function 'find_device_sysfs':
13extlinux/main.c:1131: undefined reference to 'minor'
14
15Upstream-Status: Pending
16Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
17Signed-off-by: Mike Frysinger <vapier@gentoo.org>
18
19The first part wasn't enough in OE build, I had to add the same for syslinuxext.c.
20---
21 extlinux/main.c | 1 +
22 1 file changed, 1 insertion(+)
23
24diff --git a/extlinux/main.c b/extlinux/main.c
25index a7ebd49..ebff7ea 100644
26--- a/extlinux/main.c
27+++ b/extlinux/main.c
28@@ -38,6 +38,7 @@
29 #include <sysexits.h>
30 #include <sys/ioctl.h>
31 #include <sys/stat.h>
32+#include <sys/sysmacros.h>
33 #include <sys/types.h>
34 #include <sys/mount.h>
35 #include <sys/vfs.h>
36--- a/libinstaller/syslinuxext.c 2017-02-22 20:17:05.336869181 +0100
37+++ b/libinstaller/syslinuxext.c 2017-02-22 20:16:47.500868751 +0100
38@@ -2,6 +2,7 @@
39
40 #include <sys/stat.h>
41 #include <sys/types.h>
42+#include <sys/sysmacros.h>
43 #include <getopt.h>
44 #include <ext2fs/ext2fs.h>
45
diff --git a/meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch b/meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch
deleted file mode 100644
index 312b1e8aed..0000000000
--- a/meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1syslinux-native: fix parallel building issue
2
3There might be an error when parallel build:
4
5[snip]
6cp: cannot create directory `tmp/sysroots/x86_64-linux/usr/share/
7syslinux/com32/include/gplinclude': No such file or directory
8make[4]: *** [install] Error 1
9make[3]: *** [gpllib] Error 2
10[snip]
11
12This is a potential issue. In ${S}/com32/gpllib/Makefile file,
13install target wants to copy $(SRC)/../gplinclude to
14$(INSTALLROOT)$(COM32DIR)/include/ directory, but in ${S}/com32/lib/Makefile
15file, the install target will remove $(INSTALLROOT)$(COM32DIR)/include
16directory. We need to do com32/lib first.
17
18The patch make com32/gpllib depends on com32/lib to fix this issue.
19
20Upstream-Status: Pending
21
22Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
23---
24 com32/Makefile | 1 +
25 1 file changed, 1 insertion(+)
26
27Index: syslinux-6.03/com32/Makefile
28===================================================================
29--- syslinux-6.03.orig/com32/Makefile
30+++ syslinux-6.03/com32/Makefile
31@@ -21,3 +21,4 @@ rosh: lib libutil
32 samples: libutil elflink/ldlinux
33 sysdump: lib libutil libupload gpllib
34 lua/src: cmenu modules
35+gpllib: lib
diff --git a/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch b/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch
deleted file mode 100644
index 6ba96aeb56..0000000000
--- a/meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 490fc3bbd65c2c252c1fdf3da0fac9898aa9eea6 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Fri, 15 Aug 2014 21:09:16 -0700
4Subject: [PATCH] com32/Makefile: fix parallel issue
5
6Fixed:
7cp -r syslinux-6.01/com32/libupload/*.h image/usr/share/syslinux/com32/include/
8[snip]
9rm -rf image/usr/share/syslinux/com32/include
10[snip]
11cp: cannot create regular file `image/usr/share/syslinux/com32/include/serial.h': No such file or directory
12
13The cp is happened in the "libupload" dir, while "rm -fr" is happend in
14"lib" dir, let "libupload" depend "lib" will fix the problem.
15
16Upstream-Status: Pending
17
18Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
19---
20 com32/Makefile | 1 +
21 1 file changed, 1 insertion(+)
22
23Index: syslinux-6.03/com32/Makefile
24===================================================================
25--- syslinux-6.03.orig/com32/Makefile
26+++ syslinux-6.03/com32/Makefile
27@@ -22,3 +22,4 @@ samples: libutil elflink/ldlinux
28 sysdump: lib libutil libupload gpllib
29 lua/src: cmenu modules
30 gpllib: lib
31+libupload: lib
diff --git a/meta/recipes-devtools/syslinux/syslinux_6.03.bb b/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb
index f8b1094096..a7fc21e2fc 100644
--- a/meta/recipes-devtools/syslinux/syslinux_6.03.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_6.04-pre2.bb
@@ -7,10 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
7# If you really want to run syslinux, you need mtools. We just want the 7# If you really want to run syslinux, you need mtools. We just want the
8# ldlinux.* stuff for now, so skip mtools-native 8# ldlinux.* stuff for now, so skip mtools-native
9DEPENDS = "nasm-native util-linux e2fsprogs" 9DEPENDS = "nasm-native util-linux e2fsprogs"
10PV = "6.04-pre2"
10 11
11SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/syslinux-${PV}.tar.xz \ 12SRC_URI = "https://www.zytor.com/pub/syslinux/Testing/6.04/syslinux-${PV}.tar.xz \
12 file://syslinux-fix-parallel-building-issue.patch \
13 file://syslinux-libupload-depend-lib.patch \
14 file://syslinux-remove-clean-script.patch \ 13 file://syslinux-remove-clean-script.patch \
15 file://0001-linux-syslinux-support-ext2-3-4-device.patch \ 14 file://0001-linux-syslinux-support-ext2-3-4-device.patch \
16 file://0002-linux-syslinux-implement-open_ext2_fs.patch \ 15 file://0002-linux-syslinux-implement-open_ext2_fs.patch \
@@ -21,13 +20,11 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/syslinux-${PV}.tar.xz \
21 file://0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch \ 20 file://0007-linux-syslinux-implement-ext_construct_sectmap_fs.patch \
22 file://0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch \ 21 file://0008-libinstaller-syslinuxext-implement-syslinux_patch_bo.patch \
23 file://0009-linux-syslinux-implement-install_bootblock.patch \ 22 file://0009-linux-syslinux-implement-install_bootblock.patch \
24 file://0010-gcc46-compatibility.patch \ 23 file://0001-install-don-t-install-obsolete-file-com32.ld.patch \
25 file://0011-mk-MMD-does-not-take-any-arguments.patch \
26 file://syslinux-6.03-sysmacros.patch \
27 " 24 "
28 25
29SRC_URI[md5sum] = "92a253df9211e9c20172796ecf388f13" 26SRC_URI[md5sum] = "2b31c78f087f99179feb357da312d7ec"
30SRC_URI[sha256sum] = "26d3986d2bea109d5dc0e4f8c4822a459276cf021125e8c9f23c3cca5d8c850e" 27SRC_URI[sha256sum] = "4441a5d593f85bb6e8d578cf6653fb4ec30f9e8f4a2315a3d8f2d0a8b3fadf94"
31 28
32COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)' 29COMPATIBLE_HOST = '(x86_64|i.86).*-(linux|freebsd.*)'
33# Don't let the sanity checker trip on the 32 bit real mode BIOS binaries 30# Don't let the sanity checker trip on the 32 bit real mode BIOS binaries
@@ -62,7 +59,7 @@ do_compile() {
62} 59}
63 60
64do_install() { 61do_install() {
65 oe_runmake CC="${CC} ${CFLAGS}" LD="${LD}" install INSTALLROOT="${D}" firmware="bios" 62 oe_runmake CC="${CC} ${CFLAGS}" LD="${LD}" firmware="bios" install INSTALLROOT="${D}"
66 63
67 install -d ${D}${datadir}/syslinux/ 64 install -d ${D}${datadir}/syslinux/
68 install -m 644 ${S}/bios/core/ldlinux.sys ${D}${datadir}/syslinux/ 65 install -m 644 ${S}/bios/core/ldlinux.sys ${D}${datadir}/syslinux/