mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2026-05-31 01:10:08 +00:00
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 <peter.kjellerstedt@axis.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
committed by
Martin Jansa
parent
ec5bffa7d2
commit
c2670c4b5c
-28
@@ -1,28 +0,0 @@
|
|||||||
From 80c16b1f39402e8ce33600e5f297920a6d603090 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
|
||||||
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 <alex.kanavin@gmail.com>
|
|
||||||
---
|
|
||||||
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
|
|
||||||
+32
@@ -0,0 +1,32 @@
|
|||||||
|
From 780b0b8e48551ba49b011caeeb09101a09c14a61 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Ross Burton <ross.burton@intel.com>
|
||||||
|
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 <ross.burton@intel.com>
|
||||||
|
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||||
|
(cherry picked from commit f7986375129d1ada7dc6abeeec5b9d00ef6f7149)
|
||||||
|
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
|
||||||
|
---
|
||||||
|
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
|
||||||
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
Upstream-Status: Submitted
|
|
||||||
Signed-off-by: Ross Burton <ross.burton@intel.com>
|
|
||||||
|
|
||||||
From ca05ee2fb6db5b3b1edc16dba6150a2c6078a6cf Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ross Burton <ross.burton@intel.com>
|
|
||||||
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 <ross.burton@intel.com>
|
|
||||||
---
|
|
||||||
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
|
|
||||||
+4
-5
@@ -13,12 +13,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9b8cf60ff39767ff04b671fca8302408"
|
|||||||
SECTION = "devel"
|
SECTION = "devel"
|
||||||
DEPENDS += "ncurses flex bison gperf-native"
|
DEPENDS += "ncurses flex bison gperf-native"
|
||||||
RDEPENDS_${PN} += "python3 bash"
|
RDEPENDS_${PN} += "python3 bash"
|
||||||
SRC_URI = "git://ymorin.is-a-geek.org/kconfig-frontends;branch=4.10.x \
|
SRC_URI = "git://ymorin.is-a-geek.org/kconfig-frontends;branch=4.11.x \
|
||||||
file://0001-Fix-installation-of-.pc-files.patch \
|
file://0001-Makefile-ensure-frontends-exits-before-writing-into-.patch \
|
||||||
file://0001-Switch-utils-kconfig-diff-to-use-Python-3.patch \
|
file://0001-Switch-utils-kconfig-diff-to-use-Python-3.patch"
|
||||||
file://missing-mkdir.patch"
|
|
||||||
|
|
||||||
SRCREV = "f8ffe5e1c6f183cb7d5d515aa9381b7557de654e"
|
SRCREV = "f22fce3a308be1c7790ebefc6bbedb33c5f7c86a"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
Reference in New Issue
Block a user