From 7c36b4316ad185088c65a4db8a84b5fcba9eef06 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Thu, 15 Jun 2017 23:49:22 +0100 Subject: kconfig-frontends: Remove as only needed for eglibc This was only added for eglibc. That is gone so we can drop this too. Signed-off-by: Richard Purdie --- meta/conf/distro/include/distro_alias.inc | 1 - .../files/0001-Fix-installation-of-.pc-files.patch | 28 --------------- ...Switch-utils-kconfig-diff-to-use-Python-3.patch | 26 -------------- .../kconfig-frontends/files/missing-mkdir.patch | 37 ------------------- .../kconfig-frontends_4.10.0.1.bb | 42 ---------------------- 5 files changed, 134 deletions(-) delete mode 100644 meta/recipes-devtools/kconfig-frontends/files/0001-Fix-installation-of-.pc-files.patch delete 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/files/missing-mkdir.patch delete mode 100644 meta/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb (limited to 'meta') diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index 489f5ea63d..bbeb105a92 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc @@ -153,7 +153,6 @@ DISTRO_PN_ALIAS_pn-inputproto = "Meego=xorg-x11-proto-inputproto" DISTRO_PN_ALIAS_pn-iproute2 = "OSPDT" DISTRO_PN_ALIAS_pn-jpeg = "OpenSuSE=libjpeg Ubuntu=libjpeg62" DISTRO_PN_ALIAS_pn-kbproto = "Meego=xorg-x11-proto-kbproto Ubuntu=x11proto-kb-dev Debian=x11proto-kb-dev" -DISTRO_PN_ALIAS_pn-kconfig-frontends = "OSPDT" DISTRO_PN_ALIAS_pn-kernel-devsrc = "Debian=linux-base Ubuntu=linux" DISTRO_PN_ALIAS_pn-kernelshark = "Mandriva=kernelshark Ubuntu=kernelshark" DISTRO_PN_ALIAS_pn-kern-tools-native = "Windriver" 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 deleted file mode 100644 index 57ea42e4b2..0000000000 --- a/meta/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/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 deleted file mode 100644 index b8f8904816..0000000000 --- a/meta/recipes-devtools/kconfig-frontends/files/0001-Switch-utils-kconfig-diff-to-use-Python-3.patch +++ /dev/null @@ -1,26 +0,0 @@ -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/files/missing-mkdir.patch b/meta/recipes-devtools/kconfig-frontends/files/missing-mkdir.patch deleted file mode 100644 index a11186e51e..0000000000 --- a/meta/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/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb b/meta/recipes-devtools/kconfig-frontends/kconfig-frontends_4.10.0.1.bb deleted file mode 100644 index d427e98c91..0000000000 --- a/meta/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" -- cgit 1.2.3-korg