diff options
author | Chen Qi <Qi.Chen@windriver.com> | 2014-05-08 16:31:52 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-05-11 12:27:21 +0100 |
commit | c05066e00c35d6e7fdd49f5edd4cf73fb32af9de (patch) | |
tree | e2bae0a254e940371a3a9ce7cf2199ab8fe07862 /meta/recipes-core | |
parent | bcb30d84f909c68ca9016eb95f3ff81eb3f8b8f4 (diff) | |
download | poky-c05066e00c35d6e7fdd49f5edd4cf73fb32af9de.tar.gz |
util-linux: fix parallel build issure for PATHFILES
When compiling util-linux, it's possible to encounter the following error.
/bin/sh: line 2:: misc-utils/uuidd.8.tmp: No such file or directory
This is because that the misc-utils directory doesn't exist when trying to
write to misc-utils/uuidd.8.tmp.
When generating misc-utils/uuidd.8 (or anything in PATHFILES), its directory
may not have been created yet. So we need to ensure the existence of the
directory to avoid the compilation error.
[YOCTO #6292]
(From OE-Core rev: b8c0a4f6a319a7cf84530b891707a5887f3caaf4)
Signed-off-by: Chen Qi <Qi.Chen@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core')
-rw-r--r-- | meta/recipes-core/util-linux/util-linux/util-linux-ensure-the-existence-of-directory-for-PAT.patch | 34 | ||||
-rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.24.2.bb | 1 |
2 files changed, 35 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux/util-linux-ensure-the-existence-of-directory-for-PAT.patch b/meta/recipes-core/util-linux/util-linux/util-linux-ensure-the-existence-of-directory-for-PAT.patch new file mode 100644 index 0000000000..8f26451aa8 --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/util-linux-ensure-the-existence-of-directory-for-PAT.patch | |||
@@ -0,0 +1,34 @@ | |||
1 | Upstream-Status: Pending | ||
2 | |||
3 | util-linux: ensure the existence of directory for PATHFILES | ||
4 | |||
5 | When compiling util-linux, it's possible to encounter the following error. | ||
6 | /bin/sh: line 2:: misc-utils/uuidd.8.tmp: No such file or directory | ||
7 | |||
8 | This is because that the misc-utils directory doesn't exist when trying to write to | ||
9 | misc-utils/uuidd.8.tmp. | ||
10 | |||
11 | When generating misc-utils/uuidd.8 (or anything in PATHFILES), its directory | ||
12 | may not have been created yet. So we need to ensure the existence of the directory | ||
13 | to avoid the compilation error. | ||
14 | |||
15 | Signed-off-by: Chen Qi <Qi.Chen@windriver.com> | ||
16 | --- | ||
17 | Makefile.am | 1 + | ||
18 | 1 file changed, 1 insertion(+) | ||
19 | |||
20 | diff --git a/Makefile.am b/Makefile.am | ||
21 | index 17f4c33..ca3dc0f 100644 | ||
22 | --- a/Makefile.am | ||
23 | +++ b/Makefile.am | ||
24 | @@ -123,6 +123,7 @@ EXTRA_DIST += $(PATHFILES:=.in) | ||
25 | |||
26 | $(PATHFILES): Makefile | ||
27 | @ rm -f $@ $@.tmp | ||
28 | + @ mkdir -p `dirname $@` | ||
29 | $(AM_V_GEN) srcdir=''; \ | ||
30 | test -f ./$@.in || srcdir=$(srcdir)/; \ | ||
31 | $(edit_cmd) $${srcdir}$@.in >$@.tmp | ||
32 | -- | ||
33 | 1.7.9.5 | ||
34 | |||
diff --git a/meta/recipes-core/util-linux/util-linux_2.24.2.bb b/meta/recipes-core/util-linux/util-linux_2.24.2.bb index a2d74306a6..ed753e48b3 100644 --- a/meta/recipes-core/util-linux/util-linux_2.24.2.bb +++ b/meta/recipes-core/util-linux/util-linux_2.24.2.bb | |||
@@ -15,6 +15,7 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ | |||
15 | file://configure-sbindir.patch \ | 15 | file://configure-sbindir.patch \ |
16 | file://fix-configure.patch \ | 16 | file://fix-configure.patch \ |
17 | file://fix-parallel-build.patch \ | 17 | file://fix-parallel-build.patch \ |
18 | file://util-linux-ensure-the-existence-of-directory-for-PAT.patch \ | ||
18 | ${OLDHOST} \ | 19 | ${OLDHOST} \ |
19 | " | 20 | " |
20 | 21 | ||