mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-15 21:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

syslinux: Update to 6.0.3

Browse Source 
Removed patches that are now committed upstream, rebase parallel make
patch and add a new patch to remove a script that was calling git during
the clean process.

(From OE-Core rev: b53e46bece1c4976ba146d9abf41a8a54c584300)

Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Saul Wold
2014-12-10 10:26:33 -08:00
committed by Richard Purdie
parent 31059be977
commit c4fc5641d3
9 changed files with 28 additions and 710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch Normal file
View File

@@ -0,0 +1,35 @@
syslinux-native: fix parallel building issue
There might be an error when parallel build:
[snip]
cp: cannot create directory `tmp/sysroots/x86_64-linux/usr/share/
syslinux/com32/include/gplinclude': No such file or directory
make[4]: *** [install] Error 1
make[3]: *** [gpllib] Error 2
[snip]
This is a potential issue. In ${S}/com32/gpllib/Makefile file,
install target wants to copy $(SRC)/../gplinclude to
$(INSTALLROOT)$(COM32DIR)/include/ directory, but in ${S}/com32/lib/Makefile
file, the install target will remove $(INSTALLROOT)$(COM32DIR)/include
directory. We need to do com32/lib first.
The patch make com32/gpllib depends on com32/lib to fix this issue.
Upstream-Status: Pending
Signed-off-by: Chong Lu <Chong.Lu@windriver.com>
---
com32/Makefile | 1 +
1 file changed, 1 insertion(+)
Index: syslinux-6.03/com32/Makefile
===================================================================
--- syslinux-6.03.orig/com32/Makefile
+++ syslinux-6.03/com32/Makefile
@@ -21,3 +21,4 @@ rosh: lib libutil
samples: libutil elflink/ldlinux
sysdump: lib libutil libupload gpllib
lua/src: cmenu modules
+gpllib: lib

34
meta/recipes-devtools/syslinux/syslinux/syslinux-libupload-depend-lib.patch Normal file
View File

@@ -0,0 +1,34 @@
From 490fc3bbd65c2c252c1fdf3da0fac9898aa9eea6 Mon Sep 17 00:00:00 2001
From: Robert Yang <liezhi.yang@windriver.com>
Date: Fri, 15 Aug 2014 21:09:16 -0700
Subject: [PATCH] com32/Makefile: fix parallel issue
Fixed:
cp -r syslinux-6.01/com32/libupload/*.h image/usr/share/syslinux/com32/include/
[snip]
rm -rf image/usr/share/syslinux/com32/include
[snip]
cp: cannot create regular file `image/usr/share/syslinux/com32/include/serial.h': No such file or directory
The cp is happened in the "libupload" dir, while "rm -fr" is happend in
"lib" dir, let "libupload" depend "lib" will fix the problem.
Upstream-Status: Pending
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
com32/Makefile | 1 +
1 file changed, 1 insertion(+)
diff --git a/com32/Makefile b/com32/Makefile
index 9a1721b..f172db2 100644
--- a/com32/Makefile
+++ b/com32/Makefile
@@ -21,3 +21,4 @@ rosh: lib libutil
samples: libutil elflink/ldlinux
sysdump: libupload gpllib
gpllib: lib
+libupload: lib
--
1.7.9.5

17
meta/recipes-devtools/syslinux/syslinux/syslinux-remove-clean-script.patch Normal file
View File

@@ -0,0 +1,17 @@
This script try to call git submodule, since we are downloading
the tarball it seems in-correct to do this.
Upstream-Status: Inappropriate [OE-Specific]
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Index: syslinux-6.03/efi/Makefile
===================================================================
--- syslinux-6.03.orig/efi/Makefile
+++ syslinux-6.03/efi/Makefile
@@ -101,7 +101,6 @@ tidy dist:
rm -f *.so *.o wrapper
find . \( -name \*.o -o -name \*.a -o -name .\*.d -o -name \*.tmp \) -print0 | \
xargs -0r rm -f
- $(topdir)/efi/clean-gnu-efi.sh $(EFI_SUBARCH) $(objdir)
clean: tidy