Commit Graph

52 Commits

Author SHA1 Message Date
leo chung
53a6aa5164 build: fix xconfig target
`make xconfig` fails with following linking error of qconf binary:

 g++ -lQt5Widgets -lQt5Gui -lQt5Core -o qconf qconf.o zconf.tab.o
 /usr/bin/ld: qconf.o: in function ConfigList::metaObject() const': qconf.cc:(.text+0x3eb): undefined reference to QObjectData::dynamicMetaObject() const'
 /usr/bin/ld: qconf.o: in function `ConfigList::qt_metacast(char const*)': link error.

which is caused by the wrong order of the linked objects/libraries so
this patch reorders the linker's arguments which makes the qconf compile
again.

Signed-off-by: leo chung <gewalalb@gmail.com>
[commit subject and message tweaks, whitespace fix]
Signed-off-by: Petr Štetiar <ynezz@true.cz>
(cherry picked from commit b2c55d50f8)
2019-10-09 21:07:23 +02:00
Petr Štetiar
f2c321fc07 build: fix host menu config targets using ncurses
On a recent Gentoo Linux installation, invoking `make menuconfig`, `make
kernel_menuconfig` or `make kernel_nconfig` in the build system fails,
whereas for example `make menuconfig` in the kernel tree alone works as
expected.

This is happening because STAGING_PREFIX is not defined when kernel's
{menu,n}config target calls pkg-config from the toolchain/host and thus
pkg-config returns an empty value, and the fallback values in the kernel
config script are applied but those are off and the linking fails.

Solution is to use system's pkg-config for all ncurses based menu config
targets in order to provide proper compiler/linker flags.

Ref: FS#2423
Cc: Thomas Albers <thomas.gameiro@gmail.com>
Tested-by: Stijn Tintel <stijn@linux-ipv6.be>
Tested-by: Eneas U de Queiroz <cotequeiroz@gmail.com>
Signed-off-by: Petr Štetiar <ynezz@true.cz>
(cherry picked from commit 965f341aa9)
2019-10-09 21:07:13 +02:00
Jonas Gorski
f79e6e01bd scripts/config: fix *c_shipped build depency tracking
The Makefile was missing dependencies on *c_shipped, so changes never
triggered a rebuild. Add these as optional dependencies so their absence
isn't treated as an error.

In addition, fix a typo preventing the zconf.lex.o from being removed on
clean.

Fixes: 9d5510a500 ("build: add new menuconfig code based on linux 3.9")
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
Acked-by: Jo-Philipp Wich <jo@mein.io>
(cherry picked from commit 0096a1cf00)
2019-09-04 13:16:14 +02:00
Nicolas Pitre
e7ccc34478 config: fix relational operators for bool and tristate symbols
Since commit 31847b67bec0 ("kconfig: allow use of relations other than
(in)equality") it is possible to use relational operators in Kconfig
statements. However, those operators give unexpected results when
applied to bool/tristate values:

	(n < y) = y (correct)
	(m < y) = y (correct)
	(n < m) = n (wrong)

This happens because relational operators process bool and tristate
symbols as strings and m sorts before n. It makes little sense to do a
lexicographical compare on bool and tristate values though.

Documentation/kbuild/kconfig-language.txt states that expression can have
a value of 'n', 'm' or 'y' (or 0, 1, 2 respectively for calculations).
Let's make it so for relational comparisons with bool/tristate
expressions as well and document them. If at least one symbol is an
actual string then the lexicographical compare works just as before.

Signed-off-by: Nicolas Pitre <nico@linaro.org>
Acked-by: Randy Dunlap <rdunlap@infradead.org>
Tested-by: Randy Dunlap <rdunlap@infradead.org>
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
[rebased against OpenWrt kconfig, slightly reword commit message]
(backported from upstream 9059a3493efea6492451430c7e2fa0af799a2abb)
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

(cherry picked from commit 75dcaf3d23)
2019-09-04 13:15:26 +02:00
Jonas Gorski
17ee485731 config: regenerate *_shipped sources
The pregenerated `zconf.hash.c` and `zconf.lex.c` files have not been
kept in sync with their respective `*.y` and `*.l` sources in the past
causing our kconfig implementation to not recognize important kconfig
grammer elements such as relational `<`, `<=`, `>` and `>=` operators.

Fixes: 2d7e602381 ("scripts/config: sync with latest linux upstream")
Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com>
[reword commit message]
Signed-off-by: Jo-Philipp Wich <jo@mein.io>

(cherry picked from commit 972123f1e0)
2019-09-04 13:15:26 +02:00
Paul Schulz
7bbd1855cd config: Change conf.c remove compiler warnings
Compiler is producing the warning:
   warning: format not a string literal and no format arguments
   [-Wformat-security]

This patch makes the format a literal string in printf statements.

This with: gcc version 7.3.0 (Ubuntu 7.3.0-16ubuntu3) in Ubuntu 18.04

Signed-off-by: Paul Schulz <paul@mawsonlakes.org>
2018-07-30 10:43:36 +02:00
Alif M. Ahmad
02a1a8af95 build: cleanup leftover qconf files
``make xconfig`` toplevel target will invoke ``make qconf`` inside
./scripts/config directory, which results a ``qconf`` executable.

This commit removes leftover ``qconf`` executable during ``make
config-clean``.

Signed-off-by: Alif M. Ahmad <alive4ever@live.com>
2018-02-13 11:35:35 +01:00
Zoltan HERPAI
34bbbbf9c3 merge: base: update base-files and basic config
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
2017-12-08 19:41:18 +01:00
Alif M. Ahmad
b1501a684b scripts/config: add qconf files to .gitignore
This commit adds qconf related files to .gitignore.
The files to be tracked are qconf.cc, qconf.h, and images.c.
The files to be ignored are qconf*.o, qconf*, qconf.moc, and
.tmp_qtcheck.

Signed-off-by: Alif M. Ahmad <alive4ever@live.com>
2017-11-02 15:58:45 +01:00
Alif M. Ahmad
ff43c03c14 scripts/config: Add qconf target to Makefile
qconf is kconfig UI utilizing QT toolkit. This makes it possible to use
graphical interface interaction to configure LEDE build target.

This commit adds qconf target to ./script/config/Makefile to be used by
toplevel ``make xconfig`` later.

Signed-off-by: Alif M. Ahmad <alive4ever@live.com>
2017-11-02 15:58:45 +01:00
Felix Fietkau
349bb6e663 scripts/config: add -DKBUILD_NO_NLS to CXXFLAGS
Preparation for adding C++ code which needs the same flag

Signed-off-by: Felix Fietkau <nbd@nbd.name>
2017-11-02 15:58:45 +01:00
Alif M. Ahmad
96eb96c3f0 scripts/config: import qconf
Import qconf.cc, qconf.h, and images.c from linux kernel 4.9.13 archive.

Signed-off-by: Alif M. Ahmad <alive4ever@live.com>
2017-11-02 15:58:45 +01:00
Felix Fietkau
9bfa6971ae scripts/config: properly handle select on symbols with unmet direct dependencies
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-08-03 20:03:36 +02:00
Felix Fietkau
2d7e602381 scripts/config: sync with latest linux upstream
Signed-off-by: Felix Fietkau <nbd@nbd.name>
2016-08-03 20:03:35 +02:00
John Crispin
fa69553900 branding: add LEDE branding
Signed-off-by: John Crispin <blogic@openwrt.org>
2016-03-24 22:40:13 +01:00
Felix Fietkau
b0d9e64464 scripts/config: fix handling of CONFDEFAULT on oldconfig
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 47372
2015-11-03 12:00:53 +00:00
Felix Fietkau
a9f6941436 scripts/config: sync with linux upstream
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 43873
2015-01-08 14:33:53 +00:00
Felix Fietkau
0fa857f3ba scripts/config: fix segfault introduced in r43652
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 43695
2014-12-13 14:01:26 +00:00
Jo-Philipp Wich
8557b8cd3f scripts/config: remove debug statement
Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 43655
2014-12-12 12:37:51 +00:00
Jo-Philipp Wich
2f39014a48 scripts/config: support includes relative to the currently processed file
When the initial glob() attempt on a path specified with "source" statement
yields no result, then retry the globbing on the same path with the directory
part of the currently processed file prepended.

This allows us to reference Config.in files relative to their parent instead
of relative to the top dir.

Signed-off-by: Jo-Philipp Wich <jow@openwrt.org>

SVN-Revision: 43652
2014-12-12 12:29:58 +00:00
Felix Fietkau
81013f6bbe scripts/config: make wildcard include with no results non-fatal
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 39862
2014-03-10 18:58:40 +00:00
Felix Fietkau
f935d800bf scripts/config: fix an option processing error that caused duplication in diffconfig.sh output (#13384)
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 36522
2013-05-02 14:06:10 +00:00
Felix Fietkau
45339e03de scripts/config: warn on deprected "depends" syntax instead of throwing a syntax error
Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 36375
2013-04-22 12:53:32 +00:00
Felix Fietkau
9d5510a500 build: add new menuconfig code based on linux 3.9
SVN-Revision: 36361
2013-04-18 12:05:16 +00:00
Jo-Philipp Wich
5b38fdd704 scripts/config: fix menuconfig segfault in text inputs when format patterns are entered by the user
SVN-Revision: 33773
2012-10-14 17:11:57 +00:00
Michael Büsch
50a7ff97ef mconf: Fix compile warning: "warning: conflicting types for ‘sym_set_all_changed’"
SVN-Revision: 29190
2011-11-16 17:27:36 +00:00
Felix Fietkau
5e48d47dfe scripts/config: merge fixes for various issues, including recursive dependency detection/handling (patch by mbm)
SVN-Revision: 28658
2011-10-28 14:09:12 +00:00
Jo-Philipp Wich
11dcad2834 scripts/config/.gitignore omits source files scripts/config/.gitignore aims to avoid checking binaries in to git. Unfortunately it also omits conf.c, confdata.c, and all source files in lxdialog. An OpenWRT tree pulled from a git repository will not build, and I suspect this was not the intention.
Signed-off-by: Denton Gentry <denny@geekhold.com>

SVN-Revision: 27244
2011-06-20 10:41:02 +00:00
Felix Fietkau
b0f60f8023 scripts/config: add an option for making the conf tool write to a different file
SVN-Revision: 25230
2011-01-29 02:22:40 +00:00
Florian Fainelli
aca9c9c81d adjust svn:ignore for cygwin builds
SVN-Revision: 19040
2010-01-05 11:06:21 +00:00
Felix Fietkau
30992cceeb menuconfig: allow wildcard includes to return no match (#6339)
SVN-Revision: 18743
2009-12-11 04:41:56 +00:00
Imre Kaloz
49e657f433 fix breakage introduced with [17394]
SVN-Revision: 17395
2009-08-25 11:56:27 +00:00
Florian Fainelli
32ab3b9692 do not check for a specific Cygwin version, rather check the operating system name directly, thanks AndyI
SVN-Revision: 17394
2009-08-25 09:16:03 +00:00
Florian Fainelli
9c470b63b3 cygwin also needs to be passed LIBS=-lncurses to link lxdialog successfully
SVN-Revision: 15183
2009-04-10 10:08:47 +00:00
Felix Fietkau
fa6b452873 menuconfig: don't generate inconsistencies when ~/.openwrt/defconfig specifies a default target
SVN-Revision: 13008
2008-10-18 20:16:59 +00:00
Felix Fietkau
6700c1d745 ignore mconf_check
SVN-Revision: 9379
2007-10-20 19:10:09 +00:00
John Crispin
1a3c4d1090 add possibility to set default .config values
SVN-Revision: 9300
2007-10-14 02:15:37 +00:00
Felix Fietkau
f8dfc57573 add initial version of a package feeds management script
SVN-Revision: 8973
2007-09-23 02:39:01 +00:00
Felix Fietkau
e92e3ff031 color change to make menuconfig easier to read (patch from #1730)
SVN-Revision: 7909
2007-07-11 04:03:01 +00:00
Felix Fietkau
de49793bb7 remove a useless warning
SVN-Revision: 7588
2007-06-12 13:23:43 +00:00
Felix Fietkau
e840d82e91 Add gitignore files
SVN-Revision: 7385
2007-05-29 14:23:25 +00:00
Felix Fietkau
4d8d426714 fix menuconfig 'deselect' statement
SVN-Revision: 6753
2007-03-29 11:19:50 +00:00
Felix Fietkau
c48b6508fe add 'deselect' property for menuconfig
SVN-Revision: 6647
2007-03-23 14:03:35 +00:00
Felix Fietkau
d14f611eb1 disable the automatic config reset if 'Advanced configuration options' is selected
SVN-Revision: 6506
2007-03-04 16:02:41 +00:00
Felix Fietkau
eea7bb328d force a config reset when the user changes the target platform in menuconfig
SVN-Revision: 6503
2007-03-04 14:04:33 +00:00
Felix Fietkau
c5c7a2e5ab add openbsd compatibility patch (thanks, wbx)
SVN-Revision: 5749
2006-12-10 20:58:51 +00:00
Felix Fietkau
b6e3a52a8d *sigh* increase size of the static buffer allocated in menuconfig again
SVN-Revision: 5198
2006-10-17 20:58:47 +00:00
Felix Fietkau
54fda00db6 don't generate .tmpconfig.h and .kconfig.d
SVN-Revision: 5071
2006-10-14 00:48:54 +00:00
Felix Fietkau
dfcaae5b19 improve ncurses check
SVN-Revision: 5064
2006-10-13 23:19:00 +00:00
Felix Fietkau
d16b2dd50e fix lxdialog build target
SVN-Revision: 5063
2006-10-13 23:11:19 +00:00