25 Oct, 2012
1 commit
-
sys/queue.h and CIRCLEQ in particular have proven to cause portability
problems (reported on Debian Sarge, Cygwin and FreeBSD)Reported-by: Tetsuo Handa
Tested-by: Tetsuo Handa
Tested-by: Yaakov Selkowitz
Signed-off-by: Benjamin Poirier
Signed-off-by: "Yann E. MORIN"
Signed-off-by: Michal Marek
12 Oct, 2012
1 commit
-
Pull kconfig changes from Michal Marek:
"kconfig in v3.7 is going to
- initialize ncurses only once in menuconfig
- be able to jump to a search result in menuconfig
- change the misnomer oldnoconfig to a more meaningful name
olddefconfig, keeping the old name as alias"* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
kconfig: replace 'oldnoconfig' with 'olddefconfig', and keep the old name as an alias
menuconfig: Assign jump keys per-page instead of globally
menuconfig: Do not open code textbox scroll up/down
menuconfig: Add jump keys to search results
menuconfig: Extend dialog_textbox so that it can return to a scrolled position
menuconfig: Extend dialog_textbox so that it can exit on arbitrary keypresses
menuconfig: Remove superfluous conditionnal
kconfig: document oldnoconfig to what it really does in conf.c
kconfig/mconf.c: revision of curses initialization.
08 Oct, 2012
1 commit
-
Pull kbuild fixes from Michal Marek:
"Here are two fixes I intended to send after v3.6-rc7, but failed to do
so. So please pull them for v3.7-rc1 and they will be picked up by
stable.The first one fixes gcc -x syntax in various build-time
tests, which icecream and possible other gcc wrappers did not
understand (and yes, icecream is going to be fixed as well).The second one fixes make tar-pkg so that unpacking the tarball does
not replace the /lib -> /usr/lib symlink on recent Fedora releases."* 'rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
kbuild: Fix gcc -x syntax
kbuild: Do not package /boot and /lib in make tar-pkg
03 Oct, 2012
1 commit
-
The correct syntax for gcc -x is "gcc -x assembler", not
"gcc -xassembler". Even though the latter happens to work, the former
is what is documented in the manual page and thus what gcc wrappers
such as icecream do expect.This isn't a cosmetic change. The missing space prevents icecream from
recognizing compilation tasks it can't handle, leading to silent kernel
miscompilations.Besides me, credits go to Michael Matz and Dirk Mueller for
investigating the miscompilation issue and tracking it down to this
incorrect -x parameter syntax.Signed-off-by: Jean Delvare
Acked-by: Ingo Molnar
Cc: stable@vger.kernel.org
Cc: Bernhard Walle
Cc: Michal Marek
Cc: Ralf Baechle
Signed-off-by: Michal Marek
02 Oct, 2012
1 commit
-
The kbuild target 'localyesconfig' has been same as 'localmodconfig'
since the commit 50bce3e "kconfig/streamline_config.pl: merge
local{mod,yes}config". The commit expects this script generates
different configure depending on target, but it was not yet implemented.So I added code that sets to 'yes' when target is 'localyesconfig'.
Link: http://lkml.kernel.org/r/1349101470-12243-1-git-send-email-yuta.and@gmail.com
Cc: stable@vger.kernel.org # v3.2
Cc: linux-kbuild@vger.kernel.org
Signed-off-by: Yuta Ando
Signed-off-by: Steven Rostedt
28 Sep, 2012
7 commits
-
As 67d34a6a391369269a2e5dba8a5f42cc4cd50231 said, 'oldnoconfig' doesn't
set new symbols to 'n', but instead sets it to their default values.So, this patch replaces 'oldnoconfig' with 'olddefconfig', stop making
people confused, and keep the old name 'oldnoconfig' as an alias,
because people already are dependent on its behavior with the
counter-intuitive name.Signed-off-by: Adam Lee
Signed-off-by: Michal Marek -
At the moment, keys 1-9 are assigned to the first 9 search results. This patch
makes them assigned to the first 9 results per-page instead. We are much less
likely to run out of keys that way.Signed-off-by: Benjamin Poirier
Signed-off-by: Michal Marek -
We don't need to explicitely use ncurses' scroll(). ncurses performs
vertical-motion optimization at wrefresh() time.Using strace I confirmed that with the following patch curses still sends only
the new line of text to the terminal when scrolling up/down one line at a
time.Signed-off-by: Benjamin Poirier
Signed-off-by: Michal Marek -
makes it possible to jump directly to the menu for a configuration entry after
having searched for it with '/'. If this menu is not currently accessible we
jump to the nearest accessible parent instead. After exiting this menu, the
user is returned to the search results where he may jump further in or
elsewhere.Signed-off-by: Benjamin Poirier
Signed-off-by: Michal Marek -
We can now display other UI elements (menus) "on top" of a textbox and then
seemingly come back to it in the same state it was left.Signed-off-by: Benjamin Poirier
Signed-off-by: Michal Marek -
The caller will be able to perform actions based on hotkeys in the displayed
text.Signed-off-by: Benjamin Poirier
Signed-off-by: Michal Marek -
Because end_reached is set to 0 before the loop, the test "!end_reached" is
always true and can be removed. This structure was perhaps copied from the
similar one in back_lines().Signed-off-by: Benjamin Poirier
Signed-off-by: Michal Marek
31 Aug, 2012
1 commit
-
As 67d34a6a391369269a2e5dba8a5f42cc4cd50231 said, the make target
'oldnoconfig' is a misnomer. It doesn't set new symbols to 'n', but
instead sets it to their default values.This patch fixes the document in conf.c, and will submit another patch
to replace 'oldnoconfig' to 'olddefconfig'Signed-off-by: Adam Lee
Signed-off-by: Michal Marek
30 Aug, 2012
1 commit
-
Since commit d0e1e09568 initscr() is called twice in mconf.
Do it only in init_dialog() in util.c and there also save the
cursor position for the signal handler in mconf.c.Signed-off-by: Dirk Gouders
Signed-off-by: Michal Marek
17 Aug, 2012
4 commits
-
perlcritic complains about $kconfig being reused in the foreach loop
at the end of read_kconfig. Change it to a my variable.Signed-off-by: Bill Pemberton
Signed-off-by: Steven Rostedt -
Convert remaining open calls to use the perl's preferred 3 parameter
open.Signed-off-by: Bill Pemberton
Signed-off-by: Steven Rostedt -
Change find_config function to read_config. It now finds the config,
reads the config into an array, and returns the array. This makes it
a little cleaner and changes the open to use perl's 3 option open.Signed-off-by: Bill Pemberton
Signed-off-by: Steven Rostedt -
Running streamline_config.pl as it's shown it in the comment header,
you will get a warning about $ksource being uninitialized. This is
because $ksource is set to ARGV[0], but the examples don't require any
arguments. Fix by setting ksource to . if no ARGV[0] is given.Signed-off-by: Bill Pemberton
Signed-off-by: Steven Rostedt
31 Jul, 2012
1 commit
-
…/rostedt/linux-kconfig
Pull localmodconfig updates from Steven Rostedt:
"Improve localmodconfig to remove even more unused module configs.These changes drastically improve the amount of module configs removed
from a config file. It also adds some debug that I can have users
easily enable if things do not work for them."* tag 'localmodconfig-v3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-kconfig:
localmodconfig: Add debug environment variable LOCALMODCONFIG_DEBUG
localmodconfig: Check if configs are already set for selects
localmodconfig: Read in orig config file to avoid extra processing
localmodconfig: Comments and cleanup for streamline_config.pl
26 Jul, 2012
3 commits
-
The make target 'oldnoconfig' is a misnomer. It doesn't set new symbols
to 'n', but instead sets it to their default values.Unfortunately, assuming that it actually did this, broke ktest in some
of its tests. For example, the tests to create a minimum config and even
a config bisect, depends on removing various configs and using
oldnoconfig to get rid of other configs that may have depended on it.But because some configs that it was trying to disable, were in fact
default enabled, this caused those configs to re-enable and corrupt the
test.I thought about fixing oldnoconfig, but I'm afraid that people are
already dependent on its current behavior. Instead, I'm just updating
the documentation to state that it sets the new symbols to their default
values and not to 'n'.Ideally, this would be called, 'olddefconfig' and we have an
'oldnoconfig' that actually disables the new symbols. But it's useless
for me now. If it changed, ktest would need to be consistent between
each version, and that would be to difficult to detect. I'll handle this
issue with ktest with other means.Signed-off-by: Steven Rostedt
Signed-off-by: Michal Marek -
They function just like they do in less(1).
Also correct some discrepancy between the help text and the code wrt
function keys.Signed-off-by: Benjamin Poirier
Signed-off-by: Michal Marek -
They function just like they do in less(1).
Signed-off-by: Benjamin Poirier
Signed-off-by: Michal Marek
14 Jul, 2012
2 commits
-
Signed-off-by: Michal Marek
-
For some config options (CONFIG_EXTRA_FIRMWARE, for example), the length
of a config file line can exceed the 1024 byte buffer.Switch from fgets to compat_getline to fix. compat_getline is an
internally implimented getline work-alike for portability purposes.Signed-off-by: Cody Schafer
Signed-off-by: Michal Marek
13 Jul, 2012
3 commits
-
Commit 5a6f8d2bd9e3392569ed6f29ea4d7210652f929b ("kconfig: nuke
LKC_DIRECT_LINK cruft") removed all traces of lkc_defs.h from the tree.
Remove its entries in dontdiff and kconfig's .gitignore file too.Signed-off-by: Paul Bolle
Signed-off-by: Michal Marek -
Also add a dependency on .tmp_qtcheck for KC_QT_MOC.
Signed-off-by: Yaakov Selkowitz
Signed-off-by: Michal Marek -
Various schemes exist to allow parallel installations of multiple major
versions of Qt (4.x with the previous 3.x and/or the upcoming 5.x).
QtCore.pc includes a moc_location variable which should be a more reliable
way to find moc.Signed-off-by: Yaakov Selkowitz
Signed-off-by: Michal Marek
05 Jul, 2012
3 commits
-
Import libraries on Cygwin and MinGW/MSYS use the .dll.a suffix, so
checking this suffix is necessary to make sure ncurses will still be
found when built without static libraries.Signed-off-by: Yaakov Selkowitz
Signed-off-by: Michal Marek -
Commit 8c41e5e363db55d91aa3b1cdce4ab02ad9821de7 added a check for
ncursesw/curses.h for the case where ncurses and ncursesw are build
separately but only one is installed. But if both are installed,
the headers ncurses/curses.h and ncursesw/curses.h differ, and since
libncursesw will be found first, so should ncursesw/curses.h.Signed-off-by: Yaakov Selkowitz
Signed-off-by: Michal Marek -
ESCDELAY is a global variable which is replaced by getter and setter
functions with NCURSES_REENTRANT. This fixes the following error:nconf.c: In function ‘main’:
nconf.c:1506:2: error: lvalue required as left operand of assignmentSigned-off-by: Yaakov Selkowitz
Signed-off-by: Michal Marek
20 Jun, 2012
4 commits
-
If the environment variable LOCALMODCONFIG_DEBUG is set, then debug output
will appear in the make localmodconfig. This will simplify debugging what
people get with their output, as I can just tell people to do:LOCALMODCONFIG_DEBUG=1 make localmodconfig 2>out.txt
and have them send me the out.txt. I'll be able to see why things are not
working as they think it should be.Signed-off-by: Steven Rostedt
-
There are some cases that a required module does not have a prompt
and needs to have another module enabled that selects it to be set.
As localmodconfig is conservative and tries to make the minimum config
without breaking the user's kernel, or keeping the user from using
devices that were loaded when the lsmod was done, all modules that
select this module will also be enabled.If you needed module A, but module A did not have a prompt but needed
module B to be selected, localmodconfig would make sure B was still
enabled. If not only B selected A, but C, D, E, F, and G also
selected A, then all of those would also be included, as well as the
modules they depend on. This ballooned the number of configs that
localmodconfig would keep.The fix here is to process the depends first, and then record those
configs that did not have a prompt and needed to be selected.
After the depends are done, check what configs are needed to select
the configs in the list, and if a config that selects it is already
set, then we don't need to do anything else.If no config that selects the config is set, then just pick one and
try again.This change brought down the number of selected modules from 290
to 67! Both before and after were run against a config that had 3095
modules enabled.Tested-by: John David Yost # AlleyTrotter
Signed-off-by: Steven Rostedt -
Read in the entire config file. If there's a config that we depend on
that happens to be in the core set (not a module) then we do not need
to process it as a module.Currently, we follow the entire depend and selects even if they
are enabled as core and not modules. By checking to make sure that we
only look at modules we can drop the count a little.From one of my tests, localmodconfig went from taking 3095 set modules
down to 356 before this patch, and down to 290 modules after the change.Tested-by: John David Yost # AlleyTrotter
Signed-off-by: Steven Rostedt -
Added some more comments and cleaned up part of the the code to use
a named variable instead of one of the special $1 perl variables.No functional changes.
Signed-off-by: Steven Rostedt
29 May, 2012
1 commit
-
Pull kconfig changes from Michal Marek:
- Error handling for make KCONFIG_ALLCONFIG= all*config plus a fix
for a bug that was exposed by this- Fix for the script/config utility.
* 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
scripts/config: properly report and set string options
kbuild: all{no,yes,mod,def,rand}config only read files when instructed to.
kconfig: Add error handling to KCONFIG_ALLCONFIG
18 May, 2012
1 commit
-
Hardware with MCA bus is limited to 386 and 486 class machines
that are now 20+ years old and typically with less than 32MB
of memory. A quick search on the internet, and you see that
even the MCA hobbyist/enthusiast community has lost interest
in the early 2000 era and never really even moved ahead from
the 2.4 kernels to the 2.6 series.This deletes anything remaining related to CONFIG_MCA from core
kernel code and from the x86 architecture. There is no point in
carrying this any further into the future.One complication to watch for is inadvertently scooping up
stuff relating to machine check, since there is overlap in
the TLA name space (e.g. arch/x86/boot/mca.c).Cc: Thomas Gleixner
Cc: James Bottomley
Cc: x86@kernel.org
Acked-by: Ingo Molnar
Acked-by: H. Peter Anvin
Signed-off-by: Paul Gortmaker
08 May, 2012
1 commit
-
Prevent subtle surprises to both people working on the kconfig code
and people using make allnoconfig allyesconfig allmoconfig and
randconfig by only attempting to read a config file if
KCONFIG_ALLCONFIG is set.Common sense suggests attempting to read the extra config files does
not make sense unless requested. The documentation says the code
won't attempt to read the extra config files unless requested.
Current usage does not appear to include people depending on the code
reading the config files without the variable being set So do the
simple thing and stop reading config files when passed
all{no,yes,mod,def,rand}config unless KCONFIG_ALLCONFIG environment
variable is set.Signed-off-by: Eric W. Biederman
Reported-by: Stephen Rothwell
Signed-off-by: Michal Marek
05 May, 2012
1 commit
-
- Only try to read the file specified if KCONFIG_ALL_CONFIG is set to
something other than the empty string or "1".- Don't use stat to check the name passed to conf_read_simple so that
zconf_fopen can find the file in the current directory or in SRCTREE
removing a extremely source of confusing failure, where KCONFIG_ALL_CONFIG
was not interpreted with respect to the directory make was called in.- If conf_read_simple fails complain clearly and stop processing.
Allowing the simple debugging of typos.- Clearly document the behavior so it is clear to users which
values are treated as flags and which values are treated as
filenames.Signed-off-by: Eric W. Biederman
Signed-off-by: Michal Marek
13 Apr, 2012
2 commits
-
We've now fixed IS_ENABLED() and friends to not require any special
"__enabled_" prefixed versions of the normal Kconfig options, so delete
the last traces of them being generated.Signed-off-by: Paul Gortmaker
Signed-off-by: Linus Torvalds -
This reverts commit 953742c8fe8ac45be453fee959d7be40cd89f920.
Dumping two lines into autoconf.h for all existing Kconfig options
results in a giant file (~16k lines) we have to process each time we
compile something. We've weaned IS_ENABLED() and similar off of
requiring the __enabled_ definitions so now we can revert the change
which caused all the extra lines.Signed-off-by: Paul Gortmaker
Signed-off-by: Linus Torvalds