diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2014-08-15 22:15:02 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-16 08:10:53 +0100 |
| commit | 7df3b098278b6d5eb418af9dfe7fd2d3b3ea607c (patch) | |
| tree | de5353964261d30b651a19825831d6302e149069 /meta/recipes-devtools/syslinux | |
| parent | 8111ab4cdadb4b7523652c593c48da74d9d0f8ef (diff) | |
| download | openembedded-core-7df3b098278b6d5eb418af9dfe7fd2d3b3ea607c.tar.gz openembedded-core-7df3b098278b6d5eb418af9dfe7fd2d3b3ea607c.tar.bz2 openembedded-core-7df3b098278b6d5eb418af9dfe7fd2d3b3ea607c.zip | |
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.
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/syslinux')
| -rw-r--r-- | meta/recipes-devtools/syslinux/files/syslinux-libupload-depend-lib.patch | 34 | ||||
| -rw-r--r-- | meta/recipes-devtools/syslinux/syslinux_6.01.bb | 1 |
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 @@ +From 490fc3bbd65c2c252c1fdf3da0fac9898aa9eea6 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Fri, 15 Aug 2014 21:09:16 -0700 +Subject: [PATCH] com32/Makefile: fix parallel issue + +Fixed: +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. + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + com32/Makefile | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/com32/Makefile b/com32/Makefile +index 9a1721b..f172db2 100644 +--- a/com32/Makefile ++++ b/com32/Makefile +@@ -21,3 +21,4 @@ rosh: lib libutil + samples: libutil elflink/ldlinux + sysdump: libupload gpllib + gpllib: lib ++libupload: 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 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 file://0004-pxe-use-bios_fbm-and-real_base_mem-to-calculate-free.patch \ file://syslinux-fix-parallel-building-issue.patch \ file://isohybrid-fix-overflow-on-32-bit-system.patch \ + file://syslinux-libupload-depend-lib.patch \ " SRC_URI[md5sum] = "6945ee89e29119d459baed4937bbc534" |