summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorChong Lu <Chong.Lu@windriver.com>2014-05-15 16:54:32 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-05-20 14:53:11 +0100
commita62e952b812d6dbe54334de3b63aa93b91b1ffe1 (patch)
tree4bc8c896c0c7d5a2f603309f010d3a15f202dcd8 /meta
parentb664c8618753c53f23683f7673793de20f0ee072 (diff)
downloadpoky-a62e952b812d6dbe54334de3b63aa93b91b1ffe1.tar.gz
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. (From OE-Core rev: cae1a039658cfb47390650ad5b56536ff19e1217) Signed-off-by: Chong Lu <Chong.Lu@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/syslinux/files/syslinux-fix-parallel-building-issue.patch38
-rw-r--r--meta/recipes-devtools/syslinux/syslinux_6.01.bb3
2 files changed, 40 insertions, 1 deletions
diff --git a/meta/recipes-devtools/syslinux/files/syslinux-fix-parallel-building-issue.patch b/meta/recipes-devtools/syslinux/files/syslinux-fix-parallel-building-issue.patch
new file mode 100644
index 0000000000..6b695791cd
--- /dev/null
+++ b/meta/recipes-devtools/syslinux/files/syslinux-fix-parallel-building-issue.patch
@@ -0,0 +1,38 @@
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
27diff --git a/com32/Makefile b/com32/Makefile
28index 7ea1b01..9a1721b 100644
29--- a/com32/Makefile
30+++ b/com32/Makefile
31@@ -20,3 +20,4 @@ modules: lib libutil gpllib
32 rosh: lib libutil
33 samples: libutil elflink/ldlinux
34 sysdump: libupload gpllib
35+gpllib: lib
36--
371.7.9.5
38
diff --git a/meta/recipes-devtools/syslinux/syslinux_6.01.bb b/meta/recipes-devtools/syslinux/syslinux_6.01.bb
index 1af6806100..89204b03ae 100644
--- a/meta/recipes-devtools/syslinux/syslinux_6.01.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_6.01.bb
@@ -12,7 +12,8 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/6.xx/syslinux-${PV}.tar
12 file://0001-movebits-Add-SMT_TERMINAL-a-last-resort-region-type.patch \ 12 file://0001-movebits-Add-SMT_TERMINAL-a-last-resort-region-type.patch \
13 file://0002-memscan-build-a-linked-list-of-memory-scanners.patch \ 13 file://0002-memscan-build-a-linked-list-of-memory-scanners.patch \
14 file://0003-PXELINUX-Add-bios-memscan-function.patch \ 14 file://0003-PXELINUX-Add-bios-memscan-function.patch \
15 file://0004-pxe-use-bios_fbm-and-real_base_mem-to-calculate-free.patch" 15 file://0004-pxe-use-bios_fbm-and-real_base_mem-to-calculate-free.patch \
16 file://syslinux-fix-parallel-building-issue.patch"
16 17
17SRC_URI[md5sum] = "6945ee89e29119d459baed4937bbc534" 18SRC_URI[md5sum] = "6945ee89e29119d459baed4937bbc534"
18SRC_URI[sha256sum] = "83a04cf81e6a46b80ee5a321926eea095af3498b04317e3674b46c125c7a5b43" 19SRC_URI[sha256sum] = "83a04cf81e6a46b80ee5a321926eea095af3498b04317e3674b46c125c7a5b43"