diff options
5 files changed, 0 insertions, 134 deletions
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" | |||
153 | DISTRO_PN_ALIAS_pn-iproute2 = "OSPDT" | 153 | DISTRO_PN_ALIAS_pn-iproute2 = "OSPDT" |
154 | DISTRO_PN_ALIAS_pn-jpeg = "OpenSuSE=libjpeg Ubuntu=libjpeg62" | 154 | DISTRO_PN_ALIAS_pn-jpeg = "OpenSuSE=libjpeg Ubuntu=libjpeg62" |
155 | DISTRO_PN_ALIAS_pn-kbproto = "Meego=xorg-x11-proto-kbproto Ubuntu=x11proto-kb-dev Debian=x11proto-kb-dev" | 155 | DISTRO_PN_ALIAS_pn-kbproto = "Meego=xorg-x11-proto-kbproto Ubuntu=x11proto-kb-dev Debian=x11proto-kb-dev" |
156 | DISTRO_PN_ALIAS_pn-kconfig-frontends = "OSPDT" | ||
157 | DISTRO_PN_ALIAS_pn-kernel-devsrc = "Debian=linux-base Ubuntu=linux" | 156 | DISTRO_PN_ALIAS_pn-kernel-devsrc = "Debian=linux-base Ubuntu=linux" |
158 | DISTRO_PN_ALIAS_pn-kernelshark = "Mandriva=kernelshark Ubuntu=kernelshark" | 157 | DISTRO_PN_ALIAS_pn-kernelshark = "Mandriva=kernelshark Ubuntu=kernelshark" |
159 | DISTRO_PN_ALIAS_pn-kern-tools-native = "Windriver" | 158 | 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 @@ | |||
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: Submitted | ||
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 | ||
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 @@ | |||
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/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 @@ | |||
1 | Upstream-Status: Submitted | ||
2 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
3 | |||
4 | From ca05ee2fb6db5b3b1edc16dba6150a2c6078a6cf Mon Sep 17 00:00:00 2001 | ||
5 | From: Ross Burton <ross.burton@intel.com> | ||
6 | Date: Tue, 9 May 2017 15:30:00 +0100 | ||
7 | Subject: [PATCH] Makefile: ensure utils/ exists before writing to it | ||
8 | |||
9 | Since utils/ was changed to not build recursively it's possible that in | ||
10 | out-of-tree builds the utils/ directory hasn't been created when Make runs the | ||
11 | utils/kconfig-tweak target which tries to write to file inside utils/. | ||
12 | |||
13 | To ensure this can work, mkdir the directory. | ||
14 | |||
15 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
16 | --- | ||
17 | Makefile.am | 1 + | ||
18 | 1 file changed, 1 insertion(+) | ||
19 | |||
20 | diff --git a/Makefile.am b/Makefile.am | ||
21 | index c8e96ef..1baa110 100644 | ||
22 | --- a/Makefile.am | ||
23 | +++ b/Makefile.am | ||
24 | @@ -173,2 +173,3 @@ bin_SCRIPTS += frontends/kconfig | ||
25 | frontends/kconfig: frontends/kconfig.in | ||
26 | + $(MKDIR_P) $(@D) | ||
27 | $(AM_V_GEN)$(SED) -e 's/@KCFG_LIST@/$(kcfg_list)/g' \ | ||
28 | @@ -348,6 +348,7 @@ EXTRA_DIST += \ | ||
29 | utils/kconfig-tweak.in.patch | ||
30 | |||
31 | utils/kconfig-tweak: utils/kconfig-tweak.in | ||
32 | + $(MKDIR_P) $(@D) | ||
33 | $(AM_V_GEN)$(SED) -e "s/@CONFIG_@/$(config_prefix)/g" \ | ||
34 | $< >$@ | ||
35 | @chmod +x $@ | ||
36 | -- | ||
37 | 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 @@ | |||
1 | # Copyright (C) 2012 Khem Raj <raj.khem@gmail.com> | ||
2 | # Released under the MIT license (see COPYING.MIT for the terms) | ||
3 | |||
4 | SUMMARY = "Linux kernel style configuration framework for other projects" | ||
5 | DESCRIPTION = "The kconfig-frontends project aims at centralising \ | ||
6 | the effort of keeping an up-to-date, out-of-tree, packaging of the \ | ||
7 | kconfig infrastructure, ready for use by third-party projects. \ | ||
8 | The kconfig-frontends package provides the kconfig parser, as well as all \ | ||
9 | the frontends" | ||
10 | HOMEPAGE = "http://ymorin.is-a-geek.org/projects/kconfig-frontends" | ||
11 | LICENSE = "GPL-2.0" | ||
12 | LIC_FILES_CHKSUM = "file://COPYING;md5=9b8cf60ff39767ff04b671fca8302408" | ||
13 | SECTION = "devel" | ||
14 | DEPENDS += "ncurses flex bison gperf-native" | ||
15 | RDEPENDS_${PN} += "python3 bash" | ||
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 \ | ||
19 | file://missing-mkdir.patch" | ||
20 | |||
21 | SRCREV = "f8ffe5e1c6f183cb7d5d515aa9381b7557de654e" | ||
22 | |||
23 | S = "${WORKDIR}/git" | ||
24 | |||
25 | inherit autotools pkgconfig | ||
26 | do_configure_prepend () { | ||
27 | mkdir -p ${S}/scripts/.autostuff/m4 | ||
28 | } | ||
29 | |||
30 | do_install_append() { | ||
31 | ln -s kconfig-conf ${D}${bindir}/conf | ||
32 | ln -s kconfig-mconf ${D}${bindir}/mconf | ||
33 | } | ||
34 | |||
35 | EXTRA_OECONF += "--disable-gconf --disable-qconf" | ||
36 | |||
37 | # Some packages have the version preceeding the .so instead properly | ||
38 | # versioned .so.<version>, so we need to reorder and repackage. | ||
39 | SOLIBS = "-${@d.getVar('PV')[:-2]}.so" | ||
40 | FILES_SOLIBSDEV = "${libdir}/libkconfig-parser.so" | ||
41 | |||
42 | BBCLASSEXTEND = "native" | ||