diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-04-27 17:28:12 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-05-23 17:45:35 +0100 |
commit | cee2ed45a30e9055c301f21e6a136722ae13a5ab (patch) | |
tree | 9dba52c40911baf66b56cac4c78483a31c1b9303 | |
parent | f7c2ec9f8719ee37bdca866c881ca5d853f9aefc (diff) | |
download | poky-cee2ed45a30e9055c301f21e6a136722ae13a5ab.tar.gz |
kconfig-frontends: update to 4.10.0.1
Add a couple of patches:
- move python script to use Python 3
- fix .pc file installation path
(From OE-Core rev: 3469c729a14bbf38bd2e9d7456c0651d8f313546)
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch | 29 | ||||
-rw-r--r-- | meta/recipes-devtools/kconfig-frontends/files/0001-Switch-utils-kconfig-diff-to-use-Python-3.patch | 26 | ||||
-rw-r--r-- | meta/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb (renamed from meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb) | 8 |
3 files changed, 60 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 new file mode 100644 index 0000000000..e9195a0afc --- /dev/null +++ b/meta/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch | |||
@@ -0,0 +1,29 @@ | |||
1 | From 80c16b1f39402e8ce33600e5f297920a6d603090 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Thu, 27 Apr 2017 16:57:06 +0300 | ||
4 | Subject: [PATCH] Fix installation of .pc files | ||
5 | |||
6 | They go to prefix/pkgconfig/, not prefix/pkg-config. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
10 | --- | ||
11 | Makefile.am | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/Makefile.am b/Makefile.am | ||
15 | index 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 | -- | ||
28 | 2.11.0 | ||
29 | |||
diff --git a/meta/recipes-devtools/kconfig-frontends/files/0001-Switch-utils-kconfig-diff-to-use-Python-3.patch b/meta/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/recipes-devtools/kconfig-frontends/files/0001-Switch-utils-kconfig-diff-to-use-Python-3.patch | |||
@@ -0,0 +1,26 @@ | |||
1 | From 3b9b0f82c33f793a14d44bf06b6c8136bc3fc4bf Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Thu, 27 Apr 2017 16:48:42 +0300 | ||
4 | Subject: [PATCH] Switch utils/kconfig-diff to use Python 3 | ||
5 | |||
6 | The script supports it, but continues to refer to 2.x in shebang. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
10 | --- | ||
11 | utils/kconfig-diff | 2 +- | ||
12 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
13 | |||
14 | diff --git a/utils/kconfig-diff b/utils/kconfig-diff | ||
15 | index 0db267d..19189f3 100755 | ||
16 | --- a/utils/kconfig-diff | ||
17 | +++ b/utils/kconfig-diff | ||
18 | @@ -1,4 +1,4 @@ | ||
19 | -#!/usr/bin/python | ||
20 | +#!/usr/bin/env python3 | ||
21 | # | ||
22 | # diffconfig - a tool to compare .config files. | ||
23 | # | ||
24 | -- | ||
25 | 2.11.0 | ||
26 | |||
diff --git a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb index 4ca0e4da3a..be90d6b880 100644 --- a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb +++ b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb | |||
@@ -12,10 +12,12 @@ LICENSE = "GPL-2.0" | |||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=9b8cf60ff39767ff04b671fca8302408" | 12 | LIC_FILES_CHKSUM = "file://COPYING;md5=9b8cf60ff39767ff04b671fca8302408" |
13 | SECTION = "devel" | 13 | SECTION = "devel" |
14 | DEPENDS += "ncurses flex bison gperf-native" | 14 | DEPENDS += "ncurses flex bison gperf-native" |
15 | RDEPENDS_${PN} += "python bash" | 15 | RDEPENDS_${PN} += "python3 bash" |
16 | SRC_URI = "git://ymorin.is-a-geek.org/kconfig-frontends" | 16 | SRC_URI = "git://ymorin.is-a-geek.org/kconfig-frontends;branch=4.10.x \ |
17 | file://0001-Fix-installation-of-.pc-files.patch \ | ||
18 | file://0001-Switch-utils-kconfig-diff-to-use-Python-3.patch" | ||
17 | 19 | ||
18 | SRCREV = "75d35b172fc0f7b6620dd659af41f2ce04edc4e6" | 20 | SRCREV = "f8ffe5e1c6f183cb7d5d515aa9381b7557de654e" |
19 | 21 | ||
20 | S = "${WORKDIR}/git" | 22 | S = "${WORKDIR}/git" |
21 | 23 | ||