Commit Graph

77 Commits

Author SHA1 Message Date
Peter Korsgaard
3ef31b16c1 package/config; br2_symbol_printer(): fix off-by-1 in string handling
Based on patch by bbj17@gmx.de.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-03-30 20:51:48 +02:00
Peter Korsgaard
a72ab0542f package/config: rebase against 2.6.38-rc3
Fixes nconfig crash on comments within choice groups.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-02 15:54:50 +01:00
Peter Korsgaard
a538d4057e package/config: rebase against 2.6.37
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-02 15:54:50 +01:00
Peter Korsgaard
72daa122b6 package/config: rebase against 2.6.37-rc1
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-02 15:54:50 +01:00
Peter Korsgaard
359a922659 package/config: Rebase against Linux 2.6.36
No significant changes, but makes it easier to rebase against newer
versions.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2011-02-02 15:54:33 +01:00
Peter Korsgaard
937367785a config: fix crash with too long paths
Closes #2737

Use PATH_MAX rather that 128 for path buffers. Patch from kernel 1408b15b98
(kconfig: Use PATH_MAX instead of 128 for path buffer sizes) by Will Newton.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-07 19:52:13 +01:00
Paulius Zaleckas
09c1b8bd6e package/config: .gitignore cleanup
Now all configure generated files go to output directory.

Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-05 10:22:33 +01:00
Yann E. MORIN
20106a052e package/config: update quilt series
Update the patches so they apply without offset

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-03 23:27:50 +01:00
Yann E. MORIN
e5e8fae892 Makefile: move version string from Config.in into Makefile
This re-instates writing the version string in .config headers, and no
longer provides it as a kconfig symbol in .config (it is now a variable
in the Makefile, and in the environment).

Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-03 23:26:45 +01:00
Peter Korsgaard
bfa9e9e2bd kconfig: remove CONFIG_ references in search/help
We use BR2_*, not CONFIG_* - So remove references to CONFIG_ in search/help
windows.

Long term we should probably consider doing s/^BR2_/CONFIG_/ to get rid
of all this though.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-09-05 22:51:09 +02:00
Thomas Petazzoni
40177240fa Tell git to ignore the Quilt internal directory in package/config
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-01 14:22:36 +02:00
Thomas Petazzoni
723f01dafa Remove unnecessary ugly hacks in package/config
Those hacks should not be needed and they even make "mconf" fail to
save the configuration file in $(CONFIG_DIR).

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-01 12:27:02 +02:00
Thomas Petazzoni
8b6585a9d3 Add support for the new nconf configuration tool
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-01 12:26:56 +02:00
Thomas Petazzoni
52a142a631 Bump package/config to 2.6.36-rc1
The goal is to be able to use savedefconfig to generate minimal
defconfig files.

Four of our patches are removed since the modifications have been
merged upstream. The new nconf configuration utility has appeared.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-01 12:26:49 +02:00
Thomas Petazzoni
7c524dd0b6 Clean up our patches against kconfig
Our kconfig-to-buildroot2.patch hasn't been kept up to date with all
the changes made into package/config, and a single patch wasn't very
practical to maintain all our changes. Therefore, this commit adds a
package/config/patches directory, which contains a Quilt series of
patches that correspond to our modifications to the kconfig mechanism.

The huge kconfig-to-buildroot2.patch has been split into 16 smaller
patches. The purpose of some of the modifications has been clearly
identified, while some others were not identified.

The 16 patches together do match exactly the old
kconfig-to-buildroot2.patch. We have been very careful in making sure
that we wouldn't loose any of our modifications.

The only modifications made are :

 * Instead of renaming the kernel Makefile to Makefile.kconfig and
   naming the Buildroot Makefile just 'Makefile', we instead keep the
   original package/config/Makefile from the kernel
   scripts/kconfig/Makefile and name the Buildroot Makefile
   package/config/Makefile.br. The main Buildroot Makefile is modified
   accordingly.

 * The documentation README.buildroot2 is updated to explain how to
   upgrade to a newer version of scripts/kconfig.

 * The kconfig-language.txt documentation is removed, as anybody can
   easily find it in the kernel sources so there's no need to
   duplicate it here.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2010-09-01 12:26:41 +02:00
Peter Korsgaard
3435c1afb5 kconfig: implement KCONFIG_PROBABILITY for rand{,package}config
rand{,package}config enables configuration options with 50% probability,
which isn't always what we want in BR (because the "big" configs take a
long time to build and limits the chance of a randconfig detecting a
missing dependency), so introduce a KCONFIG_PROBABILITY environment
variable to tweak the probability between 0 (all options off) and 100
(all options on).

To use, simply set the environment variable before running make or pass
it on the make command line - E.G.

make randpackageconfig KCONFIG_PROBABILITY=10

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-23 14:27:30 +02:00
Peter Korsgaard
7705e6e415 kconfig: make rand{,package}config fair
Give each boolean symbol a 50% chance of getting enabled, rather than 67%.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-22 14:17:51 +02:00
Peter Korsgaard
8e29430410 Makefile: fixup make distclean after kconfig build in BUILD_DIR
We don't actually need to explicitly clean the kconfig stuff, as distclean
already removes the entire BUILD_DIR, but fix up the packag/config makefile
to do the right thing if make clean/distclean is called manually for
completeness.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-07-01 09:03:36 +02:00
Slava Zanko
1b10ce7156 make gconfig: fix build on Fedora-13
Closes #2095

Avoids error like:
/usr/bin/ld: /dot-dot-dot/buildroot/output/build/buildroot-config/kconfig_load.o: undefined reference to symbol 'dlsym@@GLIBC_2.2.5'

Need to add -ldl to list of GTK2 development libraries.

Signed-off-by: Slava Zanko <slavazanko@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-06-24 17:01:15 +02:00
Peter Korsgaard
b50fedbcd3 check-lxdialog.sh: use mktemp for temporary file
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-06-21 23:02:24 +02:00
Peter Korsgaard
a4c99e8fb0 package/config: create .depend in object directory
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-06-21 23:02:07 +02:00
Peter Korsgaard
2cc210c92f kconfig: build in BUILD_DIR/buildroot-config
This way the main buildroot dir can be completely read-only for
out-of-tree builds

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-06-21 22:16:34 +02:00
Peter Korsgaard
b8cca06b50 cleanup/simplify kconfig changes for O= builds
No functional change.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-06-21 22:11:31 +02:00
Will Wagner
39ca6d50d8 Move config files into output directory for out-of-tree build
Closes #1213

Signed-off-by: Will Wagner <will_wagner@carallon.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-06-21 22:06:00 +02:00
Peter Korsgaard
fa11d8d830 package/config: also add gconfig change to patch
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-06-05 21:41:32 +02:00
Peter Korsgaard
2b42aae784 Makefile: support gconfig (GTK-based configurator) similar to xconfig
Support the GTK variant of the graphical kconfig configurator as an
alternative to the Qt3-based one.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-06-05 21:15:10 +02:00
Peter Korsgaard
e0197d64b5 kconfig: fix qconf (make xconfig) linking
qconf is written in C++, so use HOSTCXX instead of HOSTCC, and pass the
correct flags.

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-06-05 20:46:55 +02:00
Yann E. MORIN
6bd9ca56d9 package/config: really clean
Signed-off-by: Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-05-22 22:11:19 +02:00
Thomas Petazzoni
c0727fd319 kconfig: fix oldconfig to generate .config.cmd
Since the recent update of Kconfig to the Kconfig infrastructure found
in 2.6.30 kernels, make oldconfig was broken because it didn't
generate the .config.cmd file. This is done by a call to the
conf_write_autoconf() function.

Moreover, this process was also broken because the
conf_get_autoconfig_name() function was reading the environment
variable BUILDROOT_AUTOCONF while the main Makefile is passing it as
KCONFIG_AUTOCONFIG. We also remove the fallback on
"$(BR2_DEPENDS_DIR)/config/auto.conf" since we are not able to expand
BR2_DEPENDS_DIR at this point. Therefore, the KCONFIG_AUTOCONFIG
envionment variable *must* be set.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-08-03 10:07:54 +02:00
Thomas Petazzoni
33f13e393f kconfig: tell git to ignore new generated files
The update of kconfig and the addition of xconfig support generates
more files in package/config/. Tell git to ignore them.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-30 17:39:47 +02:00
Thomas Petazzoni
6cd6353ff9 xconfig: Save the configuration properly in qconf
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-27 16:07:05 +02:00
Thomas Petazzoni
69f982cdad xconfig: Change titlebar to Buildroot Configuration
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2009-07-27 16:07:04 +02:00
Alper Yildirim
b0df9df39a config: Add support for xconfig
It involved:

 * Modifying the top-level Makefile to create the xconfig target, and
   the $(CONFIG)/qconf target to compile the qconf utility

 * Modifying the package/config/Makefile magic so that C++ files and
   binaries gets linked properly, re-using the
   package/config/Makefile.kconfig logic inherited from the kernel

 * Hacking a little bit package/config/Makefile.kconfig in a way
   similar to the modifications done for the mconf (menuconfig
   interface)

Signed-off-by: Alper Yildirim <ayildirim@aselsan.com>
2009-07-27 16:07:00 +02:00
Alper Yildirim
4b3e11b3e7 config: Update package/config to Kconfig 2.6.30
Update the package/config stuff with the code available in the Linux
kernel 2.6.30.

Signed-off-by: Alper Yildirim <ayildirim@aselsan.com>
2009-07-27 16:06:50 +02:00
angus salkeld
9cdff46ba0 Add .gitignore files
[peter: add /.config]

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2009-05-04 21:46:53 +02:00
Peter Korsgaard
0dc552c134 menuconfig: don't prepend CONFIG_ to symbols in help text 2008-12-13 11:52:54 +00:00
Peter Korsgaard
50548330b4 kconfig: only warn about long help lines, not other types of lines
We have some pretty long depends / default y|n lines in BR, which it
shouldn't complain about.
2008-10-16 19:28:23 +00:00
Peter Korsgaard
af06d81be3 kconfig: warn about overlong lines in help-texts
From busybox r22852.
2008-08-27 20:18:33 +00:00
Peter Korsgaard
9991e8c7fb package/config: add gettext helper
From Bernhards tree (2b693d78)
2008-06-19 19:06:08 +00:00
Peter Korsgaard
e2c32ba54b package/config: rebase from upstream (2.6.24.4)
From Bernhards tree (1af211ea)
2008-06-19 08:11:51 +00:00
Peter Korsgaard
1b6f2e0f4c package/config: rebase from upstream (2.6.23.14)
From Bernhards tree (2737cfdd)
2008-06-19 08:11:43 +00:00
Peter Korsgaard
2c2796719a package/config: cygwin fix
- pass HOST_LOADLIBES down to make mconf for cygwin
- fix link-order WRT HOST_LOADLIBES

From Bernhards tree (91018d95)
2008-06-19 08:11:35 +00:00
Bernhard Reutner-Fischer
e6382c49a4 - pull "kconfig: oldconfig shall not set symbols if it does not need to" 2007-09-29 20:21:38 +00:00
Bernhard Reutner-Fischer
c907326465 - forgot to svn add kconfig-language.txt 2007-09-29 20:08:22 +00:00
Bernhard Reutner-Fischer
f5b8cd4ac1 - add a version and display it in the configuration 2007-09-25 11:37:31 +00:00
Bernhard Reutner-Fischer
1fc2723ca9 - add the $(BASE_TARGETS) per default 2007-09-23 20:46:44 +00:00
Bernhard Reutner-Fischer
28a36b609a - thinking loud about auto-generating dependencies for make(1)
Don't use this, it doesn't work yet. Thoughs welcome.
  Like: We should probably use the sym->text and not fiddle with the name since
  the name looses information ('_' != '-' in host-fakeroot). This would not
  be too robust, i fear, since the name can contain additional, arbitrary info.
  Also, the real 'depends' are a little bit ugly in kconfig. There doesn't seem
  to be a nice property that holds reverse deps that are only contain selected
  symbols.
  Thoughts?
2007-09-23 20:28:53 +00:00
Bernhard Reutner-Fischer
54cf1e72f4 - search env for BUILDROOT_CONFIG for use as a config file; defaults to .config 2007-09-23 14:12:58 +00:00
Bernhard Reutner-Fischer
0d888e3677 - pull kbuild from 2.6.22.7. This should fix the ncurses detection for dylib et al 2007-09-23 14:06:59 +00:00
Bernhard Reutner-Fischer
9952cfa5c4 - revert r19825. Fix this in the kernel instead and read README.buildroot2 2007-09-12 07:05:52 +00:00