From 7b1d809a8d8620032553845cf4a8819a19508687 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 12 Apr 2020 00:09:52 +0200 Subject: Revert "build: scripts/config - update to kconfig-v5.6" This reverts commit dcf3e63a35d05e7e5103819c0f17195bfafe9baa. The kconfig update requires further testing and refinement until it can remain in tree. Main problems are: - Recursive deps are now fatal instead of a warning - Previously legal syntax now leads to hard failures - It fails all package builds since multiple days The updated kconfig implementation needs to cope with the current status quo in the various package feeds before we can reconsider it for master. It is not desirable that single broken packages can hard-fail the entire build pipeline. Signed-off-by: Jo-Philipp Wich --- scripts/config/mconf-cfg.sh | 50 --------------------------------------------- 1 file changed, 50 deletions(-) delete mode 100755 scripts/config/mconf-cfg.sh (limited to 'scripts/config/mconf-cfg.sh') diff --git a/scripts/config/mconf-cfg.sh b/scripts/config/mconf-cfg.sh deleted file mode 100755 index aa68ec9562..0000000000 --- a/scripts/config/mconf-cfg.sh +++ /dev/null @@ -1,50 +0,0 @@ -#!/bin/sh -# SPDX-License-Identifier: GPL-2.0 - -PKG="ncursesw" -PKG2="ncurses" - -if [ -n "$(command -v pkg-config)" ]; then - if pkg-config --exists $PKG; then - echo cflags=\"$(pkg-config --cflags $PKG)\" - echo libs=\"$(pkg-config --libs $PKG)\" - exit 0 - fi - - if pkg-config --exists $PKG2; then - echo cflags=\"$(pkg-config --cflags $PKG2)\" - echo libs=\"$(pkg-config --libs $PKG2)\" - exit 0 - fi -fi - -# Check the default paths in case pkg-config is not installed. -# (Even if it is installed, some distributions such as openSUSE cannot -# find ncurses by pkg-config.) -if [ -f /usr/include/ncursesw/ncurses.h ]; then - echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncursesw\" - echo libs=\"-lncursesw\" - exit 0 -fi - -if [ -f /usr/include/ncurses/ncurses.h ]; then - echo cflags=\"-D_GNU_SOURCE -I/usr/include/ncurses\" - echo libs=\"-lncurses\" - exit 0 -fi - -if [ -f /usr/include/ncurses.h ]; then - echo cflags=\"-D_GNU_SOURCE\" - echo libs=\"-lncurses\" - exit 0 -fi - -echo >&2 "*" -echo >&2 "* Unable to find the ncurses package." -echo >&2 "* Install ncurses (ncurses-devel or libncurses-dev" -echo >&2 "* depending on your distribution)." -echo >&2 "*" -echo >&2 "* You may also need to install pkg-config to find the" -echo >&2 "* ncurses installed in a non-default location." -echo >&2 "*" -exit 1 -- cgit v1.2.3