diff options
| author | Saul Wold <sgw@linux.intel.com> | 2014-12-10 10:26:33 -0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-01-07 23:35:08 +0000 |
| commit | c4fc5641d3f994b91d685fac2602efd112a0a6a9 (patch) | |
| tree | 86162b99b1839e973a4abce31c4c836b4a94e4d1 /meta/recipes-devtools/syslinux/files/syslinux-libupload-depend-lib.patch | |
| parent | 31059be9777b6f452bfdaafc56d3fd3ad7fd0c65 (diff) | |
| download | poky-c4fc5641d3f994b91d685fac2602efd112a0a6a9.tar.gz | |
syslinux: Update to 6.0.3
Removed patches that are now committed upstream, rebase parallel make
patch and add a new patch to remove a script that was calling git during
the clean process.
(From OE-Core rev: b53e46bece1c4976ba146d9abf41a8a54c584300)
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/syslinux/files/syslinux-libupload-depend-lib.patch')
| -rw-r--r-- | meta/recipes-devtools/syslinux/files/syslinux-libupload-depend-lib.patch | 34 |
1 files changed, 0 insertions, 34 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 deleted file mode 100644 index c0714b5175..0000000000 --- a/meta/recipes-devtools/syslinux/files/syslinux-libupload-depend-lib.patch +++ /dev/null | |||
| @@ -1,34 +0,0 @@ | |||
| 1 | From 490fc3bbd65c2c252c1fdf3da0fac9898aa9eea6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
| 3 | Date: Fri, 15 Aug 2014 21:09:16 -0700 | ||
| 4 | Subject: [PATCH] com32/Makefile: fix parallel issue | ||
| 5 | |||
| 6 | Fixed: | ||
| 7 | cp -r syslinux-6.01/com32/libupload/*.h image/usr/share/syslinux/com32/include/ | ||
| 8 | [snip] | ||
| 9 | rm -rf image/usr/share/syslinux/com32/include | ||
| 10 | [snip] | ||
| 11 | cp: cannot create regular file `image/usr/share/syslinux/com32/include/serial.h': No such file or directory | ||
| 12 | |||
| 13 | The 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 | |||
| 16 | Upstream-Status: Pending | ||
| 17 | |||
| 18 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
| 19 | --- | ||
| 20 | com32/Makefile | 1 + | ||
| 21 | 1 file changed, 1 insertion(+) | ||
| 22 | |||
| 23 | diff --git a/com32/Makefile b/com32/Makefile | ||
| 24 | index 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 | -- | ||
| 33 | 1.7.9.5 | ||
| 34 | |||
