diff options
| author | Chong Lu <Chong.Lu@windriver.com> | 2014-05-15 16:54:32 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-20 14:50:32 +0100 |
| commit | cae1a039658cfb47390650ad5b56536ff19e1217 (patch) | |
| tree | 22b755d70ddfd00f003f16febc8f54613ce08b22 | |
| parent | 5c0f8111f9ec5a2c3b2826946af5132aaa13a9b9 (diff) | |
| download | openembedded-core-cae1a039658cfb47390650ad5b56536ff19e1217.tar.gz openembedded-core-cae1a039658cfb47390650ad5b56536ff19e1217.tar.bz2 openembedded-core-cae1a039658cfb47390650ad5b56536ff19e1217.zip | |
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@windriver.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-devtools/syslinux/files/syslinux-fix-parallel-building-issue.patch | 38 | ||||
| -rw-r--r-- | meta/recipes-devtools/syslinux/syslinux_6.01.bb | 3 |
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 @@ +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(+) + +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 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 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" |