diff options
author | Saul Wold <sgw@linux.intel.com> | 2014-12-10 10:26:33 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-07 23:35:08 +0000 |
commit | c4fc5641d3f994b91d685fac2602efd112a0a6a9 (patch) | |
tree | 86162b99b1839e973a4abce31c4c836b4a94e4d1 /meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch | |
parent | 31059be9777b6f452bfdaafc56d3fd3ad7fd0c65 (diff) | |
download | poky-c4fc5641d3f994b91d685fac2602efd112a0a6a9.tar.gz |
syslinux: Update to 6.0.3
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>
Diffstat (limited to 'meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch')
-rw-r--r-- | meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch | 35 |
1 files changed, 35 insertions, 0 deletions
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 new file mode 100644 index 0000000000..312b1e8aed --- /dev/null +++ b/meta/recipes-devtools/syslinux/syslinux/syslinux-fix-parallel-building-issue.patch | |||
@@ -0,0 +1,35 @@ | |||
1 | syslinux-native: fix parallel building issue | ||
2 | |||
3 | There might be an error when parallel build: | ||
4 | |||
5 | [snip] | ||
6 | cp: cannot create directory `tmp/sysroots/x86_64-linux/usr/share/ | ||
7 | syslinux/com32/include/gplinclude': No such file or directory | ||
8 | make[4]: *** [install] Error 1 | ||
9 | make[3]: *** [gpllib] Error 2 | ||
10 | [snip] | ||
11 | |||
12 | This is a potential issue. In ${S}/com32/gpllib/Makefile file, | ||
13 | install target wants to copy $(SRC)/../gplinclude to | ||
14 | $(INSTALLROOT)$(COM32DIR)/include/ directory, but in ${S}/com32/lib/Makefile | ||
15 | file, the install target will remove $(INSTALLROOT)$(COM32DIR)/include | ||
16 | directory. We need to do com32/lib first. | ||
17 | |||
18 | The patch make com32/gpllib depends on com32/lib to fix this issue. | ||
19 | |||
20 | Upstream-Status: Pending | ||
21 | |||
22 | Signed-off-by: Chong Lu <Chong.Lu@windriver.com> | ||
23 | --- | ||
24 | com32/Makefile | 1 + | ||
25 | 1 file changed, 1 insertion(+) | ||
26 | |||
27 | Index: 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 | ||