From c2670c4b5c020bfff5900b8cc1c90e220a5263e1 Mon Sep 17 00:00:00 2001 From: Peter Kjellerstedt Date: Fri, 16 Jun 2017 16:15:44 +0200 Subject: 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 Signed-off-by: Martin Jansa --- .../files/0001-Fix-installation-of-.pc-files.patch | 28 --------------- ...sure-frontends-exits-before-writing-into-.patch | 32 +++++++++++++++++ .../kconfig-frontends/files/missing-mkdir.patch | 37 ------------------- .../kconfig-frontends_4.10.0.1.bb | 42 ---------------------- .../kconfig-frontends_4.11.0.1.bb | 41 +++++++++++++++++++++ 5 files changed, 73 insertions(+), 107 deletions(-) delete mode 100644 meta-oe/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch create mode 100644 meta-oe/recipes-devtools/kconfig-frontends/files/0001-Makefile-ensure-frontends-exits-before-writing-into-.patch delete mode 100644 meta-oe/recipes-devtools/kconfig-frontends/files/missing-mkdir.patch delete mode 100644 meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb create mode 100644 meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb (limited to 'meta-oe/recipes-devtools') 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 57ea42e4b2..0000000000 --- a/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch +++ /dev/null @@ -1,28 +0,0 @@ -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: Submitted -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-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 0000000000..a5263c6f8d --- /dev/null +++ b/meta-oe/recipes-devtools/kconfig-frontends/files/0001-Makefile-ensure-frontends-exits-before-writing-into-.patch @@ -0,0 +1,32 @@ +From 780b0b8e48551ba49b011caeeb09101a09c14a61 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Fri, 26 May 2017 17:11:32 +0100 +Subject: [PATCH] Makefile: ensure frontends/ exits before writing into it + +As previously, if GCC dependencies are not being written and the build is out of +tree then frontends/ won't exist so we need to create it. + +Upstream-Status: Backport +Signed-off-by: Ross Burton +Signed-off-by: Yann E. MORIN +(cherry picked from commit f7986375129d1ada7dc6abeeec5b9d00ef6f7149) +Signed-off-by: Yann E. MORIN +--- + Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/Makefile.am b/Makefile.am +index 1baa110..434db5d 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -171,6 +171,7 @@ if COND_kconfig + bin_SCRIPTS += frontends/kconfig + + frontends/kconfig: frontends/kconfig.in ++ $(MKDIR_P) $(@D) + $(AM_V_GEN)$(SED) -e 's/@KCFG_LIST@/$(kcfg_list)/g' \ + $< >$@ + @chmod +x $@ +-- +2.12.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 deleted file mode 100644 index a11186e51e..0000000000 --- a/meta-oe/recipes-devtools/kconfig-frontends/files/missing-mkdir.patch +++ /dev/null @@ -1,37 +0,0 @@ -Upstream-Status: Submitted -Signed-off-by: Ross Burton - -From ca05ee2fb6db5b3b1edc16dba6150a2c6078a6cf Mon Sep 17 00:00:00 2001 -From: Ross Burton -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 ---- - 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 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.10.0.1.bb deleted file mode 100644 index d427e98c91..0000000000 --- a/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb +++ /dev/null @@ -1,42 +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} += "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 \ - file://missing-mkdir.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" diff --git a/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb b/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.0.1.bb new file mode 100644 index 0000000000..df08b8b114 --- /dev/null +++ b/meta-oe/recipes-devtools/kconfig-frontends/kconfig-frontends_4.11.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.11.x \ + file://0001-Makefile-ensure-frontends-exits-before-writing-into-.patch \ + file://0001-Switch-utils-kconfig-diff-to-use-Python-3.patch" + +SRCREV = "f22fce3a308be1c7790ebefc6bbedb33c5f7c86a" + +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 1.2.3-korg