[oe,meta-oe,2/2] iwd: Fix build race during documentation build

Message ID 20191105005811.2708915-2-raj.khem@gmail.com
State New
Headers show
Series
  • [oe,meta-oe,1/2] iwd: Fix installed-vs-shipped QA errors on systemd units
Related show

Commit Message

Khem Raj Nov. 5, 2019, 12:58 a.m.
Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 ...d-redirection-of-input-and-output-fi.patch | 52 +++++++++++++++++++
 meta-oe/recipes-connectivity/iwd/iwd_1.0.bb   |  4 +-
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch

-- 
2.24.0

-- 
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-devel

Patch

diff --git a/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch b/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch
new file mode 100644
index 0000000000..86837a9f66
--- /dev/null
+++ b/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch
@@ -0,0 +1,52 @@ 
+From b6da226187e704cd07857d8afeaade545688fcbb Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 4 Nov 2019 16:38:04 -0800
+Subject: [PATCH] Makefile.am: Avoid redirection of input and output files
+
+This can cause a build race in a highly parallelised build where a directory is not yet created but
+output file is being written using redirection e.g.
+
+rst2man.py --strict --no-raw --no-generator --no-datestamp < ../git/monitor/iwmon.rst > monitor/iwmon.1
+/bin/sh: monitor/iwmon.1: No such file or directory
+make[1]: *** [Makefile:3544: monitor/iwmon.1] Error 1
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ Makefile.am | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/Makefile.am b/Makefile.am
+index 823b7d02..21dd707c 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -627,7 +627,7 @@ SED_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \
+ 
+ if RUN_RST2MAN
+ RST2MAN_PROCESS = $(AM_V_GEN)$(RST2MAN) --strict --no-raw --no-generator \
+-			--no-datestamp < $< > $@
++			--no-datestamp
+ else
+ RST2MAN_PROCESS = $(AM_V_GEN)test -f $@ || \
+ 		{ echo "Generated manual page $@ does not exist"; false; }
+@@ -637,13 +637,13 @@ endif
+ 	$(SED_PROCESS)
+ 
+ %.1: %.rst Makefile
+-	$(RST2MAN_PROCESS)
++	$(RST2MAN_PROCESS) $< $@
+ 
+ %.5: %.rst Makefile
+-	$(RST2MAN_PROCESS)
++	$(RST2MAN_PROCESS) $< $@
+ 
+ %.8: %.rst Makefile
+-	$(RST2MAN_PROCESS)
++	$(RST2MAN_PROCESS) $< $@
+ 
+ install-data-local:
+ if !SYSTEMD_SERVICE
+-- 
+2.24.0
+
diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.0.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.0.bb
index 81260cc020..d11e0d4ae3 100644
--- a/meta-oe/recipes-connectivity/iwd/iwd_1.0.bb
+++ b/meta-oe/recipes-connectivity/iwd/iwd_1.0.bb
@@ -6,7 +6,9 @@  inherit autotools pkgconfig systemd python3native
 
 DEPENDS = "ell readline dbus python3-docutils-native"
 
-SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git"
+SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git \
+           file://0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch \
+          "
 SRCREV = "971e1d2038a203ad43bd2278a811a9e5ec8d52db"
 S = "${WORKDIR}/git"