diff options
| author | Robert Yang <liezhi.yang@windriver.com> | 2014-04-04 18:44:09 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-04-04 14:18:44 +0100 |
| commit | 828b6754c205fe6e5cd5f44d1ff50da304b3273d (patch) | |
| tree | 0e4edc486fab654a4c98260b6328a230bf728606 | |
| parent | fffd116d9e4bfa4f41274bd54c7dff639ce178f6 (diff) | |
| download | poky-828b6754c205fe6e5cd5f44d1ff50da304b3273d.tar.gz | |
util-linux: fix parallel build issue
The rule SETARCH_MAN_LINKS is used for the files under the sys-utils
dir, for example:
echo ".so man8/setarch.8" > sys-utils/linux32.8
but it depends on nothing so that the sys-utils dir may not exist, we
can create the sys-utils dir to fix problem.
[YOCTO #6115]
(From OE-Core rev: 4c46bfd703409bd55a781742e4afedf88da1124b)
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch | 35 | ||||
| -rw-r--r-- | meta/recipes-core/util-linux/util-linux_2.24.1.bb | 1 |
2 files changed, 36 insertions, 0 deletions
diff --git a/meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch b/meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch new file mode 100644 index 0000000000..adb271ce0d --- /dev/null +++ b/meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch | |||
| @@ -0,0 +1,35 @@ | |||
| 1 | From 774f55f9dd22c01e4041a183d8dff14811f29114 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Robert Yang <liezhi.yang@windriver.com> | ||
| 3 | Date: Fri, 4 Apr 2014 17:33:04 +0800 | ||
| 4 | Subject: [PATCH] sys-utils/Makemodule.am: fix parallel build issue | ||
| 5 | |||
| 6 | The rule SETARCH_MAN_LINKS is used for the files under the sys-utils | ||
| 7 | dir, for example: | ||
| 8 | |||
| 9 | echo ".so man8/setarch.8" > sys-utils/linux32.8 | ||
| 10 | |||
| 11 | but it depends on nothing so that the sys-utils dir may not exist, we | ||
| 12 | can create the sys-utils dir to fix problem. | ||
| 13 | |||
| 14 | Upstream-Status: Pending | ||
| 15 | |||
| 16 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | ||
| 17 | --- | ||
| 18 | sys-utils/Makemodule.am | 1 + | ||
| 19 | 1 file changed, 1 insertion(+) | ||
| 20 | |||
| 21 | diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am | ||
| 22 | index 6265282..62ead37 100644 | ||
| 23 | --- a/sys-utils/Makemodule.am | ||
| 24 | +++ b/sys-utils/Makemodule.am | ||
| 25 | @@ -124,6 +124,7 @@ man_MANS += $(SETARCH_MAN_LINKS) | ||
| 26 | CLEANFILES += $(SETARCH_MAN_LINKS) | ||
| 27 | |||
| 28 | $(SETARCH_MAN_LINKS): | ||
| 29 | + $(MKDIR_P) sys-utils | ||
| 30 | $(AM_V_GEN)echo ".so man8/setarch.8" > $@ | ||
| 31 | |||
| 32 | install-exec-hook-setarch: | ||
| 33 | -- | ||
| 34 | 1.8.2.1 | ||
| 35 | |||
diff --git a/meta/recipes-core/util-linux/util-linux_2.24.1.bb b/meta/recipes-core/util-linux/util-linux_2.24.1.bb index ab80ab6af9..8b6a1ce03a 100644 --- a/meta/recipes-core/util-linux/util-linux_2.24.1.bb +++ b/meta/recipes-core/util-linux/util-linux_2.24.1.bb | |||
| @@ -13,6 +13,7 @@ SRC_URI += "file://util-linux-ng-replace-siginterrupt.patch \ | |||
| 13 | file://uclibc-__progname-conflict.patch \ | 13 | file://uclibc-__progname-conflict.patch \ |
| 14 | file://configure-sbindir.patch \ | 14 | file://configure-sbindir.patch \ |
| 15 | file://fix-configure.patch \ | 15 | file://fix-configure.patch \ |
| 16 | file://fix-parallel-build.patch \ | ||
| 16 | ${OLDHOST} \ | 17 | ${OLDHOST} \ |
| 17 | " | 18 | " |
| 18 | 19 | ||
