summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2014-08-15 22:15:02 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-08-16 08:22:45 +0100
commit00e054eac305e5e32e30183e31dea415cc1f36ae (patch)
tree86c17ef85f8c9074cceec41eb261481ecbe354c1 /meta/recipes-devtools
parentecb6abedfc5edaa15569210c27e18251af281799 (diff)
downloadpoky-00e054eac305e5e32e30183e31dea415cc1f36ae.tar.gz
syslinux: fix race issue
Fixed do_install failed: 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. (From OE-Core rev: 7df3b098278b6d5eb418af9dfe7fd2d3b3ea607c) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/syslinux/files/syslinux-libupload-depend-lib.patch34
-rw-r--r--meta/recipes-devtools/syslinux/syslinux_6.01.bb1
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-devtools/syslinux/files/syslinux-libupload-depend-lib.patch b/meta/recipes-devtools/syslinux/files/syslinux-libupload-depend-lib.patch
new file mode 100644
index 0000000000..c0714b5175
--- /dev/null
+++ b/meta/recipes-devtools/syslinux/files/syslinux-libupload-depend-lib.patch
@@ -0,0 +1,34 @@
1From 490fc3bbd65c2c252c1fdf3da0fac9898aa9eea6 Mon Sep 17 00:00:00 2001
2From: Robert Yang <liezhi.yang@windriver.com>
3Date: Fri, 15 Aug 2014 21:09:16 -0700
4Subject: [PATCH] com32/Makefile: fix parallel issue
5
6Fixed:
7cp -r syslinux-6.01/com32/libupload/*.h image/usr/share/syslinux/com32/include/
8[snip]
9rm -rf image/usr/share/syslinux/com32/include
10[snip]
11cp: cannot create regular file `image/usr/share/syslinux/com32/include/serial.h': No such file or directory
12
13The cp is happened in the "libupload" dir, while "rm -fr" is happend in
14"lib" dir, let "libupload" depend "lib" will fix the problem.
15
16Upstream-Status: Pending
17
18Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
19---
20 com32/Makefile | 1 +
21 1 file changed, 1 insertion(+)
22
23diff --git a/com32/Makefile b/com32/Makefile
24index 9a1721b..f172db2 100644
25--- a/com32/Makefile
26+++ b/com32/Makefile
27@@ -21,3 +21,4 @@ rosh: lib libutil
28 samples: libutil elflink/ldlinux
29 sysdump: libupload gpllib
30 gpllib: lib
31+libupload: lib
32--
331.7.9.5
34
diff --git a/meta/recipes-devtools/syslinux/syslinux_6.01.bb b/meta/recipes-devtools/syslinux/syslinux_6.01.bb
index 2377cc0047..7885390eb3 100644
--- a/meta/recipes-devtools/syslinux/syslinux_6.01.bb
+++ b/meta/recipes-devtools/syslinux/syslinux_6.01.bb
@@ -15,6 +15,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/boot/syslinux/6.xx/syslinux-${PV}.tar
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 file://syslinux-fix-parallel-building-issue.patch \
17 file://isohybrid-fix-overflow-on-32-bit-system.patch \ 17 file://isohybrid-fix-overflow-on-32-bit-system.patch \
18 file://syslinux-libupload-depend-lib.patch \
18 " 19 "
19 20
20SRC_URI[md5sum] = "6945ee89e29119d459baed4937bbc534" 21SRC_URI[md5sum] = "6945ee89e29119d459baed4937bbc534"