diff options
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch | 38 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/iwd/iwd_1.6.bb (renamed from meta-oe/recipes-connectivity/iwd/iwd_1.5.bb) | 6 |
2 files changed, 2 insertions, 42 deletions
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 deleted file mode 100644 index 80126a870d..0000000000 --- a/meta-oe/recipes-connectivity/iwd/iwd/0001-Makefile.am-Avoid-redirection-of-input-and-output-fi.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 46fc0e197598579dc05e42f137e84f86a9b926e9 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 - -Ensure that directory is created before its written to - -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 | 5 +++-- - 1 file changed, 3 insertions(+), 2 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 8c69d9f4..35a25fc0 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -629,8 +629,9 @@ 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 $< $@ -+RST2MAN_PROCESS = $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ -+ $(AM_V_GEN)$(RST2MAN) --strict --no-raw \ -+ --no-generator --no-datestamp $< $@ - else - RST2MAN_PROCESS = $(AM_V_GEN)test -f $@ || \ - { echo "Generated manual page $@ does not exist"; false; } diff --git a/meta-oe/recipes-connectivity/iwd/iwd_1.5.bb b/meta-oe/recipes-connectivity/iwd/iwd_1.6.bb index 4d4c69906f..10ac03ef06 100644 --- a/meta-oe/recipes-connectivity/iwd/iwd_1.5.bb +++ b/meta-oe/recipes-connectivity/iwd/iwd_1.6.bb @@ -5,10 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fb504b67c50331fc78734fed90fb0e09" DEPENDS = "ell" -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 = "1ee7b985aaa294447d073bfe1242744784278a8e" +SRC_URI = "git://git.kernel.org/pub/scm/network/wireless/iwd.git" +SRCREV = "ad97f4f945b828425ff288e905523e11b330d41d" S = "${WORKDIR}/git" inherit autotools manpages pkgconfig python3native systemd |