From cee2ed45a30e9055c301f21e6a136722ae13a5ab Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Thu, 27 Apr 2017 17:28:12 +0300 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- .../files/0001-Fix-installation-of-.pc-files.patch | 29 +++++++++++++++ ...Switch-utils-kconfig-diff-to-use-Python-3.patch | 26 ++++++++++++++ .../kconfig-frontends_3.12.0.0.bb | 39 -------------------- .../kconfig-frontends_4.10.0.1.bb | 41 ++++++++++++++++++++++ 4 files changed, 96 insertions(+), 39 deletions(-) create mode 100644 meta/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch create mode 100644 meta/recipes-devtools/kconfig-frontends/files/0001-Switch-utils-kconfig-diff-to-use-Python-3.patch delete mode 100644 meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb create mode 100644 meta/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb (limited to 'meta/recipes-devtools/kconfig-frontends') 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 @@ +From 80c16b1f39402e8ce33600e5f297920a6d603090 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +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: Pending +Signed-off-by: Alexander Kanavin +--- + 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/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 @@ +From 3b9b0f82c33f793a14d44bf06b6c8136bc3fc4bf Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin +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 +--- + 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/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb deleted file mode 100644 index 4ca0e4da3a..0000000000 --- a/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_3.12.0.0.bb +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (C) 2012 Khem Raj -# Released under the MIT license (see COPYING.MIT for the terms) - -SUMMARY = "Linux kernel style configuration framework for other projects" -DESCRIPTION = "The kconfig-frontends project aims at centralising \ -the effort of keeping an up-to-date, out-of-tree, packaging of the \ -kconfig infrastructure, ready for use by third-party projects. \ -The kconfig-frontends package provides the kconfig parser, as well as all \ -the frontends" -HOMEPAGE = "http://ymorin.is-a-geek.org/projects/kconfig-frontends" -LICENSE = "GPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=9b8cf60ff39767ff04b671fca8302408" -SECTION = "devel" -DEPENDS += "ncurses flex bison gperf-native" -RDEPENDS_${PN} += "python bash" -SRC_URI = "git://ymorin.is-a-geek.org/kconfig-frontends" - -SRCREV = "75d35b172fc0f7b6620dd659af41f2ce04edc4e6" - -S = "${WORKDIR}/git" - -inherit autotools pkgconfig -do_configure_prepend () { - mkdir -p ${S}/scripts/.autostuff/m4 -} - -do_install_append() { - ln -s kconfig-conf ${D}${bindir}/conf - ln -s kconfig-mconf ${D}${bindir}/mconf -} - -EXTRA_OECONF += "--disable-gconf --disable-qconf" - -# Some packages have the version preceeding the .so instead properly -# versioned .so., so we need to reorder and repackage. -SOLIBS = "-${@d.getVar('PV')[:-2]}.so" -FILES_SOLIBSDEV = "${libdir}/libkconfig-parser.so" - -BBCLASSEXTEND = "native" 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 new file mode 100644 index 0000000000..be90d6b880 --- /dev/null +++ b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb @@ -0,0 +1,41 @@ +# Copyright (C) 2012 Khem Raj +# Released under the MIT license (see COPYING.MIT for the terms) + +SUMMARY = "Linux kernel style configuration framework for other projects" +DESCRIPTION = "The kconfig-frontends project aims at centralising \ +the effort of keeping an up-to-date, out-of-tree, packaging of the \ +kconfig infrastructure, ready for use by third-party projects. \ +The kconfig-frontends package provides the kconfig parser, as well as all \ +the frontends" +HOMEPAGE = "http://ymorin.is-a-geek.org/projects/kconfig-frontends" +LICENSE = "GPL-2.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=9b8cf60ff39767ff04b671fca8302408" +SECTION = "devel" +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" + +SRCREV = "f8ffe5e1c6f183cb7d5d515aa9381b7557de654e" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig +do_configure_prepend () { + mkdir -p ${S}/scripts/.autostuff/m4 +} + +do_install_append() { + ln -s kconfig-conf ${D}${bindir}/conf + ln -s kconfig-mconf ${D}${bindir}/mconf +} + +EXTRA_OECONF += "--disable-gconf --disable-qconf" + +# Some packages have the version preceeding the .so instead properly +# versioned .so., so we need to reorder and repackage. +SOLIBS = "-${@d.getVar('PV')[:-2]}.so" +FILES_SOLIBSDEV = "${libdir}/libkconfig-parser.so" + +BBCLASSEXTEND = "native" -- cgit v1.2.3-54-g00ecf