summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2017-06-16 16:15:44 +0200
committerMartin Jansa <Martin.Jansa@gmail.com>2017-06-19 19:30:41 +0200
commitc2670c4b5c020bfff5900b8cc1c90e220a5263e1 (patch)
treedc2321ffb5abf7904d84b43e07b24af89f34839f /meta-oe
parentec5bffa7d21ad2ca9576188dcbe0a85b5b6f5158 (diff)
downloadmeta-openembedded-c2670c4b5c020bfff5900b8cc1c90e220a5263e1.tar.gz
kconfig-frontends: Update to 4.11.0.1
No longer needed patches have been removed, and one patch has been backported instead of using the submitted patch. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch28
-rw-r--r--meta-oe/recipes-devtools/kconfig-frontends/files/0001-Makefile-ensure-frontends-exits-before-writing-into-.patch32
-rw-r--r--meta-oe/recipes-devtools/kconfig-frontends/files/missing-mkdir.patch37
-rw-r--r--meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb (renamed from meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb)9
4 files changed, 36 insertions, 70 deletions
diff --git a/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch b/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch
deleted file mode 100644
index 57ea42e4b..000000000
--- a/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 80c16b1f39402e8ce33600e5f297920a6d603090 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 27 Apr 2017 16:57:06 +0300
4Subject: [PATCH] Fix installation of .pc files
5
6They go to prefix/pkgconfig/, not prefix/pkg-config.
7
8Upstream-Status: Submitted
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10---
11 Makefile.am | 2 +-
12 1 file changed, 1 insertion(+), 1 deletion(-)
13
14diff --git a/Makefile.am b/Makefile.am
15index 058690a..f9e9b7b 100644
16--- a/Makefile.am
17+++ b/Makefile.am
18@@ -107,7 +107,7 @@ EXTRA_DIST += \
19 libs/parser/yconf.y.patch
20
21 # libs/parser/kconfig-parser.pc generated by AC_CONFIG_FILES in configure.ac
22-pkgconfigdir = $(libdir)/pkg-config
23+pkgconfigdir = $(libdir)/pkgconfig
24 pkgconfig_DATA = libs/parser/kconfig-parser.pc
25 DISTCLEANFILES += libs/parser/kconfig-parser.pc
26 EXTRA_DIST += libs/parser/kconfig-parser.pc.in
27--
282.11.0
diff --git a/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Makefile-ensure-frontends-exits-before-writing-into-.patch b/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Makefile-ensure-frontends-exits-before-writing-into-.patch
new file mode 100644
index 000000000..a5263c6f8
--- /dev/null
+++ b/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Makefile-ensure-frontends-exits-before-writing-into-.patch
@@ -0,0 +1,32 @@
1From 780b0b8e48551ba49b011caeeb09101a09c14a61 Mon Sep 17 00:00:00 2001
2From: Ross Burton <ross.burton@intel.com>
3Date: Fri, 26 May 2017 17:11:32 +0100
4Subject: [PATCH] Makefile: ensure frontends/ exits before writing into it
5
6As previously, if GCC dependencies are not being written and the build is out of
7tree then frontends/ won't exist so we need to create it.
8
9Upstream-Status: Backport
10Signed-off-by: Ross Burton <ross.burton@intel.com>
11Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
12(cherry picked from commit f7986375129d1ada7dc6abeeec5b9d00ef6f7149)
13Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
14---
15 Makefile.am | 1 +
16 1 file changed, 1 insertion(+)
17
18diff --git a/Makefile.am b/Makefile.am
19index 1baa110..434db5d 100644
20--- a/Makefile.am
21+++ b/Makefile.am
22@@ -171,6 +171,7 @@ if COND_kconfig
23 bin_SCRIPTS += frontends/kconfig
24
25 frontends/kconfig: frontends/kconfig.in
26+ $(MKDIR_P) $(@D)
27 $(AM_V_GEN)$(SED) -e 's/@KCFG_LIST@/$(kcfg_list)/g' \
28 $< >$@
29 @chmod +x $@
30--
312.12.0
32
diff --git a/meta-oe/recipes-devtools/kconfig-frontends/files/missing-mkdir.patch b/meta-oe/recipes-devtools/kconfig-frontends/files/missing-mkdir.patch
deleted file mode 100644
index a11186e51..000000000
--- a/meta-oe/recipes-devtools/kconfig-frontends/files/missing-mkdir.patch
+++ /dev/null
@@ -1,37 +0,0 @@
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@@ -173,2 +173,3 @@ bin_SCRIPTS += frontends/kconfig
25 frontends/kconfig: frontends/kconfig.in
26+ $(MKDIR_P) $(@D)
27 $(AM_V_GEN)$(SED) -e 's/@KCFG_LIST@/$(kcfg_list)/g' \
28@@ -348,6 +348,7 @@ EXTRA_DIST += \
29 utils/kconfig-tweak.in.patch
30
31 utils/kconfig-tweak: utils/kconfig-tweak.in
32+ $(MKDIR_P) $(@D)
33 $(AM_V_GEN)$(SED) -e "s/@CONFIG_@/$(config_prefix)/g" \
34 $< >$@
35 @chmod +x $@
36--
372.8.1
diff --git a/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb b/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb
index d427e98c9..df08b8b11 100644
--- a/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb
+++ b/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb
@@ -13,12 +13,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9b8cf60ff39767ff04b671fca8302408"
13SECTION = "devel" 13SECTION = "devel"
14DEPENDS += "ncurses flex bison gperf-native" 14DEPENDS += "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.11.x \
17 file://0001-Fix-installation-of-.pc-files.patch \ 17 file://0001-Makefile-ensure-frontends-exits-before-writing-into-.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"
20 19
21SRCREV = "f8ffe5e1c6f183cb7d5d515aa9381b7557de654e" 20SRCREV = "f22fce3a308be1c7790ebefc6bbedb33c5f7c86a"
22 21
23S = "${WORKDIR}/git" 22S = "${WORKDIR}/git"
24 23