[oe-commits] Chong Lu : syslinux-native: fix parallel building issue

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: cae1a039658cfb47390650ad5b56536ff19e1217
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=cae1a039658cfb47390650ad5b56536ff19e1217

Author: Chong Lu <Chong.Lu at windriver.com>
Date:   Thu May 15 16:54:32 2014 +0800

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.

Signed-off-by: Chong Lu <Chong.Lu at windriver.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 .../syslinux-fix-parallel-building-issue.patch     | 38 ++++++++++++++++++++++
 meta/recipes-devtools/syslinux/syslinux_6.01.bb    |  3 +-
 2 files changed, 40 insertions(+), 1 deletion(-)

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 0000000..6b69579
--- /dev/null
+++ b/meta/recipes-devtools/syslinux/files/syslinux-fix-parallel-building-issue.patch
@@ -0,0 +1,38 @@
+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 at windriver.com>
+---
+ com32/Makefile |    1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/com32/Makefile b/com32/Makefile
+index 7ea1b01..9a1721b 100644
+--- a/com32/Makefile
++++ b/com32/Makefile
+@@ -20,3 +20,4 @@ modules: lib libutil gpllib
+ rosh: lib libutil
+ samples: libutil elflink/ldlinux
+ sysdump: libupload gpllib
++gpllib: lib
+-- 
+1.7.9.5
+
diff --git a/meta/recipes-devtools/syslinux/syslinux_6.01.bb b/meta/recipes-devtools/syslinux/syslinux_6.01.bb
index 1af6806..89204b0 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
            file://0001-movebits-Add-SMT_TERMINAL-a-last-resort-region-type.patch \
            file://0002-memscan-build-a-linked-list-of-memory-scanners.patch \
            file://0003-PXELINUX-Add-bios-memscan-function.patch \
-           file://0004-pxe-use-bios_fbm-and-real_base_mem-to-calculate-free.patch"
+           file://0004-pxe-use-bios_fbm-and-real_base_mem-to-calculate-free.patch \
+           file://syslinux-fix-parallel-building-issue.patch"
 
 SRC_URI[md5sum] = "6945ee89e29119d459baed4937bbc534"
 SRC_URI[sha256sum] = "83a04cf81e6a46b80ee5a321926eea095af3498b04317e3674b46c125c7a5b43"