Patchwork [1/1] util-linux: fix parallel build issue

login
register
mail settings
Submitter Robert Yang
Date April 4, 2014, 10:44 a.m.
Message ID <bb5a276942d5bbbc69086a52abd6a21b44978bd1.1396608025.git.liezhi.yang@windriver.com>
Download mbox | patch
Permalink /patch/70103/
State Accepted
Commit 828b6754c205fe6e5cd5f44d1ff50da304b3273d
Headers show

Comments

Robert Yang - April 4, 2014, 10:44 a.m.
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]

Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
---
 .../util-linux/util-linux/fix-parallel-build.patch | 35 ++++++++++++++++++++++
 meta/recipes-core/util-linux/util-linux_2.24.1.bb  |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch

Patch

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 0000000..adb271c
--- /dev/null
+++ b/meta/recipes-core/util-linux/util-linux/fix-parallel-build.patch
@@ -0,0 +1,35 @@ 
+From 774f55f9dd22c01e4041a183d8dff14811f29114 Mon Sep 17 00:00:00 2001
+From: Robert Yang <liezhi.yang@windriver.com>
+Date: Fri, 4 Apr 2014 17:33:04 +0800
+Subject: [PATCH] sys-utils/Makemodule.am: 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.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
+---
+ sys-utils/Makemodule.am | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/sys-utils/Makemodule.am b/sys-utils/Makemodule.am
+index 6265282..62ead37 100644
+--- a/sys-utils/Makemodule.am
++++ b/sys-utils/Makemodule.am
+@@ -124,6 +124,7 @@ man_MANS += $(SETARCH_MAN_LINKS)
+ CLEANFILES += $(SETARCH_MAN_LINKS)
+ 
+ $(SETARCH_MAN_LINKS):
++	$(MKDIR_P) sys-utils
+ 	$(AM_V_GEN)echo ".so man8/setarch.8" > $@
+ 
+ install-exec-hook-setarch:
+-- 
+1.8.2.1
+
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 ab80ab6..8b6a1ce 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 \
             file://uclibc-__progname-conflict.patch \
             file://configure-sbindir.patch \
             file://fix-configure.patch \
+            file://fix-parallel-build.patch \
             ${OLDHOST} \
 "