summaryrefslogtreecommitdiffstats
path: root/support/kconfig/patches
Commit message (Collapse)AuthorAgeFilesLines
* support/kconfig/merge_config.sh: avoid false positive matches from comment linesNasser Afshin2018-11-242-0/+33
| | | | | | | | | | | | | | | | | We are using empty CONFIG_PREFIX_. This results in false positive match for comment lines when merging config fragments. To avoid false positive reports, we use separate sed expressions and address comment lines explicitly. This is actually is in the Linux kernel mainline (v4.20-rc2): 6bbe4385d035c6fac56f840a59861a0310ce137b ("kconfig: merge_config: avoid false positive matches from comment lines") Signed-off-by: Nasser Afshin <Afshin.Nasser@gmail.com> Reviewed-by: Petr Vorel <petr.vorel@gmail.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* support/kconfig/merge_config.sh: fix merging buildroot config filesNasser Afshin2018-11-242-0/+32
| | | | | | | | | | | | | | | | | This patch allows us to define config prefix with CONFIG_ environment variable. By setting the proper config prefix, we will have proper 'redundant configuration warnings' when we use '-r -m' options. This is actually already in mainline for v4.20-rc1: 2cd3faf87d2d8f6123adf34741b9a7b98828a76f ("merge_config.sh: Allow to define config prefix") Signed-off-by: Nasser Afshin <afshin.nasser@gmail.com> Reviewed-by: Petr Vorel <petr.vorel@gmail.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* kconfig: Refresh patchesPetr Vorel2018-10-303-15/+15
| | | | | Signed-off-by: Petr Vorel <petr.vorel@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* kconfig: Restore missing custom changes + add patchesPetr Vorel2018-10-303-0/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 6eacea5ae0 accidentally removed these changes in merge_config.sh: 0f56304521 ("merge_config.sh: create temporary files in /tmp") 28fac3973b ("merge_config.sh: add br2-external support") Changes were lost because commits just changed files, but didn't add patches. Therefore not only restore our changes, but also add (updated) patches. Missing 0f56304521 caused breaking merge_config.sh when used in out of tree build: $ make -C buildroot O=$PWD/output defconfig ... $ cd output $ echo 'BR2_TARGET_GENERIC_HOSTNAME="test"' > test.frag $ ../buildroot/support/kconfig/merge_config.sh .config test.frag Using .config as base Merging test.frag umask 0022 && make -C /home/test/buildroot O=/home/test/output/. alldefconfig GEN /home/test/output/Makefile *** Can't read seed configuration "./.tmp.config.qIcpASpUyh"! make[1]: *** [Makefile:925: alldefconfig] Error 1 make: *** [Makefile:16: _all] Error 2 Fixes: 6eacea5ae0 support/kconfig: bump to kconfig from Linux 4.17-rc2 Signed-off-by: Petr Vorel <petr.vorel@gmail.com> Reported-by: Erico Nunes <nunes.erico@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* kconfig: Add missing patchPetr Vorel2018-10-301-0/+26
| | | | | | | | | which was specified, but not added during last update. Fixes: 6eacea5ae0 ("support/kconfig: bump to kconfig from Linux 4.17-rc2") Signed-off-by: Petr Vorel <petr.vorel@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* support/kconfig: bump to kconfig from Linux 4.17-rc2Petr Vorel2018-09-2011-216/+134
| | | | | Signed-off-by: Petr Vorel <petr.vorel@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
* support/kconfig: ppply upstream nconfig ncurses/ncursesw fixGuillermo A. Amaral2018-01-152-0/+46
| | | | | | | | | | | | | | | | | | | | | Buildroot's "make nconfig" command stopped working a while ago on Gentoo systems. Running the command would result in a crash. The issue is caused by lxdialog's cflags which are also used to build nconfig; It would detect *ncursesw* and turn on WIDECHAR support -- but the Makefile would still link to plain *ncurses* while building nconfig (which was built without WIDECHAR support). This would cause a crash after using *wattrset* on a WINDOW instance. WIDECHAR *wattrset* would try to set the _color member in the WINDOW struct which does not exist in the NON-WIDECHAR ncurses instance. It would end up clobbering data outside the struct (usually _line entries). An upstream patch fixes the issue, so we're applying it to Buildroot's kconfig. Signed-off-by: Guillermo A. Amaral <g@maral.me> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* support/kconfig: fix usage typo and align verb tensesThomas De Schampheleire2017-10-101-1/+1
| | | | | | | | Fix typo 'selectes' -> 'selects'. Additionally, change 'will exclude' to 'excludes' to align with 'selects'. Signed-off-by: Thomas De Schampheleire <thomas.de_schampheleire@nokia.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* kconfig/lxdialog: get ncurses CFLAGS with pkg-configBjørn Forsman2015-01-072-0/+51
| | | | | | | | | | | | | | | | | | | | | | This makes "make menuconfig" also work on systems where ncurses is not installed in a standard location (such as on NixOS). This patch changes ccflags() so that it tries pkg-config first, and only if pkg-config fails does it go back to the fallback/manual checks. This is the same algorithm that ldflags() already uses. [This patch is already applied upstream (is part of linux v3.18): https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/commit/?id=be8af2d54a66911693eddc556e4f7a866670082b I'm adding this instead of doing a full upstream kconfig sync because there was a conflict in one of the Buildroot kconfig patches (against linux 3.18-rc1), which I was unable to resolve. Just drop this patch next time Buildroot kconfig is synced against upstream. ] Signed-off-by: Bjørn Forsman <bjorn.forsman@gmail.com> Acked-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* infra: replace BUILDROOT_CONFIG with BR2_CONFIGArnout Vandecappelle2014-02-091-1/+1
| | | | | | | | | | | | | | | To make the naming consistent (all user-visible options should be prefixed with BR2_). An entry is added to Makefile.legacy to warn users who have set BUILDROOT_CONFIG but not BR2_CONFIG. Still export BUILDROOT_CONFIG but pointing to some phony value, to make sure that scripts that still use it fail in a predictable way. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Tested-by: Jérémy Rosen <jeremy.rosen@openwide.fr> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* support/kconfig: Fix remaining 'kernel' mentionMaxime Hadjinlian2013-12-281-16/+38
| | | | | | | | | This patch update the patch for kernel's kconfig to add remaining 'kernel' mention. It also applies this patch to buildroot's kconfig. Signed-off-by: Maxime Hadjinlian <maxime.hadjinlian@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* support/kconfig: bump to kconfig from linux-3.12Yann E. MORIN2013-11-146-65/+20
| | | | | | | | | With this, we can trash our probability patch, it's now upstream. Refresh a few other patches. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* support/kconfig: remove useless patchYann E. MORIN2013-11-142-179/+0
| | | | | | | | | | | | | | Patches 02-cpp-comments-to-c-comments.patch changes C++-style comments into C-style comments. This is unneeded, since gcc accepts C++-style comments in C code anyway. Ditch that patch, that's one less we have to handle when updating from upstream. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* support/kconfig: fix 'space' to (de)select optionsYann E. MORIN2013-11-142-0/+42
| | | | | | | | | | | | | | | | | | | | | | | In case a menu has comment without letters/numbers (eg. characters matching the regexp '^[^[:alpha:][:digit:]]+$', for example - or *), hitting space will cycle through those comments, rather than selecting/deselecting the currently-highlighted option. This is the behaviour of hitting any letter/digit: jump to the next option which prompt starts with that letter. The only letters that do not behave as such are 'y' 'm' and 'n'. Prompts that start with one of those three letters are instead matched on the first letter that is not 'y', 'm' or 'n'. Fix that by treating 'space' as we treat y/m/n, ie. as an action key, not as shortcut to jump to prompt. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Peter Korsgaard <jacmet@uclibc.org> Cc: Samuel Martin <s.martin49@gmail.com> Cc: Thomas De Schampheleire <patrickdepinguin@gmail.com> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
* support/kconfig: fix compile warning because of missing include.Peter Seiderer2013-10-301-7/+15
| | | | | | | | | | | | | | With commit b58bf60b519353e983e372f5627d639e7cc72a7a the libgen.h include was removed from confdata.c, but it is needed for the dirname function declaration. Fixes the following compile warning: ./confdata.c: In function ‘conf_split_config’: ./confdata.c:849:6: warning: assignment makes pointer from integer without a cast Signed-off-by: Peter Seiderer <ps.report@gmx.net> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
* support/kconfig: use kconfig-provided way of setting the CONFIG_ prefixYann E. MORIN2013-04-216-184/+34
| | | | | | | | | | | | | | It's now been a while since it has been possible to build the kconfig parser to understand a prefix other than CONFIG_, and even no prefix at all, by setting the CONFIG_ macro (#define) at biuld time. Just use that, insted of patching, it will make it easier for us in the future. Our patches have been refreshed at the same time. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* support/kconfig: upgrade to 3.9-rc2Thomas Petazzoni2013-04-1111-172/+171
| | | | | | | | | | | | | | | | | Our kconfig code is updated to the version of kernel 3.9-rc2. No major issues during the migration, except: * Some conflicts when applying 03-change-config-option-prefix.patch due to upstream kernel changes. * The need of adding a new patch, 15-fix-qconf-moc-rule.patch, to fix the make rule that generates the moc file for the Qt-based interface. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Acked-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Tested-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* kconfig: do not use HOST_LOADLIBES anymoreThomas Petazzoni2012-04-191-6/+6
| | | | | Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* kconfig: sync with linux-3.0Peter Korsgaard2012-01-158-234/+59
| | | | | | And drop unused make-write-deps patch. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
* support: move kconfig stuff from package/config to support/kconfigThomas Petazzoni2011-09-1712-0/+1014
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
OpenPOWER on IntegriCloud