diff options
author | Peter Kjellerstedt <peter.kjellerstedt@axis.com> | 2017-06-16 16:15:43 +0200 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-06-19 19:30:41 +0200 |
commit | ec5bffa7d21ad2ca9576188dcbe0a85b5b6f5158 (patch) | |
tree | 9f8afabebe526ba8bc9b1d449fe667fc8faa96df /meta-oe/recipes-devtools/kconfig-frontends/files | |
parent | 62f6441a663794fd774b68f58f53af382b6931bd (diff) | |
download | meta-openembedded-contrib-ec5bffa7d21ad2ca9576188dcbe0a85b5b6f5158.tar.gz |
kconfig-frontends: Add recipe
This provides the kconfig infrastructure that is used for the Linux
kernel as a standalone package. It is not, however, intended to be
used for the kernel itself, but can be used by other packages that are
based on kconfig.
This is a verbatim copy of the corresponding recipe in OE-core since
that recipe is being removed.
Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-devtools/kconfig-frontends/files')
3 files changed, 91 insertions, 0 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 new file mode 100644 index 0000000000..57ea42e4b2 --- /dev/null +++ b/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch @@ -0,0 +1,28 @@ +From 80c16b1f39402e8ce33600e5f297920a6d603090 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Thu, 27 Apr 2017 16:57:06 +0300 +Subject: [PATCH] Fix installation of .pc files + +They go to prefix/pkgconfig/, not prefix/pkg-config. + +Upstream-Status: Submitted +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index 058690a..f9e9b7b 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -107,7 +107,7 @@ EXTRA_DIST += \ + libs/parser/yconf.y.patch + + # libs/parser/kconfig-parser.pc generated by AC_CONFIG_FILES in configure.ac +-pkgconfigdir = $(libdir)/pkg-config ++pkgconfigdir = $(libdir)/pkgconfig + pkgconfig_DATA = libs/parser/kconfig-parser.pc + DISTCLEANFILES += libs/parser/kconfig-parser.pc + EXTRA_DIST += libs/parser/kconfig-parser.pc.in +-- +2.11.0 diff --git a/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Switch-utils-kconfig-diff-to-use-Python-3.patch b/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Switch-utils-kconfig-diff-to-use-Python-3.patch new file mode 100644 index 0000000000..b8f8904816 --- /dev/null +++ b/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Switch-utils-kconfig-diff-to-use-Python-3.patch @@ -0,0 +1,26 @@ +From 3b9b0f82c33f793a14d44bf06b6c8136bc3fc4bf Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Thu, 27 Apr 2017 16:48:42 +0300 +Subject: [PATCH] Switch utils/kconfig-diff to use Python 3 + +The script supports it, but continues to refer to 2.x in shebang. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + utils/kconfig-diff | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/utils/kconfig-diff b/utils/kconfig-diff +index 0db267d..19189f3 100755 +--- a/utils/kconfig-diff ++++ b/utils/kconfig-diff +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/env python3 + # + # diffconfig - a tool to compare .config files. + # +-- +2.11.0 + diff --git a/meta-oe/recipes-devtools/kconfig-frontends/files/missing-mkdir.patch b/meta-oe/recipes-devtools/kconfig-frontends/files/missing-mkdir.patch new file mode 100644 index 0000000000..a11186e51e --- /dev/null +++ b/meta-oe/recipes-devtools/kconfig-frontends/files/missing-mkdir.patch @@ -0,0 +1,37 @@ +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 +@@ -173,2 +173,3 @@ bin_SCRIPTS += frontends/kconfig + frontends/kconfig: frontends/kconfig.in ++ $(MKDIR_P) $(@D) + $(AM_V_GEN)$(SED) -e 's/@KCFG_LIST@/$(kcfg_list)/g' \ +@@ -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 |