summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch3
-rw-r--r--meta/recipes-devtools/kconfig-frontends/files/missing-mkdir.patch33
-rw-r--r--meta/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb3
3 files changed, 36 insertions, 3 deletions
diff --git a/meta/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch b/meta/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch
index e9195a0afc..57ea42e4b2 100644
--- a/meta/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch
+++ b/meta/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch
@@ -5,7 +5,7 @@ Subject: [PATCH] Fix installation of .pc files
5 5
6They go to prefix/pkgconfig/, not prefix/pkg-config. 6They go to prefix/pkgconfig/, not prefix/pkg-config.
7 7
8Upstream-Status: Pending 8Upstream-Status: Submitted
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10--- 10---
11 Makefile.am | 2 +- 11 Makefile.am | 2 +-
@@ -26,4 +26,3 @@ index 058690a..f9e9b7b 100644
26 EXTRA_DIST += libs/parser/kconfig-parser.pc.in 26 EXTRA_DIST += libs/parser/kconfig-parser.pc.in
27-- 27--
282.11.0 282.11.0
29
diff --git a/meta/recipes-devtools/kconfig-frontends/files/missing-mkdir.patch b/meta/recipes-devtools/kconfig-frontends/files/missing-mkdir.patch
new file mode 100644
index 0000000000..a06a547d63
--- /dev/null
+++ b/meta/recipes-devtools/kconfig-frontends/files/missing-mkdir.patch
@@ -0,0 +1,33 @@
1Upstream-Status: Submitted
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From ca05ee2fb6db5b3b1edc16dba6150a2c6078a6cf Mon Sep 17 00:00:00 2001
5From: Ross Burton <ross.burton@intel.com>
6Date: Tue, 9 May 2017 15:30:00 +0100
7Subject: [PATCH] Makefile: ensure utils/ exists before writing to it
8
9Since utils/ was changed to not build recursively it's possible that in
10out-of-tree builds the utils/ directory hasn't been created when Make runs the
11utils/kconfig-tweak target which tries to write to file inside utils/.
12
13To ensure this can work, mkdir the directory.
14
15Signed-off-by: Ross Burton <ross.burton@intel.com>
16---
17 Makefile.am | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/Makefile.am b/Makefile.am
21index c8e96ef..1baa110 100644
22--- a/Makefile.am
23+++ b/Makefile.am
24@@ -348,6 +348,7 @@ EXTRA_DIST += \
25 utils/kconfig-tweak.in.patch
26
27 utils/kconfig-tweak: utils/kconfig-tweak.in
28+ $(MKDIR_P) $(@D)
29 $(AM_V_GEN)$(SED) -e "s/@CONFIG_@/$(config_prefix)/g" \
30 $< >$@
31 @chmod +x $@
32--
332.8.1
diff --git a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb
index be90d6b880..d427e98c91 100644
--- a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb
+++ b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb
@@ -15,7 +15,8 @@ DEPENDS += "ncurses flex bison gperf-native"
15RDEPENDS_${PN} += "python3 bash" 15RDEPENDS_${PN} += "python3 bash"
16SRC_URI = "git://ymorin.is-a-geek.org/kconfig-frontends;branch=4.10.x \ 16SRC_URI = "git://ymorin.is-a-geek.org/kconfig-frontends;branch=4.10.x \
17 file://0001-Fix-installation-of-.pc-files.patch \ 17 file://0001-Fix-installation-of-.pc-files.patch \
18 file://0001-Switch-utils-kconfig-diff-to-use-Python-3.patch" 18 file://0001-Switch-utils-kconfig-diff-to-use-Python-3.patch \
19 file://missing-mkdir.patch"
19 20
20SRCREV = "f8ffe5e1c6f183cb7d5d515aa9381b7557de654e" 21SRCREV = "f8ffe5e1c6f183cb7d5d515aa9381b7557de654e"
21 22