mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-27 12:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

kconfig-frontends: fix build race

Browse Source 
In parallel builds utils/kconfig-tweak may be written to before utils/ exists,
so add a mkdir.

Also mark the pkgconfig patch as Submitted as I sent that upstream at the same
time.

(From OE-Core rev: 59921b3ce23fe0d391558425f7a5ade45cbcbd80)

Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Ross Burton
2017-05-09 15:33:47 +01:00
committed by Richard Purdie
parent cee2ed45a3
commit 74ed0a2615
3 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
meta/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch
View File

@@ -5,7 +5,7 @@ Subject: [PATCH] Fix installation of .pc files
They go to prefix/pkgconfig/, not prefix/pkg-config.
Upstream-Status: Pending
Upstream-Status: Submitted
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
Makefile.am | 2 +-
@@ -26,4 +26,3 @@ index 058690a..f9e9b7b 100644
EXTRA_DIST += libs/parser/kconfig-parser.pc.in
--
2.11.0

33
meta/recipes-devtools/kconfig-frontends/files/missing-mkdir.patch Normal file
View File

@@ -0,0 +1,33 @@
Upstream-Status: Submitted
Signed-off-by: Ross Burton <ross.burton@intel.com>
From ca05ee2fb6db5b3b1edc16dba6150a2c6078a6cf Mon Sep 17 00:00:00 2001
From: Ross Burton <ross.burton@intel.com>
Date: Tue, 9 May 2017 15:30:00 +0100
Subject: [PATCH] Makefile: ensure utils/ exists before writing to it
Since utils/ was changed to not build recursively it's possible that in
out-of-tree builds the utils/ directory hasn't been created when Make runs the
utils/kconfig-tweak target which tries to write to file inside utils/.
To ensure this can work, mkdir the directory.
Signed-off-by: Ross Burton <ross.burton@intel.com>
---
Makefile.am | 1 +
1 file changed, 1 insertion(+)
diff --git a/Makefile.am b/Makefile.am
index c8e96ef..1baa110 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -348,6 +348,7 @@ EXTRA_DIST += \
utils/kconfig-tweak.in.patch
utils/kconfig-tweak: utils/kconfig-tweak.in
+ $(MKDIR_P) $(@D)
$(AM_V_GEN)$(SED) -e "s/@CONFIG_@/$(config_prefix)/g" \
$< >$@
@chmod +x $@
--
2.8.1

3
meta/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb
View File

@@ -15,7 +15,8 @@ DEPENDS += "ncurses flex bison gperf-native"
RDEPENDS_${PN} += "python3 bash"
SRC_URI = "git://ymorin.is-a-geek.org/kconfig-frontends;branch=4.10.x \
file://0001-Fix-installation-of-.pc-files.patch \
file://0001-Switch-utils-kconfig-diff-to-use-Python-3.patch"
file://0001-Switch-utils-kconfig-diff-to-use-Python-3.patch \
file://missing-mkdir.patch"
SRCREV = "f8ffe5e1c6f183cb7d5d515aa9381b7557de654e"