Config.in: bump version

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

.gitignore

@@ -1,10 +1,10 @@
-/build_*
-/project_*
-/toolchain_*
-/binaries/*
+/output
+/dl
 /.auto.deps
 /.config.cmd
 /.config.old
 /.config
 *.depend
 *.o
+*.orig
+*~

CHANGES

@@ -1,3 +1,244 @@
+2009.11, Released December 1st, 2009:
+
+	Additional fixes and cleanups.
+
+	Updated/fixed packages: alsamixergui, autoconf, coreutils, fltk,
+	microperl, ncurses, vim
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#707: Cant configure fltk-1.1.7. configure: error: Configure could ...
+
+2009.11-rc2, Released November 29th, 2009:
+
+	Additional fixes and cleanups.
+
+	Updated/fixed packages: busybox, dbus, fltk, gvfs, ltrace
+
+2009.11-rc1, Released November 23rd, 2009:
+
+	Fixes all over the tree and new features.
+
+	Cleaned up / Simplified build directory layout. Refer to
+	docs/buildroot.html#using for details.
+
+	Target defconfig files moved to configs/ and listed in 'make help'
+	output.
+
+	Fixed *clean targets. Now clean removes everything generated,
+	so you can do a fresh rebuild. Distclean furthermore removes
+	kbuild tools and .config, bringing the source tree back in a
+	pristine state.
+
+	Toolchain: ARM cortex A8 support, GCC 4.4.2, sensible default
+	soft / hardfloat setting for architecture, ensure target-ldd
+	gets installed.
+
+	New packages: divine, gvfs, libarchive, libmicrohttpd,
+	sdl_sound, swfdec, sysstat
+
+	Updated/fixed packages: alsa-lib, alsamixergui, autoconf, bootutils,
+	busybox, gcc, directfb, dnsmasq, e2fsprogs, festival, gamin, gperf,
+	gqview, gstreamer, gst-plugins-bad, gst-plugins-base, gst-plugins-good,
+	imagemagick, ipkg, iptables, iw, kernel-headers, kismet, leafpad,
+	libelf, libevent, libglib2, libidn, liblockfile, libmad, libpcap,
+	libupnp, libuuid, libxml2, lighttpd, ltrace, lua, lzma, magiccube4d,
+	matchbox, mdadm, nbd, ncftp, ncurses, netkittelnet, netsnmp,
+	ng-spice-rework, ntfs-3g, openntp, openssl, pcmanfm, php, psmisc,
+	python, quagga, radvd, rpm, rsync, rubix, samba, sawman, sdl, sdl_image,
+	shared-mime-info, sfdisk, spawn-fcgi, speech-tools, sqlite, squashfs,
+	synergy, syslinux, sysklogd, target-binutils, tcpdump, torsmo, u-boot,
+	udpcast, util-linux, valgrind, vsftpd, wipe, wpa-supplicant, x11vnc,
+	xdata_xcursor-themes, xboard, xfsprogs, xstroke, zlib
+
+	Removed package: mdnsresponder, mpatrol, gcc 3.4.6 + 4.0.4, vice
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#301: allow to install libsmbclient
+	#303: add gvfs package
+	#477: Add sdl_sound package
+	#487: Make kismet package sexier
+	#511: New package usb_modeswitch
+	#527: misc fixes for dnsmasq package
+	#565: libevent: Bump version and clean up makefile
+	#587: Use iptables multipurpose binaries and bump to 1.4.4
+	#593: Missing early check for patch(1)
+	#597: (REOP)  Selecting busybox in buildroot's config clobbers ar ...
+	#609: libmicrohttpd: New package
+	#615: python: Don't delete .py files unless asked
+	#617: netkit/inetd requires RPC and fails to build if RPC is disabled
+	#619: netkittelnet requires netkitbase to install, but there's no ...
+	#645: allow to build nbd-server with NBD package
+	#653: [SECURITY] Update php package to version 5.2.11
+	#655: Update sqlite package to version 3.6.18
+	#657: Bug in imagemagick-clean target
+	#663: Add option for NAND flash with 512B Page and 16 kB erasesize ...
+	#665: [PATCH] Samba package
+	#667: [PATCH] e2fsprogs
+	#683: SDL-dfb does not select directfb
+	#701: make install problem with unstripped binaries
+	#703: [SECURITY] Update openssl package to 0.9.8l
+	#705: Bump spawn-fcgi package to 1.6.3
+	#709: Bump lighttpd package to 1.4.24
+	#713: Migrate openntpd package to Makefile.autotools.in
+	#715: Bump libidn package to 1.15 and other fixes
+	#717: Bump dnsmasq to 2.51 and introduce new IDN option
+	#731: Bump iw package to 0.9.17
+
+2009.08, Released August 31th, 2009:
+
+	Additional fixes and cleanups.
+
+	Updated/fixed packages: ctorrent, saveconfig/getconfig,
+	sdl_net, util-linux.
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#529: util-linux doesn't find headers and include libs correctly
+	#557: Build ctorrent with SSL support if available
+
+2009.08-rc3, Released August 26th, 2009:
+
+	Additional fixes and cleanups.
+
+	Updated/fixed packages: alsa-utils, berkeleydb, busybox, dbus,
+	directfb, enchant, kernel headers.
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#471: Allow directfb compilation with debug
+	#541: Removal of CVS directories in target filesystem broken
+	#547: berkeleydb: Update config.{sub, guess}
+	#549: enchant: Fix dependencies.
+	#569: Fix alsa-utils build for x86 on x86-64
+
+2009.08-rc2, Released August 6th, 2009:
+
+	Additional fixes and new features.
+
+	New packages: libuuid, gcc 4.3.4.
+
+	Updated/fixed packages: busybox, classpath, gzip, ipsec-tools,
+	jamvm, libusb, microperl, neon, popt, sed, webkit.
+
+	Fixed issue with 'make oldconfig'
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#525: sed broken with external toolchain
+	#537: Fix gzip build with recent glibc
+
+2009.08-rc1, Released August 2nd, 2009:
+
+	Fixes all over the tree and new features.
+
+	Improvement of external toolchain support:
+	  - Support for glibc toolchains.
+	  - The toolchain configuration announced to Buildroot is
+	    verified against the real toolchain configuration.
+	  - Fixes, documentation.
+
+	Cleanup X.org support: clarified configuration options, and
+	removed mandatory dependency on useless libraries such as
+	libXt or libXaw.
+
+	New QT-based configurator, usable using 'make xconfig'.
+
+	Support for the Xtensa architecture.
+
+	Toolchain: GCC 4.4.1, 2.6.30 kernel headers, removed < 2.6.26
+	headers.
+
+	New packages: bmon, ctorrent, dosfstools, enchant,
+	gst-plugins-bad, iw, libmms, libnl, netstat-nat, ntfsprogs,
+	sdl_gfx, spawn-fcgi.
+
+	Updated packages: bind, busybox, coreutils, sqlite, directfb,
+	expat, gamin, gnuconfig, haserl, ipsec-tools, classpath,
+	libcurl, libglib2, liblockfile, libpng, libsoup, libxml2,
+	lighttpd, ltp-testsuite, lvm2, matchbox, memstat,
+	gst-plugins-good, gstreamer, libogg, libvorbis, mplayer,
+	neon, openssl, pciutils, php, qt, ruby, sawman, webkit,
+	wpa-supplicant, xdriver_xf86-input-synaptics,
+	xdriver_xf86-video-intel, xlib_libXfont, xlib_libXft,
+	xlib_libXt, xproto_xproto, xserver-xorg, xutil_makedepend,
+	xutil_util-macros.
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#83: liblockfile fails to compile due to eaccess redefinition
+	#163: Xtensa architecture port
+	#171: xorg-server / kernel headers 2.6.26 - vm86.c compilation issue
+	#241: device mapper + lvm2: build together
+	#243: ctorrent: new package
+	#247: ntfsprogs: new package
+	#271: Library 'libgcc_s.so.1' not installed in search path
+	#287: New package libnl
+	#289: New package iw
+	#331: Update MPlayer to version 1.0rc2
+	#333: Bump sqlite package to 3.6.15
+	#349: update libsoup to version 2.26.2
+	#357: New package netstat-nat
+	#359,#413: Upgrade openvpn to Makefile.autotools.in
+	#367: linux kernel compile error for arm926t
+	#369: Add SDL_gfx package
+	#373: Support for building gstreamer without libxml
+	#379: update DirectFB to version 1.4.0
+	#383: gst-plugins-good: Allow soup plugin to be configured
+	#385: neon: Fix pkgconfig dependency
+	#387: Tremor not installed to toolchain
+	#389: New package bmon
+	#391: gstreamer: Bump version to 0.10.23
+	#393: gst-plugins-base: Bump version to 0.10.23
+	#395: gst-plugins-bad: New package
+	#403: Error while building iso9660 image
+	#409: Bump php package to 5.2.10
+	#411: ipsec-tools: Bump version to 0.7.2
+	#417: New package spawn-fcgi
+	#419: Bump lighttpd package to 1.4.23
+	#421: toolchain: Clean up toolchain locale support menu
+	#427: webkit: Update to WebKit svn r44552
+	#437: ltp-testsuite: Bump version to 20090630
+	#451: Upgrade from unmaintained dosfstools-2.11 to dosfstools-3.0.3
+	#467: DirectFB 1.4.1
+	#473: memstat_0.5.tar.gz has install with -D and that fails "make"
+	#491: libxml2: Bump version to 0.7.3
+	#495: Bump bind package to 9.5.1-P3 (security)
+	#497: OpenSSL RSA key generation hangs on x86_64
+	#509: Bump sqlite package to 3.6.16
+	#523: pciutils broken with external toolchain
+	#533: Update gamin to 0.1.10 to fix compilation
+
+2009.05, Released June 1st, 2009:
+
+	Fixes for dropbear & diffutils, bump linux-advanced 2.6.29.x
+	version and marked ubifsroot as broken.
+
+2009.05-rc3, Released May 27th, 2009:
+
+	Fixes for toolchain (gcc arm pr37436), stable kernel versions,
+	busybox, curl, libusb, readline, python and strace.
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#345: libcurl package needs a urandom fix
+
+2009.05-rc2, Released May 19th, 2009:
+
+	Fixes for toolchain (gcc w/softfloat on ppc, 3.4.6 buildfix
+	for newer hosts), stable kernel versions, busybox, cups,
+	dmraid, docker, mesa3d, rsync and updated defconfigs.
+
+	xserver marked as broken on AVR32 and atngw100-expanded
+	config removed.
+
+	Issues resolved (http://bugs.uclibc.org):
+
+	#167: metacity does not build
+	#295: gamin installs python support even if python is disabled
+	#323: gen_matypes fails to execute during build of Mesa when us...
+
 2009.05-rc1, Released May 5th, 2009:
 
 	Fixes all over the tree, further conversion of packages to

COPYING

@@ -0,0 +1,339 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Lesser General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.

Config.in

@@ -8,7 +8,7 @@ config BR2_HAVE_DOT_CONFIG
 
 config BR2_VERSION
 	string
-	default "2009.05-rc1"
+	default "2009.11"
 
 source "target/Config.in.arch"
 source "target/device/Config.in"
@@ -27,6 +27,14 @@ config BR2_SVN_UP
 	string "Subversion (svn) command to update source tree"
 	default "svn up"
 
+config BR2_BZR_CO
+	string "Bazaar (bzr) command to download source tree"
+	default "bzr co"
+
+config BR2_BZR_UP
+	string "Bazaar (bzr) command to update source tree"
+	default "bzr up"
+
 config BR2_GIT
 	string "Git command to download source tree"
 	default "git clone"
@@ -61,13 +69,13 @@ config BR2_TAR_OPTIONS
 
 config BR2_DL_DIR
 	string "Download dir"
-	default "$(BASE_DIR)/dl"
+	default "$(TOPDIR)/dl"
 	help
 	  Directory to store all the source files that we need to fetch.
 	  If the Linux shell environment has defined the BUILDROOT_DL_DIR
 	  environment variable, then this overrides this configuration item.
 
-	  The default is $(BASE_DIR)/dl
+	  The default is $(TOPDIR)/dl
 
 config BR2_COPYTO
 	string "Copy result to..."
@@ -80,7 +88,7 @@ source	"target/device/Config.in.mirrors"
 
 config BR2_STAGING_DIR
 	string "Toolchain and header file location?"
-	default "$(BUILD_DIR)/staging_dir"
+	default "$(BASE_DIR)/staging"
 	help
 	  This is the location where the toolchain will be installed.  The
 	  toolchain will not work if it is moved from this location.
@@ -89,32 +97,7 @@ config BR2_STAGING_DIR
 	  will be used.
 
 	  Most people will leave this set to the default value of
-	  "$(BUILD_DIR)/staging_dir".
-
-config BR2_FPU_SUFFIX
-	bool "Add '_nofpu' suffix for softfloat toolchains"
-	help
-	  If the toolchain is configured to use softfloat, then
-	  the "_nofpu" suffix will be added to the toolchain build
-	  directory name and to any rootfs image name
-
-config BR2_TOPDIR_PREFIX
-	string "Custom build dir prefix"
-	default ""
-	help
-	  Add a custom string to the beginning of the build directories.
-
-	  build_ARCH -> [PREFIX]_build_ARCH
-	  toolchain_build_ARCH -> [PREFIX]_toolchain_build_ARCH
-
-config BR2_TOPDIR_SUFFIX
-	string "Custom build dir suffix"
-	default ""
-	help
-	  Add a custom string to the end of the build directories.
-
-	  build_ARCH -> build_ARCH_[SUFFIX]
-	  toolchain_build_ARCH -> toolchain_build_ARCH_[SUFFIX]
+	  "$(BASE_DIR)/staging".
 
 config BR2_GNU_BUILD_SUFFIX
 	string "GNU build hostname suffix"
@@ -177,6 +160,7 @@ config BR2_RECENT
 
 config BR2_CONFIG_CACHE
 	bool "Use a central configure cache file"
+	default y
 	help
 	  This determines if a central config cache is used by
 	  packages, reducing the configure time for packages as each

Makefile

@@ -22,23 +22,21 @@
 # Just run 'make menuconfig', configure stuff, then run 'make'.
 # You shouldn't need to mess with anything beyond this point...
 #--------------------------------------------------------------
-TOPDIR=./
+# absolute path
+TOPDIR:=$(shell pwd)
 CONFIG_CONFIG_IN=Config.in
 CONFIG_DEFCONFIG=.defconfig
 CONFIG=package/config
 DATE:=$(shell date +%Y%m%d)
 
-noconfig_targets:=menuconfig config oldconfig randconfig \
-	defconfig allyesconfig allnoconfig release tags \
+noconfig_targets:=menuconfig xconfig config oldconfig randconfig \
+	defconfig allyesconfig allnoconfig release \
+	randpackageconfig allyespackageconfig allnopackageconfig \
 	source-check help
 
-
-# Use shell variables, if defined
-ifneq ($(BUILDROOT_LOCAL),)
-BR2_LOCAL:=$(BUILDROOT_LOCAL)
-else
-BR2_LOCAL:=$(TOPDIR)/local
-endif
+# Strip quotes and then whitespaces
+qstrip=$(strip $(subst ",,$(1)))
+#"))
 
 # Variables for use in Make constructs
 comma:=,
@@ -48,20 +46,13 @@ space:=$(empty) $(empty)
 # $(shell find . -name *_defconfig |sed 's/.*\///')
 # Pull in the user's configuration file
 ifeq ($(filter $(noconfig_targets),$(MAKECMDGOALS)),)
-ifeq ($(BOARD),)
-# if "make BOARD=xyz" command
 -include .config
-else
-# if "make" command
--include $(BR2_LOCAL)/$(BOARD)/$(BOARD).config
-endif
 endif
 
 # Override BR2_DL_DIR if shell variable defined
 ifneq ($(BUILDROOT_DL_DIR),)
 BR2_DL_DIR:=$(BUILDROOT_DL_DIR)
 endif
-LOCAL:=$(BR2_LOCAL)
 
 # To put more focus on warnings, be less verbose as default
 # Use 'make V=1' to see the full commands
@@ -213,10 +204,67 @@ BASE_TARGETS:=uclibc
 endif
 TARGETS:=
 
-# setup our paths
-include project/Makefile.in
+# silent mode requested?
+QUIET:=$(if $(findstring s,$(MAKEFLAGS)),-q)
 
-BR2_DEPENDS_DIR=$(PROJECT_BUILD_DIR)/buildroot-config
+# Strip off the annoying quoting
+ARCH:=$(call qstrip,$(BR2_ARCH))
+ifeq ($(ARCH),xtensa)
+ARCH:=$(ARCH)_$(call qstrip,$(BR2_xtensa_core_name))
+endif
+WGET:=$(call qstrip,$(BR2_WGET)) $(SPIDER) $(QUIET)
+SVN_CO:=$(call qstrip,$(BR2_SVN_CO)) $(QUIET)
+SVN_UP:=$(call qstrip,$(BR2_SVN_UP)) $(QUIET)
+BZR_CO:=$(call qstrip,$(BR2_BZR_CO)) $(QUIET)
+BZR_UP:=$(call qstrip,$(BR2_BZR_UP)) $(QUIET)
+GIT:=$(call qstrip,$(BR2_GIT)) $(QUIET)
+ZCAT:=$(call qstrip,$(BR2_ZCAT))
+BZCAT:=$(call qstrip,$(BR2_BZCAT))
+TAR_OPTIONS=$(call qstrip,$(BR2_TAR_OPTIONS)) -xf
+
+ifneq ("$(origin O)", "command line")
+O:=output
+else
+# other packages might also support Linux-style out of tree builds
+# with the O=<dir> syntax (E.G. Busybox does). As make automatically
+# forwards command line variable definitions those packages get very
+# confused. Fix this by telling make to not do so
+MAKEOVERRIDES =
+endif
+
+BASE_DIR := $(shell mkdir -p $(O) && cd $(O) && pwd)
+$(if $(BASE_DIR),, $(error output directory "$(O)" does not exist))
+
+DL_DIR=$(call qstrip,$(BR2_DL_DIR))
+ifeq ($(DL_DIR),)
+DL_DIR:=$(TOPDIR)/dl
+endif
+
+BUILD_DIR:=$(BASE_DIR)/build
+
+GNU_TARGET_SUFFIX:=-$(call qstrip,$(BR2_GNU_TARGET_SUFFIX))
+
+STAGING_DIR:=$(call qstrip,$(BR2_STAGING_DIR))
+
+# packages compiled for the host goes here
+HOST_DIR:=$(BASE_DIR)/host
+
+# stamp (dependency) files go here
+STAMP_DIR:=$(BASE_DIR)/stamps
+
+BINARIES_DIR:=$(BASE_DIR)/images
+TARGET_DIR:=$(BASE_DIR)/target
+
+# define values for prepatched source trees for toolchains
+VENDOR_SITE:=$(call qstrip,$(BR2_VENDOR_SITE))
+VENDOR_SUFFIX:=$(call qstrip,$(BR2_VENDOR_SUFFIX))
+VENDOR_BINUTILS_RELEASE:=$(call qstrip,$(BR2_VENDOR_BINUTILS_RELEASE))
+VENDOR_GCC_RELEASE:=$(call qstrip,$(BR2_VENDOR_GCC_RELEASE))
+VENDOR_UCLIBC_RELEASE:=$(call qstrip,$(BR2_VENDOR_UCLIBC_RELEASE))
+VENDOR_GDB_RELEASE:=$(call qstrip,$(BR2_VENDOR_GDB_RELEASE))
+VENDOR_PATCH_DIR:=$(call qstrip,$(BR2_VENDOR_PATCH_DIR))
+
+BR2_DEPENDS_DIR=$(BUILD_DIR)/buildroot-config
 
 include toolchain/Makefile.in
 include package/Makefile.in
@@ -233,8 +281,6 @@ all: world
 # In this section, we need .config
 include .config.cmd
 
-include project/*.mk
-
 # We also need the various per-package makefiles, which also add
 # each selected package to TARGETS if that package was selected
 # in the .config file.
@@ -285,21 +331,19 @@ $(BR2_DEPENDS_DIR): .config
 	mkdir -p $(@D)
 	cp -dpRf $(CONFIG)/buildroot-config $@
 
-dirs: $(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
-	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(PROJECT_BUILD_DIR) \
-	$(PROJECT_BUILD_DIR)/autotools-stamps $(STAMP_DIR)
+dirs: $(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
+	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(STAMP_DIR)
 
 $(BASE_TARGETS): dirs
 
-world: dependencies dirs target-host-info $(BASE_TARGETS) $(TARGETS_ALL)
+world: dependencies dirs $(BASE_TARGETS) $(TARGETS_ALL)
 
 
-.PHONY: all world dirs clean dirclean distclean source \
+.PHONY: all world dirs clean distclean source \
 	$(BASE_TARGETS) $(TARGETS) $(TARGETS_ALL) \
 	$(TARGETS_CLEAN) $(TARGETS_DIRCLEAN) $(TARGETS_SOURCE) \
-	$(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
-	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(PROJECT_BUILD_DIR) \
-	$(PROJECT_BUILD_DIR)/autotools-stamps $(STAMP_DIR)
+	$(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(STAGING_DIR) $(TARGET_DIR) \
+	$(HOST_DIR) $(BR2_DEPENDS_DIR) $(BINARIES_DIR) $(STAMP_DIR)
 
 #############################################################
 #
@@ -307,8 +351,7 @@ world: dependencies dirs target-host-info $(BASE_TARGETS) $(TARGETS_ALL)
 # dependencies anywhere else
 #
 #############################################################
-$(DL_DIR) $(TOOL_BUILD_DIR) $(BUILD_DIR) $(HOST_DIR) $(PROJECT_BUILD_DIR) \
-	$(PROJECT_BUILD_DIR)/autotools-stamps $(BINARIES_DIR) $(STAMP_DIR):
+$(DL_DIR) $(TOOLCHAIN_DIR) $(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR):
 	@mkdir -p $@
 
 $(STAGING_DIR):
@@ -326,22 +369,25 @@ endif
 endif
 	@mkdir -p $(STAGING_DIR)/usr/include
 
-$(PROJECT_BUILD_DIR)/.root:
+$(BUILD_DIR)/.root:
 	mkdir -p $(TARGET_DIR)
 	if ! [ -d "$(TARGET_DIR)/bin" ]; then \
 		if [ -d "$(TARGET_SKELETON)" ]; then \
 			cp -fa $(TARGET_SKELETON)/* $(TARGET_DIR)/; \
 		fi; \
+		if [ -d "$(TARGET_SKELETON_PATCH)" ]; then \
+			toolchain/patch-kernel.sh $(TARGET_DIR) $(TARGET_SKELETON_PATCH)/ \*patch\*; \
+		fi; \
 		touch $(STAGING_DIR)/.fakeroot.00000; \
 	fi
-	-find $(TARGET_DIR) -type d -name CVS -o -name .svn -print0 | xargs -0 rm -rf
+	-find $(TARGET_DIR) -type d -name CVS -print0 -o -name .svn -print0 | xargs -0 rm -rf
 	-find $(TARGET_DIR) -type f -name .empty -print0 | xargs -0 rm -rf
 	touch $@
 
-$(TARGET_DIR): $(PROJECT_BUILD_DIR)/.root
+$(TARGET_DIR): $(BUILD_DIR)/.root
 
 erase-fakeroots:
-	rm -f $(PROJECT_BUILD_DIR)/.fakeroot*
+	rm -f $(BUILD_DIR)/.fakeroot*
 
 target-finalize:
 ifeq ($(BR2_HAVE_DEVFILES),y)
@@ -360,10 +406,17 @@ endif
 	find $(TARGET_DIR) -type f -perm +111 | xargs $(STRIPCMD) 2>/dev/null || true
 	$(TARGET_LDCONFIG) -r $(TARGET_DIR) 2>/dev/null
 
+	mkdir -p $(TARGET_DIR)/etc
+	echo $(BR2_VERSION)$(shell $(TOPDIR)/scripts/setlocalversion) > \
+		$(TARGET_DIR)/etc/br-version
+
+ifneq ($(BR2_ROOTFS_POST_BUILD_SCRIPT),"")
+	$(BR2_ROOTFS_POST_BUILD_SCRIPT) $(TARGET_DIR)
+endif
+
 ifeq ($(BR2_ENABLE_LOCALE_PURGE),y)
-LOCALE_WHITELIST=$(PROJECT_BUILD_DIR)/locales.nopurge
-LOCALE_NOPURGE=$(strip $(subst ",,$(BR2_ENABLE_LOCALE_WHITELIST)))
-#"))
+LOCALE_WHITELIST=$(BUILD_DIR)/locales.nopurge
+LOCALE_NOPURGE=$(call qstrip,$(BR2_ENABLE_LOCALE_WHITELIST))
 
 target-purgelocales:
 	rm -f $(LOCALE_WHITELIST)
@@ -387,34 +440,6 @@ external-deps:
 	@$(MAKE) -Bs BR2_WGET=$(TOPDIR)/toolchain/wget-show-external-deps.sh \
 		SPIDER=--spider source
 
-#############################################################
-#
-# Cleanup and misc junk
-#
-#############################################################
-clean: $(TARGETS_CLEAN)
-	rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE) $(PROJECT_BUILD_DIR)/.root $(PROJECT_BUILD_DIR)/autotools-stamps $(STAMP_DIR)
-
-dirclean: $(TARGETS_DIRCLEAN)
-	rm -rf $(STAGING_DIR) $(TARGET_DIR) $(IMAGE) $(PROJECT_BUILD_DIR)/.root $(PROJECT_BUILD_DIR)/autotools-stamps $(STAMP_DIR)
-
-distclean:
-ifeq ($(DL_DIR),$(BASE_DIR)/dl)
-	rm -rf $(DL_DIR)
-endif
-	rm -rf $(TOOL_BUILD_DIR) $(BUILD_DIR) $(PROJECT_BUILD_DIR) $(BINARIES_DIR) \
-	.config.cmd
-	$(MAKE) -C $(CONFIG) clean
-
-sourceball:
-	rm -rf $(BUILD_DIR) $(PROJECT_BUILD_DIR) $(BINARIES_DIR)
-	set -e; \
-	cd ..; \
-	rm -f buildroot.tar.bz2; \
-	tar -cvf buildroot.tar buildroot; \
-	bzip2 -9 buildroot.tar; \
-
-
 else # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
 
 all: menuconfig
@@ -431,13 +456,29 @@ $(CONFIG)/conf:
 	-@if [ ! -f .config ]; then \
 		cp $(CONFIG_DEFCONFIG) .config; \
 	fi
+
 $(CONFIG)/mconf:
 	@mkdir -p $(CONFIG)/buildroot-config
-	$(MAKE) CC="$(HOSTCC)" -C $(CONFIG) conf mconf
+	$(MAKE) CC="$(HOSTCC)" -C $(CONFIG) mconf
 	-@if [ ! -f .config ]; then \
 		cp $(CONFIG_DEFCONFIG) .config; \
 	fi
 
+$(CONFIG)/qconf:
+	@mkdir -p $(CONFIG)/buildroot-config
+	$(MAKE) CC="$(HOSTCC)" -C $(CONFIG) qconf
+	-@if [ ! -f .config ]; then \
+		cp $(CONFIG_DEFCONFIG) .config; \
+	fi
+
+xconfig: $(CONFIG)/qconf
+	@mkdir -p $(CONFIG)/buildroot-config
+	@if ! KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \
+		KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \
+		$(CONFIG)/qconf $(CONFIG_CONFIG_IN); then \
+		test -f .config.cmd || rm -f .config; \
+	fi
+
 menuconfig: $(CONFIG)/mconf
 	@mkdir -p $(CONFIG)/buildroot-config
 	@if ! KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \
@@ -470,7 +511,6 @@ allyesconfig: $(CONFIG)/conf
 	@KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \
 		KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \
 		$(CONFIG)/conf -y $(CONFIG_CONFIG_IN)
-	#sed -i -e "s/^CONFIG_DEBUG.*/# CONFIG_DEBUG is not set/" .config
 
 allnoconfig: $(CONFIG)/conf
 	@mkdir -p $(CONFIG)/buildroot-config
@@ -478,6 +518,33 @@ allnoconfig: $(CONFIG)/conf
 		KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \
 		$(CONFIG)/conf -n $(CONFIG_CONFIG_IN)
 
+randpackageconfig: $(CONFIG)/conf
+	@mkdir -p $(CONFIG)/buildroot-config
+	@grep -v BR2_PACKAGE_ .config > .config.nopkg
+	@KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \
+		KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \
+		KCONFIG_ALLCONFIG=.config.nopkg \
+		$(CONFIG)/conf -r $(CONFIG_CONFIG_IN)
+	@rm -f .config.nopkg
+
+allyespackageconfig: $(CONFIG)/conf
+	@mkdir -p $(CONFIG)/buildroot-config
+	@grep -v BR2_PACKAGE_ .config > .config.nopkg
+	@KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \
+		KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \
+		KCONFIG_ALLCONFIG=.config.nopkg \
+		$(CONFIG)/conf -y $(CONFIG_CONFIG_IN)
+	@rm -f .config.nopkg
+
+allnopackageconfig: $(CONFIG)/conf
+	@mkdir -p $(CONFIG)/buildroot-config
+	@grep -v BR2_PACKAGE_ .config > .config.nopkg
+	@KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \
+		KCONFIG_AUTOHEADER=$(CONFIG)/buildroot-config/autoconf.h \
+		KCONFIG_ALLCONFIG=.config.nopkg \
+		$(CONFIG)/conf -n $(CONFIG_CONFIG_IN)
+	@rm -f .config.nopkg
+
 defconfig: $(CONFIG)/conf
 	@mkdir -p $(CONFIG)/buildroot-config
 	@KCONFIG_AUTOCONFIG=$(CONFIG)/buildroot-config/auto.conf \
@@ -488,49 +555,43 @@ defconfig: $(CONFIG)/conf
 source-check: allyesconfig
 	$(MAKE) _source-check
 
+endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
+
 #############################################################
 #
 # Cleanup and misc junk
 #
 #############################################################
 clean:
-	rm -f .config .config.old .config.cmd .tmpconfig.h .lognr.*
-	-$(MAKE) -C $(CONFIG) clean
+	rm -rf $(STAGING_DIR) $(TARGET_DIR) $(BINARIES_DIR) $(HOST_DIR) \
+		$(STAMP_DIR) $(BUILD_DIR) $(TOOLCHAIN_DIR)
 
 distclean: clean
-	rm -rf sources/*
-
-
-endif # ifeq ($(BR2_HAVE_DOT_CONFIG),y)
+ifeq ($(DL_DIR),$(TOPDIR)/dl)
+	rm -rf $(DL_DIR)
+endif
+ifeq ($(O),output)
+	rm -rf $(O)
+endif
+	rm -rf .config .config.old .config.cmd .auto.deps
+	-$(MAKE) -C $(CONFIG) clean
 
 flush:
-	rm -f $(PROJECT_BUILD_DIR)/tgt-config.cache
+	rm -f $(BUILD_DIR)/tgt-config.cache
 
-%_defconfig: $(CONFIG)/conf
-	cp $(shell find ./target/ -name $@) .config
-	-@$(MAKE) oldconfig
-
-update:
-	cp .config $(BOARD_PATH)/$(PROJECT)_defconfig
+%_defconfig: $(TOPDIR)/configs/%_defconfig
+	cp $^ .config
+	@$(MAKE) oldconfig
 
 configured: dirs host-sed kernel-headers uclibc-config busybox-config linux26-config
 
 prepatch:	gcc-patched binutils-patched gdb-patched uclibc-patched
 
-.lognr.$(PROJECT):
-	@echo "0" > .lognr.$(PROJECT)
-
-log:	.lognr.$(PROJECT)
-	@expr `cat .lognr.$(PROJECT)` + 1 > .lognr.$(PROJECT)	
-	@echo Creating $(PROJECT)-`cat .lognr.$(PROJECT)`.log
-	@$(MAKE) > $(PROJECT)-`cat .lognr.$(PROJECT)`.log 2>&1
-
-
 cross: $(BASE_TARGETS)
 
 help:
 	@echo 'Cleaning:'
-	@echo '  clean                  - delete temporary files created by build'
+	@echo '  clean                  - delete all files created by build'
 	@echo '  distclean              - delete all non-source files (including .config)'
 	@echo
 	@echo 'Build:'
@@ -538,10 +599,16 @@ help:
 	@echo
 	@echo 'Configuration:'
 	@echo '  menuconfig             - interactive curses-based configurator'
+	@echo '  xconfig                - interactive Qt-based configurator'
 	@echo '  oldconfig              - resolve any unresolved symbols in .config'
+	@echo '  randconfig             - New config with random answer to all options'
+	@echo '  defconfig              - New config with default answer to all options'
+	@echo '  allyesconfig           - New config where all options are accepted with yes'
+	@echo '  allnoconfig            - New config where all options are answered with no'
+	@echo '  randpackageconfig      - New config with random answer to package options'
+	@echo '  allyespackageconfig    - New config where pkg options are accepted with yes'
+	@echo '  allnopackageconfig     - New config where package options are answered with no'
 	@echo '  configured             - make {uclibc/busybox/linux26}-config'
-	@echo '  saveconfig             - save current configuration under local/<project>'
-	@echo '  getconfig              - restore saved configuration from local/<project>'
 	@echo
 	@echo 'Miscellaneous:'
 	@echo '  source                 - download all sources needed for offline-build'
@@ -549,6 +616,9 @@ help:
 	@echo '  external-deps          - list external packages used'
 	@echo '  flush                  - flush configuration cache'
 	@echo
+	@$(foreach b, $(notdir $(wildcard $(TOPDIR)/configs/*_defconfig)), \
+	  printf "  %-35s - Build for %s\\n" $(b) $(b:_defconfig=);)
+	@echo
 	@echo 'See docs/README and docs/buildroot.html for further details'
 	@echo
 
@@ -558,6 +628,5 @@ release: distclean
 	tar cfz $$OUT.tar.gz --exclude .svn --exclude .git --exclude \*~ $$OUT; \
 	rm -rf $$OUT
 
-.PHONY: dummy subdirs release distclean clean config oldconfig \
-	menuconfig tags check test depend defconfig help
+.PHONY: $(noconfig_targets)
 

TODO

@@ -6,9 +6,12 @@ Buildroot2 TODOs
   packages/Makefile.autotools.in
 - fix setting of flags for packages
 
-- stabilize for a 0.10.0 release
-
-- think about using a common --config-cache for configure
-  Should take care of expanding TARGET_CONFIGURE_ARGS for cross compiles
-  to working presets.
-
+- coreutils: use make install-strip to install the packages. For now,
+  it fails beause even if we pass STRIP="/path/to/$(ARCH)-strip", the
+  coreutils build system uses the host strip to strip target
+  binaries. The ./configure execution done by Buildroot properly
+  detects the cross-strip, but when running make, build-aux/missing
+  gets run, complains about aclocal-1.10c and atuomake-1.10c not being
+  present, and rerun the configuration... with the wrong environment
+  variables (STRIP= is missing). An autoreconf on this package is
+  probably necessary.

configs/arm_toolchain_defconfig

@@ -138,7 +138,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -232,7 +232,7 @@ BR2_UCLIBC_VERSION_0_9_30=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
 BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.30.config"
 # BR2_PTHREAD_DEBUG is not set
-# BR2_UCLIBC_PROGRAM_INVOCATION is not set
+# BR2_PROGRAM_INVOCATION is not set
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
 
 #
@@ -628,7 +628,7 @@ BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -680,7 +680,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 # BR2_PACKAGE_GZIP is not set
 # BR2_PACKAGE_LZO is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 # BR2_PACKAGE_ZLIB is not set
 

configs/at91rm9200df_defconfig

@@ -143,7 +143,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -237,7 +237,7 @@ BR2_UCLIBC_VERSION_0_9_30=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
 BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.30.config"
 # BR2_PTHREAD_DEBUG is not set
-BR2_UCLIBC_PROGRAM_INVOCATION=y
+BR2_PROGRAM_INVOCATION=y
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
 
 #
@@ -283,7 +283,7 @@ BR2_GCC_SHARED_LIBGCC=y
 # Ccache Options
 #
 BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOOL_BUILD_DIR)/ccache-$(CCACHE_VER)/cache"
+BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"
 
 #
 # Gdb Options
@@ -343,7 +343,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
@@ -737,7 +737,7 @@ BR2_PACKAGE_NCURSES=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -788,7 +788,7 @@ BR2_PACKAGE_LIBGLIB2=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set

configs/at91rm9200df_ext_bare_defconfig

@@ -138,7 +138,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -548,7 +548,7 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -600,7 +600,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 # BR2_PACKAGE_GZIP is not set
 # BR2_PACKAGE_LZO is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 # BR2_PACKAGE_ZLIB is not set
 

configs/at91rm9200df_ext_defconfig

@@ -149,7 +149,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -268,7 +268,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
@@ -662,7 +662,7 @@ BR2_PACKAGE_NCURSES=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -713,7 +713,7 @@ BR2_PACKAGE_LIBGLIB2=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set

configs/at91sam9260dfc_defconfig

@@ -156,7 +156,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -255,7 +255,7 @@ BR2_ENABLE_LOCALE=y
 BR2_PTHREADS_OLD=y
 # BR2_PTHREADS_NATIVE is not set
 # BR2_PTHREAD_DEBUG is not set
-BR2_UCLIBC_PROGRAM_INVOCATION=y
+BR2_PROGRAM_INVOCATION=y
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
 
 #
@@ -303,7 +303,7 @@ BR2_GCC_SHARED_LIBGCC=y
 # Ccache Options
 #
 BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOOL_BUILD_DIR)/ccache-$(CCACHE_VER)/cache"
+BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"
 
 #
 # Gdb Options
@@ -355,7 +355,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
@@ -751,7 +751,7 @@ BR2_PACKAGE_NCURSES=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -802,7 +802,7 @@ BR2_PACKAGE_LIBGLIB2=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set

configs/at91sam9260dfc_ext_bare_defconfig

@@ -138,7 +138,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -548,7 +548,7 @@ BR2_TOOLCHAIN_EXTERNAL_PREFIX="$(ARCH)-linux"
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -600,7 +600,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 # BR2_PACKAGE_GZIP is not set
 # BR2_PACKAGE_LZO is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 # BR2_PACKAGE_ZLIB is not set
 

configs/at91sam9260dfc_ext_defconfig

@@ -157,7 +157,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -276,7 +276,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
@@ -670,7 +670,7 @@ BR2_PACKAGE_NCURSES=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -721,7 +721,7 @@ BR2_PACKAGE_LIBGLIB2=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set

configs/at91sam9260pf_defconfig

@@ -241,7 +241,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.4"
 BR2_PACKAGE_BUSYBOX_INSTALL_SYMLINKS=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-# BR2_PACKAGE_BUSYBOX_HIDE_OTHERS is not set
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
@@ -499,7 +499,7 @@ BR2_PACKAGE_FBSET=y
 # other GUIs
 #
 # BR2_PACKAGE_QTE is not set
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_x11r7 is not set
 # BR2_PACKAGE_XSERVER_xorg is not set
@@ -533,8 +533,8 @@ BR2_PACKAGE_TSLIB=y
 BR2_COMPRESSOR_SUPPORT=y
 BR2_PACKAGE_GZIP=y
 BR2_PACKAGE_LZO=y
-BR2_PACKAGE_LZMA_TARGET=y
-# BR2_PACKAGE_LZMA_TARGET_HEADERS is not set
+BR2_PACKAGE_LZMA=y
+# BR2_PACKAGE_LZMA_HEADERS is not set
 BR2_PACKAGE_LZMA_HOST=y
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set

configs/at91sam9261ek_defconfig

@@ -159,7 +159,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -258,7 +258,7 @@ BR2_ENABLE_LOCALE=y
 BR2_PTHREADS_OLD=y
 # BR2_PTHREADS_NATIVE is not set
 # BR2_PTHREAD_DEBUG is not set
-BR2_UCLIBC_PROGRAM_INVOCATION=y
+BR2_PROGRAM_INVOCATION=y
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
 
 #
@@ -306,7 +306,7 @@ BR2_GCC_SHARED_LIBGCC=y
 # Ccache Options
 #
 BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOOL_BUILD_DIR)/ccache-$(CCACHE_VER)/cache"
+BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"
 
 #
 # Gdb Options
@@ -349,7 +349,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
@@ -751,7 +751,7 @@ BR2_PACKAGE_FBSET=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -817,8 +817,8 @@ BR2_PACKAGE_TSLIB=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-BR2_PACKAGE_LZMA_TARGET=y
-# BR2_PACKAGE_LZMA_TARGET_HEADERS is not set
+BR2_PACKAGE_LZMA=y
+# BR2_PACKAGE_LZMA_HEADERS is not set
 BR2_PACKAGE_LZMA_HOST=y
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set

configs/at91sam9261ek_ext_bare_defconfig

@@ -141,7 +141,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -551,7 +551,7 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -603,7 +603,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 # BR2_PACKAGE_GZIP is not set
 # BR2_PACKAGE_LZO is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 # BR2_PACKAGE_ZLIB is not set
 

configs/at91sam9261ek_ext_defconfig

@@ -160,7 +160,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -307,7 +307,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
@@ -707,7 +707,7 @@ BR2_PACKAGE_FBSET=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -773,8 +773,8 @@ BR2_PACKAGE_TSLIB=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-BR2_PACKAGE_LZMA_TARGET=y
-# BR2_PACKAGE_LZMA_TARGET_HEADERS is not set
+BR2_PACKAGE_LZMA=y
+# BR2_PACKAGE_LZMA_HEADERS is not set
 BR2_PACKAGE_LZMA_HOST=y
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set

configs/at91sam9263ek_defconfig

@@ -157,7 +157,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -251,7 +251,7 @@ BR2_UCLIBC_VERSION_0_9_30=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
 BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.30.config"
 # BR2_PTHREAD_DEBUG is not set
-BR2_UCLIBC_PROGRAM_INVOCATION=y
+BR2_PROGRAM_INVOCATION=y
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
 
 #
@@ -297,7 +297,7 @@ BR2_GCC_SHARED_LIBGCC=y
 # Ccache Options
 #
 BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOOL_BUILD_DIR)/ccache-$(CCACHE_VER)/cache"
+BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"
 
 #
 # Gdb Options
@@ -348,7 +348,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
@@ -748,7 +748,7 @@ BR2_PACKAGE_FBSET=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -814,8 +814,8 @@ BR2_PACKAGE_TSLIB=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-BR2_PACKAGE_LZMA_TARGET=y
-# BR2_PACKAGE_LZMA_TARGET_HEADERS is not set
+BR2_PACKAGE_LZMA=y
+# BR2_PACKAGE_LZMA_HEADERS is not set
 BR2_PACKAGE_LZMA_HOST=y
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set

configs/at91sam9263ek_ext_bare_defconfig

@@ -140,7 +140,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -550,7 +550,7 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -602,7 +602,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 # BR2_PACKAGE_GZIP is not set
 # BR2_PACKAGE_LZO is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 # BR2_PACKAGE_ZLIB is not set
 

configs/at91sam9263ek_ext_defconfig

@@ -159,7 +159,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -269,7 +269,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
@@ -669,7 +669,7 @@ BR2_PACKAGE_FBSET=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -735,8 +735,8 @@ BR2_PACKAGE_TSLIB=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-BR2_PACKAGE_LZMA_TARGET=y
-# BR2_PACKAGE_LZMA_TARGET_HEADERS is not set
+BR2_PACKAGE_LZMA=y
+# BR2_PACKAGE_LZMA_HEADERS is not set
 BR2_PACKAGE_LZMA_HOST=y
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set

configs/at91sam9g20dfc_defconfig

@@ -157,7 +157,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -251,7 +251,7 @@ BR2_UCLIBC_VERSION_0_9_30=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
 BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.30.config"
 # BR2_PTHREAD_DEBUG is not set
-BR2_UCLIBC_PROGRAM_INVOCATION=y
+BR2_PROGRAM_INVOCATION=y
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
 
 #
@@ -297,7 +297,7 @@ BR2_GCC_SHARED_LIBGCC=y
 # Ccache Options
 #
 BR2_CCACHE=y
-BR2_CCACHE_DIR="$(TOOL_BUILD_DIR)/ccache-$(CCACHE_VER)/cache"
+BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"
 
 #
 # Gdb Options
@@ -348,7 +348,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
@@ -685,7 +685,7 @@ BR2_PACKAGE_NCURSES=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -736,7 +736,7 @@ BR2_PACKAGE_XSERVER_none=y
 # Compressors / decompressors
 #
 # BR2_PACKAGE_LZO is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set

configs/at91sam9g20dfc_ext_bare_defconfig

@@ -138,7 +138,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -548,7 +548,7 @@ BR2_TARGET_OPTIMIZATION="-Os -pipe"
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -600,7 +600,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 # BR2_PACKAGE_GZIP is not set
 # BR2_PACKAGE_LZO is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 # BR2_PACKAGE_ZLIB is not set
 

configs/at91sam9g20dfc_ext_defconfig

@@ -157,7 +157,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -276,7 +276,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.2"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
@@ -670,7 +670,7 @@ BR2_PACKAGE_NCURSES=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -721,7 +721,7 @@ BR2_PACKAGE_LIBGLIB2=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set

configs/atngw100-base_defconfig

@@ -1,9 +1,9 @@
 #
 # Automatically generated make config: don't edit
-# Fri Jul  4 12:05:11 2008
+# Tue May 12 20:24:27 2009
 #
 BR2_HAVE_DOT_CONFIG=y
-BR2_VERSION="0.10.0-svn"
+BR2_VERSION="2009.05-rc1"
 # BR2_alpha is not set
 # BR2_arm is not set
 # BR2_armeb is not set
@@ -16,15 +16,11 @@ BR2_avr32=y
 # BR2_mipsel is not set
 # BR2_nios2 is not set
 # BR2_powerpc is not set
-# BR2_s390 is not set
 # BR2_sh is not set
 # BR2_sh64 is not set
 # BR2_sparc is not set
 # BR2_sparc64 is not set
 # BR2_x86_64 is not set
-BR2_at32ap7000=y
-# BR2_at32ap7001 is not set
-# BR2_at32ap7002 is not set
 BR2_ARCH="avr32"
 BR2_ENDIAN="BIG"
 
@@ -42,24 +38,11 @@ BR2_BANNER="ATNGW100-BASE ($(DATE))"
 #
 # Preset Devices
 #
+# BR2_TARGET_AMD is not set
+BR2_BOARD_NAME="atngw100-base"
+BR2_BOARD_PATH="target/device/Atmel/$(BR2_BOARD_NAME)"
 BR2_TARGET_ATMEL=y
 
-#
-# Selection criteria
-#
-BR2_TARGET_ATMEL_NET=y
-BR2_TARGET_ATMEL_LCD=y
-# BR2_TARGET_ATMEL_FPDSP is not set
-# BR2_TARGET_ATMEL_MPB is not set
-
-#
-# Device Selection
-#
-
-#
-# Development Board Selection
-#
-
 #
 # Atmel AVR32 Specific Device Support
 #
@@ -67,15 +50,16 @@ BR2_TARGET_AVR32=y
 BR2_TARGET_AT32AP7000=y
 # BR2_TARGET_AT32AP7001 is not set
 # BR2_TARGET_AT32AP7002 is not set
+# BR2_TARGET_AT32AP7200 is not set
 
 #
 # Development board support
 #
 # BR2_TARGET_AVR32_ATSTK1002 is not set
+# BR2_TARGET_AVR32_ATSTK1005 is not set
 # BR2_TARGET_AVR32_ATNGW100 is not set
 BR2_TARGET_AVR32_ATNGW100_BASE=y
 # BR2_TARGET_AVR32_ATNGW100_EXPANDED is not set
-BR2_BOARD_NAME="atngw100-base"
 
 #
 # Package support
@@ -85,26 +69,21 @@ BR2_BOARD_NAME="atngw100-base"
 # Secondary locations
 #
 BR2_TARGET_ATMEL_COPYTO=""
-BR2_BOARD_PATH="target/device/Atmel/$(BR2_BOARD_NAME)"
-BR2_KERNEL_ARCH_PATCH_VERSION="2.6.24"
-BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-avr32/kernel-patches-$(BR2_KERNEL_ARCH_PATCH_VERSION)"
 # BR2_TARGET_VALKA is not set
 
-#
-# Generic Architecture support
-#
-
 #
 # Generic System Support
 #
 # BR2_TARGET_GENERIC_ACCESS_POINT is not set
 # BR2_TARGET_GENERIC_FIREWALL is not set
-# BR2_TARGET_GENERIC_DEV_SYSTEM is not set
+
+#
+# Generic development system requires a toolchain with WCHAR and PROGRAM_INVOCATION support
+#
 
 #
 # Build options
 #
-BR2_PRIMARY_SITE=""
 BR2_WGET="wget --passive-ftp --retry-connrefused --waitretry=10"
 BR2_SVN_CO="svn co"
 BR2_SVN_UP="svn up"
@@ -112,11 +91,14 @@ BR2_GIT="git clone"
 BR2_ZCAT="zcat"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
+BR2_COPYTO=""
 
 #
 # Mirrors and Download locations
 #
+BR2_PRIMARY_SITE=""
+BR2_BACKUP_SITE="http://buildroot.net/downloads/sources/"
 BR2_SOURCEFORGE_MIRROR="easynews"
 BR2_KERNEL_MIRROR="http://www.kernel.org/pub/"
 BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu"
@@ -131,14 +113,13 @@ BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
-BR2_ROOTFS_PREFIX="rootfs"
-BR2_ROOTFS_SUFFIX="$(DATE)"
 BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
 BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=1
 # BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
 BR2_RECENT=y
+# BR2_CONFIG_CACHE is not set
 # BR2_ENABLE_DEBUG is not set
 BR2_STRIP_strip=y
 # BR2_STRIP_sstrip is not set
@@ -151,6 +132,7 @@ BR2_OPTIMIZE_S=y
 # BR2_PREFER_STATIC_LIB is not set
 # BR2_HAVE_MANPAGES is not set
 # BR2_HAVE_INFOPAGES is not set
+# BR2_HAVE_DOCUMENTATION is not set
 # BR2_HAVE_DEVFILES is not set
 BR2_UPDATE_CONFIG=y
 
@@ -163,71 +145,69 @@ BR2_TOOLCHAIN_EXTERNAL_SOURCE=y
 BR2_TOOLCHAIN_SOURCE=y
 # BR2_TOOLCHAIN_ATMEL_AVR32_4_1_2 is not set
 # BR2_TOOLCHAIN_ATMEL_AVR32_4_2_1 is not set
-BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2=y
-# BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3_ENABLE is not set
+# BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2 is not set
+BR2_TOOLCHAIN_ATMEL_AVR32_4_2_2_REV_2=y
 # BR2_TOOLCHAIN_ATMEL_AVR32_4_2_3 is not set
 # BR2_TOOLCHAIN_UNKNOWNVENDOR is not set
 BR2_TOOLCHAIN_ATMEL_AVR32=y
 BR2_VENDOR_SITE="$(BR2_ATMEL_MIRROR)"
 BR2_VENDOR_SUFFIX="-avr32"
-BR2_VENDOR_BINUTILS_RELEASE="-2.1.5"
-BR2_VENDOR_GCC_RELEASE="-2.1.5"
+BR2_VENDOR_BINUTILS_RELEASE="-1.0.1"
+BR2_VENDOR_GCC_RELEASE="-1.1.3"
 BR2_VENDOR_UCLIBC_RELEASE="-2.1.5"
 BR2_VENDOR_PATCH_DIR="Atmel/avr32"
 # BR2_EXT_GCC_VERSION_4_1_2 is not set
 # BR2_EXT_GCC_VERSION_4_2_1 is not set
 BR2_EXT_GCC_VERSION_4_2_2=y
 # BR2_EXT_GCC_VERSION_4_2_3 is not set
-BR2_EXT_BINUTILS_VERSION_2_17=y
-BR2_EXT_UCLIBC_VERSION_0_9_29=y
+# BR2_EXT_BINUTILS_VERSION_2_17 is not set
+BR2_EXT_BINUTILS_VERSION_2_18=y
 # BR2_EXT_UCLIBC_VERSION_0_9_28_3 is not set
+# BR2_EXT_UCLIBC_VERSION_0_9_29 is not set
+BR2_EXT_UCLIBC_VERSION_0_9_30=y
+# BR2_EXT_UCLIBC_VERSION_0_9_30_1 is not set
 
 #
 # Kernel Header Options
 #
-# BR2_KERNEL_HEADERS_2_4_25 is not set
-# BR2_KERNEL_HEADERS_2_4_27 is not set
-# BR2_KERNEL_HEADERS_2_4_29 is not set
-# BR2_KERNEL_HEADERS_2_4_31 is not set
-# BR2_KERNEL_HEADERS_2_6_9 is not set
-# BR2_KERNEL_HEADERS_2_6_11 is not set
-# BR2_KERNEL_HEADERS_2_6_12 is not set
-# BR2_KERNEL_HEADERS_2_6_20_4 is not set
-# BR2_KERNEL_HEADERS_2_6_20 is not set
-# BR2_KERNEL_HEADERS_2_6_21_5 is not set
-# BR2_KERNEL_HEADERS_2_6_21 is not set
-# BR2_KERNEL_HEADERS_2_6_22_1 is not set
-# BR2_KERNEL_HEADERS_2_6_22_10 is not set
-# BR2_KERNEL_HEADERS_2_6_22 is not set
 # BR2_KERNEL_HEADERS_2_6_23 is not set
-BR2_KERNEL_HEADERS_2_6_24=y
+# BR2_KERNEL_HEADERS_2_6_24 is not set
 # BR2_KERNEL_HEADERS_2_6_25 is not set
+# BR2_KERNEL_HEADERS_2_6_26 is not set
+# BR2_KERNEL_HEADERS_2_6_27 is not set
+# BR2_KERNEL_HEADERS_2_6_28 is not set
+BR2_KERNEL_HEADERS_2_6_29=y
 # BR2_KERNEL_HEADERS_SNAP is not set
-BR2_DEFAULT_KERNEL_HEADERS="2.6.24.7"
+BR2_DEFAULT_KERNEL_HEADERS="2.6.29.2"
 
 #
 # uClibc Options
 #
 # BR2_UCLIBC_VERSION_0_9_28_3 is not set
-BR2_UCLIBC_VERSION_0_9_29=y
+# BR2_UCLIBC_VERSION_0_9_29 is not set
+BR2_UCLIBC_VERSION_0_9_30=y
+# BR2_UCLIBC_VERSION_0_9_30_1 is not set
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
+BR2_UCLIBC_VERSION_STRING="0.9.30"
 BR2_UCLIBC_CONFIG="target/device/Atmel/uClibc.config.avr32"
-# BR2_ENABLE_LOCALE is not set
-# BR2_PTHREADS_NONE is not set
-# BR2_PTHREADS is not set
-BR2_PTHREADS_OLD=y
-# BR2_PTHREADS_NATIVE is not set
 # BR2_PTHREAD_DEBUG is not set
-# BR2_UCLIBC_PROGRAM_INVOCATION is not set
+# BR2_PROGRAM_INVOCATION is not set
+# BR2_UCLIBC_INSTALL_TEST_SUITE is not set
 
 #
 # Binutils Options
 #
-BR2_BINUTILS_VERSION_2_17=y
+# BR2_BINUTILS_VERSION_2_17 is not set
 # BR2_BINUTILS_VERSION_2_17_50_0_17 is not set
-# BR2_BINUTILS_VERSION_2_18 is not set
+BR2_BINUTILS_VERSION_2_18=y
 # BR2_BINUTILS_VERSION_2_18_50_0_1 is not set
-BR2_BINUTILS_VERSION="2.17"
+# BR2_BINUTILS_VERSION_2_18_50_0_3 is not set
+# BR2_BINUTILS_VERSION_2_18_50_0_6 is not set
+# BR2_BINUTILS_VERSION_2_18_50_0_8 is not set
+# BR2_BINUTILS_VERSION_2_18_50_0_9 is not set
+# BR2_BINUTILS_VERSION_2_19 is not set
+# BR2_BINUTILS_VERSION_2_19_1 is not set
+BR2_BINUTILS_VERSION="2.18"
 BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 
 #
@@ -241,14 +221,15 @@ BR2_GCC_VERSION_4_2_2=y
 # BR2_GCC_VERSION_4_2_3 is not set
 # BR2_GCC_VERSION_4_2_4 is not set
 # BR2_GCC_VERSION_4_3_1 is not set
+# BR2_GCC_VERSION_4_3_2 is not set
+# BR2_GCC_VERSION_4_3_3 is not set
+# BR2_GCC_VERSION_4_4_X is not set
 BR2_GCC_SUPPORTS_SYSROOT=y
 # BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set
 BR2_GCC_VERSION="4.2.2"
 # BR2_TOOLCHAIN_SYSROOT is not set
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
-BR2_GCC_CROSS_CXX=y
-# BR2_INSTALL_LIBSTDCPP is not set
 # BR2_GCC_SHARED_LIBGCC is not set
 
 #
@@ -266,42 +247,42 @@ BR2_GCC_CROSS_CXX=y
 #
 # Common Toolchain Options
 #
+BR2_LARGEFILE=y
+BR2_INET_IPV6=y
+BR2_INET_RPC=y
+# BR2_ENABLE_LOCALE is not set
+BR2_USE_WCHAR=y
+BR2_SOFT_FLOAT=y
+# BR2_USE_SSP is not set
+# BR2_PTHREADS_NONE is not set
+# BR2_PTHREADS is not set
+BR2_PTHREADS_OLD=y
+# BR2_PTHREADS_NATIVE is not set
+# BR2_INSTALL_LIBSTDCPP is not set
+BR2_TARGET_OPTIMIZATION="-Os -pipe"
 # BR2_MKLIBS is not set
 # BR2_PACKAGE_SSTRIP_TARGET is not set
 # BR2_PACKAGE_SSTRIP_HOST is not set
 # BR2_ENABLE_MULTILIB is not set
-BR2_LARGEFILE=y
-BR2_INET_IPV6=y
-BR2_INET_RPC=y
-BR2_USE_WCHAR=y
-BR2_SOFT_FLOAT=y
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
 # BR2_CROSS_TOOLCHAIN_TARGET_UTILS is not set
 
 #
 # Package Selection for the target
 #
 BR2_PACKAGE_BUSYBOX=y
-# BR2_BUSYBOX_VERSION_1_2_2_1 is not set
-# BR2_BUSYBOX_VERSION_1_6_1 is not set
-# BR2_BUSYBOX_VERSION_1_7_X is not set
-# BR2_BUSYBOX_VERSION_1_8_X is not set
-# BR2_BUSYBOX_VERSION_1_9_X is not set
-# BR2_BUSYBOX_VERSION_1_10_X is not set
-BR2_BUSYBOX_VERSION_1_11_X=y
+# BR2_BUSYBOX_VERSION_1_12_X is not set
+# BR2_BUSYBOX_VERSION_1_13_X is not set
+BR2_BUSYBOX_VERSION_1_14_X=y
 # BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.11.0"
+BR2_BUSYBOX_VERSION="1.14.0"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
-BR2_PACKAGE_BUSYBOX_CONFIG="$(BR2_BOARD_PATH)/busybox-$(BR2_BUSYBOX_VERSION).config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 BR2_PACKAGE_BUSYBOX_SKELETON=y
 
 #
 # The minimum needed to build a uClibc development system
 #
-# BR2_PACKAGE_BASH is not set
-# BR2_PACKAGE_BZIP2 is not set
-# BR2_PACKAGE_DIFFUTILS is not set
 # BR2_PACKAGE_FLEX is not set
 # BR2_PACKAGE_GCC_TARGET is not set
 # BR2_PACKAGE_MAKE is not set
@@ -321,10 +302,15 @@ BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_GETTEXT is not set
 # BR2_PACKAGE_LIBINTL is not set
 # BR2_PACKAGE_LIBGMP is not set
+# BR2_PACKAGE_GPERF is not set
 # BR2_PACKAGE_LIBMPFR is not set
 # BR2_PACKAGE_LIBTOOL is not set
 # BR2_PACKAGE_M4 is not set
-# BR2_PACKAGE_OPROFILE is not set
+
+#
+# oprofile requires a toolchain with C++ support enabled
+#
+# BR2_PACKAGE_PKG_CONFIG is not set
 # BR2_PACKAGE_READLINE is not set
 # BR2_PACKAGE_PCRE is not set
 
@@ -337,81 +323,91 @@ BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_BSDIFF is not set
 # BR2_PACKAGE_CUPS is not set
 # BR2_PACKAGE_CUSTOMIZE is not set
-# BR2_PACKAGE_DASH is not set
 # BR2_PACKAGE_FILE is not set
 # BR2_PACKAGE_GAMIN is not set
-# BR2_PACKAGE_ICU is not set
-# BR2_PACKAGE_IPKG is not set
+
+#
+# icu requires a toolchain with C++ support and WCHAR enabled
+#
 # BR2_PACKAGE_KEXEC is not set
+# BR2_PACKAGE_LIBCONFIG is not set
+# BR2_PACKAGE_LIBCONFUSE is not set
 BR2_PACKAGE_LIBDAEMON=y
 # BR2_PACKAGE_LIBELF is not set
 # BR2_PACKAGE_LIBEVENT is not set
-# BR2_PACKAGE_LIBFLOAT is not set
 # BR2_PACKAGE_LIBGCRYPT is not set
 # BR2_PACKAGE_LIBGPG_ERROR is not set
 # BR2_PACKAGE_LIBICONV is not set
+# BR2_PACKAGE_LIBIDN is not set
 # BR2_PACKAGE_LIBLOCKFILE is not set
+# BR2_PACKAGE_LIBOIL is not set
 # BR2_PACKAGE_LIBSYSFS is not set
 # BR2_PACKAGE_LOCKFILE_PROGS is not set
+# BR2_PACKAGE_LOGROTATE is not set
 # BR2_PACKAGE_LSOF is not set
 # BR2_PACKAGE_LTP-TESTSUITE is not set
 # BR2_PACKAGE_LTRACE is not set
-# BR2_PACKAGE_LTT is not set
+# BR2_PACKAGE_MEMSTAT is not set
 # BR2_PACKAGE_NG_SPICE_REWORK is not set
 # BR2_PACKAGE_POPT is not set
-# BR2_PACKAGE_PORTAGE is not set
 # BR2_PACKAGE_SCREEN is not set
-# BR2_PACKAGE_SQLITE is not set
+# BR2_PACKAGE_SHARED_MIME_INFO is not set
 # BR2_PACKAGE_STARTUP_NOTIFICATION is not set
 # BR2_PACKAGE_STRACE is not set
 # BR2_PACKAGE_SUDO is not set
-BR2_DATABASE_SUPPORT=y
-# BR2_PACKAGE_MYSQL_CLIENT is not set
-BR2_NETWORK_SUPPORT=y
+
+#
+# Database
+#
+
+#
+# Mysql client requires a toolchain with C++ support enabled
+#
+# BR2_PACKAGE_SQLITE is not set
+
+#
+# Networking
+#
 
 #
 # Networking applications
 #
-
-#
-# argus		- disabled (requires libpcap)
-#
+# BR2_PACKAGE_ARGUS is not set
 BR2_PACKAGE_AVAHI=y
 BR2_PACKAGE_AVAHI_AUTOIPD=y
-
-#
-# mDNS/DNS-SD daemon	- disabled (requires expat)
-#
+# BR2_PACKAGE_AVAHI_DAEMON is not set
 # BR2_PACKAGE_AXEL is not set
-# BR2_PACKAGE_BOA is not set
 # BR2_PACKAGE_BIND is not set
 # BR2_PACKAGE_BRIDGE is not set
-# BR2_PACKAGE_CURL is not set
-# BR2_PACKAGE_LIBCURL is not set
 # BR2_PACKAGE_DNSMASQ is not set
 # BR2_PACKAGE_DROPBEAR is not set
 # BR2_PACKAGE_ETHTOOL is not set
 # BR2_PACKAGE_HASERL is not set
 # BR2_PACKAGE_IFPLUGD is not set
-# BR2_PACKAGE_IRDA_UTILS is not set
-# BR2_PACKAGE_IPERF is not set
-# BR2_PACKAGE_IPROUTE2 is not set
 
 #
-# ipsec-tools	- disabled (requires openssl, flex and the flex library (libfl.a) )
+# iperf requires a toolchain with C++ support enabled
 #
+# BR2_PACKAGE_IPROUTE2 is not set
+# BR2_PACKAGE_IPSEC_TOOLS is not set
 # BR2_PACKAGE_IPTABLES is not set
 # BR2_PACKAGE_KISMET is not set
 # BR2_PACKAGE_L2TP is not set
 # BR2_PACKAGE_LIBCGI is not set
-# BR2_PACKAGE_LIBCGICC is not set
+
+#
+# libcgicc requires a toolchain with C++ support enabled
+#
+# BR2_PACKAGE_LIBCURL is not set
+# BR2_PACKAGE_LIBDNET is not set
 # BR2_PACKAGE_LIBEXOSIP2 is not set
 # BR2_PACKAGE_LIBOSIP2 is not set
 # BR2_PACKAGE_LIBPCAP is not set
+# BR2_PACKAGE_LIBSOUP is not set
+# BR2_PACKAGE_LIBUPNP is not set
 # BR2_PACKAGE_LINKS is not set
 # BR2_PACKAGE_LRZSZ is not set
 # BR2_PACKAGE_MDNSRESPONDER is not set
-# BR2_PACKAGE_MICROCOM is not set
 # BR2_PACKAGE_MIIDIAG is not set
 # BR2_PACKAGE_MROUTED is not set
 # BR2_PACKAGE_MUTT is not set
@@ -429,13 +425,12 @@ BR2_PACKAGE_AVAHI_AUTOIPD=y
 # BR2_PACKAGE_OPENSSH is not set
 # BR2_PACKAGE_OPENSSL is not set
 # BR2_PACKAGE_OPENVPN is not set
-# BR2_PACKAGE_OPENSWAN is not set
 # BR2_PACKAGE_PORTMAP is not set
 # BR2_PACKAGE_PPPD is not set
+# BR2_PACKAGE_RADVD is not set
 # BR2_PACKAGE_RP_PPPOE is not set
 # BR2_PACKAGE_PPTP_LINUX is not set
 # BR2_PACKAGE_PROFTPD is not set
-# BR2_PACKAGE_QUAGGA is not set
 
 #
 # quagga suite
@@ -458,32 +453,277 @@ BR2_PACKAGE_AVAHI_AUTOIPD=y
 # BR2_PACKAGE_TN5250 is not set
 # BR2_PACKAGE_TTCP is not set
 # BR2_PACKAGE_UDPCAST is not set
-
-#
-# vpnc		- disabled (requires libgcrypt and libgpg_error)
-#
+# BR2_PACKAGE_VPNC is not set
+# BR2_PACKAGE_VSFTPD is not set
 # BR2_PACKAGE_VTUN is not set
 # BR2_PACKAGE_WEBIF is not set
 # BR2_PACKAGE_WIRELESS_TOOLS is not set
-# BR2_BLOCKDEV_SUPPORT is not set
+# BR2_PACKAGE_WPA_SUPPLICANT is not set
+
+#
+# Hardware handling / blockdevices and filesystem maintenance
+#
+
+#
+# dbus not available (need expat or libxml2)
+#
+
+#
+# dbus-glib needs dbus to be compiled with expat support
+#
+# BR2_PACKAGE_DEVMEM2 is not set
+# BR2_PACKAGE_DM is not set
+# BR2_PACKAGE_DMRAID is not set
+# BR2_PACKAGE_E2FSPROGS is not set
+# BR2_PACKAGE_EEPROG is not set
+# BR2_PACKAGE_FCONFIG is not set
+# BR2_PACKAGE_FIS is not set
+# BR2_PACKAGE_LIBFUSE is not set
+# BR2_PACKAGE_GADGETFS_TEST is not set
+# BR2_PACKAGE_HAL is not set
+# BR2_PACKAGE_HWDATA is not set
+# BR2_PACKAGE_I2C_TOOLS is not set
+# BR2_PACKAGE_INPUT_TOOLS is not set
+# BR2_PACKAGE_IOSTAT is not set
+# BR2_PACKAGE_LIBAIO is not set
+# BR2_PACKAGE_LIBRAW1394 is not set
+# BR2_PACKAGE_LIBUSB is not set
+# BR2_PACKAGE_LM_SENSORS is not set
+# BR2_PACKAGE_LVM2 is not set
+# BR2_PACKAGE_MDADM is not set
+# BR2_PACKAGE_MEMTESTER is not set
+# BR2_PACKAGE_MKDOSFS is not set
 BR2_PACKAGE_MTD=y
-# BR2_AUDIO_SUPPORT is not set
-# BR2_GRAPHIC_SUPPORT is not set
-# BR2_COMPRESSOR_SUPPORT is not set
-# BR2_SCRIPTING_SUPPORT is not set
-BR2_XML_SUPPORT=y
+BR2_PACKAGE_MTD_UTILS=y
+# BR2_PACKAGE_MTD_20061007 is not set
+# BR2_PACKAGE_MTD_20050122 is not set
+# BR2_PACKAGE_MTD_UTILS_GIT is not set
+
+#
+# MTD tools selection
+#
+# BR2_PACKAGE_MTD_DOCFDISK is not set
+# BR2_PACKAGE_MTD_DOC_LOADBIOS is not set
+BR2_PACKAGE_MTD_FLASHCP=y
+BR2_PACKAGE_MTD_FLASH_ERASE=y
+BR2_PACKAGE_MTD_FLASH_ERASEALL=y
+BR2_PACKAGE_MTD_FLASH_INFO=y
+BR2_PACKAGE_MTD_FLASH_LOCK=y
+BR2_PACKAGE_MTD_FLASH_UNLOCK=y
+BR2_PACKAGE_MTD_FTL_CHECK=y
+BR2_PACKAGE_MTD_FTL_FORMAT=y
+BR2_PACKAGE_MTD_JFFS2DUMP=y
+BR2_PACKAGE_MTD_MKFSJFFS2=y
+# BR2_PACKAGE_MTD_MKFSJFFS is not set
+BR2_PACKAGE_MTD_MTD_DEBUG=y
+BR2_PACKAGE_MTD_NANDDUMP=y
+BR2_PACKAGE_MTD_NANDWRITE=y
+# BR2_PACKAGE_MTD_NFTL_FORMAT is not set
+# BR2_PACKAGE_MTD_NFTLDUMP is not set
+BR2_PACKAGE_MTD_SUMTOOL=y
+# BR2_PACKAGE_NTFS_3G is not set
+# BR2_PACKAGE_PCIUTILS is not set
+# BR2_PACKAGE_PCMCIA is not set
+# BR2_PACKAGE_SETSERIAL is not set
+# BR2_PACKAGE_SMARTMONTOOLS is not set
+# BR2_PACKAGE_USBMOUNT is not set
+# BR2_PACKAGE_USBUTILS is not set
+# BR2_PACKAGE_WIPE is not set
+# BR2_PACKAGE_XFSPROGS is not set
+
+#
+# Audio and video libraries and applications
+#
+# BR2_PACKAGE_ALSA_LIB is not set
+
+#
+# asterisk	- disabled (required openssl and mpg123)
+#
+# BR2_PACKAGE_AUMIX is not set
+# BR2_PACKAGE_FLAC is not set
+# BR2_PACKAGE_GSTREAMER is not set
+# BR2_PACKAGE_LIBID3TAG is not set
+# BR2_PACKAGE_LIBMAD is not set
+# BR2_PACKAGE_LIBMPD is not set
+# BR2_PACKAGE_LIBOGG is not set
+# BR2_PACKAGE_LIBSNDFILE is not set
+# BR2_PACKAGE_LIBTHEORA is not set
+# BR2_PACKAGE_LIBVORBIS is not set
+# BR2_PACKAGE_MADPLAY is not set
+# BR2_PACKAGE_MPG123 is not set
+# BR2_PACKAGE_MPLAYER is not set
+# BR2_PACKAGE_SPEEX is not set
+# BR2_PACKAGE_FESTIVAL is not set
+
+#
+# taglib requires a toolchain with C++ support enabled
+#
+# BR2_PACKAGE_VLC is not set
+
+#
+# Graphic libraries and applications (graphic/text)
+#
+
+#
+# text rendering libraries
+#
+# BR2_PACKAGE_NCURSES is not set
+# BR2_PACKAGE_NEWT is not set
+# BR2_PACKAGE_SLANG is not set
+
+#
+# text rendering applications
+#
+# BR2_PACKAGE_DIALOG is not set
+
+#
+# graphic libraries
+#
+# BR2_PACKAGE_DIRECTFB is not set
+# BR2_PACKAGE_FBDUMP is not set
+# BR2_PACKAGE_IMAGEMAGICK is not set
+# BR2_PACKAGE_JPEG is not set
+# BR2_PACKAGE_LIBART is not set
+# BR2_PACKAGE_LIBPNG is not set
+# BR2_PACKAGE_LIBUNGIF is not set
+# BR2_PACKAGE_LINUX_FUSION is not set
+# BR2_PACKAGE_PIXMAN is not set
+# BR2_PACKAGE_SDL is not set
+# BR2_PACKAGE_TIFF is not set
+
+#
+# busybox graphic applications
+#
+
+#
+# --> May be broken in busybox
+#
+# BR2_PACKAGE_FBV is not set
+# BR2_PACKAGE_FBSET is not set
+
+#
+# other GUIs
+#
+
+#
+# qtopia4 requires a toolchain with C++ support enabled
+#
+BR2_PACKAGE_XSERVER_none=y
+# BR2_PACKAGE_XSERVER_xorg is not set
+# BR2_PACKAGE_XSERVER_tinyx is not set
+
+#
+# xorg requires a toolchain with LOCALE, LARGEFILE and WCHAR support
+#
+
+#
+# X libraries and helper libraries
+#
+# BR2_PACKAGE_ATK is not set
+# BR2_PACKAGE_CAIRO is not set
+# BR2_PACKAGE_PANGO is not set
+# BR2_PACKAGE_LIBDRM is not set
+# BR2_PACKAGE_LIBERATION is not set
+# BR2_PACKAGE_LIBGLIB12 is not set
+# BR2_PACKAGE_LIBGLIB2 is not set
+# BR2_PACKAGE_OPENMOTIF is not set
+# BR2_PACKAGE_FONTCONFIG is not set
+# BR2_PACKAGE_FREETYPE is not set
+# BR2_PACKAGE_TSLIB is not set
+
+#
+# webkit requires a toolchain with C++ support and WCHAR enabled
+#
+
+#
+# X Window managers
+#
+# BR2_PACKAGE_MATCHBOX is not set
+
+#
+# X applications
+#
+# BR2_PACKAGE_ALSAMIXERGUI is not set
+
+#
+# dillo		- disabled (requires jpeg,libglib12,libgtk12,zlib,libpng and Xorg(7))
+#
+# BR2_PACKAGE_GQVIEW is not set
+# BR2_PACKAGE_GOB2 is not set
+# BR2_PACKAGE_LEAFPAD is not set
+
+#
+# midori		- disabled (requires Xorg(7))
+#
+# BR2_PACKAGE_PCMANFM is not set
+# BR2_PACKAGE_SYLPHEED is not set
+# BR2_PACKAGE_TORSMO is not set
+# BR2_PACKAGE_X11VNC is not set
+# BR2_PACKAGE_XPDF is not set
+# BR2_PACKAGE_XSTROKE is not set
+# BR2_PACKAGE_XVKBD is not set
+
+#
+# Compressors / decompressors
+#
+BR2_PACKAGE_LZO=y
+# BR2_PACKAGE_LZOP is not set
+
+#
+# lzma requires a toolchain with C++ support
+#
+# BR2_PACKAGE_LZMA_HOST is not set
+BR2_PACKAGE_ZLIB=y
+# BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
+
+#
+# Package managers
+#
+# BR2_PACKAGE_IPKG is not set
+# BR2_PACKAGE_PORTAGE is not set
+
+#
+# Interpreter languages / Scripting
+#
+# BR2_PACKAGE_LUA is not set
+# BR2_PACKAGE_MICROPERL is not set
+# BR2_PACKAGE_PYTHON is not set
+# BR2_PACKAGE_RUBY is not set
+# BR2_PACKAGE_TCL is not set
+# BR2_PACKAGE_PHP is not set
+
+#
+# XML handling
+#
 # BR2_PACKAGE_EXPAT is not set
 # BR2_PACKAGE_EZXML is not set
 # BR2_PACKAGE_LIBXML2 is not set
 # BR2_PACKAGE_LIBXSLT is not set
-# BR2_PACKAGE_XERCES is not set
-BR2_JAVA_SUPPORT=y
+
+#
+# xerces-c++ requires a toolchain with C++ support enabled
+#
+
+#
+# Java
+#
 # BR2_PACKAGE_CLASSPATH is not set
-# BR2_GAMES is not set
+
+#
+# Games
+#
+# BR2_PACKAGE_GNUCHESS is not set
+# BR2_PACKAGE_MAGICCUBE4D is not set
+# BR2_PACKAGE_PRBOOM is not set
+# BR2_PACKAGE_RUBIX is not set
+# BR2_PACKAGE_VICE is not set
+# BR2_PACKAGE_XBOARD is not set
 
 #
 # Target filesystem options
 #
+BR2_ROOTFS_PREFIX="rootfs"
+BR2_ROOTFS_SUFFIX="$(DATE)"
 
 #
 # filesystem for target device
@@ -494,6 +734,7 @@ BR2_JAVA_SUPPORT=y
 BR2_TARGET_ROOTFS_JFFS2=y
 # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_1056 is not set
 # BR2_TARGET_ROOTFS_JFFS2_DATAFLASH_528 is not set
+# BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_2K_128K is not set
 BR2_TARGET_ROOTFS_JFFS2_FLASH_128=y
 # BR2_TARGET_ROOTFS_JFFS2_FLASH_64 is not set
 # BR2_TARGET_ROOTFS_JFFS2_CUSTOM is not set
@@ -505,7 +746,6 @@ BR2_TARGET_ROOTFS_JFFS2_PAD=y
 BR2_TARGET_ROOTFS_JFFS2_PADSIZE=0x0
 # BR2_TARGET_ROOTFS_JFFS2_LE is not set
 BR2_TARGET_ROOTFS_JFFS2_BE=y
-# BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set
 # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
 BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
 BR2_TARGET_ROOTFS_JFFS2_COPYTO=""
@@ -525,7 +765,21 @@ BR2_TARGET_ROOTFS_TAR_COPYTO=""
 #
 # bootloader for target device
 #
-# BR2_TARGET_UBOOT is not set
+BR2_TARGET_UBOOT=y
+BR2_TARGET_UBOOT_BOARDNAME="atngw100"
+# BR2_TARGET_UBOOT_2009_03 is not set
+# BR2_TARGET_UBOOT_2009_01 is not set
+BR2_TARGET_UBOOT_2008_10=y
+# BR2_TARGET_UBOOT_1_3_4 is not set
+# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
+BR2_UBOOT_VERSION="2008.10"
+BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
+# BR2_TARGET_U_BOOT_ARCH_PATCH is not set
+BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+# BR2_TARGET_UBOOT_SILENT is not set
+# BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
+# BR2_TARGET_UBOOT_TOOL_ENV is not set
+# BR2_TARGET_UBOOT_DEFAULT_ENV is not set
 
 #
 # Kernel
@@ -537,46 +791,41 @@ BR2_KERNEL_LINUX_ADVANCED=y
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-2.6.22.5.config"
 BR2_PACKAGE_LINUX_FORMAT="uImage"
-BR2_KERNEL_CURRENT_VERSION="2.6.25.9"
-BR2_KERNEL_NEXT_VERSION="2.6.25"
-BR2_KERNEL_THIS_VERSION="2.6.24"
-BR2_KERNEL_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6/"
+BR2_KERNEL_CURRENT_VERSION="2.6.29.2"
+BR2_KERNEL_LATEST_2_6_29="2"
+BR2_KERNEL_LATEST_2_6_28="7"
+BR2_KERNEL_LATEST_2_6_27="13"
+BR2_KERNEL_LATEST_2_6_26="8"
+BR2_KERNEL_LATEST_2_6_25="19"
+BR2_KERNEL_LATEST_2_6_24="7"
+BR2_KERNEL_LATEST_2_6_23="17"
+BR2_KERNEL_LATEST_2_6_22="19"
+BR2_KERNEL_LATEST_2_6_21="7"
+BR2_KERNEL_LATEST_2_6_20="21"
+BR2_KERNEL_THIS_VERSION="2.6.29"
+BR2_KERNEL_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6"
 BR2_MM_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6"
 BR2_RC_MM_PATCH_DIR="$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)/2.6.$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)-mm$(BR2_KERNEL_MM_LEVEL)"
 # BR2_LINUX_2_6_STABLE is not set
+BR2_LINUX_2_6_29=y
+# BR2_LINUX_2_6_28 is not set
+# BR2_LINUX_2_6_27 is not set
+# BR2_LINUX_2_6_26 is not set
 # BR2_LINUX_2_6_25 is not set
-BR2_LINUX_2_6_24=y
+# BR2_LINUX_2_6_24 is not set
 # BR2_LINUX_2_6_23 is not set
-# BR2_LINUX_2_6_22_10 is not set
-# BR2_LINUX_2_6_22_1 is not set
 # BR2_LINUX_2_6_22 is not set
-# BR2_LINUX_2_6_21_7 is not set
-# BR2_LINUX_2_6_21_5 is not set
 # BR2_LINUX_2_6_21 is not set
 # BR2_LINUX_2_6_20 is not set
-# BR2_LINUX_2_6_26 is not set
-# BR2_LINUX_2_6_27 is not set
 # BR2_LINUX26_CUSTOM is not set
 
 #
 # Patches
 #
 # BR2_KERNEL_ADD_KERNEL_ORG_PATCH is not set
-# BR2_KERNEL_ADD_PATCH is not set
-BR2_KERNEL_ARCH_PATCH_ENABLED=y
-BR2_ARCH_AVR32_2_6_24=y
-# BR2_ARCH_AVR32_2_6_23 is not set
-# BR2_ARCH_AVR32_2_6_22_10 is not set
-# BR2_ARCH_AVR32_2_6_22_1 is not set
-# BR2_ARCH_AVR32_2_6_21_5 is not set
-# BR2_ARCH_AVR32_2_6_20_4 is not set
-# BR2_LINUX_AVR32_ISI_PATCH is not set
-# BR2_LINUX_AVR32_AC97_PATCH is not set
-# BR2_LINUX_AVR32_PSIF_PATCH is not set
+# BR2_KERNEL_ARCH_PATCH_ENABLED is not set
 BR2_LINUX_BSP_PATCH=""
-# BR2_KERNEL_PREPATCHED is not set
 BR2_KERNEL_BASE=y
-# BR2_KERNEL_LATEST is not set
 BR2_DOWNLOAD_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION)"
 BR2_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION)"
 
@@ -586,9 +835,6 @@ BR2_LINUX26_VERSION="$(BR2_KERNEL_THIS_VERSION)"
 BR2_PACKAGE_LINUX_USE_KCONFIG=y
 # BR2_PACKAGE_LINUX_USE_DEFCONFIG is not set
 # BR2_PACKAGE_LINUX_USE_XCONFIG is not set
-BR2_MAKE_XCONFIG=y
-# BR2_MAKE_MENUCONFIG is not set
-BR2_KERNEL_CONFIG_METHOD="xconfig"
 # BR2_LINUX_BIN_BZIMAGE is not set
 BR2_LINUX_BIN_UIMAGE=y
 # BR2_LINUX_BIN_VMLINUX is not set

configs/atngw100_defconfig

@@ -1,9 +1,9 @@
 #
 # Automatically generated make config: don't edit
-# Wed Apr 29 16:19:36 2009
+# Wed May 13 12:33:57 2009
 #
 BR2_HAVE_DOT_CONFIG=y
-BR2_VERSION="2009.05-svn"
+BR2_VERSION="2009.05-rc1"
 # BR2_alpha is not set
 # BR2_arm is not set
 # BR2_armeb is not set
@@ -69,8 +69,6 @@ BR2_TARGET_AVR32_ATNGW100=y
 # Secondary locations
 #
 BR2_TARGET_ATMEL_COPYTO=""
-BR2_KERNEL_ARCH_PATCH_VERSION="2.6.27.6"
-BR2_KERNEL_ARCH_PATCH_DIR="target/device/Atmel/arch-avr32/kernel-patches-$(BR2_KERNEL_ARCH_PATCH_VERSION)"
 # BR2_TARGET_VALKA is not set
 
 #
@@ -93,7 +91,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="zcat"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -117,7 +115,7 @@ BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
 BR2_GNU_TARGET_SUFFIX="linux-uclibc"
-BR2_JLEVEL=2
+BR2_JLEVEL=3
 # BR2_PREFER_IMA is not set
 # BR2_DEPRECATED is not set
 BR2_RECENT=y
@@ -178,10 +176,10 @@ BR2_EXT_UCLIBC_VERSION_0_9_30=y
 # BR2_KERNEL_HEADERS_2_6_25 is not set
 # BR2_KERNEL_HEADERS_2_6_26 is not set
 # BR2_KERNEL_HEADERS_2_6_27 is not set
-BR2_KERNEL_HEADERS_2_6_28=y
-# BR2_KERNEL_HEADERS_2_6_29 is not set
+# BR2_KERNEL_HEADERS_2_6_28 is not set
+BR2_KERNEL_HEADERS_2_6_29=y
 # BR2_KERNEL_HEADERS_SNAP is not set
-BR2_DEFAULT_KERNEL_HEADERS="2.6.28.9"
+BR2_DEFAULT_KERNEL_HEADERS="2.6.29.2"
 
 #
 # uClibc Options
@@ -194,7 +192,7 @@ BR2_UCLIBC_VERSION_0_9_30=y
 BR2_UCLIBC_VERSION_STRING="0.9.30"
 BR2_UCLIBC_CONFIG="target/device/Atmel/uClibc.config.avr32"
 # BR2_PTHREAD_DEBUG is not set
-# BR2_UCLIBC_PROGRAM_INVOCATION is not set
+# BR2_PROGRAM_INVOCATION is not set
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
 
 #
@@ -238,7 +236,8 @@ BR2_GCC_SHARED_LIBGCC=y
 #
 # Ccache Options
 #
-# BR2_CCACHE is not set
+BR2_CCACHE=y
+BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache"
 
 #
 # Gdb Options
@@ -246,14 +245,11 @@ BR2_GCC_SHARED_LIBGCC=y
 # BR2_PACKAGE_GDB is not set
 BR2_PACKAGE_GDB_SERVER=y
 BR2_PACKAGE_GDB_HOST=y
-# BR2_GDB_VERSION_6_2_1 is not set
-# BR2_GDB_VERSION_6_3 is not set
 # BR2_GDB_VERSION_6_4 is not set
 # BR2_GDB_VERSION_6_5 is not set
 # BR2_GDB_VERSION_6_6 is not set
 BR2_GDB_VERSION_6_7_1=y
 # BR2_GDB_VERSION_6_8 is not set
-# BR2_GDB_VERSION_SNAPSHOT is not set
 BR2_GDB_VERSION="6.7.1"
 
 #
@@ -267,7 +263,7 @@ BR2_ENABLE_LOCALE=y
 # BR2_ENABLE_LOCALE_PURGE is not set
 BR2_USE_WCHAR=y
 BR2_SOFT_FLOAT=y
-# BR2_USE_SSP is not set
+BR2_USE_SSP=y
 # BR2_PTHREADS_NONE is not set
 # BR2_PTHREADS is not set
 BR2_PTHREADS_OLD=y
@@ -286,13 +282,13 @@ BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
 #
 BR2_PACKAGE_BUSYBOX=y
 # BR2_BUSYBOX_VERSION_1_12_X is not set
-BR2_BUSYBOX_VERSION_1_13_X=y
-# BR2_BUSYBOX_VERSION_1_14_X is not set
+# BR2_BUSYBOX_VERSION_1_13_X is not set
+BR2_BUSYBOX_VERSION_1_14_X=y
 # BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.13.4"
+BR2_BUSYBOX_VERSION="1.14.0"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 BR2_PACKAGE_BUSYBOX_SKELETON=y
 
 #
@@ -360,6 +356,7 @@ BR2_PACKAGE_LIBICONV=y
 # BR2_PACKAGE_NG_SPICE_REWORK is not set
 # BR2_PACKAGE_POPT is not set
 # BR2_PACKAGE_SCREEN is not set
+# BR2_PACKAGE_SHARED_MIME_INFO is not set
 # BR2_PACKAGE_STARTUP_NOTIFICATION is not set
 BR2_PACKAGE_STRACE=y
 # BR2_PACKAGE_SUDO is not set
@@ -534,10 +531,7 @@ BR2_PACKAGE_MTD_MTD_DEBUG=y
 # BR2_PACKAGE_MTD_NFTL_FORMAT is not set
 # BR2_PACKAGE_MTD_NFTLDUMP is not set
 # BR2_PACKAGE_MTD_SUMTOOL is not set
-
-#
-# ntfs-3g requires a toolchain with LARGEFILE and WCHAR support
-#
+# BR2_PACKAGE_NTFS_3G is not set
 # BR2_PACKAGE_PCIUTILS is not set
 # BR2_PACKAGE_PCMCIA is not set
 # BR2_PACKAGE_SETSERIAL is not set
@@ -617,7 +611,7 @@ BR2_PACKAGE_LINUX_FUSION=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -652,6 +646,7 @@ BR2_PACKAGE_LIBGLIB2=y
 # dillo		- disabled (requires jpeg,libglib12,libgtk12,zlib,libpng and Xorg(7))
 #
 # BR2_PACKAGE_GQVIEW is not set
+# BR2_PACKAGE_GOB2 is not set
 # BR2_PACKAGE_LEAFPAD is not set
 
 #
@@ -670,7 +665,7 @@ BR2_PACKAGE_LIBGLIB2=y
 #
 BR2_PACKAGE_LZO=y
 # BR2_PACKAGE_LZOP is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -807,9 +802,10 @@ BR2_KERNEL_LINUX_ADVANCED=y
 # BR2_KERNEL_LINUX is not set
 # BR2_KERNEL_HURD is not set
 BR2_PACKAGE_LINUX=y
-BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-2.6.27.config"
+BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-2.6.29.2.config"
 BR2_PACKAGE_LINUX_FORMAT="uImage"
-BR2_KERNEL_CURRENT_VERSION="2.6.28.7"
+BR2_KERNEL_CURRENT_VERSION="2.6.29.2"
+BR2_KERNEL_LATEST_2_6_29="2"
 BR2_KERNEL_LATEST_2_6_28="7"
 BR2_KERNEL_LATEST_2_6_27="13"
 BR2_KERNEL_LATEST_2_6_26="8"
@@ -819,16 +815,16 @@ BR2_KERNEL_LATEST_2_6_23="17"
 BR2_KERNEL_LATEST_2_6_22="19"
 BR2_KERNEL_LATEST_2_6_21="7"
 BR2_KERNEL_LATEST_2_6_20="21"
-BR2_KERNEL_PATCH_LEVEL="13"
-BR2_KERNEL_NEXT_VERSION="2.6.28"
-BR2_KERNEL_THIS_VERSION="2.6.27"
+BR2_KERNEL_PATCH_LEVEL="2"
+BR2_KERNEL_THIS_VERSION="2.6.29"
 BR2_KERNEL_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6"
 BR2_MM_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6"
 BR2_RC_MM_PATCH_DIR="$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)/2.6.$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)-mm$(BR2_KERNEL_MM_LEVEL)"
 BR2_KERNEL_PATCH_SITE="$(BR2_KERNEL_SITE)"
 # BR2_LINUX_2_6_STABLE is not set
+BR2_LINUX_2_6_29=y
 # BR2_LINUX_2_6_28 is not set
-BR2_LINUX_2_6_27=y
+# BR2_LINUX_2_6_27 is not set
 # BR2_LINUX_2_6_26 is not set
 # BR2_LINUX_2_6_25 is not set
 # BR2_LINUX_2_6_24 is not set
@@ -836,7 +832,6 @@ BR2_LINUX_2_6_27=y
 # BR2_LINUX_2_6_22 is not set
 # BR2_LINUX_2_6_21 is not set
 # BR2_LINUX_2_6_20 is not set
-# BR2_LINUX_2_6_29 is not set
 # BR2_LINUX26_CUSTOM is not set
 
 #
@@ -853,9 +848,7 @@ BR2_KERNEL_ADD_LATEST_MINORPATCH=y
 # BR2_KERNEL_ADD_LATEST_MM_PATCH is not set
 # BR2_KERNEL_ADD_MM_PATCH is not set
 BR2_KERNEL_ADD_PATCH=y
-BR2_KERNEL_ARCH_PATCH_ENABLED=y
-# BR2_ARCH_AVR32_2_6_28_2 is not set
-BR2_ARCH_AVR32_2_6_27_6=y
+# BR2_KERNEL_ARCH_PATCH_ENABLED is not set
 BR2_LINUX_BSP_PATCH=""
 BR2_KERNEL_PATCH="patch-$(BR2_DOWNLOAD_LINUX26_VERSION).$(BR2_KERNEL_PATCH_LEVEL).bz2"
 BR2_EXTRA_VERSION=".$(BR2_KERNEL_PATCH_LEVEL)"

configs/atstk1005_defconfig

@@ -89,7 +89,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="zcat"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -197,7 +197,7 @@ BR2_UCLIBC_VERSION_0_9_30=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
 BR2_UCLIBC_CONFIG="target/device/Atmel/uClibc.config.avr32"
 # BR2_PTHREAD_DEBUG is not set
-# BR2_UCLIBC_PROGRAM_INVOCATION is not set
+# BR2_PROGRAM_INVOCATION is not set
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
 
 #
@@ -296,7 +296,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.4"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 BR2_PACKAGE_BUSYBOX_SKELETON=y
 
 #
@@ -656,7 +656,7 @@ BR2_PACKAGE_NCURSES=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -707,7 +707,7 @@ BR2_PACKAGE_LIBGLIB2=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set

configs/atstk100x_defconfig

@@ -90,7 +90,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="zcat"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -191,7 +191,7 @@ BR2_UCLIBC_VERSION_0_9_30=y
 BR2_UCLIBC_VERSION_STRING="0.9.30"
 BR2_UCLIBC_CONFIG="target/device/Atmel/uClibc.config.avr32"
 # BR2_PTHREAD_DEBUG is not set
-BR2_UCLIBC_PROGRAM_INVOCATION=y
+BR2_PROGRAM_INVOCATION=y
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
 
 #
@@ -289,7 +289,7 @@ BR2_BUSYBOX_VERSION_1_14_X=y
 BR2_BUSYBOX_VERSION="1.14.0"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="target/device/Atmel/atstk100x/busybox-1.9.1.config"
-# BR2_PACKAGE_BUSYBOX_HIDE_OTHERS is not set
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_BUSYBOX_SKELETON=y
 
 #
@@ -686,14 +686,13 @@ BR2_PACKAGE_FBSET=y
 #
 # other GUIs
 #
-BR2_PACKAGE_QTOPIA4=y
-# BR2_PACKAGE_QTOPIA4_DEBUG is not set
-BR2_PACKAGE_QTOPIA4_SHARED=y
-# BR2_PACKAGE_QTOPIA4_STATIC is not set
-# BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL is not set
-# BR2_PACKAGE_QTOPIA4_LICENSE_APPROVED is not set
-# BR2_PACKAGE_QTOPIA4_QT3SUPPORT is not set
-BR2_PACKAGE_QTOPIA4_GUI_MODULE=y
+BR2_PACKAGE_QT=y
+# BR2_PACKAGE_QT_DEBUG is not set
+BR2_PACKAGE_QT_SHARED=y
+# BR2_PACKAGE_QT_STATIC is not set
+# BR2_PACKAGE_QT_LICENSE_APPROVED is not set
+# BR2_PACKAGE_QT_QT3SUPPORT is not set
+BR2_PACKAGE_QT_GUI_MODULE=y
 
 #
 # Pixel depths
@@ -702,63 +701,62 @@ BR2_PACKAGE_QTOPIA4_GUI_MODULE=y
 #
 # Deselecting each option leads to Qt's default (8,16,32)
 #
-# BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_ALL is not set
-# BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_1 is not set
-# BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_4 is not set
-BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_8=y
-# BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_12 is not set
-# BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_15 is not set
-BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_16=y
-# BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_18 is not set
-# BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_24 is not set
-BR2_PACKAGE_QTOPIA4_PIXEL_DEPTH_32=y
-BR2_PACKAGE_QTOPIA4_GIF=y
-BR2_PACKAGE_QTOPIA4_LIBMNG=y
-BR2_PACKAGE_QTOPIA4_NOJPEG=y
-# BR2_PACKAGE_QTOPIA4_SYSTEMJPEG is not set
-# BR2_PACKAGE_QTOPIA4_QTJPEG is not set
-BR2_PACKAGE_QTOPIA4_NOPNG=y
-# BR2_PACKAGE_QTOPIA4_SYSTEMPNG is not set
-# BR2_PACKAGE_QTOPIA4_QTPNG is not set
-BR2_PACKAGE_QTOPIA4_NOTIFF=y
-# BR2_PACKAGE_QTOPIA4_SYSTEMTIFF is not set
-# BR2_PACKAGE_QTOPIA4_QTTIFF is not set
-BR2_PACKAGE_QTOPIA4_QTZLIB=y
-# BR2_PACKAGE_QTOPIA4_SYSTEMZLIB is not set
-BR2_PACKAGE_QTOPIA4_NOFREETYPE=y
-# BR2_PACKAGE_QTOPIA4_QTFREETYPE is not set
-# BR2_PACKAGE_QTOPIA4_SYSTEMFREETYPE is not set
-BR2_PACKAGE_QTOPIA4_EMB_PLATFORM="$(ARCH)"
-# BR2_PACKAGE_QTOPIA4_SQL_MODULE is not set
+# BR2_PACKAGE_QT_PIXEL_DEPTH_1 is not set
+# BR2_PACKAGE_QT_PIXEL_DEPTH_4 is not set
+BR2_PACKAGE_QT_PIXEL_DEPTH_8=y
+# BR2_PACKAGE_QT_PIXEL_DEPTH_12 is not set
+# BR2_PACKAGE_QT_PIXEL_DEPTH_15 is not set
+BR2_PACKAGE_QT_PIXEL_DEPTH_16=y
+# BR2_PACKAGE_QT_PIXEL_DEPTH_18 is not set
+# BR2_PACKAGE_QT_PIXEL_DEPTH_24 is not set
+BR2_PACKAGE_QT_PIXEL_DEPTH_32=y
+BR2_PACKAGE_QT_GIF=y
+BR2_PACKAGE_QT_LIBMNG=y
+BR2_PACKAGE_QT_NOJPEG=y
+# BR2_PACKAGE_QT_SYSTEMJPEG is not set
+# BR2_PACKAGE_QT_QTJPEG is not set
+BR2_PACKAGE_QT_NOPNG=y
+# BR2_PACKAGE_QT_SYSTEMPNG is not set
+# BR2_PACKAGE_QT_QTPNG is not set
+BR2_PACKAGE_QT_NOTIFF=y
+# BR2_PACKAGE_QT_SYSTEMTIFF is not set
+# BR2_PACKAGE_QT_QTTIFF is not set
+BR2_PACKAGE_QT_QTZLIB=y
+# BR2_PACKAGE_QT_SYSTEMZLIB is not set
+BR2_PACKAGE_QT_NOFREETYPE=y
+# BR2_PACKAGE_QT_QTFREETYPE is not set
+# BR2_PACKAGE_QT_SYSTEMFREETYPE is not set
+BR2_PACKAGE_QT_EMB_PLATFORM="$(ARCH)"
+# BR2_PACKAGE_QT_SQL_MODULE is not set
 
 #
 # Graphics drivers
 #
-BR2_PACKAGE_QTOPIA4_GFX_LINUXFB=y
-# BR2_PACKAGE_QTOPIA4_GFX_TRANSFORMED is not set
-# BR2_PACKAGE_QTOPIA4_GFX_QVFB is not set
-# BR2_PACKAGE_QTOPIA4_GFX_VNC is not set
-# BR2_PACKAGE_QTOPIA4_GFX_MULTISCREEN is not set
+BR2_PACKAGE_QT_GFX_LINUXFB=y
+# BR2_PACKAGE_QT_GFX_TRANSFORMED is not set
+# BR2_PACKAGE_QT_GFX_QVFB is not set
+# BR2_PACKAGE_QT_GFX_VNC is not set
+# BR2_PACKAGE_QT_GFX_MULTISCREEN is not set
 
 #
 # Mouse drivers
 #
-# BR2_PACKAGE_QTOPIA4_MOUSE_PC is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_BUS is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_LINUXTP is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_YOPY is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_VR41XX is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_TSLIB is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_QVFB is not set
-# BR2_PACKAGE_QTOPIA4_PHONON is not set
-BR2_PACKAGE_QTOPIA4_XML=y
-# BR2_PACKAGE_QTOPIA4_XMLPATTERNS is not set
-# BR2_PACKAGE_QTOPIA4_SVG is not set
-BR2_PACKAGE_QTOPIA4_NETWORK=y
-# BR2_PACKAGE_QTOPIA4_WEBKIT is not set
-# BR2_PACKAGE_QTOPIA4_OPENSSL is not set
-BR2_PACKAGE_QTOPIA4_SCRIPT=y
-# BR2_PACKAGE_QTOPIA4_SCRIPTTOOLS is not set
+# BR2_PACKAGE_QT_MOUSE_PC is not set
+# BR2_PACKAGE_QT_MOUSE_BUS is not set
+# BR2_PACKAGE_QT_MOUSE_LINUXTP is not set
+# BR2_PACKAGE_QT_MOUSE_YOPY is not set
+# BR2_PACKAGE_QT_MOUSE_VR41XX is not set
+# BR2_PACKAGE_QT_MOUSE_TSLIB is not set
+# BR2_PACKAGE_QT_MOUSE_QVFB is not set
+# BR2_PACKAGE_QT_PHONON is not set
+BR2_PACKAGE_QT_XML=y
+# BR2_PACKAGE_QT_XMLPATTERNS is not set
+# BR2_PACKAGE_QT_SVG is not set
+BR2_PACKAGE_QT_NETWORK=y
+# BR2_PACKAGE_QT_WEBKIT is not set
+# BR2_PACKAGE_QT_OPENSSL is not set
+BR2_PACKAGE_QT_SCRIPT=y
+# BR2_PACKAGE_QT_SCRIPTTOOLS is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -812,7 +810,7 @@ BR2_PACKAGE_LIBGLIB2=y
 # BR2_PACKAGE_GZIP is not set
 BR2_PACKAGE_LZO=y
 # BR2_PACKAGE_LZOP is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set

configs/i386_defconfig

@@ -1,9 +1,9 @@
 #
 # Automatically generated make config: don't edit
-# Thu Jan 29 19:58:33 2009
+# Wed May 13 01:39:19 2009
 #
 BR2_HAVE_DOT_CONFIG=y
-BR2_VERSION="2009.02-svn"
+BR2_VERSION="2009.05-rc1"
 # BR2_alpha is not set
 # BR2_arm is not set
 # BR2_armeb is not set
@@ -21,10 +21,10 @@ BR2_i386=y
 # BR2_sparc is not set
 # BR2_sparc64 is not set
 # BR2_x86_64 is not set
-# BR2_x86_i386 is not set
+BR2_x86_i386=y
 # BR2_x86_i486 is not set
 # BR2_x86_i586 is not set
-BR2_x86_i686=y
+# BR2_x86_i686 is not set
 # BR2_x86_pentiumpro is not set
 # BR2_x86_pentium_mmx is not set
 # BR2_x86_pentium_m is not set
@@ -45,10 +45,10 @@ BR2_x86_i686=y
 # BR2_x86_c3 is not set
 # BR2_x86_winchip_c6 is not set
 # BR2_x86_winchip2 is not set
-BR2_ARCH="i686"
+BR2_ARCH="i386"
 BR2_ENDIAN="LITTLE"
-BR2_GCC_TARGET_TUNE="i686"
-BR2_GCC_TARGET_ARCH="i686"
+BR2_GCC_TARGET_TUNE="i386"
+BR2_GCC_TARGET_ARCH="i386"
 
 #
 # Target options
@@ -64,17 +64,22 @@ BR2_BANNER="Welcome to the Erik's uClibc development environment."
 #
 # Preset Devices
 #
-BR2_BOARD_NAME="i386"
+# BR2_TARGET_AMD is not set
+BR2_BOARD_NAME="i686"
 BR2_BOARD_PATH="target/device/x86/$(BR2_BOARD_NAME)"
 BR2_TARGET_X86=y
-BR2_TARGET_I386=y
+BR2_TARGET_I686=y
 
 #
 # Generic System Support
 #
 # BR2_TARGET_GENERIC_ACCESS_POINT is not set
 # BR2_TARGET_GENERIC_FIREWALL is not set
-# BR2_TARGET_GENERIC_DEV_SYSTEM is not set
+
+#
+# Generic development system requires a toolchain with WCHAR and PROGRAM_INVOCATION support
+#
+# BR2_TARGET_GENERIC_GETTY is not set
 
 #
 # Build options
@@ -86,7 +91,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -108,8 +113,6 @@ BR2_STAGING_DIR="$(BUILD_DIR)/staging_dir"
 # BR2_FPU_SUFFIX is not set
 BR2_TOPDIR_PREFIX=""
 BR2_TOPDIR_SUFFIX=""
-BR2_ROOTFS_PREFIX="rootfs"
-BR2_ROOTFS_SUFFIX=""
 BR2_GNU_BUILD_SUFFIX="pc-linux-gnu"
 BR2_GNU_TARGET_SUFFIX="linux-uclibc"
 BR2_JLEVEL=1
@@ -149,43 +152,33 @@ BR2_EXT_BINUTILS_VERSION_2_18=y
 BR2_EXT_UCLIBC_VERSION_0_9_28_3=y
 BR2_EXT_UCLIBC_VERSION_0_9_29=y
 BR2_EXT_UCLIBC_VERSION_0_9_30=y
+BR2_EXT_UCLIBC_VERSION_0_9_30_1=y
 
 #
 # Kernel Header Options
 #
-# BR2_KERNEL_HEADERS_2_4_31 is not set
-# BR2_KERNEL_HEADERS_2_6_20_4 is not set
-# BR2_KERNEL_HEADERS_2_6_20 is not set
-# BR2_KERNEL_HEADERS_2_6_21_5 is not set
-# BR2_KERNEL_HEADERS_2_6_21 is not set
-# BR2_KERNEL_HEADERS_2_6_22_1 is not set
-# BR2_KERNEL_HEADERS_2_6_22_10 is not set
-# BR2_KERNEL_HEADERS_2_6_22 is not set
 # BR2_KERNEL_HEADERS_2_6_23 is not set
 # BR2_KERNEL_HEADERS_2_6_24 is not set
 # BR2_KERNEL_HEADERS_2_6_25 is not set
 # BR2_KERNEL_HEADERS_2_6_26 is not set
 # BR2_KERNEL_HEADERS_2_6_27 is not set
-BR2_KERNEL_HEADERS_2_6_28=y
+# BR2_KERNEL_HEADERS_2_6_28 is not set
+BR2_KERNEL_HEADERS_2_6_29=y
 # BR2_KERNEL_HEADERS_SNAP is not set
-BR2_DEFAULT_KERNEL_HEADERS="2.6.28.2"
+BR2_DEFAULT_KERNEL_HEADERS="2.6.29.2"
 
 #
 # uClibc Options
 #
 # BR2_UCLIBC_VERSION_0_9_28_3 is not set
-BR2_UCLIBC_VERSION_0_9_29=y
+# BR2_UCLIBC_VERSION_0_9_29 is not set
 # BR2_UCLIBC_VERSION_0_9_30 is not set
+BR2_UCLIBC_VERSION_0_9_30_1=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
+BR2_UCLIBC_VERSION_STRING="0.9.30.1"
 BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.29.config"
-BR2_ENABLE_LOCALE=y
-# BR2_ENABLE_LOCALE_PREGENERATED is not set
-# BR2_PTHREADS_NONE is not set
-# BR2_PTHREADS is not set
-BR2_PTHREADS_OLD=y
-# BR2_PTHREADS_NATIVE is not set
 # BR2_PTHREAD_DEBUG is not set
-# BR2_UCLIBC_PROGRAM_INVOCATION is not set
+# BR2_PROGRAM_INVOCATION is not set
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
 
 #
@@ -193,14 +186,15 @@ BR2_PTHREADS_OLD=y
 #
 # BR2_BINUTILS_VERSION_2_17 is not set
 # BR2_BINUTILS_VERSION_2_17_50_0_17 is not set
-BR2_BINUTILS_VERSION_2_18=y
+# BR2_BINUTILS_VERSION_2_18 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_1 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_3 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_6 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_8 is not set
 # BR2_BINUTILS_VERSION_2_18_50_0_9 is not set
 # BR2_BINUTILS_VERSION_2_19 is not set
-BR2_BINUTILS_VERSION="2.18"
+BR2_BINUTILS_VERSION_2_19_1=y
+BR2_BINUTILS_VERSION="2.19.1"
 BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 
 #
@@ -214,16 +208,16 @@ BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 # BR2_GCC_VERSION_4_2_3 is not set
 # BR2_GCC_VERSION_4_2_4 is not set
 # BR2_GCC_VERSION_4_3_1 is not set
-BR2_GCC_VERSION_4_3_2=y
+# BR2_GCC_VERSION_4_3_2 is not set
+# BR2_GCC_VERSION_4_3_3 is not set
+BR2_GCC_VERSION_4_4_X=y
 BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
-BR2_GCC_VERSION="4.3.2"
+BR2_GCC_VERSION="4.4.0"
 BR2_TOOLCHAIN_SYSROOT=y
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
-BR2_GCC_CROSS_CXX=y
 # BR2_GCC_CROSS_FORTRAN is not set
-BR2_INSTALL_LIBSTDCPP=y
 # BR2_INSTALL_LIBGCJ is not set
 # BR2_INSTALL_OBJC is not set
 # BR2_INSTALL_FORTRAN is not set
@@ -240,48 +234,49 @@ BR2_GCC_SHARED_LIBGCC=y
 # BR2_PACKAGE_GDB is not set
 BR2_PACKAGE_GDB_SERVER=y
 # BR2_PACKAGE_GDB_HOST is not set
-# BR2_GDB_VERSION_6_2_1 is not set
-# BR2_GDB_VERSION_6_3 is not set
 # BR2_GDB_VERSION_6_4 is not set
 # BR2_GDB_VERSION_6_5 is not set
 # BR2_GDB_VERSION_6_6 is not set
 # BR2_GDB_VERSION_6_7_1 is not set
 BR2_GDB_VERSION_6_8=y
-# BR2_GDB_VERSION_SNAPSHOT is not set
 BR2_GDB_VERSION="6.8"
 
 #
 # Common Toolchain Options
 #
+BR2_LARGEFILE=y
+BR2_INET_IPV6=y
+BR2_INET_RPC=y
+BR2_ENABLE_LOCALE=y
+# BR2_ENABLE_LOCALE_PREGENERATED is not set
+# BR2_ENABLE_LOCALE_PURGE is not set
+BR2_USE_WCHAR=y
+# BR2_USE_SSP is not set
+# BR2_PTHREADS_NONE is not set
+# BR2_PTHREADS is not set
+BR2_PTHREADS_OLD=y
+# BR2_PTHREADS_NATIVE is not set
+BR2_GCC_CROSS_CXX=y
+BR2_INSTALL_LIBSTDCPP=y
+BR2_TARGET_OPTIMIZATION="-Os -pipe"
 # BR2_MKLIBS is not set
 # BR2_PACKAGE_SSTRIP_TARGET is not set
 # BR2_PACKAGE_SSTRIP_HOST is not set
 # BR2_ENABLE_MULTILIB is not set
-BR2_LARGEFILE=y
-BR2_INET_IPV6=y
-BR2_INET_RPC=y
-BR2_USE_WCHAR=y
-BR2_TARGET_OPTIMIZATION="-Os -pipe"
 BR2_CROSS_TOOLCHAIN_TARGET_UTILS=y
 
 #
 # Package Selection for the target
 #
 BR2_PACKAGE_BUSYBOX=y
-# BR2_BUSYBOX_VERSION_1_2_2_1 is not set
-# BR2_BUSYBOX_VERSION_1_6_1 is not set
-# BR2_BUSYBOX_VERSION_1_7_X is not set
-# BR2_BUSYBOX_VERSION_1_8_X is not set
-# BR2_BUSYBOX_VERSION_1_9_X is not set
-# BR2_BUSYBOX_VERSION_1_10_X is not set
-# BR2_BUSYBOX_VERSION_1_11_X is not set
 # BR2_BUSYBOX_VERSION_1_12_X is not set
-BR2_BUSYBOX_VERSION_1_13_X=y
+# BR2_BUSYBOX_VERSION_1_13_X is not set
+BR2_BUSYBOX_VERSION_1_14_X=y
 # BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.13.4"
+BR2_BUSYBOX_VERSION="1.14.0"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
@@ -311,6 +306,7 @@ BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_LIBTOOL is not set
 # BR2_PACKAGE_M4 is not set
 # BR2_PACKAGE_OPROFILE is not set
+# BR2_PACKAGE_PKG_CONFIG is not set
 # BR2_PACKAGE_READLINE is not set
 # BR2_PACKAGE_VALGRIND is not set
 # BR2_PACKAGE_PCRE is not set
@@ -322,7 +318,10 @@ BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_BEECRYPT is not set
 # BR2_PACKAGE_BERKELEYDB is not set
 # BR2_PACKAGE_BSDIFF is not set
-# BR2_PACKAGE_CUPS is not set
+
+#
+# cups requires a toolchain with Stack Protection support
+#
 # BR2_PACKAGE_CUSTOMIZE is not set
 # BR2_PACKAGE_FILE is not set
 # BR2_PACKAGE_GAMIN is not set
@@ -349,6 +348,7 @@ BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_NG_SPICE_REWORK is not set
 # BR2_PACKAGE_POPT is not set
 # BR2_PACKAGE_SCREEN is not set
+# BR2_PACKAGE_SHARED_MIME_INFO is not set
 # BR2_PACKAGE_STARTUP_NOTIFICATION is not set
 # BR2_PACKAGE_STRACE is not set
 # BR2_PACKAGE_SUDO is not set
@@ -378,10 +378,7 @@ BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_IFPLUGD is not set
 # BR2_PACKAGE_IPERF is not set
 # BR2_PACKAGE_IPROUTE2 is not set
-
-#
-# ipsec-tools	- disabled (requires openssl, flex and the flex library (libfl.a) )
-#
+# BR2_PACKAGE_IPSEC_TOOLS is not set
 # BR2_PACKAGE_IPTABLES is not set
 # BR2_PACKAGE_KISMET is not set
 # BR2_PACKAGE_L2TP is not set
@@ -392,11 +389,11 @@ BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_LIBEXOSIP2 is not set
 # BR2_PACKAGE_LIBOSIP2 is not set
 # BR2_PACKAGE_LIBPCAP is not set
+# BR2_PACKAGE_LIBSOUP is not set
 # BR2_PACKAGE_LIBUPNP is not set
 # BR2_PACKAGE_LINKS is not set
 # BR2_PACKAGE_LRZSZ is not set
 # BR2_PACKAGE_MDNSRESPONDER is not set
-# BR2_PACKAGE_MICROCOM is not set
 # BR2_PACKAGE_MIIDIAG is not set
 # BR2_PACKAGE_MROUTED is not set
 # BR2_PACKAGE_MUTT is not set
@@ -414,7 +411,6 @@ BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_OPENSSH is not set
 # BR2_PACKAGE_OPENSSL is not set
 # BR2_PACKAGE_OPENVPN is not set
-# BR2_PACKAGE_OPENSWAN is not set
 # BR2_PACKAGE_PORTMAP is not set
 # BR2_PACKAGE_PPPD is not set
 # BR2_PACKAGE_RADVD is not set
@@ -448,6 +444,7 @@ BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_VTUN is not set
 # BR2_PACKAGE_WEBIF is not set
 # BR2_PACKAGE_WIRELESS_TOOLS is not set
+# BR2_PACKAGE_WPA_SUPPLICANT is not set
 
 #
 # Hardware handling / blockdevices and filesystem maintenance
@@ -457,6 +454,10 @@ BR2_HOST_FAKEROOT=y
 #
 # dbus not available (need expat or libxml2)
 #
+
+#
+# dbus-glib needs dbus to be compiled with expat support
+#
 # BR2_PACKAGE_DEVMEM2 is not set
 # BR2_PACKAGE_DM is not set
 # BR2_PACKAGE_DMRAID is not set
@@ -507,7 +508,7 @@ BR2_PACKAGE_MTD_NANDWRITE=y
 BR2_PACKAGE_MTD_NFTL_FORMAT=y
 BR2_PACKAGE_MTD_NFTLDUMP=y
 BR2_PACKAGE_MTD_SUMTOOL=y
-# BR2_PACKAGE_NTFS-3G is not set
+# BR2_PACKAGE_NTFS_3G is not set
 # BR2_PACKAGE_PCIUTILS is not set
 # BR2_PACKAGE_PCMCIA is not set
 # BR2_PACKAGE_SETSERIAL is not set
@@ -526,6 +527,7 @@ BR2_PACKAGE_MTD_SUMTOOL=y
 # asterisk	- disabled (required openssl and mpg123)
 #
 # BR2_PACKAGE_AUMIX is not set
+# BR2_PACKAGE_FLAC is not set
 # BR2_PACKAGE_GSTREAMER is not set
 # BR2_PACKAGE_LIBID3TAG is not set
 # BR2_PACKAGE_LIBMAD is not set
@@ -533,15 +535,13 @@ BR2_PACKAGE_MTD_SUMTOOL=y
 # BR2_PACKAGE_LIBOGG is not set
 # BR2_PACKAGE_LIBSNDFILE is not set
 # BR2_PACKAGE_LIBTHEORA is not set
-
-#
-# libvorbis requires the package libogg to build
-#
+# BR2_PACKAGE_LIBVORBIS is not set
 # BR2_PACKAGE_MADPLAY is not set
 # BR2_PACKAGE_MPG123 is not set
 # BR2_PACKAGE_MPLAYER is not set
 # BR2_PACKAGE_SPEEX is not set
 # BR2_PACKAGE_FESTIVAL is not set
+# BR2_PACKAGE_TAGLIB is not set
 # BR2_PACKAGE_VLC is not set
 
 #
@@ -588,7 +588,7 @@ BR2_PACKAGE_MTD_SUMTOOL=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -597,6 +597,7 @@ BR2_PACKAGE_XSERVER_none=y
 # X libraries and helper libraries
 #
 # BR2_PACKAGE_ATK is not set
+# BR2_PACKAGE_CAIRO is not set
 # BR2_PACKAGE_PANGO is not set
 # BR2_PACKAGE_LIBDRM is not set
 # BR2_PACKAGE_LIBERATION is not set
@@ -622,6 +623,7 @@ BR2_PACKAGE_XSERVER_none=y
 # dillo		- disabled (requires jpeg,libglib12,libgtk12,zlib,libpng and Xorg(7))
 #
 # BR2_PACKAGE_GQVIEW is not set
+# BR2_PACKAGE_GOB2 is not set
 # BR2_PACKAGE_LEAFPAD is not set
 
 #
@@ -639,7 +641,8 @@ BR2_PACKAGE_XSERVER_none=y
 # Compressors / decompressors
 #
 BR2_PACKAGE_LZO=y
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZOP is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -687,6 +690,8 @@ BR2_PACKAGE_ZLIB=y
 #
 # Target filesystem options
 #
+BR2_ROOTFS_PREFIX="rootfs"
+BR2_ROOTFS_SUFFIX=""
 
 #
 # filesystem for target device
@@ -708,7 +713,6 @@ BR2_TARGET_ROOTFS_JFFS2_EBSIZE=0x20000
 # BR2_TARGET_ROOTFS_JFFS2_PAD is not set
 BR2_TARGET_ROOTFS_JFFS2_LE=y
 # BR2_TARGET_ROOTFS_JFFS2_BE is not set
-# BR2_TARGET_ROOTFS_JFFS2_SQUASH is not set
 # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set
 BR2_TARGET_ROOTFS_JFFS2_OUTPUT="$(IMAGE).jffs2"
 BR2_TARGET_ROOTFS_JFFS2_COPYTO=""
@@ -738,8 +742,9 @@ BR2_KERNEL_LINUX_ADVANCED=y
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_KCONFIG="target/device/x86/i386/linux-$(BR2_LINUX26_VERSION).config"
 BR2_PACKAGE_LINUX_FORMAT="bzImage"
-BR2_KERNEL_CURRENT_VERSION="2.6.28.2"
-BR2_KERNEL_LATEST_2_6_28="2"
+BR2_KERNEL_CURRENT_VERSION="2.6.29.2"
+BR2_KERNEL_LATEST_2_6_29="2"
+BR2_KERNEL_LATEST_2_6_28="7"
 BR2_KERNEL_LATEST_2_6_27="13"
 BR2_KERNEL_LATEST_2_6_26="8"
 BR2_KERNEL_LATEST_2_6_25="19"
@@ -752,6 +757,7 @@ BR2_KERNEL_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6"
 BR2_MM_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6"
 BR2_RC_MM_PATCH_DIR="$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)/2.6.$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)-mm$(BR2_KERNEL_MM_LEVEL)"
 BR2_LINUX_2_6_STABLE=y
+# BR2_LINUX_2_6_29 is not set
 # BR2_LINUX_2_6_28 is not set
 # BR2_LINUX_2_6_27 is not set
 # BR2_LINUX_2_6_26 is not set
@@ -761,7 +767,6 @@ BR2_LINUX_2_6_STABLE=y
 # BR2_LINUX_2_6_22 is not set
 # BR2_LINUX_2_6_21 is not set
 # BR2_LINUX_2_6_20 is not set
-# BR2_LINUX_2_6_29 is not set
 # BR2_LINUX26_CUSTOM is not set
 
 #

configs/i686_defconfig

@@ -1,9 +1,9 @@
 #
 # Automatically generated make config: don't edit
-# Fri Apr 17 03:45:22 2009
+# Wed May 13 01:35:07 2009
 #
 BR2_HAVE_DOT_CONFIG=y
-BR2_VERSION="2009.05-svn"
+BR2_VERSION="2009.05-rc1"
 # BR2_alpha is not set
 # BR2_arm is not set
 # BR2_armeb is not set
@@ -91,7 +91,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -162,10 +162,10 @@ BR2_EXT_UCLIBC_VERSION_0_9_30_1=y
 # BR2_KERNEL_HEADERS_2_6_25 is not set
 # BR2_KERNEL_HEADERS_2_6_26 is not set
 # BR2_KERNEL_HEADERS_2_6_27 is not set
-BR2_KERNEL_HEADERS_2_6_28=y
-# BR2_KERNEL_HEADERS_2_6_29 is not set
+# BR2_KERNEL_HEADERS_2_6_28 is not set
+BR2_KERNEL_HEADERS_2_6_29=y
 # BR2_KERNEL_HEADERS_SNAP is not set
-BR2_DEFAULT_KERNEL_HEADERS="2.6.28.9"
+BR2_DEFAULT_KERNEL_HEADERS="2.6.29.2"
 
 #
 # uClibc Options
@@ -178,7 +178,7 @@ BR2_UCLIBC_VERSION_0_9_30_1=y
 BR2_UCLIBC_VERSION_STRING="0.9.30.1"
 BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.30.config"
 # BR2_PTHREAD_DEBUG is not set
-# BR2_UCLIBC_PROGRAM_INVOCATION is not set
+# BR2_PROGRAM_INVOCATION is not set
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
 
 #
@@ -208,11 +208,12 @@ BR2_EXTRA_BINUTILS_CONFIG_OPTIONS=""
 # BR2_GCC_VERSION_4_2_3 is not set
 # BR2_GCC_VERSION_4_2_4 is not set
 # BR2_GCC_VERSION_4_3_1 is not set
-BR2_GCC_VERSION_4_3_2=y
+# BR2_GCC_VERSION_4_3_2 is not set
 # BR2_GCC_VERSION_4_3_3 is not set
+BR2_GCC_VERSION_4_4_X=y
 BR2_GCC_SUPPORTS_SYSROOT=y
 BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE=y
-BR2_GCC_VERSION="4.3.2"
+BR2_GCC_VERSION="4.4.0"
 BR2_TOOLCHAIN_SYSROOT=y
 # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set
 BR2_EXTRA_GCC_CONFIG_OPTIONS=""
@@ -233,14 +234,11 @@ BR2_GCC_SHARED_LIBGCC=y
 # BR2_PACKAGE_GDB is not set
 BR2_PACKAGE_GDB_SERVER=y
 # BR2_PACKAGE_GDB_HOST is not set
-# BR2_GDB_VERSION_6_2_1 is not set
-# BR2_GDB_VERSION_6_3 is not set
 # BR2_GDB_VERSION_6_4 is not set
 # BR2_GDB_VERSION_6_5 is not set
 # BR2_GDB_VERSION_6_6 is not set
 # BR2_GDB_VERSION_6_7_1 is not set
 BR2_GDB_VERSION_6_8=y
-# BR2_GDB_VERSION_SNAPSHOT is not set
 BR2_GDB_VERSION="6.8"
 
 #
@@ -253,6 +251,7 @@ BR2_ENABLE_LOCALE=y
 # BR2_ENABLE_LOCALE_PREGENERATED is not set
 # BR2_ENABLE_LOCALE_PURGE is not set
 BR2_USE_WCHAR=y
+# BR2_USE_SSP is not set
 # BR2_PTHREADS_NONE is not set
 # BR2_PTHREADS is not set
 BR2_PTHREADS_OLD=y
@@ -277,7 +276,7 @@ BR2_BUSYBOX_VERSION_1_14_X=y
 BR2_BUSYBOX_VERSION="1.14.0"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
@@ -319,7 +318,10 @@ BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_BEECRYPT is not set
 # BR2_PACKAGE_BERKELEYDB is not set
 # BR2_PACKAGE_BSDIFF is not set
-# BR2_PACKAGE_CUPS is not set
+
+#
+# cups requires a toolchain with Stack Protection support
+#
 # BR2_PACKAGE_CUSTOMIZE is not set
 # BR2_PACKAGE_FILE is not set
 # BR2_PACKAGE_GAMIN is not set
@@ -346,6 +348,7 @@ BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_NG_SPICE_REWORK is not set
 # BR2_PACKAGE_POPT is not set
 # BR2_PACKAGE_SCREEN is not set
+# BR2_PACKAGE_SHARED_MIME_INFO is not set
 # BR2_PACKAGE_STARTUP_NOTIFICATION is not set
 # BR2_PACKAGE_STRACE is not set
 # BR2_PACKAGE_SUDO is not set
@@ -386,6 +389,7 @@ BR2_HOST_FAKEROOT=y
 # BR2_PACKAGE_LIBEXOSIP2 is not set
 # BR2_PACKAGE_LIBOSIP2 is not set
 # BR2_PACKAGE_LIBPCAP is not set
+# BR2_PACKAGE_LIBSOUP is not set
 # BR2_PACKAGE_LIBUPNP is not set
 # BR2_PACKAGE_LINKS is not set
 # BR2_PACKAGE_LRZSZ is not set
@@ -450,6 +454,10 @@ BR2_HOST_FAKEROOT=y
 #
 # dbus not available (need expat or libxml2)
 #
+
+#
+# dbus-glib needs dbus to be compiled with expat support
+#
 # BR2_PACKAGE_DEVMEM2 is not set
 # BR2_PACKAGE_DM is not set
 # BR2_PACKAGE_DMRAID is not set
@@ -500,10 +508,7 @@ BR2_PACKAGE_MTD_NANDWRITE=y
 BR2_PACKAGE_MTD_NFTL_FORMAT=y
 BR2_PACKAGE_MTD_NFTLDUMP=y
 BR2_PACKAGE_MTD_SUMTOOL=y
-
-#
-# ntfs-3g requires a toolchain with LARGEFILE and WCHAR support
-#
+# BR2_PACKAGE_NTFS_3G is not set
 # BR2_PACKAGE_PCIUTILS is not set
 # BR2_PACKAGE_PCMCIA is not set
 # BR2_PACKAGE_SETSERIAL is not set
@@ -536,6 +541,7 @@ BR2_PACKAGE_MTD_SUMTOOL=y
 # BR2_PACKAGE_MPLAYER is not set
 # BR2_PACKAGE_SPEEX is not set
 # BR2_PACKAGE_FESTIVAL is not set
+# BR2_PACKAGE_TAGLIB is not set
 # BR2_PACKAGE_VLC is not set
 
 #
@@ -582,7 +588,7 @@ BR2_PACKAGE_MTD_SUMTOOL=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 # BR2_PACKAGE_XSERVER_tinyx is not set
@@ -617,6 +623,7 @@ BR2_PACKAGE_XSERVER_none=y
 # dillo		- disabled (requires jpeg,libglib12,libgtk12,zlib,libpng and Xorg(7))
 #
 # BR2_PACKAGE_GQVIEW is not set
+# BR2_PACKAGE_GOB2 is not set
 # BR2_PACKAGE_LEAFPAD is not set
 
 #
@@ -635,7 +642,7 @@ BR2_PACKAGE_XSERVER_none=y
 #
 BR2_PACKAGE_LZO=y
 # BR2_PACKAGE_LZOP is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set
@@ -735,7 +742,8 @@ BR2_KERNEL_LINUX_ADVANCED=y
 BR2_PACKAGE_LINUX=y
 BR2_PACKAGE_LINUX_KCONFIG="$(BR2_BOARD_PATH)/$(BR2_BOARD_NAME)-linux-$(BR2_LINUX26_VERSION).config"
 BR2_PACKAGE_LINUX_FORMAT="bzImage"
-BR2_KERNEL_CURRENT_VERSION="2.6.28.7"
+BR2_KERNEL_CURRENT_VERSION="2.6.29.2"
+BR2_KERNEL_LATEST_2_6_29="2"
 BR2_KERNEL_LATEST_2_6_28="7"
 BR2_KERNEL_LATEST_2_6_27="13"
 BR2_KERNEL_LATEST_2_6_26="8"
@@ -749,6 +757,7 @@ BR2_KERNEL_SITE="http://ftp.kernel.org/pub/linux/kernel/v2.6"
 BR2_MM_PATCH_SITE="http://ftp.kernel.org/pub/linux/kernel/people/akpm/patches/2.6"
 BR2_RC_MM_PATCH_DIR="$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)/2.6.$(BR2_KERNEL_NEXT_VERSION)-rc$(BR2_KERNEL_RC_LEVEL)-mm$(BR2_KERNEL_MM_LEVEL)"
 BR2_LINUX_2_6_STABLE=y
+# BR2_LINUX_2_6_29 is not set
 # BR2_LINUX_2_6_28 is not set
 # BR2_LINUX_2_6_27 is not set
 # BR2_LINUX_2_6_26 is not set
@@ -758,7 +767,6 @@ BR2_LINUX_2_6_STABLE=y
 # BR2_LINUX_2_6_22 is not set
 # BR2_LINUX_2_6_21 is not set
 # BR2_LINUX_2_6_20 is not set
-# BR2_LINUX_2_6_29 is not set
 # BR2_LINUX26_CUSTOM is not set
 
 #

configs/integrator926_defconfig

@@ -87,7 +87,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -185,7 +185,7 @@ BR2_UCLIBC_CONFIG="target/device/ARMLTD/uClibc.integrator926.config"
 BR2_PTHREADS_OLD=y
 # BR2_PTHREADS_NATIVE is not set
 # BR2_PTHREAD_DEBUG is not set
-# BR2_UCLIBC_PROGRAM_INVOCATION is not set
+# BR2_PROGRAM_INVOCATION is not set
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
 
 #
@@ -273,7 +273,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.4"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 BR2_PACKAGE_BUSYBOX_SKELETON=y
 
 #
@@ -640,7 +640,7 @@ BR2_PACKAGE_XSERVER_none=y
 # Compressors / decompressors
 #
 # BR2_PACKAGE_LZO is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set

configs/integrator926_huge_defconfig

@@ -87,7 +87,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 BR2_COPYTO=""
 
 #
@@ -185,7 +185,7 @@ BR2_UCLIBC_CONFIG="target/device/ARMLTD/uClibc.integrator926.config"
 BR2_PTHREADS_OLD=y
 # BR2_PTHREADS_NATIVE is not set
 # BR2_PTHREAD_DEBUG is not set
-# BR2_UCLIBC_PROGRAM_INVOCATION is not set
+# BR2_PROGRAM_INVOCATION is not set
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
 
 #
@@ -274,7 +274,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.4"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-BR2_PACKAGE_BUSYBOX_HIDE_OTHERS=y
+# BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 BR2_PACKAGE_BUSYBOX_SKELETON=y
 
 #
@@ -561,7 +561,7 @@ BR2_PACKAGE_NCURSES=y
 #
 # other GUIs
 #
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_xorg is not set
 
@@ -616,8 +616,8 @@ BR2_PACKAGE_XSERVER_none=y
 # Compressors / decompressors
 #
 # BR2_PACKAGE_LZO is not set
-BR2_PACKAGE_LZMA_TARGET=y
-# BR2_PACKAGE_LZMA_TARGET_HEADERS is not set
+BR2_PACKAGE_LZMA=y
+# BR2_PACKAGE_LZMA_HEADERS is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set

configs/kb9202_defconfig

@@ -98,7 +98,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="gzip -d -c"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 
 #
 # Mirrors and Download locations
@@ -189,7 +189,7 @@ BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.29.config"
 BR2_PTHREADS_OLD=y
 # BR2_PTHREADS_NATIVE is not set
 # BR2_PTHREAD_DEBUG is not set
-# BR2_UCLIBC_PROGRAM_INVOCATION is not set
+# BR2_PROGRAM_INVOCATION is not set
 
 #
 # Binutils Options
@@ -268,7 +268,7 @@ BR2_BUSYBOX_VERSION_1_13_X=y
 BR2_BUSYBOX_VERSION="1.13.4"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.13.x.config"
-# BR2_PACKAGE_BUSYBOX_HIDE_OTHERS is not set
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 # BR2_PACKAGE_BUSYBOX_SKELETON is not set
 
 #
@@ -563,7 +563,7 @@ BR2_GRAPHIC_SUPPORT=y
 # other GUIs
 #
 # BR2_PACKAGE_QTE is not set
-# BR2_PACKAGE_QTOPIA4 is not set
+# BR2_PACKAGE_QT is not set
 BR2_PACKAGE_XSERVER_none=y
 # BR2_PACKAGE_XSERVER_x11r7 is not set
 # BR2_PACKAGE_XSERVER_xorg is not set
@@ -632,7 +632,7 @@ BR2_X11_PREFIX="/usr"
 BR2_COMPRESSOR_SUPPORT=y
 # BR2_PACKAGE_GZIP is not set
 # BR2_PACKAGE_LZO is not set
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 # BR2_PACKAGE_ZLIB is not set
 BR2_SCRIPTING_SUPPORT=y

configs/v100sc2_defconfig

@@ -69,7 +69,7 @@ BR2_GIT="git clone"
 BR2_ZCAT="zcat"
 BR2_BZCAT="bzcat"
 BR2_TAR_OPTIONS=""
-BR2_DL_DIR="$(BASE_DIR)/dl"
+BR2_DL_DIR="$(TOPDIR)/dl"
 
 #
 # Mirrors and Download locations
@@ -172,7 +172,7 @@ BR2_ENABLE_LOCALE=y
 BR2_PTHREADS_OLD=y
 # BR2_PTHREADS_NATIVE is not set
 # BR2_PTHREAD_DEBUG is not set
-# BR2_UCLIBC_PROGRAM_INVOCATION is not set
+# BR2_PROGRAM_INVOCATION is not set
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
 
 #
@@ -258,7 +258,7 @@ BR2_BUSYBOX_VERSION_1_12_X=y
 BR2_BUSYBOX_VERSION="1.12.1"
 BR2_PACKAGE_BUSYBOX_FULLINSTALL=y
 BR2_PACKAGE_BUSYBOX_CONFIG="target/device/valka/v100sc2/busybox.config"
-# BR2_PACKAGE_BUSYBOX_HIDE_OTHERS is not set
+BR2_PACKAGE_BUSYBOX_SHOW_OTHERS=y
 BR2_PACKAGE_BUSYBOX_SKELETON=y
 
 #
@@ -542,57 +542,57 @@ BR2_PACKAGE_NCURSES=y
 #
 # other GUIs
 #
-BR2_PACKAGE_QTOPIA4=y
-# BR2_PACKAGE_QTOPIA4_DEBUG is not set
-BR2_PACKAGE_QTOPIA4_SHARED=y
-# BR2_PACKAGE_QTOPIA4_STATIC is not set
-BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_GPL=y
-# BR2_PACKAGE_QTOPIA4_LICENSE_TYPE_COMMERCIAL is not set
-BR2_PACKAGE_QTOPIA4_GPL_LICENSE_APPROVED=y
-# BR2_PACKAGE_QTOPIA4_QT3SUPPORT is not set
-BR2_PACKAGE_QTOPIA4_DEPTHS="-depths 24,16,8"
-BR2_PACKAGE_QTOPIA4_GIF=y
-# BR2_PACKAGE_QTOPIA4_LIBMNG is not set
-# BR2_PACKAGE_QTOPIA4_NOJPEG is not set
-# BR2_PACKAGE_QTOPIA4_SYSTEMJPEG is not set
-BR2_PACKAGE_QTOPIA4_QTJPEG=y
-# BR2_PACKAGE_QTOPIA4_NOPNG is not set
-# BR2_PACKAGE_QTOPIA4_SYSTEMPNG is not set
-BR2_PACKAGE_QTOPIA4_QTPNG=y
-# BR2_PACKAGE_QTOPIA4_NOTIFF is not set
-# BR2_PACKAGE_QTOPIA4_SYSTEMTIFF is not set
-BR2_PACKAGE_QTOPIA4_QTTIFF=y
-BR2_PACKAGE_QTOPIA4_QTZLIB=y
-# BR2_PACKAGE_QTOPIA4_SYSTEMZLIB is not set
-# BR2_PACKAGE_QTOPIA4_NOFREETYPE is not set
-BR2_PACKAGE_QTOPIA4_QTFREETYPE=y
-# BR2_PACKAGE_QTOPIA4_SYSTEMFREETYPE is not set
-BR2_PACKAGE_QTOPIA4_EMB_PLATFORM="avr32"
-# BR2_PACKAGE_QTOPIA4_SQL_MODULE is not set
+BR2_PACKAGE_QT=y
+# BR2_PACKAGE_QT_DEBUG is not set
+BR2_PACKAGE_QT_SHARED=y
+# BR2_PACKAGE_QT_STATIC is not set
+BR2_PACKAGE_QT_GPL_LICENSE_APPROVED=y
+# BR2_PACKAGE_QT_QT3SUPPORT is not set
+BR2_PACKAGE_QT_PIXEL_DEPTH_8=y
+BR2_PACKAGE_QT_PIXEL_DEPTH_16=y
+BR2_PACKAGE_QT_PIXEL_DEPTH_24=y
+BR2_PACKAGE_QT_GIF=y
+# BR2_PACKAGE_QT_LIBMNG is not set
+# BR2_PACKAGE_QT_NOJPEG is not set
+# BR2_PACKAGE_QT_SYSTEMJPEG is not set
+BR2_PACKAGE_QT_QTJPEG=y
+# BR2_PACKAGE_QT_NOPNG is not set
+# BR2_PACKAGE_QT_SYSTEMPNG is not set
+BR2_PACKAGE_QT_QTPNG=y
+# BR2_PACKAGE_QT_NOTIFF is not set
+# BR2_PACKAGE_QT_SYSTEMTIFF is not set
+BR2_PACKAGE_QT_QTTIFF=y
+BR2_PACKAGE_QT_QTZLIB=y
+# BR2_PACKAGE_QT_SYSTEMZLIB is not set
+# BR2_PACKAGE_QT_NOFREETYPE is not set
+BR2_PACKAGE_QT_QTFREETYPE=y
+# BR2_PACKAGE_QT_SYSTEMFREETYPE is not set
+BR2_PACKAGE_QT_EMB_PLATFORM="avr32"
+# BR2_PACKAGE_QT_SQL_MODULE is not set
 
 #
 # Graphics drivers
 #
-BR2_PACKAGE_QTOPIA4_GFX_LINUXFB=y
-# BR2_PACKAGE_QTOPIA4_GFX_TRANSFORMED is not set
-# BR2_PACKAGE_QTOPIA4_GFX_QVFB is not set
-BR2_PACKAGE_QTOPIA4_GFX_VNC=y
-BR2_PACKAGE_QTOPIA4_GFX_MULTISCREEN=y
+BR2_PACKAGE_QT_GFX_LINUXFB=y
+# BR2_PACKAGE_QT_GFX_TRANSFORMED is not set
+# BR2_PACKAGE_QT_GFX_QVFB is not set
+BR2_PACKAGE_QT_GFX_VNC=y
+BR2_PACKAGE_QT_GFX_MULTISCREEN=y
 
 #
 # Mouse drivers
 #
-# BR2_PACKAGE_QTOPIA4_MOUSE_PC is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_BUS is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_LINUXTP is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_YOPY is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_VR41XX is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_TSLIB is not set
-# BR2_PACKAGE_QTOPIA4_MOUSE_QVFB is not set
-# BR2_PACKAGE_QTOPIA4_XMLPATTERNS is not set
-BR2_PACKAGE_QTOPIA4_SVG=y
-BR2_PACKAGE_QTOPIA4_WEBKIT=y
-BR2_PACKAGE_QTOPIA4_OPENSSL=y
+# BR2_PACKAGE_QT_MOUSE_PC is not set
+# BR2_PACKAGE_QT_MOUSE_BUS is not set
+# BR2_PACKAGE_QT_MOUSE_LINUXTP is not set
+# BR2_PACKAGE_QT_MOUSE_YOPY is not set
+# BR2_PACKAGE_QT_MOUSE_VR41XX is not set
+# BR2_PACKAGE_QT_MOUSE_TSLIB is not set
+# BR2_PACKAGE_QT_MOUSE_QVFB is not set
+# BR2_PACKAGE_QT_XMLPATTERNS is not set
+BR2_PACKAGE_QT_SVG=y
+BR2_PACKAGE_QT_WEBKIT=y
+BR2_PACKAGE_QT_OPENSSL=y
 
 #
 # X Window System server
@@ -653,7 +653,7 @@ BR2_PACKAGE_LIBGLIB2=y
 BR2_COMPRESSOR_SUPPORT=y
 # BR2_PACKAGE_GZIP is not set
 BR2_PACKAGE_LZO=y
-# BR2_PACKAGE_LZMA_TARGET is not set
+# BR2_PACKAGE_LZMA is not set
 # BR2_PACKAGE_LZMA_HOST is not set
 BR2_PACKAGE_ZLIB=y
 # BR2_PACKAGE_ZLIB_TARGET_HEADERS is not set

docs/U-boot.html

@@ -20,7 +20,6 @@
 	usage and documentation by Ulf Samuelsson.
 	</p>
 
-	<p><small>$LastChangedDate: 2008-12-16 10:00:11 +0100 (tis, 16 dec 2008) $</small></p>
 	<ul>
 		<li><a href="#about">About U-Boot</a></li>
 		<li><a href="#at91rm9200dk">Board Support for AT91RM9200DK</a></li>

docs/about.html

@@ -26,7 +26,8 @@ you do not need to be root to build or run Buildroot.
 Buildroot is maintained by <a href=
 "mailto:jacmet@uclibc.org">Peter Korsgaard</a>, and
 licensed under the
-<a href="http://www.gnu.org/copyleft/lgpl.html">GNU LIBRARY GENERAL PUBLIC LICENSE</a>.
+<a href="http://www.gnu.org/licenses/old-licenses/gpl-2.0.html">GNU
+GENERAL PUBLIC LICENSE V2 (Or later)</a>.
 
 
 <!--#include file="footer.html" -->

docs/buildroot.html

@@ -19,21 +19,20 @@
     usage and documentation by Thomas Petazzoni. Contributions from
     Karsten Kruse, Ned Ludd, Martin Herren and others. </p>
 
-    <p><small>$LastChangedDate$</small></p>
-
     <ul>
 
       <li><a href="#about">About Buildroot</a></li>
       <li><a href="#download">Obtaining Buildroot</a></li>
       <li><a href="#using">Using Buildroot</a></li>
-      <li><a href="#custom_targetfs">Customizing the target filesystem</a></li>
+      <li><a href="#custom_targetfs">Customizing the generated target filesystem</a></li>
       <li><a href="#custom_busybox">Customizing the Busybox
       configuration</a></li>
       <li><a href="#custom_uclibc">Customizing the uClibc
       configuration</a></li>
+      <li><a href="#custom_linux26">Customizing the Linux kernel
+      configuration</a></li>
+      <li><a href="#rebuilding_packages">Understanding how to rebuild packages</a></li>
       <li><a href="#buildroot_innards">How Buildroot works</a></li>
-      <li><a href="#multi_project">Building several projects in the
-      same buildroot source tree</a></li>
       <li><a href="#using_toolchain">Using the uClibc toolchain
       outside Buildroot</a></li>
       <li><a href="#external_toolchain">Use an external toolchain</a></li>
@@ -41,16 +40,16 @@
       </li>
       <li><a href="#add_software">Extending Buildroot with more
       Software</a></li>
+      <li><a href="#board_support">Creating your own board support</a></li>
       <li><a href="#links">Resources</a></li>
     </ul>
 
     <h2><a name="about" id="about"></a>About Buildroot</h2>
 
-    <p>Buildroot is a set of Makefiles and patches that allow to easily
-    generate both a cross-compilation toolchain and a root filesystem for your
-    target. The cross-compilation toolchain uses uClibc (<a href=
-    "http://www.uclibc.org/">http://www.uclibc.org/</a>), a tiny C standard
-    library. </p>
+    <p>Buildroot is a set of Makefiles and patches that allow to
+    easily generate a cross-compilation toolchain, a root filesystem
+    and a Linux kernel image for your target. Buildroot can be used
+    for either one, two or all of these options, independently.</p>
 
     <p>Buildroot is useful mainly for people working with embedded systems.
     Embedded systems often use processors that are not the regular x86
@@ -156,13 +155,20 @@
  $ make menuconfig
 </pre>
 
+<p>to run the curses-based configurator, or</p>
+
+<pre>
+ $ make xconfig
+</pre>
+
+    <p>to run the Qt3-based configurator. On Debian-like systems, the
+    <code>libncurses5-dev</code> package is required to use the
+    <i>menuconfig</i> interface, and the <code>libqt3-mt-dev</code> is
+    required to use the <i>xconfig</i> interface.</p>
+
     <p>For each entry of the configuration tool, you can find associated help
     that describes the purpose of the entry. </p>
 
-    <p>One of the key configuration items is the <code>PROJECT</code> which
-    determines where some board specific packages are built and where the
-    results are stored. </p>
-
     <p>Once everything is configured, the configuration tool has generated a
     <code>.config</code> file that contains the description of your
     configuration. It will be used by the Makefiles to do what's needed. </p>
@@ -174,55 +180,64 @@
  $ make
 </pre>
 
-    <p>This command will download, configure and compile all the selected
-    tools, and finally generate a target filesystem. The target filesystem will
-    be named <code>root_fs_ARCH.EXT</code> where <code>ARCH</code> is your
-    architecture and <code>EXT</code> depends on the type of target filesystem
-    selected in the <code>Target options</code> section of the configuration
-    tool.
-    The file is stored in the "binaries/<code>$(PROJECT)</code>/" directory</p>
+    <p>This command will download, configure and compile all the
+    selected tools, and finally generate a toolchain, a root
+    filesystem image and a kernel image (or only one of these
+    elements, depending on the configuration).</p>
 
-    <h3><a name="local_board_support" id="local_board_support"></a>
-    Creating your own board support</h3>
+    <p>Buildroot output is stored in a single directory,
+    <code>output/</code>. This directory contains several
+    subdirectories:</p>
 
-    <p>Once a package has been unpacked, it is possible to manually update
-    configuration files. Buildroot can automatically save the configuration
-    of buildroot, linux, busybox, uclibc and u-boot in "local/$(PROJECT) by
-    using the command:
-    </p>
+    <ul>
 
-<pre>
- $ make saveconfig
-</pre>
+      <li><code>images/</code> where all the images (kernel image,
+      bootloader and root filesystem images) are stored.</li>
 
-     <p>Once a buildroot configuration has been created by saveconfig,
-     the default "$(TOPDIR)/.config" file can be overridden by</p>
+      <li><code>build/</code> where all the components are built
+      (tools needed to run Buildroot on the host and packages compiled
+      for the target). The <code>build/</code> directory contains one
+      subdirectory for each of these components. The toolchain
+      components are however built in a separate directory.</li>
 
-<pre>
- $ make BOARD=&lt;project&gt;
-</pre>
+      <li><code>staging/</code> which contains a hierarchy similar to
+      a root filesystem hierarchy. This directory contains the
+      installation of cross-compilation toolchain and all the
+      userspace packages selected for the target. However, this
+      directory is <i>not</i> intended to be the root filesystem for
+      the target: it contains a lot of development files, unstripped
+      binaries and libraries, that make it far too big for an embedded
+      system.</li>
 
-    <p>Buildroot will then use "local/&lt;project&gt;/&lt;project&gt;.config"
-    instead of ".config". </p>
+      <li><code>target/</code> which contains <i>almost</i> the root
+      filesystem for the target: everything needed is present except
+      the device files in <code>/dev/</code> (Buildroot can't create
+      them because Buildroot doesn't run as root and does not want to
+      run as root). Therefore, this directory <b>should not be used on
+      your target</b> but instead you should use one of the images
+      built in the <code>images/</code> directory. If you need an
+      extracted image of the root filesystem, for booting over NFS,
+      then use the tarball image generated in <code>images/</code> and
+      extract it as root.<br/>Compared to <code>staging/</code>,
+      <code>target/</code> contains only the necessary files to run
+      the libraries and applications: all the development files
+      (headers, etc.) are not present.</li>
 
-    <p>If you want to modify your board, you can copy the project configuration
-     file to ".config" by using the command:</p>
+      <li><code>host/</code> contains the installation of tools
+      compiled for the host that are needed for the proper execution
+      of Buildroot.</li>
 
-<pre>
- $ make BOARD=&lt;project&gt; getconfig
-</pre>
-
-    <p>You can share your custom board support directory between several buildroot trees
-    by setting the environment variable <code>BUILDROOT_LOCAL</code> to this directory,
-    </p>
+      <li><code>toolchain/</code> contains the build directories for
+      the various components of the cross-compilation toolchain.</li>
 
+    </ul>
 
     <h3><a name="offline_builds" id="offline_builds"></a>
     Offline builds</h3>
 
-    <p>If you intend to do an offline-build and just want to download all
-    sources that you previously selected in &quot;make menuconfig&quot; then
-    issue:</p>
+    <p>If you intend to do an offline-build and just want to download
+    all sources that you previously selected in the configurator
+    (<i>menuconfig</i> or <i>xconfig</i>) then issue:</p>
 <pre>
  $ make source
 </pre>
@@ -249,13 +264,20 @@
     <p>Buildroot optionally honors some environment variables that are passed
     to <code>make</code> :</p>
     <ul>
-    <li>HOSTCXX</li>
-    <li>HOSTCC</li>
-    <li>UCLIBC_CONFIG_FILE=&lt;path/to/.config&gt;</li>
-    <li>BUSYBOX_CONFIG_FILE=&lt;path/to/.config&gt;</li>
-    <li>BUILDROOT_COPYTO</li>
-    <li>BUILDROOT_DL_DIR</li>
-    <li>BUILDROOT_LOCAL</li>
+    <li><code>HOSTCXX</code>, the host C++ compiler to use</li>
+    <li><code>HOSTCC</code>, the host C compiler to use</li>
+    <li><code>UCLIBC_CONFIG_FILE=&lt;path/to/.config&gt;</code>, path
+    to the uClibc configuration file to use to compile uClibc if an
+    internal toolchain is selected</li>
+    <li><code>BUSYBOX_CONFIG_FILE=&lt;path/to/.config&gt;</code>, path
+    to the Busybox configuration file</li>
+    <li><code>LINUX26_KCONFIG=&lt;path/to/.config&gt;</code>, path
+    to the Linux kernel configuration file</li>
+    <li><code>BUILDROOT_COPYTO</code>, an additional location at which
+    the binary images of the root filesystem, kernel, etc. built by
+    Buildroot are copied</li>
+    <li><code>BUILDROOT_DL_DIR</code> to override the directory in
+    which Buildroot stores/retrieves downloaded files</li>
     </ul>
 
     <p>An example that uses config files located in the toplevel directory and
@@ -279,43 +301,14 @@ $ make HOSTCXX=g++-4.3-HEAD HOSTCC=gcc-4.3-HEAD
 $ export BUILDROOT_COPYTO=/tftpboot
 </pre>
 
-
-    <h3><a name="helper_completion" id="helper_completion"></a>
-    Using auto-completion</h3>
-
-    <p>If you are lazy enough that you don't want to type the entire <i>make
-    menuconfig</i> command line, you can enable auto-completion in your shell.
-    Here is how you can do that using <i>bash</i>:</p>
-<pre>
-$ complete -W menuconfig make
-</pre>
-
-    <p>Then just enter the beginning of the line, and ask <i>bash</i> to
-    complete it for you by pressing the <i>TAB</i> key:</p>
-<pre>
-$ make me&lt;TAB&gt;
-</pre>
-
-    <p>will result in <i>bash</i> to append <i>nuconfig</i> for you!</p>
-
-    <p>Alternatively, some distributions (of which Debian and Mandriva are but
-    an example) have more powerful make completion. Depending on you
-    distribution, you may have to install a package to enable completion. Under
-    Mandriva, this is <i>bash-completion</i>, while Debian ships it as part of
-    the <i>bash</i> package.</p>
-
-    <p>Other shells, such as <i>zsh</i>, also have completion facilities. See
-    the documentation for your shell.</p>
-
     <h2><a name="custom_targetfs" id="custom_targetfs"></a>Customizing the
-    target filesystem</h2>
+    generated target filesystem</h2>
 
     <p>There are a few ways to customize the resulting target filesystem:</p>
 
     <ul>
       <li>Customize the target filesystem directly, and rebuild the image. The
-      target filesystem is available under <code>project_build_ARCH/root/</code>
-      where <code>ARCH</code> is the chosen target architecture.
+      target filesystem is available under <code>output/target/</code>.
       You can simply make your changes here, and run make afterwards, which will
       rebuild the target filesystem image. This method allows to do everything
       on the target filesystem, but if you decide to completely rebuild your
@@ -330,20 +323,33 @@ $ make me&lt;TAB&gt;
       toolchain and the tools. <br />
       You can also customize the <code>target/generic/device_table.txt</code>
       file which is used by the tools that generate the target filesystem image
-      to properly set permissions and create device nodes. The
-      <code>target/generic/skel.tar.gz</code> file contains the main
-      directories of a root filesystem and there is no obvious reason for which
-      it should be changed. These main directories are in an tarball inside of
-      inside the skeleton because it contains symlinks that would be broken
-      otherwise. <br />
+      to properly set permissions and create device nodes.<br />
       These customizations are deployed into
-      <code>project_build_ARCH/root/</code> just before the actual image
+      <code>output/target/</code> just before the actual image
       is made. So simply rebuilding the image by running
       make should propagate any new changes to the image. </li>
 
-      <li>When configuring the build system, using <code>make menuconfig</code>,
-      you can specify the contents of the /etc/hostname and /etc/issue
-      (the welcome banner) in the <code>PROJECT</code> section</li>
+      <li>Add support for your own target in Buildroot so that you
+      have your own target skeleton, see <a href="#board_support">this
+      section</a> for details</li>
+
+      <li>In Buildroot configuration, you can specify the path to a
+      post-build script that gets called <i>after</i> Buildroot built
+      all the selected software, but <i>before</i> the the rootfs
+      packages are assembled. The destination root filesystem folder
+      is given as first argument to this script, and this script can
+      then be used to copy programs, static data or any other needed
+      file to your target filesystem.<br/>You should, however, use
+      that feature with care. Whenever you find that a certain package
+      generates wrong or unneeded files, you should rather fix than
+      package than working around it with a cleanup script.</li>
+
+      <li>A special package, <i>customize</i>, stored in
+      <code>package/customize</code> can be used. You can put all the
+      files that you want to see in the final target root filesystem
+      in <code>package/customize/source</code>, and then enable this
+      special package from the configuration system.</li>
+
     </ul>
 
     <h2><a name="custom_busybox" id="custom_busybox"></a>Customizing the
@@ -412,6 +418,85 @@ $ make me&lt;TAB&gt;
     <p>If you want to use an existing config file for uclibc, then see
     section <a href="#environment_variables">environment variables</a>. </p>
 
+    <h2><a name="custom_linux26" id="custom_linux26"></a>Customizing
+    the Linux kernel configuration</h2>
+
+    <p>The Linux kernel configuration can be customized just like <a
+    href="#custom_busybox">BusyBox</a> and <a href="#custom_uclibc">uClibc</a>
+    using <code>make linux26-menuconfig</code>. Make sure you have
+    enabled the kernel build in <code>make menuconfig</code> first.
+    Once done, run <code>make</code> to (re)build everything.</p>
+
+    <p>If you want to use an existing config file for Linux, then see
+    section <a href="#environment_variables">environment variables</a>.</p>
+
+    <h2><a name="#rebuilding_packages"
+    id="rebuilding_packages">Understanding how to rebuild
+    packages</a></h2>
+
+    <p>One of the most common question and issue about Buildroot
+    encountered by users is how to rebuild a given package or how to
+    remove a package without rebuilding everything from scratch.</p>
+
+    <p>Removing a package is currently unsupported by Buildroot
+    without rebuilding from scratch. This is because Buildroot doesn't
+    keep track of which package installs what files in the
+    <code>output/staging</code> and <code>output/target</code>
+    directories. However, implement clean package removal is on the
+    TODO-list of Buildroot developers.</p>
+
+    <p>To rebuild a single package from scratch, the easiest way is to
+    remove its build directory in <code>output/build</code>. Buildroot
+    will then re-extract, re-configure, re-compile and re-install this
+    package from scratch.</p>
+
+    <p>However, if you don't want to rebuild the package completely
+    from scratch, a better understanding of the Buildroot internals is
+    needed. Internally, to keep track of which steps have been done
+    and which steps remains to be done, Buildroot maintains stamps
+    files (i.e, empty files that just tell whether this or this action
+    has been done). The problem is that these stamps files are not
+    uniformely named and handled by the different packages, so some
+    understanding of the particular package is needed.</p>
+
+    <p>For packages relying on the <i>autotools</i> Buildroot
+    infrastructure (see <a href="#add_software">this section</a> for
+    details), the following stamps files are interesting:</p>
+
+    <ul>
+
+      <li><code>output/build/packagename-version/.stamp_configured</code>. If
+      removed, Buildroot will trigger the recompilation of the package
+      from the configuration step (execution of
+      <code>./configure</code>)</li>
+
+      <li><code>output/build/packagename-version/.stamp_built</code>. If
+      removed, Buildroot will trigger the recompilation of the package
+      from the compilation step (execution of <code>make</code>)</li>
+
+    </ul>
+
+    <p>For other packages, an analysis of the specific
+    <i>package.mk</i> file is needed. For example, the zlib Makefile
+    looks like:</p>
+
+    <pre>
+$(ZLIB_DIR)/.configured: $(ZLIB_DIR)/.patched
+        (cd $(ZLIB_DIR); rm -rf config.cache; \
+                        [...]
+        )
+        touch $@
+
+$(ZLIB_DIR)/libz.a: $(ZLIB_DIR)/.configured
+        $(MAKE) -C $(ZLIB_DIR) all libz.a
+        touch -c $@
+    </pre>
+
+    <p>So, if you want to trigger the reconfiguration, you need to
+    remove <code>output/build/zlib-version/.configured</code> and if
+    you want to trigger only the recompilation, you need to remove
+    <code>output/build/zlib-version/libz.a</code>.</p>
+
     <h2><a name="buildroot_innards" id="buildroot_innards"></a>How Buildroot
     works</h2>
 
@@ -466,334 +551,147 @@ $ make me&lt;TAB&gt;
     configuration is done) :</p>
 
     <ol>
-      <li>Create the download directory (<code>dl/</code> by default). This is
-      where the tarballs will be downloaded. It is interesting to know that the
-      tarballs are in this directory because it may be useful to save them
-      somewhere to avoid further downloads. </li>
 
-      <li>Create the shared build directory (<code>build_ARCH/</code> by
-      default, where <code>ARCH</code> is your architecture). This is where all
-      non configurable user-space tools will be compiled.When building two or
-      more targets using the same architecture, the first build will go through
-      the full download, configure, make process, but the second and later
-      builds will only copy the result from the first build to its project
-      specific target directory significantly speeding up the build process</li>
+      <li>Create all the output directories: <code>staging</code>,
+      <code>target</code>, <code>build</code>, <code>stamps</code>,
+      etc. in the output directory (<code>output/</code> by default,
+      another value can be specified using <code>O=</code>)</li>
 
-      <li>Create the project specific build directory
-      (<code>project_build_ARCH/$(PROJECT)</code> by default, where
-      <code>ARCH</code> is your architecture). This is where all configurable
-      user-space tools will be compiled. The project specific build directory
-      is neccessary, if two different targets needs to use a specific package,
-      but the packages have different configuration for both targets. Some
-      examples of packages built in this directory are busybox and linux.
-      </li>
+      <li>Generate all the targets listed in the
+      <code>BASE_TARGETS</code> variable. When an internal toolchain
+      is used, it means generating the cross-compilation
+      toolchain. When an external toolchain is used, it means checking
+      the features of the external toolchain and importing it into the
+      Buildroot environment.</li>
 
-      <li>Create the project specific result directory
-      (<code>binaries/$(PROJECT)</code> by default, where <code>ARCH</code>
-      is your architecture). This is where the root filesystem images are
-      stored, It is also used to store the linux kernel image and any
-      utilities, boot-loaders etc. needed for a target.
-      </li>
+      <li>Generate all the targets listed in the <code>TARGETS</code>
+      variable. This variable is filled by all the individual
+      components Makefiles. So, generating all these targets will
+      trigger the compilation of the userspace packages (libraries,
+      programs), the kernel, the bootloader and the generation of the
+      root filesystem images, depending on the configuration.</li>
 
-      <li>Create the toolchain build directory
-      (<code>toolchain_build_ARCH/</code> by default, where <code>ARCH</code>
-      is your architecture). This is where the cross compilation toolchain will
-      be compiled. </li>
-
-      <li>Setup the staging directory (<code>build_ARCH/staging_dir/</code> by
-      default). This is where the cross-compilation toolchain will be
-      installed. If you want to use the same cross-compilation toolchain for
-      other purposes, such as compiling third-party applications, you can add
-      <code>build_ARCH/staging_dir/usr/bin</code> to your PATH, and then use
-      <code>arch-linux-gcc</code> to compile your application. In order to
-      setup this staging directory, it first removes it, and then it creates
-      various subdirectories and symlinks inside it. </li>
-
-      <li>Create the target directory (<code>project_build_ARCH/root/</code> by
-      default) and the target filesystem skeleton. This directory will contain
-      the final root filesystem. To setup it up, it first deletes it, then it
-      uncompress the <code>target/generic/skel.tar.gz</code> file to create the
-      main subdirectories and symlinks, copies the skeleton available in
-      <code>target/generic/target_skeleton</code> and then removes useless
-      <code>.svn/CVS</code> directories. </li>
-
-      <li>Add the <code>TARGETS</code> dependency. This should generally check
-      if the configuration option for this package is enabled, and if so then
-      &quot;subscribe&quot; this package to be compiled by adding it to the
-      TARGETS global variable. </li>
     </ol>
 
-    <h2><a name="multi_project" id="multi_project"></a>Building several
-      projects in the same buildroot source tree</h2>
+    <h2><a name="board_support" id="board_support"></a>
+    Creating your own board support</h2>
 
-    <p><i>Note: the contents of this section are obsolete since this
-    feature has been implemented.</i></p>
+    <p>Creating your own board support in Buildroot allows you to have
+    a convenient place to store the Busybox, uClibc, kernel
+    configurations, your target filesystem skeleton, and a Buildroot
+    configuration that match your project.</p>
 
-    <h3>Background</h3>
+    <p>Follow these steps to integrate your board in Buildroot:</p>
 
-    <p>Buildroot has always supported building several projects in the same
-    tree if each project was for a different architecture. </p>
-
-    <p>The root file system has been created in the
-    <code>&quot;build_&lt;ARCH&gt;/root&quot;</code>
-    directory which is unique for each architecture.
-    Toolchains have been built in
-    <code>&quot;toolchain_build_&lt;ARCH&gt;&quot;</code>. </p>
-
-    <p> It the user wanted to build several root file systems for the same
-    architecture, a prefix or suffix could be added in the configuration file
-    so the root file system would be built in
-    <code>&quot;&lt;PREFIX&gt;_build_&lt;ARCH&gt;_&lt;SUFFIX&gt;/root&quot;</code>
-    By supplying <u>unique</u> combinations of
-    <code>&quot;&lt;PREFIX&gt;&quot;</code> and
-    <code>&quot;&lt;SUFFIX&gt;&quot;</code>
-    each project would get a <u>unique</u> root file system tree. </p>
-
-    <p>The disadvantage of this approach is that a new toolchain was
-    built for each project,  adding considerable time to the build
-    process, even if it was two projects for the same chip. </p>
-
-    <p>This drawback has been somewhat lessened with
-    <code>gcc-4.x.y</code> which allows buildroot to use an external
-    toolchain. Certain packages requires special
-    features in the toolchain, and if an external toolchain is selected,
-    this may lack the neccessary features to complete the build of the root
-     file system.</p>
-
-    <p>A bigger problem was that the
-    <code>&quot;build_&lt;ARCH&gt;&quot;</code> tree
-    was also duplicated, so each </code>package</code> would also
-    be rebuilt once per project, resulting in even longer build times.</p>
-
-    <h3>Project to share toolchain and package builds</h3>
-
-    <p>Work has started on a project which will allow the user to build
-    multiple root file systems for the same architecture in the same tree.
-    The toolchain and the package build directory will be shared, but each
-    project will have a dedicated directory tree for project specific
-    builds. </p>
-
-    <p>With this approach, most, if not all packages will be compiled
-    when the first project is built.
-    The process is almost identical to the original process.
-    Packages are downloaded and extracted to the shared
-    <code>&quot;build_&lt;ARCH&gt;/&lt;package&gt;&quot;</code>
-    directory. They are configured and compiled. </p>
-
-    <p>Package libraries and headers are installed in the shared $(STAGING_DIR),
-    and then the project specific root file system &quot;$(TARGET_DIR)&quot;
-    is populated. </p>
-
-    <p>At the end of the build, the root file system will be used
-    to generate the resulting root file system binaries. </p>
-
-    <p>Once the first project has been built, building other projects will
-    typically involve populating the new project's root file system directory
-    from the existing binaries generated in the shared
-    <code>&quot;build_&lt;ARCH&gt;/&lt;&gt;&quot;</code> directory. </p>
-
-    <p>Only packages, not used by the first project, will have to go
-    through the normal extract-configure-compile flow. </p>
-
-    <h3>Implementation</h3>
-
-    <p>The core of the solution is the introduction
-    of two new directories: </p>
-
-    <ul>
-    <li><code>project_build_&lt;ARCH&gt;</code></li>
-
-    <li><code>binaries;</code></li>
-    </ul>
-
-    <p>Each of the directories contain one subdirectory per project.
-    The name of the subdirectory is configured by the user in the
-    normal buildroot configuration, using the value of: </p>
-
-    <p><code>Project Options ---> Project name</code></p>
-
-    <p>The configuration defines the $(PROJECT) variable.</p>
-
-    <p>The default project name is <code>&quot;uclibc&quot;</code>.</p>
-
-    <p><code>&quot;package/Makefile.in&quot;</code> defines:
-    <pre>
-    <code>PROJECT_BUILD_DIR:=project_build_$(ARCH)/$(PROJECT)</code>
-    <code>BINARIES_DIR:=binaries/$(PROJECT)</code>
-    </pre>
-    </p>
-
-    <p>It also defines the location for the target root file system:
-    <pre>
-    <code>TARGET_DIR:=$(PROJECT_BUILD_DIR)/$(PROJECT)/root</code>
-    </pre>
-    </p>
-
-    <p>I.E: If the user has choosen
-    <code>&quot;myproject&quot;</code>
-    as the $(PROJECT) name:
-
-    <ul>
-    <li><code>&quot;project_build_&lt;ARCH&gt;/myproject&quot;</code></li>
-    <li><code>&quot;binaries/myproject&quot;</code></li>
-    </ul>
-
-    <p>will be created. </p>
-
-    <p>Currently, the <u>root file system</u>, <u>busybox</u> and an Atmel
-    customized version of
-    <u><code>U-Boot</code></u>, as well as some Atmel specific
-    bootloaders like <u>at91-bootstrap</u> and <u>dataflashboot.bin</u>
-    are built in
-    <code>&quot;$(PROJECT_BUILD_DIR)&quot;</code>
-
-    <p>The resulting binaries for all architectures are stored in the
-    <code>&quot;$(BINARIES_DIR)&quot;</code> directory. <p>
-
-    <h3>Summary</h3>
-
-    <p>The project will share directories which can be share without
-    conflicts, but will use unique build directories, where the user
-    can configure the build. </p>
-
-    <h2><a name="Linux" id="Linux"></a>Linux</h2>
-
-     <p>The user can select from three different Linux strategies:
-
-     <ul>
-     <li>Legacy: Only use version supported by the kernel headers</li>
-     <li>Advanced: Allow any 2.6.X.Y combination.
-	(Minimum 2.6.19)</li>
-     <li>Power-User Strategy: Allow
-     <code>&quot;-git&quot;</code>, or
-     <code>&quot;-mm&quot;</code>, or user downloadable kernels</li>
-     </ul>
-
-     <p>The current kernel patches can be applied to the
-     linux source tree even if the version differs from the
-     kernel header version. </p>
-
-     <p>Since the user can select any kernel-patch
-     he/she will be able to select a non-working combination.
-     If the patch fails, the user will have to generate a new
-     proprietary kernel-patch or decide to not apply the kernel
-     patches</p>
-
-     <p>There is also support for <u>board specific</u> and
-     <u>architecture specific</u> patches. </p>
-
-     <p>There will also be a way for the user to supply absolute
-     or relative paths to patches, possibly outside the main tree.
-     This can be used to apply custom kernel-header-patches, if
-     the versions available in buildroot cannot be applied to the
-     specific linux version used</p>
-
-     <p>Maybe, there will also be a possibility to supply an
-     <code>&quot;URL&quot;</code> to a patch available on Internet. </p>
-
-     <p>
-	If there is no linux config file available,
-	buildroot starts the linux configuration system, which
-	defaults to "make menuconfig".
-     </p>
-
-    <h3>Todo</h3>
     <ol>
 
-     <li>Configurable packages</li>
-     <p>Many packages can, on top of the simple
-     &quot;enable/disable build&quot;,
-     be further configured using Kconfig.
-     Currently these packages will be compiled using the
-     configuration specified in the
-     <code>&quot;.config&quot;</code> file of the <u>first</u>
-     project demanding the build of the package.</p>
+      <li>Create a new directory in <code>target/device/</code>, named
+      after your company or organization</li>
 
-     <p>If <u>another</u> project uses the same packages, but with
-     a different configuration,these packages will <u>not</u> be rebuilt,
-     and the root file system for the new project will be populated
-     with files from the build of the <u>first</u> project</p>
+      <li>Add a line <code>source
+      "target/device/yourcompany/Config.in"</code> in
+      <code>target/device/Config.in</code> so that your board appears
+      in the configuration system</li>
 
-     <p>If multiple project are built, and a specific package
-     needs two different configuration, then the user must
-     delete the package from the
-     <code>&quot;build_&lt;ARCH&gt;&quot;</code> directory
-     before rebuilding the new project.<p>
+      <li>In <code>target/device/yourcompany/</code>, create a
+      directory for your project. This way, you'll be able to store
+      several projects of your company/organization inside
+      Buildroot.</li>
 
-     <p>A long term solution is to edit the package makefile and move
-     the build of the configurable packages from
-     <code>&quot;build_&lt;ARCH&gt;&quot;</code> to
-     <code>&quot;project_build_&lt;ARCH&gt;/&lt;project name&gt;&quot;</code>
-     and send a patch to the buildroot mailing list.
+      <li>Create a <code>target/device/yourcompany/Config.in</code>
+      file that looks like the following:
 
-     <li>Naming conventions</li>
+      <pre>
+menuconfig BR2_TARGET_COMPANY
+       bool "Company projects"
 
-     <p>Names of resulting binaries should reflect the
-     &quot;project name&quot;
+if BR2_TARGET_COMPANY
 
-     <li>Generating File System binaries</li>
-     <p>
-     Packages which needs to be installed with the &quot;root&quot;
-     as owner, will generate a
-     <code>&quot;.fakeroot.&lt;package&gt;&quot;</code> file
-     which will be used for the final build of the root file system binary. </p>
+config BR2_TARGET_COMPANY_PROJECT_FOOBAR
+       bool "Support for Company project Foobar"
+       help
+         This option enables support for Company project Foobar
 
-     <p>This was previously located in the
-     <code>&quot;$(STAGING_DIR)&quot;</code> directory, but was
-     recently moved to the
-     <code>&quot;$(PROJECT_BUILD_DIR)&quot;</code> directory. </p>
+endif
+      </pre>
 
-     <p>Currently only three packages:
-     <code>&quot;at&quot;</code>,
-     <code>&quot;ltp-testsuite&quot;</code> and
-     <code>&quot;nfs-utils&quot;</code>
-     requests fakeroot. <p>
+      Of course, customize the different values to match your
+      company/organization and your project. This file will create a
+      menu entry that contains the different projects of your
+      company/organization.</li>
 
-     <p>The makefile fragments for each file system type like
-     <code>&quot;ext2&quot;</code>,
-     <code>&quot;jffs2&quot;</code> or
-     <code>&quot;squashfs&quot;</code>
-     will, when the file system binary is generated,
-     collect all present
-     <code>&quot;.fakeroot.&lt;package&gt;&quot;</code> files
-     to a single <code>&quot;_fakeroot.&lt;file system&gt;&quot;</code>
-     file and call fakeroot.</p>
-     <code>&quot;.fakeroot.&lt;package&gt;&quot;</code>
-     files are deleted as the last action of the Buildroot Makefile. </p>
+      <li>Create a <code>target/device/yourcompany/Makefile.in</code>
+      file that looks like the following:
 
-     <p>It needs to be evaluated if any further action for the
-     file system binary build is needed. </p>
+      <pre>
+ifeq ($(BR2_TARGET_COMPANY_PROJECT_FOOBAR),y)
+include target/device/yourcompany/project-foobar/Makefile.in
+endif
+      </pre>
+      </li>
 
-     </ol>
+      <li>Now, create the
+      <code>target/device/yourcompany/project-foobar/Makefile.in</code>
+      file. It is first recommended to define a
+      <code>BOARD_PATH</code> variable set to
+      <code>target/device/yourcompany/project-foobar</code>, as it
+      will simplify further definitions. Then, the file might define
+      one or several of the following variables:
+
+      <ul>
+
+	<li><code>TARGET_SKELETON</code> to a directory that contains
+	the target skeleton for your project. If this variable is
+	defined, this target skeleton will be used instead of the
+	default one. If defined, the convention is to define it to
+	<code>$(BOARD_PATH)/target_skeleton</code>, so that the target
+	skeletonn is stored in the board specific directory.</li>
+
+	<li><code>TARGET_DEVICE_TABLE</code> to a file that contains
+	the target device table, i.e the list of device files (in
+	<code>/dev/</code>) created by the root filesystem building
+	procedure. If this variable is defined, the given device table
+	will be used instead of the default one. If defined, the
+	convention is to define it to
+	<code>$(BOARD_PATH)/target_device_table.txt</code>. See
+	<code>target/generic/device_table.txt</code> for an example
+	file.</li>
+
+      </ul>
+
+      </li>
+
+      <li>Then, in the
+      <code>target/device/yourcompany/project-foobar/</code>
+      directory, you can store configuration files for the kernel,
+      for Busybox or uClibc.
+
+      You can furthermore create one or more preconfigured configuration
+      files, referencing those files. These config files are named
+      <code>something_defconfig</config> and are stored in the toplevel
+      <code>configs/</code> directory. Your users will then be able
+      to run <code>make something_defconfig</code> and get the right
+      configuration for your project</li>
+
+    </ol>
 
     <h2><a name="using_toolchain" id="using_toolchain"></a>Using the
-    uClibc toolchain outside Buildroot</h2>
+    generated toolchain outside Buildroot</h2>
 
     <p>You may want to compile your own programs or other software
     that are not packaged in Buildroot. In order to do this, you can
     use the toolchain that was generated by Buildroot. </p>
 
     <p>The toolchain generated by Buildroot by default is located in
-    <code>build_ARCH/staging_dir/</code>. The simplest way to use it
-    is to add <code>build_ARCH/staging_dir/usr/bin/</code> to your PATH
+    <code>output/staging/</code>. The simplest way to use it
+    is to add <code>output/staging/usr/bin/</code> to your PATH
     environnement variable, and then to use
-    <code>arch-linux-gcc</code>, <code>arch-linux-objdump</code>,
-    <code>arch-linux-ld</code>, etc. </p>
+    <code>ARCH-linux-gcc</code>, <code>ARCH-linux-objdump</code>,
+    <code>ARCH-linux-ld</code>, etc. </p>
 
-    <p>For example, you may add the following to your
-    <code>.bashrc</code> (considering you're building for the MIPS
-    architecture and that Buildroot is located in
-    <code>~/buildroot/</code>) :</p>
-
-<pre>
-export PATH=&quot;$PATH:~/buildroot/build_mips/staging_dir/usr/bin/&quot;
-</pre>
-
-    <p>Then you can simply do :</p>
-
-<pre>
-mips-linux-gcc -o foo foo.c
-</pre>
+    <p>The easiest way is of course to add the
+    <code>output/staging/usr/bin/</code> directory to your PATH
+    environment variable.</p>
 
      <p><b>Important</b> : do not try to move a gcc-3.x toolchain to an other
      directory, it won't work. There are some hardcoded paths in the
@@ -804,8 +702,8 @@ mips-linux-gcc -o foo foo.c
      might be cumbersome.</p>
 
      <p>It is also possible to generate the Buildroot toolchain in
-     another directory than <code>build_ARCH/staging_dir</code> using
-     the <code>Build options -&gt; Toolchain and header file
+     another directory than <code>output/staging</code> using the
+     <code>Build options -&gt; Toolchain and header file
      location</code> option. This could be useful if the toolchain
      must be shared with other users.</p>
 
@@ -913,9 +811,7 @@ config BR2_PACKAGE_FOO
     <em>sorted alphabetically</em> per category and are <em>NOT</em>
     supposed to contain anything but the <em>bare</em> name of the package.</p>
 <pre>
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/procps/Config.in"
-endif
 </pre>
    <p><strong>Note:</strong><br>
    Generally all packages should live <em>directly</em> in the
@@ -965,7 +861,7 @@ endif
 
     <p>On <a href="#ex1line9">line 9</a>, we tell Buildroot to install
     the application to the staging directory. The staging directory,
-    located in <code>build_ARCH/staging_dir/</code> is the directory
+    located in <code>output/staging/</code> is the directory
     where all the packages are installed, including their
     documentation, etc. By default, packages are installed in this
     location using the <code>make install</code> command.</p>

docs/copyright.txt

@@ -25,6 +25,6 @@ HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
 
 You have been warned.
 
-You can contact the webmaster at <andersen@codepoet.org> if you have some sort
+You can contact the webmaster at <buildroot@uclibc.org> if you have some sort
 of problem with this.
 

docs/docs.html

@@ -2,15 +2,21 @@
 
 
 <h3>Documentation</h3>
-Current documentation for buildroot includes:
+Documentation for buildroot includes:
 
 <ul>
 
   <li>
-    <a href= "buildroot.html">Buildroot - Usage and
-    documentation</a> is where you want to start reading if you wish to
-    understand how buildroot work, or wish to change/extend/fix things.  If you
-    find any errors (factual, grammatical, whatever) please report them.
+    Usage and documentation is where you want to start reading if you
+    wish to understand how buildroot work, or wish to
+    change/extend/fix things. If you find any errors (factual,
+    grammatical, whatever) please report them. Choose between:
+    <p>
+    <ul>
+      <li><a href="/downloads/buildroot.html">Latest stable release</a></li>
+      <li><a href="buildroot.html">GIT head revision</a></li>
+    </ul>
+    <p>
   </li>
 
   <li>
@@ -20,7 +26,7 @@ Current documentation for buildroot includes:
 
   <li>
     If you find that you need help with buildroot, you can ask for help on the
-    <a href= "lists/uClibc/">buildroot mailing list</a> at buildroot at mail.uclibc.org.
+    <a href= "lists.html">buildroot mailing list</a> at buildroot at uclibc.org.
     In addition the BusyBox, uClibc, and buildroot developers are also known to
     hang out on the uClibc IRC channel: #uclibc on irc.freenode.net.
   </li>

docs/download.html

@@ -6,7 +6,23 @@
 
 <p>
 
-The latest release can always be dowloaded from
+The latest stable release is <b>2009.11</b>, which can be downloaded
+here:<p>
+
+<a href="/downloads/buildroot-2009.11.tar.gz">buildroot-2009.11.tar.gz</a>
+or
+<a href="/downloads/buildroot-2009.11.tar.bz2">buildroot-2009.11.tar.bz2</a>.
+<p>
+<!--
+The latest release candidate is <b>2009.11-rc2</b>, which can be
+downloaded here:<p>
+
+<a href="/downloads/buildroot-2009.11-rc2.tar.gz">buildroot-2009.11-rc2.tar.gz</a>
+or
+<a href="/downloads/buildroot-2009.11-rc2.tar.bz2">buildroot-2009.11-rc2.tar.bz2</a>.
+<p>
+-->
+This and earlier releases can always be downloaded from
 <a href="/downloads/">http://buildroot.net/downloads/</a>.
 
 <p>
@@ -19,7 +35,7 @@ follow development, but cannot or do not wish to use Git.
 	<li> Click here to <a href="downloads/snapshots/">Daily Snapshots</a>.
 	</li>
 
-	<li> Click here to <a href="http://sources.busybox.net/index.py/trunk/buildroot/">browse the source tree</a>.
+	<li> Click here to <a href="http://git.buildroot.net/buildroot">browse the source tree</a>.
 	</li>
 
 	<li>Anonymous <a href="git.html">Git access</a> is available.
@@ -27,4 +43,3 @@ follow development, but cannot or do not wish to use Git.
 </ul>
 
 <!--#include file="footer.html" -->
-

docs/git.html

@@ -27,12 +27,13 @@ tree at any time so it is in sync with the latest and greatest by entering your
 buildroot directory and running the command:
 
 <pre>
-git pull</pre>
+git pull
+</pre>
 
 Because you've only been granted anonymous access to the tree, you won't be
 able to commit any changes. Changes can be submitted for inclusion by posting
 them to the buildroot mailing list or to the <a
-href="http://bugs.uclibc.org/">Bug and Patch Tracking System</a>.
+href="https://bugs.uclibc.org/">Bug and Patch Tracking System</a>.
 
 <!--#include file="footer.html" -->
 

docs/header.html

@@ -36,7 +36,7 @@
     <br><a href="/download.html">Download</a>
     <br><a href="http://git.buildroot.net/buildroot">Browse Source</a>
     <br><a href="/git.html">Accessing Source</a>
-    <br><a href="http://bugs.uclibc.org/">Bug Tracking</a>
+    <br><a href="https://bugs.uclibc.org/">Bug Tracking</a>
     <br><a href="/docs.html">Documentation</a>
     <br><a href="/lists.html">Mailing Lists</a>
 

docs/lists.html

@@ -22,8 +22,8 @@ list with frequently asked questions...
 
 <center>
 <form method="GET" action="http://www.google.com/custom">
-<input type="hidden" name="domains" value="buildroot.uclibc.org">
-<input type="hidden" name="sitesearch" value="buildroot.uclibc.org">
+<input type="hidden" name="domains" value="lists.busybox.net">
+<input type="hidden" name="sitesearch" value="lists.busybox.net">
 <input type="text" name="q" size="31" maxlength="255" value="">
 <br>
 <input type="submit" name="sa" value="search the mailing list archives">

docs/news.html

@@ -5,6 +5,164 @@
 <p>
 
 <ul>
+  <li><b>1 December 2009 -- 2009.11 released</b>
+
+    <p>The stable 2009.11 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2009.11">CHANGES</a>
+    for more details, and go to the <a href="/downloads/">downloads page</a>
+    to pick up the <a href="/downloads/buildroot-2009.11.tar.bz2">2009.11
+    release</a>.</p>
+
+  <li><b>29 November 2009 -- 2009.11-rc2 released</b>
+
+    <p>RC2 is out with more cleanups and bugfixes, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2009.11_rc2">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.11-rc2.tar.bz2">2009.11-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
+  <li><b>23 November 2009 -- 2009.11-rc1 released</b>
+
+    <p>We have a new release candidate! Lots of changes all over the
+    tree, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2009.11_rc1">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.11-rc1.tar.bz2">2009.11-rc1
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
+  <li><b>7 September 2009 -- First Buildroot Developer Day</b>
+
+    <p>The first <i>Buildroot Developer Day</i> will take place on
+    Saturday, October 17th in Grenoble, France, just the day after
+    Embedded Linux Conference Europe. This <i>Developer Day</i> aims
+    at allowing Buildroot developers to meet and exchange ideas on the
+    project and its future.</p>
+
+    <p>As the number of places is limited, interested candidates are
+    invited to send an e-mail to Peter Korsgaard (<code>jacmet at
+    uclibc dot org</code>) and Thomas Petazzoni (<code>thomas dot
+    petazzoni at free-electrons dot com</code>).</p>
+
+    <p>This <i>Developer Day</i> will take place thanks to the
+    sponsoring of <a href="http://www.calao-systems.com">Calao
+    Systems</a> and <a href="http://www.free-electrons.com">Free
+    Electrons</a>.</p>
+
+  <li><b>31 August 2009 -- 2009.08 released</b>
+
+    <p>The stable 2009.08 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2009-August/029018.html">announcement</a>
+    or <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2009.08">CHANGES</a>
+    for more details, and go to the <a href="/downloads/">downloads page</a>
+    to pick up the <a href="/downloads/buildroot-2009.08.tar.bz2">2009.08
+    release</a>.</p>
+
+  <li><b>26 August 2009 -- 2009.08-rc3 released</b>
+    <p>A number of bugfixes have been added to the tree since RC2
+    (especially thanks to Thomas Petazzoni) - See the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2009.08_rc3">CHANGES</a>
+    file for details. This is very much expected to be the final release
+    candidate, so give it a good test and expect a final 2009.08
+    release next weekend unless critical issues are found.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.08-rc3.tar.bz2">2009.08-rc3
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
+  <li><b>6 August 2009 -- 2009.08-rc2 released</b>
+
+    <p>RC2 is out with more cleanups and bugfixes, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2009.08_rc2">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.08-rc2.tar.bz2">2009.08-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
+  <li><b>2 August 2009 -- 2009.08-rc1 released</b>
+
+    <p>We have a new release candidate! Lots of changes all over the
+    tree, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2009.08_rc1">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.08-rc1.tar.bz2">2009.08-rc1
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
+  <li><b>1 June 2009 -- 2009.05 released</b>
+
+    <p>The stable 2009.05 release is out - Thanks to everyone
+    contributing and testing the release candidates. See the
+    <a href="http://lists.busybox.net/pipermail/buildroot/2009-June/027640.html">announcement</a>
+    or <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2009.05">CHANGES</a>
+    for more details, and go to the <a href="/downloads/">downloads page</a>
+    to pick up the <a href="/downloads/buildroot-2009.05.tar.bz2">2009.05
+    release</a>.</p>
+
+  <li><b>27 May 2009 -- 2009.05-rc3 released</b>
+
+    <p>We had a number of fixes post-RC2, so RC3 is out (see <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2009.05_rc3">CHANGES</a>
+    for details). Now is the moment to test and verify that everything
+    is working for your favorite config - Expect a final 2009.05 very soon.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.05-rc3.tar.bz2">2009.05-rc3
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
+  <li><b>19 May 2009 -- 2009.05-rc2 released</b>
+
+    <p>RC2 is out with more cleanups and bug fixes (see <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2009.05_rc2">CHANGES</a>).
+    Unless big issues are found, expect this to be the last release
+    candidate before the release - So give it a good test.</p>
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.05-rc2.tar.bz2">2009.05-rc2
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
+
+  <li><b>14 May 2009 -- Buildroot.org</b>
+
+    <p>Earl Levine has been so kind to donate the <b>buildroot.org</b>
+    domain to us, so the website can now also be reached at <a
+    href="http://www.buildroot.org">www.buildroot.org</a> (and git at
+    <a href="http://git.buildroot.org/buildroot">git.buildroot.org</a>).
+
+    Thanks a lot Earl!</p>
+
+  <li><b>5 May 2009 -- 2009.05-rc1 released</b>
+
+    <p>We have a new release candidate! Lots of changes all over the
+    tree, see the <a
+    href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2009.05_rc1">CHANGES</a>
+    file for details.
+
+    <p>Head to the <a href="/downloads/">downloads page</a> to pick up the
+    <a href="/downloads/buildroot-2009.05-rc1.tar.bz2">2009.05-rc1
+    release candidate</a>, and report any problems found to the <a
+    href="lists.html">mailing list</a> or <a
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
 
   <li><b>3 May 2009 -- Moved to git</b>
 
@@ -44,7 +202,7 @@
     <a href="/downloads/buildroot-2009.02-rc4.tar.bz2">2009.02-rc4
     release candidate</a>, and report any problems found to the <a
     href="lists.html">mailing list</a> or <a
-    href="http://bugs.uclibc.org">bug tracker</a>.</p>
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
 
   <li><b>31 January 2009 -- 2009.02-rc3 released</b>
       <p>RC3 is out with more cleanups and bug fixes. Unless big issues
@@ -55,7 +213,7 @@
     <a href="/downloads/buildroot-2009.02-rc3.tar.bz2">2009.02-rc3
     release candidate</a>, and report any problems found to the <a
     href="lists.html">mailing list</a> or <a
-    href="http://bugs.uclibc.org">bug tracker</a>.</p>
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
 
   <li><b>23 January 2009 -- 2009.02-rc2 released</b>
     <p>Another week, another release candidate with a bunch of
@@ -65,7 +223,7 @@
     <a href="/downloads/buildroot-2009.02-rc2.tar.bz2">2009.02-rc2
     release candidate</a>, and report any problems found to the <a
     href="lists.html">mailing list</a> or <a
-    href="http://bugs.uclibc.org">bug tracker</a>.</p>
+    href="https://bugs.uclibc.org">bug tracker</a>.</p>
 
   <li><b>16 January 2009 -- Release candidate and new maintainer</b>
     <p>It has been a long time coming, but we finally have a new
@@ -75,7 +233,7 @@
     <a href="/downloads/buildroot-2009.02-rc1.tar.bz2">2009.02-rc1
     release candidate</a>, and report any problems found to the <a
     href="lists.html">mailing list</a> or <a
-    href="http://bugs.uclibc.org">bug tracker</a>. The plan is to
+    href="https://bugs.uclibc.org">bug tracker</a>. The plan is to
     release 2009.02 in time for <a
     href="http://www.fosdem.org/2009/">FOSDEM</a>.</p>
 
@@ -103,7 +261,7 @@
 
     If you find a bug in buildroot, or wish to submit a patch to fix a problem
     or add a shiny new feature, please use the <a
-    href="http://bugs.uclibc.org/">Bug and Patch Tracking System</a> to post
+    href="https://bugs.uclibc.org/">Bug and Patch Tracking System</a> to post
     the details, to make certain your work is not lost.
 
 

package/Config.in

@@ -4,7 +4,7 @@ source "package/busybox/Config.in"
 
 comment "The minimum needed to build a uClibc development system"
 
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/bash/Config.in"
 source "package/bzip2/Config.in"
 source "package/coreutils/Config.in"
@@ -12,15 +12,15 @@ source "package/diffutils/Config.in"
 source "package/findutils/Config.in"
 endif
 source "package/flex/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/gawk/Config.in"
 endif
 source "toolchain/gcc/Config.in.2"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/grep/Config.in"
 endif
 source "package/make/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/patch/Config.in"
 source "package/sed/Config.in"
 source "package/tar/Config.in"
@@ -41,7 +41,6 @@ source "package/gperf/Config.in"
 source "package/mpfr/Config.in"
 source "package/libtool/Config.in"
 source "package/m4/Config.in"
-source "package/mpatrol/Config.in"
 source "package/oprofile/Config.in"
 source "package/pkg-config/Config.in"
 source "package/readline/Config.in"
@@ -53,19 +52,20 @@ source "package/at/Config.in"
 source "package/beecrypt/Config.in"
 source "package/berkeleydb/Config.in"
 source "package/bsdiff/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/bootutils/Config.in"
 endif
 source "package/cups/Config.in"
 source "package/customize/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/dash/Config.in"
 endif
+source "package/enchant/Config.in"
 source "package/file/Config.in"
 source "package/gamin/Config.in"
 source "package/icu/Config.in"
 source "package/kexec/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/less/Config.in"
 endif
 source "package/libconfig/Config.in"
@@ -87,16 +87,16 @@ source "package/lsof/Config.in"
 source "package/ltp-testsuite/Config.in"
 source "package/ltrace/Config.in"
 source "package/memstat/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/module-init-tools/Config.in"
 source "package/modutils/Config.in"
 endif
 source "package/ng-spice-rework/Config.in"
 source "package/popt/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/procps/Config.in"
 endif
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/psmisc/Config.in"
 endif
 source "package/screen/Config.in"
@@ -104,7 +104,7 @@ source "package/shared-mime-info/Config.in"
 source "package/startup-notification/Config.in"
 source "package/strace/Config.in"
 source "package/sudo/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/sysklogd/Config.in"
 # busybox has init and the runit stuff
 source "package/sysvinit/Config.in"
@@ -114,26 +114,23 @@ endif
 
 source "package/database/Config.in"
 
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
-# busybox has an editor
-
 # text editors
 source "package/editors/Config.in"
 
-endif
-
 menu "Networking"
 
 comment "Networking applications"
 source "package/argus/Config.in"
 source "package/avahi/Config.in"
 source "package/axel/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/boa/Config.in"
 endif
 source "package/bind/Config.in"
+source "package/bmon/Config.in"
 source "package/bridge-utils/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+source "package/ctorrent/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/dhcp/Config.in"
 endif
 source "package/dnsmasq/Config.in"
@@ -142,11 +139,11 @@ source "package/ethtool/Config.in"
 source "package/haserl/Config.in"
 source "package/hostap/Config.in"
 source "package/ifplugd/Config.in"
-#source "package/irda-utils/Config.in"
 source "package/iperf/Config.in"
 source "package/iproute2/Config.in"
 source "package/ipsec-tools/Config.in"
 source "package/iptables/Config.in"
+source "package/iw/Config.in"
 source "package/kismet/Config.in"
 source "package/l2tp/Config.in"
 source "package/libcgi/Config.in"
@@ -154,17 +151,18 @@ source "package/libcgicc/Config.in"
 source "package/libcurl/Config.in"
 source "package/libdnet/Config.in"
 source "package/libeXosip2/Config.in"
+source "package/libmicrohttpd/Config.in"
+source "package/libnl/Config.in"
 source "package/libosip2/Config.in"
 source "package/libpcap/Config.in"
 source "package/libsoup/Config.in"
 source "package/libupnp/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/lighttpd/Config.in"
 endif
 source "package/links/Config.in"
 source "package/lrzsz/Config.in"
-source "package/mdnsresponder/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/microcom/Config.in"
 endif
 source "package/mii-diag/Config.in"
@@ -173,13 +171,14 @@ source "package/mutt/Config.in"
 source "package/nbd/Config.in"
 source "package/ncftp/Config.in"
 source "package/neon/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/netcat/Config.in"
-endif
 source "package/netkitbase/Config.in"
 source "package/netkittelnet/Config.in"
+endif
 source "package/netplug/Config.in"
 source "package/netsnmp/Config.in"
+source "package/netstat-nat/Config.in"
 source "package/nfs-utils/Config.in"
 source "package/ntp/Config.in"
 source "package/olsr/Config.in"
@@ -198,25 +197,22 @@ source "package/quagga/Config.in"
 source "package/rsync/Config.in"
 source "package/samba/Config.in"
 source "package/socat/Config.in"
+source "package/spawn-fcgi/Config.in"
 source "package/stunnel/Config.in"
 source "package/tcpdump/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/tftpd/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
 source "package/thttpd/Config.in"
 source "package/tinyhttpd/Config.in"
 endif
 source "package/tn5250/Config.in"
 source "package/ttcp/Config.in"
-#if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
-# ATTENTION! This was merged into busybox!
-#source "package/udhcp/Config.in"
-#endif
 source "package/udpcast/Config.in"
 source "package/vpnc/Config.in"
 source "package/vsftpd/Config.in"
 source "package/vtun/Config.in"
 source "package/webif/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/wget/Config.in"
 endif
 source "package/wireless-tools/Config.in"
@@ -229,17 +225,20 @@ source "package/acpid/Config.in"
 source "package/dbus/Config.in"
 source "package/dbus-glib/Config.in"
 source "package/dbus-python/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/devmem2/Config.in"
-source "package/dm/Config.in"
+endif
 source "package/dmraid/Config.in"
+source "package/dosfstools/Config.in"
 source "package/e2fsprogs/Config.in"
 source "package/eeprog/Config.in"
 source "package/fconfig/Config.in"
 source "package/fis/Config.in"
 source "package/fuse/Config.in"
 source "package/gadgetfs-test/Config.in"
+source "package/gvfs/Config.in"
 source "package/hal/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/hdparm/Config.in"
 source "package/hotplug/Config.in"
 endif
@@ -254,21 +253,23 @@ source "package/lm-sensors/Config.in"
 source "package/lvm2/Config.in"
 source "package/mdadm/Config.in"
 source "package/memtester/Config.in"
-source "package/mkdosfs/Config.in"
 source "package/mtd/Config.in"
 source "package/ntfs-3g/Config.in"
+source "package/ntfsprogs/Config.in"
 source "package/pciutils/Config.in"
 source "package/pcmcia/Config.in"
 source "package/setserial/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 # busybox has fdisk
 source "package/sfdisk/Config.in"
 endif
 source "package/smartmontools/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+source "package/sysstat/Config.in"
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 # mdev
 source "package/udev/Config.in"
 endif
+source "package/usb_modeswitch/Config.in"
 source "package/usbmount/Config.in"
 source "package/usbutils/Config.in"
 source "package/wipe/Config.in"
@@ -290,6 +291,7 @@ source "package/dialog/Config.in"
 comment "graphic libraries"
 source "package/directfb/Config.in"
 source "package/directfb-examples/Config.in"
+source "package/divine/Config.in"
 source "package/fbdump/Config.in"
 source "package/imagemagick/Config.in"
 source "package/jpeg/Config.in"
@@ -303,8 +305,10 @@ source "package/sawman/Config.in"
 source "package/sdl/Config.in"
 source "package/sdl_image/Config.in"
 source "package/sdl_mixer/Config.in"
+source "package/sdl_sound/Config.in"
 source "package/sdl_net/Config.in"
 source "package/sdl_ttf/Config.in"
+source "package/sdl_gfx/Config.in"
 source "package/tiff/Config.in"
 
 comment "busybox graphic applications"
@@ -313,46 +317,13 @@ source "package/fbv/Config.in"
 source "package/fbset/Config.in"
 
 comment "other GUIs"
-source "package/qtopia4/Config.in"
+source "package/qt/Config.in"
 
 #source "package/microwin/Config.in"
 
-
-choice
-	prompt "X Window System server"
-	default BR2_PACKAGE_XSERVER_none
-	help
-	  Select the X Window System server to use
-
-config BR2_PACKAGE_XSERVER_none
-	bool "none"
-config BR2_PACKAGE_XSERVER_xorg
-	bool "modular xorg"
-	depends on BR2_USE_WCHAR && BR2_LARGEFILE # && BR2_ENABLE_LOCALE
-# depending on BR2_ENABLE_LOCALE gives a recursion error with dbus
-config BR2_PACKAGE_XSERVER_tinyx
-	bool "tinyx"
-	depends on BR2_USE_WCHAR
-endchoice
-
-comment "xorg requires a toolchain with LOCALE, LARGEFILE and WCHAR support"
-	depends on !(BR2_USE_WCHAR && BR2_LARGEFILE && BR2_ENABLE_LOCALE)
-comment "tinyx requires a toolchain with WCHAR support"
-	depends on !BR2_USE_WCHAR
-
-config BR2_X11_PREFIX
-	string
-	default "/usr/X11R6"	if BR2_PACKAGE_XSERVER_xorg
-	default "/usr"		if BR2_PACKAGE_XSERVER_tinyx
-	help
-	  X11 apps root location
-
-if !BR2_PACKAGE_XSERVER_none
 source "package/x11r7/Config.in"
-endif
 
 comment "X libraries and helper libraries"
-#XXX: maybe some of these should depend on !BR2_PACKAGE_XSERVER_none
 source "package/atk/Config.in"
 source "package/cairo/Config.in"
 source "package/pango/Config.in"
@@ -402,9 +373,10 @@ endmenu
 
 menu "Compressors / decompressors"
 
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/gzip/Config.in"
 endif
+source "package/libarchive/Config.in"
 source "package/lzo/Config.in"
 source "package/lzop/Config.in"
 source "package/lzma/Config.in"
@@ -415,7 +387,7 @@ menu "Package managers"
 
 source "package/ipkg/Config.in"
 source "package/portage/Config.in"
-if !BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
+if BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
 source "package/rpm/Config.in"
 endif
 endmenu

package/Makefile.autotools.in

@@ -30,6 +30,8 @@
 #	list of (package) targets that must be built before foo
 # FOO_AUTORECONF [YES/NO, default NO]
 #	run <autoreconf> before <configure>
+# FOO_AUTORECONF_OPT [default empty]
+#	arguments passed to the <autoreconf> script
 # FOO_LIBTOOL_PATCH [YES/NO, default YES]
 #	Do you want the standard buildroot patch applied to ltmain.sh? (libtool)
 # FOO_USE_CONFIG_CACHE [YES/NO default $(BR2_CONFIG_CACHE)]
@@ -140,7 +142,7 @@ DOWNLOAD=$(WGET) -P $(DL_DIR) $(1)/$(2)
 else
 define DOWNLOAD
 	$(Q)test -e $(DL_DIR)/$(2) || \
-	for site in $(strip $(subst ",,$(BR2_PRIMARY_SITE))) $(1) $(strip $(subst ",,$(BR2_BACKUP_SITE))); \
+	for site in $(call qstrip,$(BR2_PRIMARY_SITE)) $(1) $(call qstrip,$(BR2_BACKUP_SITE)); \
 	do $(WGET) -P $(DL_DIR) $$site/$(2) && exit; done
 endef
 endif
@@ -186,7 +188,8 @@ $(BUILD_DIR)/%/.stamp_extracted:
 $(BUILD_DIR)/%/.stamp_libtool_patch:
 	$(call MESSAGE,"Patching libtool")
 # if the package uses libtool, patch it for cross-compiling in buildroot
-	$(Q)if test "$($(PKG)_LIBTOOL_PATCH)" = "YES"; then \
+	$(Q)if test "$($(PKG)_LIBTOOL_PATCH)" = "YES" -a \
+	"$($(PKG)_AUTORECONF)" != "YES"; then \
 	for i in `find $(@D) -name ltmain.sh`; do \
 		toolchain/patch-kernel.sh $${i%/*} package buildroot-libtool.patch; \
 		done \
@@ -225,7 +228,7 @@ endif
 # Running autoreconf
 $(BUILD_DIR)/%/.stamp_autoconfigured:
 	$(call MESSAGE,"Running autoreconf")
-	$(Q)cd $(@D)/$($(PKG)_SUBDIR) && $(AUTORECONF)
+	$(Q)cd $(@D)/$($(PKG)_SUBDIR) && $(AUTORECONF) $($(PKG)_AUTORECONF_OPT)
 # if the package uses libtool, patch it for cross-compiling in buildroot
 	$(Q)if test "$($(PKG)_LIBTOOL_PATCH)" = "YES"; then \
 		for i in `find $(@D)/$($(PKG)_SUBDIR) -name ltmain.sh`; do \
@@ -243,7 +246,7 @@ $(BUILD_DIR)/%/.stamp_configured:
 	$(TARGET_CONFIGURE_ENV) \
 	$($(PKG)_CONF_ENV) \
 	$(if $(THIS_SRCDIR),$(THIS_SRCDIR)/,./)configure \
-		$(if $(filter YES,$($(PKG)_USE_CONFIG_CACHE)),--cache-file="$(PROJECT_BUILD_DIR)/tgt-config.cache",) \
+		$(if $(filter YES,$($(PKG)_USE_CONFIG_CACHE)),--cache-file="$(BUILD_DIR)/tgt-config.cache",) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -253,6 +256,7 @@ $(BUILD_DIR)/%/.stamp_configured:
 		$(DISABLE_DOCUMENTATION) \
 		$(DISABLE_NLS) \
 		$(DISABLE_LARGEFILE) \
+		$(DISABLE_IPV6) \
 		$(QUIET) $($(PKG)_CONF_OPT)
 	$(Q)touch $@
 
@@ -274,7 +278,7 @@ $(BUILD_DIR)/%/.stamp_staging_installed:
 	touch $@
 
 # Install to target dir
-$(PROJECT_BUILD_DIR)/autotools-stamps/%_target_installed:
+$(BUILD_DIR)/%/.stamp_target_installed:
 	$(call MESSAGE,"Installing to target")
 	$($(PKG)_MAKE_ENV) $($(PKG)_MAKE) $($(PKG)_INSTALL_TARGET_OPT) -C $($(PKG)_DIR)/$($(PKG)_SUBDIR)
 	$(if $(BR2_HAVE_MANPAGES),,for d in man share/man; do \
@@ -329,6 +333,7 @@ $(2)_SITE			?= \
 	http://$$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/$(1)
 $(2)_DEPENDENCIES		?=
 $(2)_AUTORECONF			?= NO
+$(2)_AUTORECONF_OPT		?=
 $(2)_LIBTOOL_PATCH		?= YES
 $(2)_USE_CONFIG_CACHE   ?= $(if $(BR2_CONFIG_CACHE),YES,NO)
 $(2)_CONF_ENV			?=
@@ -352,8 +357,7 @@ $(2)_DIR_PREFIX			=  $(if $(3),$(3),$(TOP_SRCDIR)/package)
 
 
 # define sub-target stamps
-# targets which affect $(TARGET_DIR) must use a unique stamp for each $(PROJECT)
-$(2)_TARGET_INSTALL_TARGET =	$(PROJECT_BUILD_DIR)/autotools-stamps/$(1)_target_installed
+$(2)_TARGET_INSTALL_TARGET =	$$($(2)_DIR)/.stamp_target_installed
 $(2)_TARGET_INSTALL_STAGING =	$$($(2)_DIR)/.stamp_staging_installed
 $(2)_TARGET_BUILD =		$$($(2)_DIR)/.stamp_built
 $(2)_TARGET_CONFIGURE =		$$($(2)_DIR)/.stamp_configured
@@ -369,7 +373,7 @@ $(2)_TARGET_DIRCLEAN =		$$($(2)_DIR)/.stamp_dircleaned
 $(2)_HOOK_POST_EXTRACT =	$$($(2)_DIR)/.stamp_hook_post_extract
 $(2)_HOOK_POST_CONFIGURE =	$$($(2)_DIR)/.stamp_hook_post_configure
 $(2)_HOOK_POST_BUILD =		$$($(2)_DIR)/.stamp_hook_post_build
-$(2)_HOOK_POST_INSTALL =	$(PROJECT_BUILD_DIR)/autotools-stamps/$(1)_hook_post_install
+$(2)_HOOK_POST_INSTALL =	$$($(2)_DIR)/.stamp_hook_post_install
 
 # human-friendly targets and target sequencing
 $(1):			$(1)-install

package/Makefile.in

@@ -45,12 +45,10 @@ TARGET_CFLAGS+= $(BR2_SYSROOT) $(BR2_ISYSROOT)
 TARGET_LDFLAGS+= $(BR2_SYSROOT)
 endif
 
-CC_TARGET_TUNE_:=$(strip $(subst ",,$(BR2_GCC_TARGET_TUNE)))
-#"))
-CC_TARGET_ARCH_:=$(strip $(subst ",,$(BR2_GCC_TARGET_ARCH)))
-#"))
-CC_TARGET_ABI_:=$(strip $(subst ",,$(BR2_GCC_TARGET_ABI)))
-#"))
+CC_TARGET_TUNE_:=$(call qstrip,$(BR2_GCC_TARGET_TUNE))
+CC_TARGET_ARCH_:=$(call qstrip,$(BR2_GCC_TARGET_ARCH))
+CC_TARGET_ABI_:=$(call qstrip,$(BR2_GCC_TARGET_ABI))
+
 ifneq ($(CC_TARGET_TUNE_),)
 TARGET_CFLAGS+=-mtune=$(CC_TARGET_TUNE_)
 endif
@@ -99,7 +97,7 @@ TARGET_LDFLAGS=--sysroot $(STAGING_DIR)/
 endif
 #########################################################################
 #ifeq ($(BR2_ROOTFS_SUFFIX),)
-ROOTFS_SUFFIX:=$(strip $(subst ",, $(BR2_ROOTFS_SUFFIX)))
+ROOTFS_SUFFIX:=$(call qstrip,$(BR2_ROOTFS_SUFFIX))
 ifeq ($(ROOTFS_SUFFIX),)
 ROOTFS_SUFFIX:=
 else
@@ -107,32 +105,23 @@ XXXX=xxxx
 ROOTFS_SUFFIX:=-$(BR2_ROOTFS_SUFFIX)
 endif
 
-ifeq ($(strip $(subst ",, $(BR2_FPU_SUFFIX))),y)
-COND_ARCH_FPU_SUFFIX:=$(ARCH_FPU_SUFFIX)
-else
-COND_ARCH_FPU_SUFFIX:=
-endif
-
 ifeq ($(BR2_TOOLCHAIN_SOURCE),y)
-TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)
+TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
 
 # Quotes are needed for spaces et al in path components.
-TARGET_PATH="$(TOOL_BUILD_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"
-IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)
+TARGET_PATH="$(TOOLCHAIN_DIR)/bin:$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(PATH)"
+IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ROOTFS_SUFFIX)
 GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)-linux
 REAL_GNU_TARGET_NAME=$(OPTIMIZE_FOR_CPU)$(GNU_TARGET_SUFFIX)
 TARGET_CROSS=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-
 KERNEL_CROSS=$(TARGET_CROSS)
 else
-TOOLCHAIN_EXTERNAL_PREFIX:=$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_PREFIX)))
-#"))
-TOOLCHAIN_EXTERNAL_PATH:=$(strip $(subst ",, $(BR2_TOOLCHAIN_EXTERNAL_PATH)))
-#"))
-#TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(TOOLCHAIN_EXTERNAL_PREFIX)
-TOOL_BUILD_DIR=$(BASE_DIR)/$(TOPDIR_PREFIX)toolchain_build_$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(TOPDIR_SUFFIX)
-TARGET_PATH="$(STAGING_DIR)/bin:$(STAGING_DIR)/usr/bin:$(TOOL_BUILD_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"
+TOOLCHAIN_EXTERNAL_PREFIX:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PREFIX))
+TOOLCHAIN_EXTERNAL_PATH:=$(call qstrip,$(BR2_TOOLCHAIN_EXTERNAL_PATH))
+TOOLCHAIN_DIR=$(BASE_DIR)/toolchain
+TARGET_PATH="$(HOST_DIR)/bin:$(HOST_DIR)/usr/bin:$(TOOLCHAIN_DIR)/bin:$(TOOLCHAIN_EXTERNAL_PATH)/bin:$(PATH)"
 #IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(TOOLCHAIN_EXTERNAL_PREFIX)$(ROOTFS_SUFFIX)
-IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(COND_ARCH_FPU_SUFFIX)$(ROOTFS_SUFFIX)
+IMAGE:=$(BINARIES_DIR)/$(BR2_ROOTFS_PREFIX).$(ARCH)$(ROOTFS_SUFFIX)
 
 REAL_GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
 GNU_TARGET_NAME=$(TOOLCHAIN_EXTERNAL_PREFIX)
@@ -144,11 +133,7 @@ TARGET_AS=$(TARGET_CROSS)as
 TARGET_CC=$(TARGET_CROSS)gcc
 TARGET_CPP=$(TARGET_CROSS)cpp
 TARGET_CXX=$(TARGET_CROSS)g++
-ifeq ($(BR2_GCC_VERSION_3_4_6),y)
-TARGET_FC=$(TARGET_CROSS)g77
-else
 TARGET_FC=$(TARGET_CROSS)gfortran
-endif
 TARGET_LD=$(TARGET_CROSS)ld
 TARGET_NM=$(TARGET_CROSS)nm
 TARGET_RANLIB=$(TARGET_CROSS)ranlib
@@ -178,10 +163,10 @@ TARGET_STRIP=$(STAGING_DIR)/usr/bin/$(REAL_GNU_TARGET_NAME)-sstrip
 STRIPCMD=$(TARGET_STRIP)
 endif
 ifeq ($(BR2_STRIP_none),y)
-TARGET_STRIP=true -Not_stripping
+TARGET_STRIP=true Not_stripping
 STRIPCMD=$(TARGET_STRIP)
 endif
-INSTALL=/usr/bin/install
+INSTALL:=$(shell which install || type -p install)
 FLEX:=$(shell which flex || type -p flex)
 BISON:=$(shell which bison || type -p bison)
 
@@ -205,19 +190,9 @@ HOST_ARCH:=$(shell $(HOSTCC) -dumpmachine | sed -e s'/-.*//' \
 	-e 's/mipsel-.*/mipsel/' \
 	-e 's/cris.*/cris/' \
 	-e 's/i[3-9]86/i386/' \
+	-e 's/xtensa.*/xtensa/' \
 	)
-GNU_HOST_NAME:=$(HOST_ARCH)-$(subst ",,$(BR2_GNU_BUILD_SUFFIX))
-#")
-
-AUTO_CONFIGURE_TARGET=\
-	$(TARGET_CONFIGURE_OPTS) \
-	$(TARGET_CONFIGURE_ARGS) \
-	$(TARGET_CONFIGURE_ENV) \
-	$(if $(THIS_SRCDIR),$(THIS_SRCDIR)/,./)configure \
-		$(if $(BR2_CONFIG_CACHE),--cache-file="$(PROJECT_BUILD_DIR)/tgt-config.cache",) \
-		--target=$(GNU_TARGET_NAME) \
-		--host=$(GNU_TARGET_NAME) \
-		--build=$(GNU_HOST_NAME)
+GNU_HOST_NAME:=$(HOST_ARCH)-$(call qstrip,$(BR2_GNU_BUILD_SUFFIX))
 
 TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
 		AR="$(TARGET_AR)" \
@@ -252,7 +227,7 @@ TARGET_CONFIGURE_OPTS=PATH=$(TARGET_PATH) \
 		DEFAULT_LINKER="$(TARGET_LD)" \
 		PKG_CONFIG_SYSROOT_DIR="$(STAGING_DIR)" \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
-		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig$(PKG_CONFIG_PATH)" \
+		PKG_CONFIG_PATH="$(STAGING_DIR)/usr/lib/pkgconfig:$(PKG_CONFIG_PATH)" \
 		STAGING_DIR="$(STAGING_DIR)"
 
 TARGET_CONFIGURE_ENV=\
@@ -297,9 +272,12 @@ HOST_CONFIGURE_OPTS=PATH=$(HOST_PATH) \
 		ORIGINAL_NM_FOR_TARGET="$(TARGET_NM)" \
 		ORIGINAL_OBJDUMP_FOR_TARGET="$(TARGET_OBJDUMP)" \
 		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
-		PKG_CONFIG_PATH="$(HOST_DIR)/usr/lib/pkgconfig$(PKG_CONFIG_PATH)"
+		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig"
+
+HOST_MAKE_ENV=PATH=$(HOST_PATH) \
+		PKG_CONFIG="$(PKG_CONFIG_HOST_BINARY)" \
+		PKG_CONFIG_LIBDIR="$(HOST_DIR)/usr/lib/pkgconfig"
 
-HOST_MAKE_ENV=PATH=$(HOST_PATH)
 
 #######################################################################
 # settings we need to pass to configure
@@ -363,7 +341,7 @@ DISABLE_LARGEFILE= --disable-largefile
 endif
 
 ifneq ($(BR2_HAVE_DOCUMENTATION),y)
-DISABLE_DOCUMENTATION=--without-html-dir --disable-gtk-doc
+DISABLE_DOCUMENTATION=--disable-gtk-doc
 endif
 
 ifneq ($(BR2_INET_IPV6),y)
@@ -380,24 +358,8 @@ else
 ENABLE_DEBUG:=
 endif
 
-
 # X Windowing system
 
-XSERVER:=
-ifeq ($(BR2_PACKAGE_TINYX),y)
-XSERVER+=tinyx
-endif
-ifeq ($(BR2_PACKAGE_XORG),y)
-XSERVER+=xorg
-endif
-ifeq ($(BR2_PACKAGE_XORG7),y)
-XSERVER+=xserver_xorg-server
-endif
-ifeq ($(BR2_PACKAGE_XGGI),y)
-XSERVER+=xggi
-endif
-
-X11_PREFIX:=$(strip $(subst ",, $(BR2_X11_PREFIX)))
-#"))
+X11_PREFIX:=$(call qstrip,$(BR2_X11_PREFIX))
 
 include package/Makefile.autotools.in

package/alsamixergui/Config.in

@@ -1,4 +1,6 @@
 config BR2_PACKAGE_ALSAMIXERGUI
+	depends on BR2_PACKAGE_XORG7
+	depends on BR2_PACKAGE_ALSA_LIB
 	select BR2_PACKAGE_FLTK
 	bool "alsamixergui"
 	help

package/alsamixergui/alsamixergui.mk

@@ -10,9 +10,11 @@ ALSAMIXERGUI_AUTORECONF = YES
 ALSAMIXERGUI_INSTALL_STAGING = NO
 ALSAMIXERGUI_INSTALL_TARGET = YES
 
-ALSAMIXERGUI_CONF_OPT = LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib -lstdc++ -lX11"
+ALSAMIXERGUI_CONF_ENV = ac_cv_lib_fltk_numericsort=yes \
+			ac_cv_lib_fltk_fl_numericsort=yes \
+			ac_cv_lib_asound_snd_ctl_open=yes
 
-ALSAMIXERGUI_DEPENDENCIES = uclibc fltk
+ALSAMIXERGUI_DEPENDENCIES = fltk alsa-lib
 
 $(eval $(call AUTOTARGETS,package,alsamixergui))
 

package/argus/argus.mk

@@ -35,7 +35,7 @@ $(ARGUS_DIR)/.configured: $(ARGUS_DIR)/.unpacked
 	(cd $(ARGUS_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
-		./configure \
+		./configure $(QUIET) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -51,7 +51,7 @@ $(TARGET_DIR)/$(ARGUS_TARGET_BINARY): $(ARGUS_DIR)/$(ARGUS_BINARY)
 	cp -dpf $(ARGUS_DIR)/$(ARGUS_BINARY) $@
 	$(STRIPCMD) $(STRIP_STRIP_ALL) $@
 
-argus: uclibc libpcap $(TARGET_DIR)/$(ARGUS_TARGET_BINARY)
+argus: libpcap $(TARGET_DIR)/$(ARGUS_TARGET_BINARY)
 
 argus-clean:
 	-$(MAKE) -C $(ARGUS_DIR) clean

package/at/at.mk

@@ -25,7 +25,7 @@ $(AT_DIR)/.configured: $(AT_DIR)/.unpacked
 	(cd $(AT_DIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
-		./configure \
+		./configure $(QUIET) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -49,14 +49,14 @@ $(TARGET_DIR)/$(AT_TARGET_SCRIPT): $(AT_DIR)/$(AT_BINARY)
 	# Use fakeroot to pretend to do 'make install' as root
 	echo '$(MAKE) DAEMON_USERNAME=root DAEMON_GROUPNAME=root ' \
 	 '$(TARGET_CONFIGURE_OPTS) DESTDIR=$(TARGET_DIR) -C $(AT_DIR) install' \
-		> $(PROJECT_BUILD_DIR)/.fakeroot.at
+		> $(BUILD_DIR)/.fakeroot.at
 ifneq ($(BR2_HAVE_MANPAGES),y)
-	echo 'rm -rf $(TARGET_DIR)/usr/man' >> $(PROJECT_BUILD_DIR)/.fakeroot.at
+	echo 'rm -rf $(TARGET_DIR)/usr/man' >> $(BUILD_DIR)/.fakeroot.at
 endif
-	echo 'rm -rf $(TARGET_DIR)/usr/doc/at' >> $(PROJECT_BUILD_DIR)/.fakeroot.at
+	echo 'rm -rf $(TARGET_DIR)/usr/doc/at' >> $(BUILD_DIR)/.fakeroot.at
 	$(INSTALL) -m 0755 -D $(AT_DIR)/debian/rc $(TARGET_DIR)/$(AT_TARGET_SCRIPT)
 
-at: uclibc host-fakeroot $(TARGET_DIR)/$(AT_TARGET_SCRIPT)
+at: host-fakeroot $(TARGET_DIR)/$(AT_TARGET_SCRIPT)
 
 at-clean:
 	-$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(AT_DIR) uninstall

package/atk/atk.mk

@@ -45,7 +45,7 @@ ATK_CONF_OPT =  --enable-shared \
 		--disable-glibtest --enable-explicit-deps=no \
 		--disable-debug
 
-ifneq ($(BR2_PACKAGE_XSERVER_none),y)
+ifeq ($(BR2_PACKAGE_XORG7),y)
 ATK_CONF_OPT += --with-x \
 		--x-includes=$(STAGING_DIR)/usr/include/X11 \
 		--x-libraries=$(STAGING_DIR)/usr/lib --disable-glibtest
@@ -74,7 +74,7 @@ $(STAMP_DIR)/host_atk_configured: $(STAMP_DIR)/host_atk_unpacked $(STAMP_DIR)/ho
 		$(HOST_CONFIGURE_OPTS) \
 		CFLAGS="$(HOST_CFLAGS)" \
 		LDFLAGS="$(HOST_LDFLAGS)" \
-		./configure \
+		./configure $(QUIET) \
 		--prefix="$(HOST_DIR)/usr" \
 		--sysconfdir="$(HOST_DIR)/etc" \
 		--enable-shared \

package/autoconf/autoconf.mk

@@ -3,7 +3,7 @@
 # autoconf
 #
 #############################################################
-AUTOCONF_VERSION = 2.63
+AUTOCONF_VERSION = 2.64
 AUTOCONF_SOURCE = autoconf-$(AUTOCONF_VERSION).tar.bz2
 AUTOCONF_SITE = $(BR2_GNU_MIRROR)/autoconf
 
@@ -11,9 +11,10 @@ ifeq ($(BR2_ENABLE_DEBUG),y) # install-exec doesn't install aclocal stuff
 AUTOCONF_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 endif
 
-AUTOCONF_CONF_ENV = EMACS="no"
+AUTOCONF_CONF_ENV = EMACS="no" ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
+		    ac_cv_prog_gnu_m4_gnu=no
 
-AUTOCONF_DEPENDENCIES = uclibc microperl
+AUTOCONF_DEPENDENCIES = microperl
 
 $(eval $(call AUTOTARGETS,package,autoconf))
 
@@ -39,7 +40,9 @@ $(STAMP_DIR)/host_autoconf_configured: $(STAMP_DIR)/host_autoconf_unpacked $(STA
 		$(HOST_CONFIGURE_OPTS) \
 		CFLAGS="$(HOST_CFLAGS)" \
 		LDFLAGS="$(HOST_LDFLAGS)" \
-		./configure \
+		ac_cv_path_M4=$(HOST_DIR)/usr/bin/m4 \
+		ac_cv_prog_gnu_m4_gnu=no \
+		./configure $(QUIET) \
 		--prefix="$(HOST_DIR)/usr" \
 		--sysconfdir="$(HOST_DIR)/etc" \
 		--disable-static \

package/automake/automake.mk

@@ -11,7 +11,7 @@ ifeq ($(BR2_ENABLE_DEBUG),y) # install-exec doesn't install aclocal stuff
 AUTOMAKE_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 endif
 
-AUTOMAKE_DEPENDENCIES = uclibc autoconf microperl
+AUTOMAKE_DEPENDENCIES = autoconf microperl
 
 $(eval $(call AUTOTARGETS,package,automake))
 
@@ -38,7 +38,7 @@ $(STAMP_DIR)/host_automake_configured: $(STAMP_DIR)/host_automake_unpacked $(STA
 		$(HOST_CONFIGURE_OPTS) \
 		CFLAGS="$(HOST_CFLAGS)" \
 		LDFLAGS="$(HOST_LDFLAGS)" \
-		./configure \
+		./configure $(QUIET) \
 		--prefix="$(HOST_DIR)/usr" \
 		--sysconfdir="$(HOST_DIR)/etc" \
 		--disable-static \

package/avahi/busybox-udhcpc-default.script

@@ -18,6 +18,12 @@ case "$1" in
 		if [ $? -eq 0 ]; then
 			/sbin/ifconfig $interface 0.0.0.0
 		fi
+		if [ -x /usr/sbin/avahi-autoipd ]; then
+			/usr/sbin/avahi-autoipd -k $interface
+		fi
+		;;
+
+	leasefail|nak)
 		if [ -x /usr/sbin/avahi-autoipd ]; then
 			/usr/sbin/avahi-autoipd -wD $interface --no-chroot
 		fi

package/axel/axel.mk

@@ -36,7 +36,7 @@ ifeq ($(BR2_HAVE_MANPAGES),y)
 	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) install-man
 endif
 
-axel: uclibc $(TARGET_DIR)/$(AXEL_TARGET_BINARY)
+axel: $(TARGET_DIR)/$(AXEL_TARGET_BINARY)
 
 axel-clean:
 	$(MAKE) DESTDIR=$(TARGET_DIR) -C $(AXEL_DIR) uninstall

package/bash/bash.mk

@@ -46,7 +46,7 @@ $(BASH_DIR)/.configured: $(BASH_DIR)/.unpacked
 		bash_cv_getcwd_malloc=yes \
 		bash_cv_func_sigsetjmp=present \
 		bash_cv_printf_a_format=yes \
-		./configure \
+		./configure $(QUIET) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -92,9 +92,9 @@ endif
 # If both bash and busybox are selected, make certain bash wins
 # the fight over who gets to own the /bin/sh symlink.
 ifeq ($(BR2_PACKAGE_BUSYBOX),y)
-bash: ncurses uclibc busybox $(TARGET_DIR)/$(BASH_TARGET_BINARY)
+bash: ncurses busybox $(TARGET_DIR)/$(BASH_TARGET_BINARY)
 else
-bash: ncurses uclibc $(TARGET_DIR)/$(BASH_TARGET_BINARY)
+bash: ncurses $(TARGET_DIR)/$(BASH_TARGET_BINARY)
 endif
 
 # If both bash and busybox are selected, the /bin/sh symlink

package/berkeleydb/berkeleydb.mk

@@ -20,10 +20,11 @@ $(DB_DIR)/.dist: $(DL_DIR)/$(DB_SOURCE)
 	touch $@
 
 $(DB_DIR)/.configured: $(DB_DIR)/.dist
+	$(CONFIG_UPDATE) $(DB_DIR)/dist
 	(cd $(DB_DIR)/build_unix; rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
-		../dist/configure \
+		../dist/configure $(QUIET) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -89,7 +90,7 @@ berkeleydb-clean:
 berkeleydb-dirclean:
 	rm -rf $(DB_DIR)
 
-berkeleydb: uclibc $(TARGET_DIR)/lib/$(DB_SHARLIB)
+berkeleydb: $(TARGET_DIR)/lib/$(DB_SHARLIB)
 
 #############################################################
 #

package/bind/bind.mk

@@ -3,11 +3,10 @@
 # bind
 #
 #############################################################
-BIND_VERSION = 9.5.1-P2
+BIND_VERSION = 9.5.1-P3
 BIND_SOURCE = bind-$(BIND_VERSION).tar.gz
 BIND_SITE = ftp://ftp.isc.org/isc/bind9/$(BIND_VERSION)
 BIND_LIBTOOL_PATCH = NO
-BIND_DEPENDENCIES = uclibc
 BIND_INSTALL_STAGING = NO
 BIND_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
 BIND_TARGET_SBINS = lwresd named named-checkconf named-checkzone

package/bison/bison.mk

@@ -26,7 +26,7 @@ $(BISON_DIR)/.configured: $(BISON_DIR)/.unpacked
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
 		gt_cv_func_gnugettext2_libintl=yes \
-		./configure \
+		./configure $(QUIET) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -62,7 +62,7 @@ endif
 	rm -rf $(TARGET_DIR)/usr/share/doc
 	cp -a package/bison/yacc $(TARGET_DIR)/usr/bin/yacc
 
-bison: uclibc $(TARGET_DIR)/$(BISON_TARGET_BINARY)
+bison: $(TARGET_DIR)/$(BISON_TARGET_BINARY)
 
 bison-clean:
 	-$(MAKE) DESTDIR=$(TARGET_DIR) CC=$(TARGET_CC) -C $(BISON_DIR) uninstall

package/blackbox/Config.in

@@ -1,6 +1,6 @@
 config BR2_PACKAGE_BLACKBOX
 	bool "blackbox"
-	depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7
+	depends on BR2_PACKAGE_XORG7
 	depends on BR2_INSTALL_LIBSTDCPP
 	help
 	  Blackbox is a fast, lightweight window manager for the X

package/blackbox/blackbox.mk

@@ -14,6 +14,6 @@ BLACKBOX_INSTALL_TARGET:=YES
 BLACKBOX_CONF_OPT:=--x-includes=$(STAGING_DIR)/usr/include/X11 \
 		--x-libraries=$(STAGING_DIR)/usr/lib
 
-BLACKBOX_DEPENDENCIES:=uclibc $(XSERVER)
+BLACKBOX_DEPENDENCIES:=xserver_xorg-server
 
 $(eval $(call AUTOTARGETS,package,blackbox))

package/bmon/Config.in

@@ -0,0 +1,5 @@
+config BR2_PACKAGE_BMON
+	bool "bmon"
+	select BR2_PACKAGE_NCURSES
+	help
+	  Linux bandwidth monitor

package/bmon/bmon-gcc4.patch

@@ -0,0 +1,36 @@
+diff -ru bmon-2.1.0~/src/out_audio.c bmon-2.1.0/src/out_audio.c
+--- bmon-2.1.0~/src/out_audio.c	2008-07-26 20:06:24.000000000 +0200
++++ bmon-2.1.0/src/out_audio.c	2008-07-26 20:09:42.000000000 +0200
+@@ -141,7 +141,7 @@
+ 	.om_draw = audio_draw,
+ 	.om_set_opts = audio_set_opts,
+ 	.om_probe = audio_probe,
+-	.om_shutdown audio_shutdown,
++	.om_shutdown = audio_shutdown
+ };
+ 
+ static void __init audio_init(void)
+diff -ru bmon-2.1.0~/src/out_db.c bmon-2.1.0/src/out_db.c
+--- bmon-2.1.0~/src/out_db.c	2008-07-26 20:06:24.000000000 +0200
++++ bmon-2.1.0/src/out_db.c	2008-07-26 20:07:44.000000000 +0200
+@@ -679,7 +679,7 @@
+ 	.om_draw = db_draw,
+ 	.om_set_opts = db_set_opts,
+ 	.om_probe = db_probe,
+-	.om_shutdown db_shutdown,
++	.om_shutdown = db_shutdown,
+ };
+ 
+ static void __init db_init(void)
+diff -ru bmon-2.1.0~/src/out_xml_event.c bmon-2.1.0/src/out_xml_event.c
+--- bmon-2.1.0~/src/out_xml_event.c	2008-07-26 20:06:24.000000000 +0200
++++ bmon-2.1.0/src/out_xml_event.c	2008-07-26 20:09:42.000000000 +0200
+@@ -127,7 +127,7 @@
+ 	.om_draw = xml_event_draw,
+ 	.om_set_opts = xml_event_set_opts,
+ 	.om_probe = xml_event_probe,
+-	.om_shutdown xml_event_shutdown,
++	.om_shutdown = xml_event_shutdown
+ };
+ 
+ static void __init xml_event_init(void)

package/bmon/bmon-nolibnl.patch

@@ -0,0 +1,24 @@
+diff -Nura bmon/configure bmon.libnl/configure
+--- bmon/configure	2005-04-05 12:01:33.000000000 -0300
++++ bmon.libnl/configure	2009-06-10 16:10:52.000000000 -0300
+@@ -7327,13 +7327,13 @@
+ echo "${ECHO_T}$ac_cv_lib_nl_nl_connect" >&6
+ if test $ac_cv_lib_nl_nl_connect = yes; then
+ 
+-
+-cat >>confdefs.h <<_ACEOF
+-#define HAVE_NL "1"
+-_ACEOF
+-
+-	LIBNL="-lnl"
+-	NL="Yes"
++	case ${target_os} in
++	    *linux*)
++		echo
++		echo "*** Warning: Building bmon on Linux w/o libnl ***"
++		echo
++	    ;;
++	esac
+ 
+ else
+ 

package/bmon/bmon-nostrip.patch

@@ -0,0 +1,12 @@
+diff -Nura bmon/GNUmakefile bmon.nostrip/GNUmakefile
+--- bmon/GNUmakefile	2005-04-05 12:01:33.000000000 -0300
++++ bmon.nostrip/GNUmakefile	2009-06-10 16:12:04.000000000 -0300
+@@ -50,7 +50,7 @@
+ install:
+ 	./install-sh -d -m 0755 $(DESTDIR)$(prefix)/bin
+ 	./install-sh -d -m 0755 $(DESTDIR)$(mandir)/man1
+-	./install-sh -c -s -m 0755 src/bmon $(DESTDIR)$(prefix)/bin
++	./install-sh -c -m 0755 src/bmon $(DESTDIR)$(prefix)/bin
+ 	./install-sh -c    -m 0644 man/bmon.1 $(DESTDIR)$(mandir)/man1
+ 
+ show: Makefile.opts

package/bmon/bmon.mk

@@ -0,0 +1,18 @@
+#############################################################
+#
+# bmon
+#
+#############################################################
+
+BMON_VERSION = 2.1.0
+BMON_SOURCE = bmon-$(BMON_VERSION).tar.gz
+BMON_SITE = http://distfiles.gentoo.org/distfiles
+BMON_DEPENDENCIES = ncurses
+BMON_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) install
+
+$(eval $(call AUTOTARGETS,package,bmon))
+
+$(BMON_TARGET_UNINSTALL):
+	$(call MESSAGE,"Uninstalling")
+	rm -f $(TARGET_DIR)/usr/bin/bmon
+	rm -f $(BMON_TARGET_INSTALL_TARGET) $(BMON_HOOK_POST_INSTALL)

package/boa/boa.mk

@@ -29,7 +29,7 @@ $(BOA_WORKDIR)/Makefile: $(BOA_DIR)/.unpacked
 	(cd $(BOA_WORKDIR); rm -rf config.cache; \
 		$(TARGET_CONFIGURE_OPTS) \
 		$(TARGET_CONFIGURE_ARGS) \
-		$(BOA_DIR)/configure \
+		$(BOA_DIR)/configure $(QUIET) \
 		--target=$(GNU_TARGET_NAME) \
 		--host=$(GNU_TARGET_NAME) \
 		--build=$(GNU_HOST_NAME) \
@@ -63,7 +63,7 @@ $(BOA_WORKDIR)/.installed: $(BOA_WORKDIR)/src/boa $(BOA_WORKDIR)/src/boa_indexer
 	$(STRIPCMD) $(STRIP_STRIP_ALL) $(TARGET_DIR)/usr/sbin/boa $(TARGET_DIR)/usr/lib/boa/boa_indexer
 	touch $(BOA_WORKDIR)/.installed
 
-boa: uclibc $(BOA_WORKDIR)/.installed
+boa: $(BOA_WORKDIR)/.installed
 
 boa-source: $(DL_DIR)/$(BOA_SOURCE)
 

package/bootutils/Config.in

@@ -1,5 +1,6 @@
 config BR2_PACKAGE_BOOTUTILS
 	bool "bootutils"
+	depends on BR2_LARGEFILE
 	help
 	  BootUtils is a collection of utilities to facilitate booting of
 	  Linux 2.6-based systems. The process of finding the root volume
@@ -8,3 +9,5 @@ config BR2_PACKAGE_BOOTUTILS
 
 	  http://bootutils.pr.linuxrulz.org/
 
+comment "bootutils requires a toolchain with LARGEFILE support"
+	depends on !BR2_LARGEFILE

package/bridge-utils/bridge.mk

@@ -12,7 +12,6 @@ BRIDGE_INSTALL_STAGING:=NO
 BRIDGE_INSTALL_TARGET:=YES
 BRIDGE_INSTALL_TARGET_OPT:=DESTDIR=$(TARGET_DIR) install
 BRIDGE_CONF_OPT:=--with-linux-headers=$(LINUX_HEADERS_DIR)
-BRIDGE_DEPENDENCIES:=uclibc
 
 $(eval $(call AUTOTARGETS,package,bridge))
 

package/bsdiff/bsdiff.mk

@@ -33,7 +33,7 @@ $(TARGET_DIR)/$(BSDIFF_TARGET_BINARY): $(BSDIFF_DIR)/$(BSDIFF_BINARY)
 	cp -dpf $(BSDIFF_DIR)/bsdiff $(TARGET_DIR)/usr/bin/.
 	cp -dpf $(BSDIFF_DIR)/bspatch $(TARGET_DIR)/usr/bin/.
 
-bsdiff: uclibc bzip2 $(TARGET_DIR)/$(BSDIFF_TARGET_BINARY)
+bsdiff: bzip2 $(TARGET_DIR)/$(BSDIFF_TARGET_BINARY)
 
 bsdiff-source: $(DL_DIR)/$(BSDIFF_SOURCE)
 

package/busybox/Config.in

@@ -12,7 +12,7 @@ config BR2_PACKAGE_BUSYBOX
 choice
 	prompt "BusyBox Version"
 	depends on BR2_PACKAGE_BUSYBOX
-	default BR2_BUSYBOX_VERSION_1_14_X
+	default BR2_BUSYBOX_VERSION_1_15_X
 	help
 	  Select the version of BusyBox you wish to use.
 
@@ -22,10 +22,14 @@ choice
 
 	config BR2_BUSYBOX_VERSION_1_13_X
 		bool "BusyBox 1.13.x"
-		depends on BR2_DEPRECATED || BR2_RECENT
+		depends on BR2_RECENT
 
 	config BR2_BUSYBOX_VERSION_1_14_X
 		bool "BusyBox 1.14.x"
+		depends on BR2_DEPRECATED || BR2_RECENT
+
+	config BR2_BUSYBOX_VERSION_1_15_X
+		bool "BusyBox 1.15.x"
 
 	config BR2_PACKAGE_BUSYBOX_SNAPSHOT
 		bool "daily snapshot"
@@ -36,7 +40,8 @@ config BR2_BUSYBOX_VERSION
 	string
 	default "1.12.4"	if BR2_BUSYBOX_VERSION_1_12_X
 	default "1.13.4"	if BR2_BUSYBOX_VERSION_1_13_X
-	default "1.14.0"	if BR2_BUSYBOX_VERSION_1_14_X
+	default "1.14.4"	if BR2_BUSYBOX_VERSION_1_14_X
+	default "1.15.2"	if BR2_BUSYBOX_VERSION_1_15_X
 
 config BR2_PACKAGE_BUSYBOX_FULLINSTALL
 	bool "Run BusyBox's own full installation"
@@ -54,22 +59,22 @@ config BR2_PACKAGE_BUSYBOX_FULLINSTALL
 config BR2_PACKAGE_BUSYBOX_CONFIG
 	string "BusyBox configuration file to use?"
 	depends on BR2_PACKAGE_BUSYBOX
-	default "target/device/x86/i386/busybox.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT
+	default "package/busybox/busybox-1.13.x.config" if BR2_PACKAGE_BUSYBOX_SNAPSHOT
 	default "package/busybox/busybox-1.11.x.config" if BR2_BUSYBOX_VERSION_1_12_X
 	default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_13_X
 	default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_14_X
+	default "package/busybox/busybox-1.13.x.config" if BR2_BUSYBOX_VERSION_1_15_X
 	help
 	  Some people may wish to use their own modified BusyBox configuration
 	  file, and will specify their config file location with this option.
 
 	  Most people will just use the default BusyBox configuration file.
 
-config BR2_PACKAGE_BUSYBOX_HIDE_OTHERS
-	bool "Hide applications that are provided by busybox"
-	depends on BR2_PACKAGE_BUSYBOX
-	default y
+config BR2_PACKAGE_BUSYBOX_SHOW_OTHERS
+	bool "Show packages that are also provided by busybox" if BR2_PACKAGE_BUSYBOX
+	default y if !BR2_PACKAGE_BUSYBOX
 	help
-	  Do not show packages in menuconfig that are potentially provided
+	  Show packages in menuconfig that are potentially also provided
 	  by busybox.
 
 config BR2_PACKAGE_BUSYBOX_SKELETON

package/busybox/busybox-1.13.x.config

@@ -562,7 +562,7 @@ CONFIG_DC=y
 # CONFIG_DEVFSD_FG_NP is not set
 # CONFIG_DEVFSD_VERBOSE is not set
 # CONFIG_FEATURE_DEVFS is not set
-# CONFIG_DEVMEM is not set
+CONFIG_DEVMEM=y
 CONFIG_EJECT=y
 # CONFIG_FEATURE_EJECT_SCSI is not set
 # CONFIG_FBSPLASH is not set

package/busybox/busybox-1.14.0-acpid.patch

@@ -1,13 +0,0 @@
---- busybox-1.14.0/util-linux/acpid.c	Tue Apr 14 01:43:11 2009
-+++ busybox-1.14.0-acpid/util-linux/acpid.c	Sat Apr 18 13:33:19 2009
-@@ -78,8 +78,8 @@
- 	// goto configuration directory
- 	xchdir(opt_conf);
- 
--//	// setup signals
--//	bb_signals(BB_FATAL_SIGS, record_signo);
-+	// prevent zombies
-+	signal(SIGCHLD, SIG_IGN);
- 
- 	// no explicit evdev files given? -> use proc event interface
- 	if (!*argv) {

package/busybox/busybox-1.14.0-defconfig.patch

@@ -1,11 +0,0 @@
---- busybox-1.14.0/scripts/defconfig	Tue Apr 14 01:42:52 2009
-+++ busybox-1.14.0-defconfig/scripts/defconfig	Fri Apr 17 01:08:24 2009
-@@ -579,7 +579,7 @@
- CONFIG_EJECT=y
- CONFIG_FEATURE_EJECT_SCSI=y
- CONFIG_FBSPLASH=y
--CONFIG_FLASH_ERASEALL=y
-+# CONFIG_FLASH_ERASEALL is not set
- CONFIG_IONICE=y
- # CONFIG_INOTIFYD is not set
- CONFIG_LAST=y

package/busybox/busybox-1.14.0-des.patch

@@ -1,14 +0,0 @@
---- busybox-1.14.0/libbb/pw_encrypt_des.c	Tue Apr 14 01:43:00 2009
-+++ busybox-1.14.0-des/libbb/pw_encrypt_des.c	Fri May  1 03:40:16 2009
-@@ -778,8 +778,10 @@
- 	to64_msb_first(output + 2, (r0 >> 8));
- 	/* bits 7..0 of r0 and 31..16 of r1 */
- 	to64_msb_first(output + 6, (r0 << 16) | (r1 >> 16));
--	/* (bits 15..0 of r1 + 00) and NUL byte */
-+	/* bits 15..0 of r1 and two zero bits (plus extra zero byte) */
- 	to64_msb_first(output + 10, (r1 << 8));
-+	/* extra zero byte is encoded as '.', fixing it */
-+	output[13] = '\0';
- #endif
- 
- 	return output;

package/busybox/busybox-1.14.0-dhcp_hostname.patch

@@ -1,12 +0,0 @@
---- busybox-1.14.0/networking/udhcp/leases.c	Tue Apr 14 01:42:51 2009
-+++ busybox-1.14.0-dhcp_hostname/networking/udhcp/leases.c	Tue Apr 21 02:41:22 2009
-@@ -63,7 +63,8 @@
- 	if (oldest) {
- 		oldest->hostname[0] = '\0';
- 		if (hostname) {
--        		hostname_length = hostname[-1]; /* look at option size byte */
-+			/* option size byte, + 1 for NUL */
-+        		hostname_length = hostname[-1] + 1;
- 			if (hostname_length > sizeof(oldest->hostname))
- 				hostname_length = sizeof(oldest->hostname);
-             		hostname = (uint8_t*) safe_strncpy((char*)oldest->hostname, (char*)hostname, hostname_length);

package/busybox/busybox-1.14.0-mdev.patch

@@ -1,24 +0,0 @@
---- busybox-1.14.0/util-linux/mdev.c	Tue Apr 14 23:23:04 2009
-+++ busybox-1.14.0-mdev/util-linux/mdev.c	Sat May  2 16:31:34 2009
-@@ -181,7 +181,8 @@
- 		 * the rest of fields unless keep_matching == 1 */
- 
- 		/* 2nd field: uid:gid - device ownership */
--		parse_chown_usergroup_or_die(&ugid, tokens[1]);
-+		if (get_uidgid(&ugid, tokens[1], 1) == 0)
-+			bb_error_msg("unknown user/group %s", tokens[1]);
- 
- 		/* 3rd field: mode - device permissions */
- 		mode = strtoul(tokens[2], NULL, 8);
-@@ -524,7 +525,10 @@
- 				make_device(temp, 1);
- 		}
- 		else if (strcmp(action, "add") == 0) {
--			make_device(temp, 0);
-+			/* N.B. make_device() mangles the device path, so save it */
-+			char *s = xstrdup(temp);
-+			make_device(s, 0);
-+			free(s);
- 			if (ENABLE_FEATURE_MDEV_LOAD_FIRMWARE) {
- 				if (fw)
- 					load_firmware(fw, temp);

package/busybox/busybox-1.14.0-unaligned.patch

@@ -1,14 +0,0 @@
---- busybox-1.14.0/include/platform.h	Tue Apr 14 01:43:05 2009
-+++ busybox-1.14.0-unaligned/include/platform.h	Sat Apr 18 00:14:34 2009
-@@ -173,7 +173,10 @@
- /* performs reasonably well (gcc usually inlines memcpy here) */
- #define move_from_unaligned16(v, u16p) (memcpy(&(v), (u16p), 2))
- #define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4))
--#define move_to_unaligned32(u32p, v)   (memcpy((u32p), &(v), 4))
-+#define move_to_unaligned32(u32p, v) do { \
-+	uint32_t __t = (v); \
-+	memcpy((u32p), &__t, 4); \
-+} while (0)
- #endif
- 
- /* ---- Networking ------------------------------------------ */

package/busybox/busybox-1.15.2-flash-eraseall.patch

@@ -0,0 +1,104 @@
+From 86cfb70ca5f2bde11f2d071bc59db75291d8552f Mon Sep 17 00:00:00 2001
+From: Denys Vlasenko <vda.linux@googlemail.com>
+Date: Fri, 27 Nov 2009 13:26:17 +0100
+Subject: [PATCH] flash_eraseall: stop using obsolete mtd/jffs2-user.h; code shrink
+
+function                                             old     new   delta
+show_progress                                         68      67      -1
+flash_eraseall_main                                 1007     882    -125
+------------------------------------------------------------------------------
+(add/remove: 0/0 grow/shrink: 0/2 up/down: 0/-126)           Total: -126 bytes
+
+Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
+---
+ miscutils/flash_eraseall.c |   47 ++++++++++++++++++++++++++++---------------
+ 1 files changed, 30 insertions(+), 17 deletions(-)
+
+diff --git a/miscutils/flash_eraseall.c b/miscutils/flash_eraseall.c
+index ba0a6b5..ca00a13 100644
+--- a/miscutils/flash_eraseall.c
++++ b/miscutils/flash_eraseall.c
+@@ -12,22 +12,35 @@
+ 
+ #include "libbb.h"
+ #include <mtd/mtd-user.h>
+-#include <mtd/jffs2-user.h>
++#include <linux/jffs2.h>
+ 
+ #define OPTION_J	(1 << 0)
+ #define OPTION_Q	(1 << 1)
+ #define IS_NAND		(1 << 2)
+ #define BBTEST		(1 << 3)
+ 
+-struct globals {
+-	/* This is used in the cpu_to_je/je_to_cpu macros in jffs2_user.h */
+-	int tgt_endian;
+-};
+-#define G (*(struct globals*)&bb_common_bufsiz1)
+-#define target_endian	(G.tgt_endian)
+-#define INIT_G() do { \
+-	target_endian = __BYTE_ORDER; \
+-} while (0)
++/* mtd/jffs2-user.h used to have this atrocity:
++extern int target_endian;
++
++#define t16(x) ({ __u16 __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_16(__b); })
++#define t32(x) ({ __u32 __b = (x); (target_endian==__BYTE_ORDER)?__b:bswap_32(__b); })
++
++#define cpu_to_je16(x) ((jint16_t){t16(x)})
++#define cpu_to_je32(x) ((jint32_t){t32(x)})
++#define cpu_to_jemode(x) ((jmode_t){t32(x)})
++
++#define je16_to_cpu(x) (t16((x).v16))
++#define je32_to_cpu(x) (t32((x).v32))
++#define jemode_to_cpu(x) (t32((x).m))
++
++but mtd/jffs2-user.h is gone now (at least 2.6.31.6 does not have it anymore)
++*/
++
++/* We always use native endianness */
++#undef cpu_to_je16
++#undef cpu_to_je32
++#define cpu_to_je16(v) ((jint16_t){(v)})
++#define cpu_to_je32(v) ((jint32_t){(v)})
+ 
+ static uint32_t crc32(uint32_t val, const void *ss, int len,
+ 		uint32_t *crc32_table)
+@@ -40,9 +53,11 @@ static uint32_t crc32(uint32_t val, const void *ss, int len,
+ 
+ static void show_progress(mtd_info_t *meminfo, erase_info_t *erase)
+ {
+-	printf("\rErasing %d Kibyte @ %x -- %2llu %% complete.",
+-		(unsigned)meminfo->erasesize / 1024, erase->start,
+-		(unsigned long long) erase->start * 100 / meminfo->size);
++	printf("\rErasing %u Kibyte @ %x - %2u%% complete.",
++		(unsigned)meminfo->erasesize / 1024,
++		erase->start,
++		(unsigned) ((unsigned long long) erase->start * 100 / meminfo->size)
++	);
+ 	fflush(stdout);
+ }
+ 
+@@ -57,17 +72,15 @@ int flash_eraseall_main(int argc UNUSED_PARAM, char **argv)
+ 	unsigned int flags;
+ 	char *mtd_name;
+ 
+-	INIT_G();
+ 	opt_complementary = "=1";
+ 	flags = BBTEST | getopt32(argv, "jq");
+ 
+ 	mtd_name = argv[optind];
+-	xstat(mtd_name, &st);
++	fd = xopen(mtd_name, O_RDWR);
++	fstat(fd, &st);
+ 	if (!S_ISCHR(st.st_mode))
+ 		bb_error_msg_and_die("%s: not a char device", mtd_name);
+ 
+-	fd = xopen(mtd_name, O_RDWR);
+-
+ 	xioctl(fd, MEMGETINFO, &meminfo);
+ 	erase.length = meminfo.erasesize;
+ 	if (meminfo.type == MTD_NANDFLASH)
+-- 
+1.6.5
+

package/busybox/busybox.mk

@@ -7,29 +7,28 @@
 
 ifeq ($(BR2_PACKAGE_BUSYBOX_SNAPSHOT),y)
 # Be aware that this changes daily....
-BUSYBOX_DIR:=$(PROJECT_BUILD_DIR)/busybox
+BUSYBOX_DIR:=$(BUILD_DIR)/busybox
 BUSYBOX_SOURCE:=busybox-snapshot.tar.bz2
 BUSYBOX_SITE:=http://www.busybox.net/downloads/snapshots
 else
-BUSYBOX_VERSION=$(strip $(subst ",, $(BR2_BUSYBOX_VERSION)))
-#"))
-BUSYBOX_DIR:=$(PROJECT_BUILD_DIR)/busybox-$(BUSYBOX_VERSION)
+BUSYBOX_VERSION=$(call qstrip,$(BR2_BUSYBOX_VERSION))
+BUSYBOX_DIR:=$(BUILD_DIR)/busybox-$(BUSYBOX_VERSION)
 BUSYBOX_SOURCE:=busybox-$(BUSYBOX_VERSION).tar.bz2
 BUSYBOX_SITE:=http://www.busybox.net/downloads
 endif
 
 BUSYBOX_UNZIP=$(BZCAT)
+BUSYBOX_CFLAGS=$(TARGET_CFLAGS) -I$(LINUX_HEADERS_DIR)/include
 
 ifndef BUSYBOX_CONFIG_FILE
-BUSYBOX_CONFIG_FILE=$(subst ",, $(strip $(BR2_PACKAGE_BUSYBOX_CONFIG)))
-#")
+BUSYBOX_CONFIG_FILE=$(call qstrip,$(BR2_PACKAGE_BUSYBOX_CONFIG))
 endif
 
 $(DL_DIR)/$(BUSYBOX_SOURCE):
 	$(call DOWNLOAD,$(BUSYBOX_SITE),$(BUSYBOX_SOURCE))
 
 $(BUSYBOX_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
-	$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(PROJECT_BUILD_DIR) $(TAR_OPTIONS) -
+	$(BUSYBOX_UNZIP) $(DL_DIR)/$(BUSYBOX_SOURCE) | tar -C $(BUILD_DIR) $(TAR_OPTIONS) -
 ifeq ($(BR2_PACKAGE_SYSKLOGD),y)
 	# if we have external syslogd, force busybox to use it
 	$(SED) "/#include.*busybox\.h/a#define CONFIG_SYSLOGD" $(BUSYBOX_DIR)/init/init.c
@@ -69,8 +68,15 @@ else
 endif
 ifeq ($(BR2_INET_IPV6),y)
 	$(SED) "s/^.*CONFIG_FEATURE_IPV6.*/CONFIG_FEATURE_IPV6=y/;" $(BUSYBOX_DIR)/.config
+	$(SED) "s/^.*CONFIG_FEATURE_IFUPDOWN_IPV6.*/CONFIG_FEATURE_IFUPDOWN_IPV6=y/;" $(BUSYBOX_DIR)/.config
 else
 	$(SED) "s/^.*CONFIG_FEATURE_IPV6.*/CONFIG_FEATURE_IPV6=n/;" $(BUSYBOX_DIR)/.config
+	$(SED) "s/^.*CONFIG_FEATURE_IFUPDOWN_IPV6.*/CONFIG_FEATURE_IFUPDOWN_IPV6=n/;" $(BUSYBOX_DIR)/.config
+endif
+ifeq ($(BR2_INET_RPC),y)
+	$(SED) "s/^.*CONFIG_FEATURE_MOUNT_NFS.*/CONFIG_FEATURE_MOUNT_NFS=y/;" $(BUSYBOX_DIR)/.config
+else
+	$(SED) "s/^.*CONFIG_FEATURE_MOUNT_NFS.*/CONFIG_FEATURE_MOUNT_NFS=n/;" $(BUSYBOX_DIR)/.config
 endif
 ifeq ($(BR2_PACKAGE_BUSYBOX_SKELETON),y)
 	# force mdev on
@@ -95,13 +101,13 @@ $(BUSYBOX_DIR)/busybox: $(BUSYBOX_DIR)/.config
 	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
 		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
 		ARCH=$(KERNEL_ARCH) \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR)
+		EXTRA_CFLAGS="$(BUSYBOX_CFLAGS)" -C $(BUSYBOX_DIR)
 ifeq ($(BR2_PREFER_IMA)$(BR2_PACKAGE_BUSYBOX_SNAPSHOT),yy)
 	rm -f $@
 	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
 		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
 		ARCH=$(KERNEL_ARCH) STRIP="$(STRIPCMD)" \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR) \
+		EXTRA_CFLAGS="$(BUSYBOX_CFLAGS)" -C $(BUSYBOX_DIR) \
 		-f scripts/Makefile.IMA
 endif
 
@@ -110,22 +116,22 @@ ifeq ($(BR2_PACKAGE_BUSYBOX_FULLINSTALL),y)
 	$(MAKE) CC=$(TARGET_CC) CROSS_COMPILE="$(TARGET_CROSS)" \
 		CROSS="$(TARGET_CROSS)" PREFIX="$(TARGET_DIR)" \
 		ARCH=$(KERNEL_ARCH) \
-		EXTRA_CFLAGS="$(TARGET_CFLAGS)" -C $(BUSYBOX_DIR) install
+		EXTRA_CFLAGS="$(BUSYBOX_CFLAGS)" -C $(BUSYBOX_DIR) install
 else
 	install -D -m 0755 $(BUSYBOX_DIR)/busybox $(TARGET_DIR)/bin/busybox
 endif
 	# Just in case
 	-chmod a+x $(TARGET_DIR)/usr/share/udhcpc/default.script
 
-busybox: uclibc $(TARGET_DIR)/bin/busybox
+busybox: $(TARGET_DIR)/bin/busybox
 
 busybox-source: $(DL_DIR)/$(BUSYBOX_SOURCE)
 
-busybox-unpacked: host-sed $(PROJECT_BUILD_DIR) $(BUSYBOX_DIR)/.unpacked
+busybox-unpacked: host-sed $(BUILD_DIR) $(BUSYBOX_DIR)/.unpacked
 
-busybox-config: host-sed $(PROJECT_BUILD_DIR) $(BUSYBOX_DIR)/.config
+busybox-config: host-sed $(BUILD_DIR) $(BUSYBOX_DIR)/.config
 
-busybox-menuconfig: host-sed $(PROJECT_BUILD_DIR) busybox-source $(BUSYBOX_DIR)/.config
+busybox-menuconfig: host-sed $(BUILD_DIR) busybox-source $(BUSYBOX_DIR)/.config
 	$(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_DIR) menuconfig
 
 busybox-update:

package/busybox/initramfs.mk

@@ -6,7 +6,7 @@
 ifeq ($(BR2_PACKAGE_BUSYBOX_INITRAMFS),y)
 
 BUSYBOX_INITRAMFS_DIR:=$(BUSYBOX_DIR)-initramfs
-BR2_INITRAMFS_DIR:=$(PROJECT_BUILD_DIR)/initramfs
+BR2_INITRAMFS_DIR:=$(BUILD_DIR)/initramfs
 BB_INITRAMFS_TARGET:=$(IMAGE).initramfs_lst
 
 $(BUSYBOX_INITRAMFS_DIR)/.unpacked: $(DL_DIR)/$(BUSYBOX_SOURCE)
@@ -105,39 +105,39 @@ $(BR2_INITRAMFS_DIR)/bin/busybox: $(BUSYBOX_INITRAMFS_DIR)/busybox
 
 
 $(BB_INITRAMFS_TARGET): host-fakeroot $(BR2_INITRAMFS_DIR)/bin/busybox
-	ln -fs bin/busybox $(PROJECT_BUILD_DIR)/initramfs/init
-	mkdir -p $(PROJECT_BUILD_DIR)/initramfs/etc
+	ln -fs bin/busybox $(BUILD_DIR)/initramfs/init
+	mkdir -p $(BUILD_DIR)/initramfs/etc
 	cat target/generic/target_busybox_skeleton/etc/inittab > \
-		$(PROJECT_BUILD_DIR)/initramfs/etc/inittab
-	rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
-	(echo "chown -R 0:0 $(PROJECT_BUILD_DIR)/initramfs"; \
-	 echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(PROJECT_BUILD_DIR)/initramfs"; \
-	 echo "$(SHELL) target/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(PROJECT_BUILD_DIR)/initramfs > $(BB_INITRAMFS_TARGET)"; \
-	) > $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
-	chmod +x $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
+		$(BUILD_DIR)/initramfs/etc/inittab
+	rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
+	(echo "chown -R 0:0 $(BUILD_DIR)/initramfs"; \
+	 echo "$(HOST_DIR)/usr/bin/makedevs -d $(TARGET_DEVICE_TABLE) $(BUILD_DIR)/initramfs"; \
+	 echo "$(SHELL) target/initramfs/gen_initramfs_list.sh -u 0 -g 0 $(BUILD_DIR)/initramfs > $(BB_INITRAMFS_TARGET)"; \
+	) > $(BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
+	chmod +x $(BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
 	$(HOST_DIR)/usr/bin/fakeroot -- \
-		$(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
-	rm -f $(PROJECT_BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
+		$(BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
+	rm -f $(BUILD_DIR)/_fakeroot.$(notdir $(BB_INITRAMFS_TARGET))
 	touch -c $@
 
-$(PROJECT_BUILD_DIR)/.initramfs_done: $(BR2_INITRAMFS_DIR)/bin/busybox \
+$(BUILD_DIR)/.initramfs_done: $(BR2_INITRAMFS_DIR)/bin/busybox \
 					$(BB_INITRAMFS_TARGET)
 	touch $@
 
 busybox-initramfs-source:
-busybox-initramfs: uclibc $(PROJECT_BUILD_DIR)/.initramfs_done
+busybox-initramfs: $(BUILD_DIR)/.initramfs_done
 
 busybox-initramfs-menuconfig: host-sed $(BUILD_DIR) busybox-source $(BUSYBOX_INITRAMFS_DIR)/.configured
 	$(MAKE) __TARGET_ARCH=$(ARCH) -C $(BUSYBOX_INITRAMFS_DIR) menuconfig
 
 busybox-initramfs-clean:
-	rm -f $(BUSYBOX_INITRAMFS_DIR)/busybox $(PROJECT_BUILD_DIR)/.initramfs_*
+	rm -f $(BUSYBOX_INITRAMFS_DIR)/busybox $(BUILD_DIR)/.initramfs_*
 	rm -rf $(BR2_INITRAMFS_DIR) $(BB_INITRAMFS_TARGET)
 	-$(MAKE) -C $(BUSYBOX_INITRAMFS_DIR) clean
 
 busybox-initramfs-dirclean:
 	rm -rf $(BUSYBOX_INITRAMFS_DIR) $(BR2_INITRAMFS_DIR) \
-		$(PROJECT_BUILD_DIR)/.initramfs_*
+		$(BUILD_DIR)/.initramfs_*
 endif
 #############################################################
 #

package/bzip2/bzip2.mk

@@ -96,7 +96,7 @@ $(TARGET_DIR)/usr/lib/libbz2.a: $(STAGING_DIR)/usr/lib/libbz2.a
 
 bzip2-headers: $(TARGET_DIR)/usr/lib/libbz2.a
 
-bzip2: uclibc $(BZIP2_TARGET_BINARY)
+bzip2: $(BZIP2_TARGET_BINARY)
 
 bzip2-clean:
 	rm -f $(addprefix $(TARGET_DIR),/lib/libbz2.* \

package/cairo/cairo.mk

@@ -39,7 +39,7 @@ CAIRO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \
 		ac_cv_func_working_mktime=yes jm_cv_func_working_re_compile_pattern=yes \
 		ac_use_included_regex=no gl_cv_c_restrict=no
 
-CAIRO_DEPENDENCIES = uclibc host-pkgconfig fontconfig pixman
+CAIRO_DEPENDENCIES = host-pkgconfig fontconfig pixman
 
 ifeq ($(BR2_PACKAGE_DIRECTFB),y)
 	CAIRO_CONF_OPT += --enable-directfb
@@ -48,9 +48,9 @@ else
 	CAIRO_CONF_OPT += --disable-directfb
 endif
 
-ifneq ($(BR2_PACKAGE_XSERVER_none),y)
+ifeq ($(BR2_PACKAGE_XORG7),y)
 	CAIRO_CONF_OPT += --enable-xlib --with-x
-	CAIRO_DEPENDENCIES += $(XSERVER)
+	CAIRO_DEPENDENCIES += xserver_xorg-server
 else
 	CAIRO_CONF_OPT += --disable-xlib --without-x
 endif
@@ -101,7 +101,7 @@ $(STAMP_DIR)/host_cairo_configured: $(STAMP_DIR)/host_cairo_unpacked $(STAMP_DIR
 		$(HOST_CONFIGURE_OPTS) \
 		CFLAGS="$(HOST_CFLAGS)" \
 		LDFLAGS="$(HOST_LDFLAGS)" \
-		./configure \
+		./configure $(QUIET) \
 		--prefix="$(HOST_DIR)/usr" \
 		--sysconfdir="$(HOST_DIR)/etc" \
 		--enable-ps \

package/config/.gitignore

@@ -1,6 +1,10 @@
 /buildroot-config
 /conf
 /mconf
+/qconf
+/qconf.moc
+/.tmp_qtcheck
+/lkc_defs.h
 /lex.zconf.c
 /zconf.hash.c
 /zconf.tab.c

package/config/Makefile

@@ -14,7 +14,10 @@ __hostprogs := $(sort $(hostprogs-y) $(hostprogs-m))
 host-csingle := $(foreach m,$(__hostprogs),$(if $($(m)-objs),,$(m)))
 host-cmulti := $(foreach m,$(__hostprogs),\
            $(if $($(m)-cxxobjs),,$(if $($(m)-objs),$(m))))
+host-cxxmulti := $(foreach m,$(__hostprogs),\
+           $(if $($(m)-cxxobjs),$(m),$(if $($(m)-objs),)))
 host-cobjs := $(sort $(foreach m,$(__hostprogs),$($(m)-objs)))
+host-cxxobjs := $(sort $(foreach m,$(__hostprogs),$($(m)-cxxobjs)))
 
 $(host-csingle): %: %.c
 	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $< $(HOST_LOADLIBES) -o $@
@@ -22,9 +25,15 @@ $(host-csingle): %: %.c
 $(host-cmulti): %: $(host-cobjs) $(host-cshlib)
 	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $($@-objs) $(HOST_LOADLIBES) -o $@
 
+$(host-cxxmulti): %: $(host-cxxobjs) $(host-cobjs) $(host-cshlib)
+	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) $($@-objs) $($@-cxxobjs) $(HOSTLOADLIBES_$@) -o $@
+
 $(host-cobjs): %.o: %.c
 	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCFLAGS_$@) -c $< -o $@
 
+$(host-cxxobjs): %.o: %.cc
+	$(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTCFLAGS) $(HOSTCXXFLAGS_$@) -c $< -o $@
+
 $(obj)/%:: $(src)/%_shipped
 	$(Q)cat $< > $@
 

package/config/Makefile.kconfig

@@ -4,7 +4,11 @@
 
 PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config
 
+ifdef KBUILD_KCONFIG
+Kconfig := $(KBUILD_KCONFIG)
+else
 Kconfig := arch/$(SRCARCH)/Kconfig
+endif
 
 xconfig: $(obj)/qconf
 	$< $(Kconfig)
@@ -24,22 +28,25 @@ oldconfig: $(obj)/conf
 silentoldconfig: $(obj)/conf
 	$< -s $(Kconfig)
 
-# Create new linux.po file
+# Create new linux.pot file
 # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
 # The symlink is used to repair a deficiency in arch/um
-update-po-config: $(obj)/kxgettext
-	xgettext --default-domain=linux                  \
+update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
+	$(Q)echo "  GEN config"
+	$(Q)xgettext --default-domain=linux              \
 	    --add-comments --keyword=_ --keyword=N_      \
 	    --from-code=UTF-8                            \
 	    --files-from=scripts/kconfig/POTFILES.in     \
 	    --output $(obj)/config.pot
 	$(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
 	$(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch
-	(for i in `ls arch/`;                            \
-	do                                               \
-	    $(obj)/kxgettext arch/$$i/Kconfig;           \
-	done ) >> $(obj)/config.pot
-	msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
+	$(Q)(for i in `ls arch/*/Kconfig`;               \
+	    do                                           \
+		echo "  GEN $$i";                        \
+		$(obj)/kxgettext $$i                     \
+		     >> $(obj)/config.pot;               \
+	    done )
+	$(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
 	    --output $(obj)/linux.pot
 	$(Q)rm -f arch/um/Kconfig.arch
 	$(Q)rm -f $(obj)/config.pot
@@ -76,7 +83,7 @@ help:
 	@echo  '  xconfig	  - Update current config utilising a QT based front-end'
 	@echo  '  gconfig	  - Update current config utilising a GTK based front-end'
 	@echo  '  oldconfig	  - Update current config utilising a provided .config as base'
-	@echo  '  silentoldconfig - Same as oldconfig, but quietly'
+	@echo  '  silentoldconfig - Same as oldconfig, but quietly, additionally update deps'
 	@echo  '  randconfig	  - New config with random answer to all options'
 	@echo  '  defconfig	  - New config with default answer to all options'
 	@echo  '  allmodconfig	  - New config selecting modules when possible'
@@ -93,17 +100,11 @@ HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
 
 HOST_EXTRACFLAGS += -DLOCALE
 
-PHONY += $(obj)/dochecklxdialog
-$(obj)/dochecklxdialog:
-	$(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_LOADLIBES)
-
-always := dochecklxdialog
-
 
 # ===========================================================================
 # Shared Makefile for the various kconfig executables:
 # conf:	  Used for defconfig, oldconfig and related targets
-# mconf:  Used for the mconfig target.
+# mconf:  Used for the menuconfig target
 #         Utilizes the lxdialog package
 # qconf:  Used for the xconfig target
 #         Based on QT which needs to be installed to compile it
@@ -124,12 +125,16 @@ ifeq ($(MAKECMDGOALS),menuconfig)
 	hostprogs-y += mconf
 endif
 ifeq ($(findstring mconf,$(MAKECMDGOALS)),mconf)
-	hostprogs-y += mconf
+       hostprogs-y += mconf
 endif
 
 ifeq ($(MAKECMDGOALS),xconfig)
 	qconf-target := 1
 endif
+ifeq ($(findstring qconf,$(MAKECMDGOALS)),qconf)
+	qconf-target := 1
+endif
+
 ifeq ($(MAKECMDGOALS),gconfig)
 	gconf-target := 1
 endif
@@ -145,8 +150,17 @@ gconf-objs	:= gconf.o kconfig_load.o zconf.tab.o
 endif
 
 clean-files	:= lkc_defs.h qconf.moc .tmp_qtcheck \
-		   .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c
+		   .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
 clean-files     += mconf qconf gconf
+clean-files     += config.pot linux.pot
+
+# Check that we have the required ncurses stuff installed for lxdialog (menuconfig)
+PHONY += $(obj)/dochecklxdialog
+$(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog
+$(obj)/dochecklxdialog:
+	$(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES)
+
+always := dochecklxdialog
 
 # Add environment specific flags
 HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(srctree)/$(src)/check.sh $(HOSTCC) $(HOSTCFLAGS))
@@ -184,8 +198,8 @@ $(obj)/.tmp_qtcheck:
 	  done; \
 	  if [ -z "$$dir" ]; then \
 	    echo "*"; \
-	    echo "* Unable to find the QT installation. Please make sure that"; \
-	    echo "* the QT development package is correctly installed and"; \
+	    echo "* Unable to find the QT3 installation. Please make sure that"; \
+	    echo "* the QT3 development package is correctly installed and"; \
 	    echo "* either install pkg-config or set the QTDIR environment"; \
 	    echo "* variable to the correct location."; \
 	    echo "*"; \
@@ -251,6 +265,9 @@ $(obj)/%.moc: $(src)/%.h
 $(obj)/lkc_defs.h: $(src)/lkc_proto.h
 	sed < $< > $@ 's/P(\([^,]*\),.*/#define \1 (\*\1_p)/'
 
+# Extract gconf menu items for I18N support
+$(obj)/gconf.glade.h: $(obj)/gconf.glade
+	intltool-extract --type=gettext/glade $(obj)/gconf.glade
 
 ###
 # The following requires flex/bison/gperf

package/config/POTFILES.in

@@ -1,5 +1,12 @@
+scripts/kconfig/lxdialog/checklist.c
+scripts/kconfig/lxdialog/inputbox.c
+scripts/kconfig/lxdialog/menubox.c
+scripts/kconfig/lxdialog/textbox.c
+scripts/kconfig/lxdialog/util.c
+scripts/kconfig/lxdialog/yesno.c
 scripts/kconfig/mconf.c
 scripts/kconfig/conf.c
 scripts/kconfig/confdata.c
 scripts/kconfig/gconf.c
+scripts/kconfig/gconf.glade.h
 scripts/kconfig/qconf.cc

package/config/conf.c

@@ -3,13 +3,15 @@
  * Released under the terms of the GNU GPL v2.0.
  */
 
+#include <locale.h>
 #include <ctype.h>
-#include <stdlib.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <time.h>
+#include <unistd.h>
 #include <sys/stat.h>
+#include <sys/time.h>
 
 #define LKC_DIRECT_LINK
 #include "lkc.h"
@@ -31,6 +33,7 @@ char *defconfig_file;
 
 static int indent = 1;
 static int valid_stdin = 1;
+static int sync_kconfig;
 static int conf_cnt;
 static char line[128];
 static struct menu *rootEntry;
@@ -40,7 +43,7 @@ static char nohelp_text[] = N_("Sorry, no help available for this option yet.\n"
 static const char *get_help(struct menu *menu)
 {
 	if (menu_has_help(menu))
-		return menu_get_help(menu);
+		return _(menu_get_help(menu));
 	else
 		return nohelp_text;
 }
@@ -64,7 +67,7 @@ static void strip(char *str)
 
 static void check_stdin(void)
 {
-	if (!valid_stdin && input_mode == ask_silent) {
+	if (!valid_stdin) {
 		printf(_("aborted!\n\n"));
 		printf(_("Console input/output is redirected. "));
 		printf(_("Run 'make oldconfig' to update configuration.\n\n"));
@@ -75,10 +78,9 @@ static void check_stdin(void)
 static int conf_askvalue(struct symbol *sym, const char *def)
 {
 	enum symbol_type type = sym_get_type(sym);
-	tristate val;
 
 	if (!sym_has_value(sym))
-		printf("(NEW) ");
+		printf(_("(NEW) "));
 
 	line[0] = '\n';
 	line[1] = 0;
@@ -91,15 +93,6 @@ static int conf_askvalue(struct symbol *sym, const char *def)
 	}
 
 	switch (input_mode) {
-	case set_no:
-	case set_mod:
-	case set_yes:
-	case set_random:
-		if (sym_has_value(sym)) {
-			printf("%s\n", def);
-			return 0;
-		}
-		break;
 	case ask_new:
 	case ask_silent:
 		if (sym_has_value(sym)) {
@@ -111,9 +104,6 @@ static int conf_askvalue(struct symbol *sym, const char *def)
 		fflush(stdout);
 		fgets(line, 128, stdin);
 		return 1;
-	case set_default:
-		printf("%s\n", def);
-		return 1;
 	default:
 		break;
 	}
@@ -127,52 +117,6 @@ static int conf_askvalue(struct symbol *sym, const char *def)
 	default:
 		;
 	}
-	switch (input_mode) {
-	case set_yes:
-		if (sym_tristate_within_range(sym, yes)) {
-			line[0] = 'y';
-			line[1] = '\n';
-			line[2] = 0;
-			break;
-		}
-	case set_mod:
-		if (type == S_TRISTATE) {
-			if (sym_tristate_within_range(sym, mod)) {
-				line[0] = 'm';
-				line[1] = '\n';
-				line[2] = 0;
-				break;
-			}
-		} else {
-			if (sym_tristate_within_range(sym, yes)) {
-				line[0] = 'y';
-				line[1] = '\n';
-				line[2] = 0;
-				break;
-			}
-		}
-	case set_no:
-		if (sym_tristate_within_range(sym, no)) {
-			line[0] = 'n';
-			line[1] = '\n';
-			line[2] = 0;
-			break;
-		}
-	case set_random:
-		do {
-			val = (tristate)(random() % 3);
-		} while (!sym_tristate_within_range(sym, val));
-		switch (val) {
-		case no: line[0] = 'n'; break;
-		case mod: line[0] = 'm'; break;
-		case yes: line[0] = 'y'; break;
-		}
-		line[1] = '\n';
-		line[2] = 0;
-		break;
-	default:
-		break;
-	}
 	printf("%s", line);
 	return 1;
 }
@@ -183,7 +127,7 @@ int conf_string(struct menu *menu)
 	const char *def;
 
 	while (1) {
-		printf("%*s%s ", indent - 1, "", menu->prompt->text);
+		printf("%*s%s ", indent - 1, "", _(menu->prompt->text));
 		printf("(%s) ", sym->name);
 		def = sym_get_string_value(sym);
 		if (sym_get_string_value(sym))
@@ -216,7 +160,7 @@ static int conf_sym(struct menu *menu)
 	tristate oldval, newval;
 
 	while (1) {
-		printf("%*s%s ", indent - 1, "", menu->prompt->text);
+		printf("%*s%s ", indent - 1, "", _(menu->prompt->text));
 		if (sym->name)
 			printf("(%s) ", sym->name);
 		type = sym_get_type(sym);
@@ -306,7 +250,7 @@ static int conf_choice(struct menu *menu)
 		case no:
 			return 1;
 		case mod:
-			printf("%*s%s\n", indent - 1, "", menu_get_prompt(menu));
+			printf("%*s%s\n", indent - 1, "", _(menu_get_prompt(menu)));
 			return 0;
 		case yes:
 			break;
@@ -316,7 +260,7 @@ static int conf_choice(struct menu *menu)
 	while (1) {
 		int cnt, def;
 
-		printf("%*s%s\n", indent - 1, "", menu_get_prompt(menu));
+		printf("%*s%s\n", indent - 1, "", _(menu_get_prompt(menu)));
 		def_sym = sym_get_choice_value(sym);
 		cnt = def = 0;
 		line[0] = 0;
@@ -324,7 +268,7 @@ static int conf_choice(struct menu *menu)
 			if (!menu_is_visible(child))
 				continue;
 			if (!child->sym) {
-				printf("%*c %s\n", indent, '*', menu_get_prompt(child));
+				printf("%*c %s\n", indent, '*', _(menu_get_prompt(child)));
 				continue;
 			}
 			cnt++;
@@ -333,14 +277,14 @@ static int conf_choice(struct menu *menu)
 				printf("%*c", indent, '>');
 			} else
 				printf("%*c", indent, ' ');
-			printf(" %d. %s", cnt, menu_get_prompt(child));
+			printf(" %d. %s", cnt, _(menu_get_prompt(child)));
 			if (child->sym->name)
 				printf(" (%s)", child->sym->name);
 			if (!sym_has_value(child->sym))
-				printf(" (NEW)");
+				printf(_(" (NEW)"));
 			printf("\n");
 		}
-		printf("%*schoice", indent - 1, "");
+		printf(_("%*schoice"), indent - 1, "");
 		if (cnt == 1) {
 			printf("[1]: 1\n");
 			goto conf_childs;
@@ -373,15 +317,7 @@ static int conf_choice(struct menu *menu)
 			else
 				continue;
 			break;
-		case set_random:
-			if (is_new)
-				def = (random() % cnt) + 1;
-		case set_default:
-		case set_yes:
-		case set_mod:
-		case set_no:
-			cnt = def;
-			printf("%d\n", cnt);
+		default:
 			break;
 		}
 
@@ -399,9 +335,9 @@ static int conf_choice(struct menu *menu)
 			continue;
 		}
 		sym_set_choice_value(sym, child->sym);
-		if (child->list) {
+		for (child = child->list; child; child = child->next) {
 			indent += 2;
-			conf(child->list);
+			conf(child);
 			indent -= 2;
 		}
 		return 1;
@@ -433,7 +369,7 @@ static void conf(struct menu *menu)
 			if (prompt)
 				printf("%*c\n%*c %s\n%*c\n",
 					indent, '*',
-					indent, '*', prompt,
+					indent, '*', _(prompt),
 					indent, '*');
 		default:
 			;
@@ -495,30 +431,29 @@ static void check_conf(struct menu *menu)
 
 int main(int ac, char **av)
 {
-	int i = 1;
+	int opt;
 	const char *name;
 	struct stat tmpstat;
 
-	if (ac > i && av[i][0] == '-') {
-		switch (av[i++][1]) {
+	setlocale(LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
+
+	while ((opt = getopt(ac, av, "osdD:nmyrh")) != -1) {
+		switch (opt) {
 		case 'o':
-			input_mode = ask_new;
+			input_mode = ask_silent;
 			break;
 		case 's':
 			input_mode = ask_silent;
-			valid_stdin = isatty(0) && isatty(1) && isatty(2);
+			sync_kconfig = 1;
 			break;
 		case 'd':
 			input_mode = set_default;
 			break;
 		case 'D':
 			input_mode = set_default;
-			defconfig_file = av[i++];
-			if (!defconfig_file) {
-				printf(_("%s: No default config file specified\n"),
-					av[0]);
-				exit(1);
-			}
+			defconfig_file = optarg;
 			break;
 		case 'n':
 			input_mode = set_no;
@@ -530,44 +465,63 @@ int main(int ac, char **av)
 			input_mode = set_yes;
 			break;
 		case 'r':
+		{
+			struct timeval now;
+			unsigned int seed;
+
+			/*
+			 * Use microseconds derived seed,
+			 * compensate for systems where it may be zero
+			 */
+			gettimeofday(&now, NULL);
+
+			seed = (unsigned int)((now.tv_sec + 1) * (now.tv_usec + 1));
+			srand(seed);
+
 			input_mode = set_random;
-			srandom(time(NULL));
 			break;
+		}
 		case 'h':
-		case '?':
-			fprintf(stderr, "See README for usage info\n");
+			printf(_("See README for usage info\n"));
 			exit(0);
+			break;
+		default:
+			fprintf(stderr, _("See README for usage info\n"));
+			exit(1);
 		}
 	}
-  	name = av[i];
-	if (!name) {
+	if (ac == optind) {
 		printf(_("%s: Kconfig file missing\n"), av[0]);
 		exit(1);
 	}
+	name = av[optind];
 	conf_parse(name);
-	/*zconfdump(stdout);*/
+	if (sync_kconfig) {
+		name = conf_get_configname();
+		if (stat(name, &tmpstat)) {
+			fprintf(stderr, _("***\n"
+				"*** You have not yet configured Buildroot!\n"
+				"*** (missing .config file \"%s\")\n"
+				"***\n"
+				"*** Please run some configurator (e.g. \"make oldconfig\" or\n"
+				"*** \"make menuconfig\" or \"make xconfig\").\n"
+				"***\n"), name);
+			exit(1);
+		}
+	}
+
 	switch (input_mode) {
 	case set_default:
 		if (!defconfig_file)
 			defconfig_file = conf_get_default_confname();
 		if (conf_read(defconfig_file)) {
-			printf("***\n"
+			printf(_("***\n"
 				"*** Can't find default configuration \"%s\"!\n"
-				"***\n", defconfig_file);
+				"***\n"), defconfig_file);
 			exit(1);
 		}
 		break;
 	case ask_silent:
-		if (stat(".config", &tmpstat)) {
-			printf(_("***\n"
-				"*** You have not yet configured Buildroot!\n"
-				"*** (missing .config file)\n"
-				"***\n"
-				"*** Please run some configurator (e.g. \"make oldconfig\" or\n"
-				"*** \"make menuconfig\" or \"make config\").\n"
-				"***\n"));
-			exit(1);
-		}
 	case ask_all:
 	case ask_new:
 		conf_read(NULL);
@@ -597,35 +551,70 @@ int main(int ac, char **av)
 		break;
 	}
 
-	if (input_mode != ask_silent) {
+	if (sync_kconfig) {
+		if (conf_get_changed()) {
+			name = getenv("KCONFIG_NOSILENTUPDATE");
+			if (name && *name) {
+				fprintf(stderr,
+					_("\n*** Buildroot configuration requires explicit update.\n\n"));
+				return 1;
+			}
+		}
+		valid_stdin = isatty(0) && isatty(1) && isatty(2);
+	}
+
+	switch (input_mode) {
+	case set_no:
+		conf_set_all_new_symbols(def_no);
+		break;
+	case set_yes:
+		conf_set_all_new_symbols(def_yes);
+		break;
+	case set_mod:
+		conf_set_all_new_symbols(def_mod);
+		break;
+	case set_random:
+		conf_set_all_new_symbols(def_random);
+		break;
+	case set_default:
+		conf_set_all_new_symbols(def_default);
+		break;
+	case ask_new:
+	case ask_all:
 		rootEntry = &rootmenu;
 		conf(&rootmenu);
-		if (input_mode == ask_all) {
-			input_mode = ask_silent;
-			valid_stdin = 1;
+		input_mode = ask_silent;
+		/* fall through */
+	case ask_silent:
+		/* Update until a loop caused no more changes */
+		do {
+			conf_cnt = 0;
+			check_conf(&rootmenu);
+		} while (conf_cnt);
+		break;
+	}
+
+	if (sync_kconfig) {
+		/* silentoldconfig is used during the build so we shall update autoconf.
+		 * All other commands are only used to generate a config.
+		 */
+		if (conf_get_changed() && conf_write(NULL)) {
+			fprintf(stderr, _("\n*** Error during writing of the Buildroot configuration.\n\n"));
+			exit(1);
 		}
-	} else if (conf_get_changed()) {
-		name = getenv("KCONFIG_NOSILENTUPDATE");
-		if (name && *name) {
-			fprintf(stderr, _("\n*** Buildroot configuration requires explicit update.\n\n"));
+		if (conf_write_autoconf()) {
+			fprintf(stderr, _("\n*** Error during update of the Buildroot configuration.\n\n"));
+			return 1;
+		}
+	} else {
+		if (conf_write(NULL)) {
+			fprintf(stderr, _("\n*** Error during writing of the Buildroot configuration.\n\n"));
+			exit(1);
+		}
+		if (conf_write_autoconf()) {
+			fprintf(stderr, _("\n*** Error during update of the Buildroot configuration.\n\n"));
 			return 1;
 		}
-	} else
-		goto skip_check;
-
-	do {
-		conf_cnt = 0;
-		check_conf(&rootmenu);
-	} while (conf_cnt);
-	if (conf_write(NULL)) {
-		fprintf(stderr, _("\n*** Error during writing of the Buildroot configuration.\n\n"));
-		return 1;
 	}
-skip_check:
-	if (/*input_mode == ask_silent &&*/ conf_write_autoconf()) {
-		fprintf(stderr, _("\n*** Error during writing of the Buildroot configuration.\n\n"));
-		return 1;
-	}
-
 	return 0;
 }

package/config/confdata.c

@@ -42,6 +42,11 @@ const char *conf_get_configname(void)
 	return name ? name : ".config";
 }
 
+const char *conf_get_autoconfig_name(void)
+{
+	return getenv("KCONFIG_AUTOCONFIG");
+}
+
 static char *conf_expand_value(const char *in)
 {
 	struct symbol *sym;
@@ -224,7 +229,7 @@ load:
 			if (def == S_DEF_USER) {
 				sym = sym_find(line + 2);
 				if (!sym) {
-					conf_warning("trying to assign nonexistent symbol %s", line + 2);
+					sym_add_change_count(1);
 					break;
 				}
 			} else {
@@ -233,8 +238,7 @@ load:
 					sym->type = S_BOOLEAN;
 			}
 			if (sym->flags & def_flags) {
-				conf_warning("trying to reassign symbol %s", sym->name);
-				break;
+				conf_warning("override: reassigning to symbol %s", sym->name);
 			}
 			switch (sym->type) {
 			case S_BOOLEAN:
@@ -260,7 +264,7 @@ load:
 			if (def == S_DEF_USER) {
 				sym = sym_find(line);
 				if (!sym) {
-					conf_warning("trying to assign nonexistent symbol %s", line);
+					sym_add_change_count(1);
 					break;
 				}
 			} else {
@@ -269,8 +273,7 @@ load:
 					sym->type = S_OTHER;
 			}
 			if (sym->flags & def_flags) {
-				conf_warning("trying to reassign symbol %s", sym->name);
-				break;
+				conf_warning("override: reassigning to symbol %s", sym->name);
 			}
 			if (conf_set_sym_val(sym, def, def_flags, p))
 				continue;
@@ -294,14 +297,12 @@ load:
 				}
 				break;
 			case yes:
-				if (cs->def[def].tri != no) {
-					conf_warning("%s creates inconsistent choice state", sym->name);
-					cs->flags &= ~def_flags;
-				} else
-					cs->def[def].val = sym;
+				if (cs->def[def].tri != no)
+					conf_warning("override: %s changes choice state", sym->name);
+				cs->def[def].val = sym;
 				break;
 			}
-			cs->def[def].tri = E_OR(cs->def[def].tri, sym->def[def].tri);
+			cs->def[def].tri = EXPR_OR(cs->def[def].tri, sym->def[def].tri);
 		}
 	}
 	fclose(in);
@@ -313,7 +314,7 @@ load:
 
 int conf_read(const char *name)
 {
-	struct symbol *sym;
+	struct symbol *sym, *choice_sym;
 	struct property *prop;
 	struct expr *e;
 	int i, flags;
@@ -354,9 +355,9 @@ int conf_read(const char *name)
 		 */
 		prop = sym_get_choice_prop(sym);
 		flags = sym->flags;
-		for (e = prop->expr; e; e = e->left.expr)
-			if (e->right.sym->visible != no)
-				flags &= e->right.sym->flags;
+		expr_list_for_each_sym(prop->expr, e, choice_sym)
+			if (choice_sym->visible != no)
+				flags &= choice_sym->flags;
 		sym->flags &= flags | ~SYMBOL_DEF_USER;
 	}
 
@@ -554,15 +555,15 @@ int conf_write(const char *name)
 
 int conf_split_config(void)
 {
-	char *name, path[128], *opwd, *dir, *_name;
+	const char *name;
+	char path[128];
+	char *opwd, *dir, *_name;
 	char *s, *d, c;
 	struct symbol *sym;
 	struct stat sb;
 	int res, i, fd;
 
-	name = getenv("KCONFIG_AUTOCONFIG");
-	if (!name)
-		name = "include/config/auto.conf";
+	name = conf_get_autoconfig_name();
 	conf_read_simple(name, S_DEF_AUTO);
 
 	opwd = malloc(256);
@@ -683,7 +684,7 @@ int conf_write_autoconf(void)
 {
 	struct symbol *sym;
 	const char *str;
-	char *name;
+	const char *name;
 	FILE *out, *out_h;
 	time_t now;
 	int i, l;
@@ -783,9 +784,7 @@ int conf_write_autoconf(void)
 		name = "include/linux/autoconf.h";
 	if (rename(".tmpconfig.h", name))
 		return 1;
-	name = getenv("KCONFIG_AUTOCONFIG");
-	if (!name)
-		name = "include/config/auto.conf";
+	name = conf_get_autoconfig_name();
 	/*
 	 * This must be the last step, kbuild has a dependency on auto.conf
 	 * and this marks the successful completion of the previous steps.
@@ -822,3 +821,93 @@ void conf_set_changed_callback(void (*fn)(void))
 {
 	conf_changed_callback = fn;
 }
+
+
+void conf_set_all_new_symbols(enum conf_def_mode mode)
+{
+	struct symbol *sym, *csym;
+	struct property *prop;
+	struct expr *e;
+	int i, cnt, def;
+
+	for_all_symbols(i, sym) {
+		if (sym_has_value(sym))
+			continue;
+		switch (sym_get_type(sym)) {
+		case S_BOOLEAN:
+		case S_TRISTATE:
+			switch (mode) {
+			case def_yes:
+				sym->def[S_DEF_USER].tri = yes;
+				break;
+			case def_mod:
+				sym->def[S_DEF_USER].tri = mod;
+				break;
+			case def_no:
+				sym->def[S_DEF_USER].tri = no;
+				break;
+			case def_random:
+				sym->def[S_DEF_USER].tri = (tristate)(rand() % 3);
+				break;
+			default:
+				continue;
+			}
+			if (!(sym_is_choice(sym) && mode == def_random))
+				sym->flags |= SYMBOL_DEF_USER;
+			break;
+		default:
+			break;
+		}
+
+	}
+
+	sym_clear_all_valid();
+
+	if (mode != def_random)
+		return;
+	/*
+	 * We have different type of choice blocks.
+	 * If curr.tri equal to mod then we can select several
+	 * choice symbols in one block.
+	 * In this case we do nothing.
+	 * If curr.tri equal yes then only one symbol can be
+	 * selected in a choice block and we set it to yes,
+	 * and the rest to no.
+	 */
+	for_all_symbols(i, csym) {
+		if (sym_has_value(csym) || !sym_is_choice(csym))
+			continue;
+
+		sym_calc_value(csym);
+
+		if (csym->curr.tri != yes)
+			continue;
+
+		prop = sym_get_choice_prop(csym);
+
+		/* count entries in choice block */
+		cnt = 0;
+		expr_list_for_each_sym(prop->expr, e, sym)
+			cnt++;
+
+		/*
+		 * find a random value and set it to yes,
+		 * set the rest to no so we have only one set
+		 */
+		def = (rand() % cnt);
+
+		cnt = 0;
+		expr_list_for_each_sym(prop->expr, e, sym) {
+			if (def == cnt++) {
+				sym->def[S_DEF_USER].tri = yes;
+				csym->def[S_DEF_USER].val = sym;
+			}
+			else {
+				sym->def[S_DEF_USER].tri = no;
+			}
+		}
+		csym->flags |= SYMBOL_DEF_USER;
+		/* clear VALID to get value calculated */
+		csym->flags &= ~(SYMBOL_VALID);
+	}
+}

package/config/expr.c

@@ -87,7 +87,7 @@ struct expr *expr_copy(struct expr *org)
 		break;
 	case E_AND:
 	case E_OR:
-	case E_CHOICE:
+	case E_LIST:
 		e->left.expr = expr_copy(org->left.expr);
 		e->right.expr = expr_copy(org->right.expr);
 		break;
@@ -217,7 +217,7 @@ int expr_eq(struct expr *e1, struct expr *e2)
 		expr_free(e2);
 		trans_count = old_count;
 		return res;
-	case E_CHOICE:
+	case E_LIST:
 	case E_RANGE:
 	case E_NONE:
 		/* panic */;
@@ -648,7 +648,7 @@ struct expr *expr_transform(struct expr *e)
 	case E_EQUAL:
 	case E_UNEQUAL:
 	case E_SYMBOL:
-	case E_CHOICE:
+	case E_LIST:
 		break;
 	default:
 		e->left.expr = expr_transform(e->left.expr);
@@ -932,7 +932,7 @@ struct expr *expr_trans_compare(struct expr *e, enum expr_type type, struct symb
 		break;
 	case E_SYMBOL:
 		return expr_alloc_comp(type, e->left.sym, sym);
-	case E_CHOICE:
+	case E_LIST:
 	case E_RANGE:
 	case E_NONE:
 		/* panic */;
@@ -955,14 +955,14 @@ tristate expr_calc_value(struct expr *e)
 	case E_AND:
 		val1 = expr_calc_value(e->left.expr);
 		val2 = expr_calc_value(e->right.expr);
-		return E_AND(val1, val2);
+		return EXPR_AND(val1, val2);
 	case E_OR:
 		val1 = expr_calc_value(e->left.expr);
 		val2 = expr_calc_value(e->right.expr);
-		return E_OR(val1, val2);
+		return EXPR_OR(val1, val2);
 	case E_NOT:
 		val1 = expr_calc_value(e->left.expr);
-		return E_NOT(val1);
+		return EXPR_NOT(val1);
 	case E_EQUAL:
 		sym_calc_value(e->left.sym);
 		sym_calc_value(e->right.sym);
@@ -1000,9 +1000,9 @@ int expr_compare_type(enum expr_type t1, enum expr_type t2)
 		if (t2 == E_OR)
 			return 1;
 	case E_OR:
-		if (t2 == E_CHOICE)
+		if (t2 == E_LIST)
 			return 1;
-	case E_CHOICE:
+	case E_LIST:
 		if (t2 == 0)
 			return 1;
 	default:
@@ -1034,12 +1034,18 @@ void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *
 		expr_print(e->left.expr, fn, data, E_NOT);
 		break;
 	case E_EQUAL:
-		fn(data, e->left.sym, e->left.sym->name);
+		if (e->left.sym->name)
+			fn(data, e->left.sym, e->left.sym->name);
+		else
+			fn(data, NULL, "<choice>");
 		fn(data, NULL, "=");
 		fn(data, e->right.sym, e->right.sym->name);
 		break;
 	case E_UNEQUAL:
-		fn(data, e->left.sym, e->left.sym->name);
+		if (e->left.sym->name)
+			fn(data, e->left.sym, e->left.sym->name);
+		else
+			fn(data, NULL, "<choice>");
 		fn(data, NULL, "!=");
 		fn(data, e->right.sym, e->right.sym->name);
 		break;
@@ -1053,11 +1059,11 @@ void expr_print(struct expr *e, void (*fn)(void *, struct symbol *, const char *
 		fn(data, NULL, " && ");
 		expr_print(e->right.expr, fn, data, E_AND);
 		break;
-	case E_CHOICE:
+	case E_LIST:
 		fn(data, e->right.sym, e->right.sym->name);
 		if (e->left.expr) {
 			fn(data, NULL, " ^ ");
-			expr_print(e->left.expr, fn, data, E_CHOICE);
+			expr_print(e->left.expr, fn, data, E_LIST);
 		}
 		break;
 	case E_RANGE:

package/config/expr.h

@@ -25,14 +25,13 @@ struct file {
 
 #define FILE_BUSY		0x0001
 #define FILE_SCANNED		0x0002
-#define FILE_PRINTED		0x0004
 
 typedef enum tristate {
 	no, mod, yes
 } tristate;
 
 enum expr_type {
-	E_NONE, E_OR, E_AND, E_NOT, E_EQUAL, E_UNEQUAL, E_CHOICE, E_SYMBOL, E_RANGE
+	E_NONE, E_OR, E_AND, E_NOT, E_EQUAL, E_UNEQUAL, E_LIST, E_SYMBOL, E_RANGE
 };
 
 union expr_data {
@@ -45,9 +44,12 @@ struct expr {
 	union expr_data left, right;
 };
 
-#define E_OR(dep1, dep2)	(((dep1)>(dep2))?(dep1):(dep2))
-#define E_AND(dep1, dep2)	(((dep1)<(dep2))?(dep1):(dep2))
-#define E_NOT(dep)		(2-(dep))
+#define EXPR_OR(dep1, dep2)	(((dep1)>(dep2))?(dep1):(dep2))
+#define EXPR_AND(dep1, dep2)	(((dep1)<(dep2))?(dep1):(dep2))
+#define EXPR_NOT(dep)		(2-(dep))
+
+#define expr_list_for_each_sym(l, e, s) \
+	for (e = (l); e && (s = e->right.sym); e = e->left.expr)
 
 struct expr_value {
 	struct expr *expr;
@@ -63,9 +65,13 @@ enum symbol_type {
 	S_UNKNOWN, S_BOOLEAN, S_TRISTATE, S_INT, S_HEX, S_STRING, S_OTHER
 };
 
+/* enum values are used as index to symbol.def[] */
 enum {
 	S_DEF_USER,		/* main user value */
-	S_DEF_AUTO
+	S_DEF_AUTO,		/* values read from auto.conf */
+	S_DEF_DEF3,		/* Reserved for UI usage */
+	S_DEF_DEF4,		/* Reserved for UI usage */
+	S_DEF_COUNT
 };
 
 struct symbol {
@@ -73,7 +79,7 @@ struct symbol {
 	char *name;
 	enum symbol_type type;
 	struct symbol_value curr;
-	struct symbol_value def[4];
+	struct symbol_value def[S_DEF_COUNT];
 	tristate visible;
 	int flags;
 	struct property *prop;
@@ -82,42 +88,64 @@ struct symbol {
 
 #define for_all_symbols(i, sym) for (i = 0; i < 257; i++) for (sym = symbol_hash[i]; sym; sym = sym->next) if (sym->type != S_OTHER)
 
-#define SYMBOL_CONST		0x0001
-#define SYMBOL_CHECK		0x0008
-#define SYMBOL_CHOICE		0x0010
-#define SYMBOL_CHOICEVAL	0x0020
-#define SYMBOL_PRINTED		0x0040
-#define SYMBOL_VALID		0x0080
-#define SYMBOL_OPTIONAL		0x0100
-#define SYMBOL_WRITE		0x0200
-#define SYMBOL_CHANGED		0x0400
-#define SYMBOL_AUTO		0x1000
-#define SYMBOL_CHECKED		0x2000
-#define SYMBOL_WARNED		0x8000
-#define SYMBOL_DEF		0x10000
-#define SYMBOL_DEF_USER		0x10000
-#define SYMBOL_DEF_AUTO		0x20000
-#define SYMBOL_DEF3		0x40000
-#define SYMBOL_DEF4		0x80000
+#define SYMBOL_CONST      0x0001  /* symbol is const */
+#define SYMBOL_CHECK      0x0008  /* used during dependency checking */
+#define SYMBOL_CHOICE     0x0010  /* start of a choice block (null name) */
+#define SYMBOL_CHOICEVAL  0x0020  /* used as a value in a choice block */
+#define SYMBOL_VALID      0x0080  /* set when symbol.curr is calculated */
+#define SYMBOL_OPTIONAL   0x0100  /* choice is optional - values can be 'n' */
+#define SYMBOL_WRITE      0x0200  /* ? */
+#define SYMBOL_CHANGED    0x0400  /* ? */
+#define SYMBOL_AUTO       0x1000  /* value from environment variable */
+#define SYMBOL_CHECKED    0x2000  /* used during dependency checking */
+#define SYMBOL_WARNED     0x8000  /* warning has been issued */
+
+/* Set when symbol.def[] is used */
+#define SYMBOL_DEF        0x10000  /* First bit of SYMBOL_DEF */
+#define SYMBOL_DEF_USER   0x10000  /* symbol.def[S_DEF_USER] is valid */
+#define SYMBOL_DEF_AUTO   0x20000  /* symbol.def[S_DEF_AUTO] is valid */
+#define SYMBOL_DEF3       0x40000  /* symbol.def[S_DEF_3] is valid */
+#define SYMBOL_DEF4       0x80000  /* symbol.def[S_DEF_4] is valid */
 
 #define SYMBOL_MAXLENGTH	256
 #define SYMBOL_HASHSIZE		257
 #define SYMBOL_HASHMASK		0xff
 
+/* A property represent the config options that can be associated
+ * with a config "symbol".
+ * Sample:
+ * config FOO
+ *         default y
+ *         prompt "foo prompt"
+ *         select BAR
+ * config BAZ
+ *         int "BAZ Value"
+ *         range 1..255
+ */
 enum prop_type {
-	P_UNKNOWN, P_PROMPT, P_COMMENT, P_MENU, P_DEFAULT, P_CHOICE, P_SELECT, P_RANGE
+	P_UNKNOWN,
+	P_PROMPT,   /* prompt "foo prompt" or "BAZ Value" */
+	P_COMMENT,  /* text associated with a comment */
+	P_MENU,     /* prompt associated with a menuconfig option */
+	P_DEFAULT,  /* default y */
+	P_CHOICE,   /* choice value */
+	P_SELECT,   /* select BAR */
+	P_RANGE,    /* range 7..100 (for a symbol) */
+	P_ENV,      /* value from environment variable */
 };
 
 struct property {
-	struct property *next;
-	struct symbol *sym;
-	enum prop_type type;
-	const char *text;
+	struct property *next;     /* next property - null if last */
+	struct symbol *sym;        /* the symbol for which the property is associated */
+	enum prop_type type;       /* type of property */
+	const char *text;          /* the prompt value - P_PROMPT, P_MENU, P_COMMENT */
 	struct expr_value visible;
-	struct expr *expr;
-	struct menu *menu;
-	struct file *file;
-	int lineno;
+	struct expr *expr;         /* the optional conditional part of the property */
+	struct menu *menu;         /* the menu the property are associated with
+	                            * valid for: P_SELECT, P_RANGE, P_CHOICE,
+	                            * P_PROMPT, P_DEFAULT, P_MENU, P_COMMENT */
+	struct file *file;         /* what file was this property defined */
+	int lineno;                /* what lineno was this property defined */
 };
 
 #define for_all_properties(sym, st, tok) \

package/config/gconf.c

@@ -119,8 +119,6 @@ const char *dbg_print_flags(int val)
 		strcat(buf, "choice/");
 	if (val & SYMBOL_CHOICEVAL)
 		strcat(buf, "choiceval/");
-	if (val & SYMBOL_PRINTED)
-		strcat(buf, "printed/");
 	if (val & SYMBOL_VALID)
 		strcat(buf, "valid/");
 	if (val & SYMBOL_OPTIONAL)
@@ -457,14 +455,18 @@ static void text_insert_help(struct menu *menu)
 {
 	GtkTextBuffer *buffer;
 	GtkTextIter start, end;
-	const char *prompt = menu_get_prompt(menu);
+	const char *prompt = _(menu_get_prompt(menu));
 	gchar *name;
 	const char *help;
 
-	help = _(menu_get_help(menu));
+	help = menu_get_help(menu);
+
+	/* Gettextize if the help text not empty */
+	if ((help != 0) && (help[0] != 0))
+		help = _(help);
 
 	if (menu->sym && menu->sym->name)
-		name = g_strdup_printf(_(menu->sym->name));
+		name = g_strdup_printf(menu->sym->name);
 	else
 		name = g_strdup("");
 
@@ -1171,7 +1173,7 @@ static gchar **fill_row(struct menu *menu)
 	bzero(row, sizeof(row));
 
 	row[COL_OPTION] =
-	    g_strdup_printf("%s %s", menu_get_prompt(menu),
+	    g_strdup_printf("%s %s", _(menu_get_prompt(menu)),
 			    sym && sym_has_value(sym) ? "(NEW)" : "");
 
 	if (show_all && !menu_is_visible(menu))
@@ -1221,7 +1223,7 @@ static gchar **fill_row(struct menu *menu)
 
 		if (def_menu)
 			row[COL_VALUE] =
-			    g_strdup(menu_get_prompt(def_menu));
+			    g_strdup(_(menu_get_prompt(def_menu)));
 	}
 	if (sym->flags & SYMBOL_CHOICEVAL)
 		row[COL_BTNRAD] = GINT_TO_POINTER(TRUE);

package/config/kconfig-language.txt

@@ -24,7 +24,7 @@ visible if its parent entry is also visible.
 Menu entries
 ------------
 
-Most entries define a config option, all other entries help to organize
+Most entries define a config option; all other entries help to organize
 them. A single configuration option is defined like this:
 
 config MODVERSIONS
@@ -50,7 +50,7 @@ applicable everywhere (see syntax).
 
 - type definition: "bool"/"tristate"/"string"/"hex"/"int"
   Every config option must have a type. There are only two basic types:
-  tristate and string, the other types are based on these two. The type
+  tristate and string; the other types are based on these two. The type
   definition optionally accepts an input prompt, so these two examples
   are equivalent:
 
@@ -104,14 +104,15 @@ applicable everywhere (see syntax).
   Reverse dependencies can only be used with boolean or tristate
   symbols.
   Note:
-	select is evil.... select will by brute force set a symbol
-	equal to 'y' without visiting the dependencies. So abusing
-	select you are able to select a symbol FOO even if FOO depends
-	on BAR that is not set. In general use select only for
-	non-visible symbols (no promts anywhere) and for symbols with
-	no dependencies. That will limit the usefulness but on the
-	other hand avoid the illegal configurations all over. kconfig
-	should one day warn about such things.
+	select should be used with care. select will force
+	a symbol to a value without visiting the dependencies.
+	By abusing select you are able to select a symbol FOO even
+	if FOO depends on BAR that is not set.
+	In general use select only for non-visible symbols
+	(no prompts anywhere) and for symbols with no dependencies.
+	That will limit the usefulness but on the other hand avoid
+	the illegal configurations all over.
+	kconfig should one day warn about such things.
 
 - numerical ranges: "range" <symbol> <symbol> ["if" <expr>]
   This allows to limit the range of possible input values for int
@@ -127,6 +128,27 @@ applicable everywhere (see syntax).
   used to help visually separate configuration logic from help within
   the file as an aid to developers.
 
+- misc options: "option" <symbol>[=<value>]
+  Various less common options can be defined via this option syntax,
+  which can modify the behaviour of the menu entry and its config
+  symbol. These options are currently possible:
+
+  - "defconfig_list"
+    This declares a list of default entries which can be used when
+    looking for the default configuration (which is used when the main
+    .config doesn't exists yet.)
+
+  - "modules"
+    This declares the symbol to be used as the MODULES symbol, which
+    enables the third modular state for all config symbols.
+
+  - "env"=<value>
+    This imports the environment variable into Kconfig. It behaves like
+    a default, except that the value comes from the environment, this
+    also means that the behaviour when mixing it with normal defaults is
+    undefined at this point. The symbol is currently not exported back
+    to the build environment (if this is desired, it can be done via
+    another symbol).
 
 Menu dependencies
 -----------------
@@ -162,9 +184,9 @@ An expression can have a value of 'n', 'm' or 'y' (or 0, 1, 2
 respectively for calculations). A menu entry becomes visible when it's
 expression evaluates to 'm' or 'y'.
 
-There are two types of symbols: constant and nonconstant symbols.
-Nonconstant symbols are the most common ones and are defined with the
-'config' statement. Nonconstant symbols consist entirely of alphanumeric
+There are two types of symbols: constant and non-constant symbols.
+Non-constant symbols are the most common ones and are defined with the
+'config' statement. Non-constant symbols consist entirely of alphanumeric
 characters or underscores.
 Constant symbols are only part of expressions. Constant symbols are
 always surrounded by single or double quotes. Within the quote, any
@@ -301,3 +323,57 @@ mainmenu:
 
 This sets the config program's title bar if the config program chooses
 to use it.
+
+
+Kconfig hints
+-------------
+This is a collection of Kconfig tips, most of which aren't obvious at
+first glance and most of which have become idioms in several Kconfig
+files.
+
+Adding common features and make the usage configurable
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+It is a common idiom to implement a feature/functionality that are
+relevant for some architectures but not all.
+The recommended way to do so is to use a config variable named HAVE_*
+that is defined in a common Kconfig file and selected by the relevant
+architectures.
+An example is the generic IOMAP functionality.
+
+We would in lib/Kconfig see:
+
+# Generic IOMAP is used to ...
+config HAVE_GENERIC_IOMAP
+
+config GENERIC_IOMAP
+	depends on HAVE_GENERIC_IOMAP && FOO
+
+And in lib/Makefile we would see:
+obj-$(CONFIG_GENERIC_IOMAP) += iomap.o
+
+For each architecture using the generic IOMAP functionality we would see:
+
+config X86
+	select ...
+	select HAVE_GENERIC_IOMAP
+	select ...
+
+Note: we use the existing config option and avoid creating a new
+config variable to select HAVE_GENERIC_IOMAP.
+
+Note: the use of the internal config variable HAVE_GENERIC_IOMAP, it is
+introduced to overcome the limitation of select which will force a
+config option to 'y' no matter the dependencies.
+The dependencies are moved to the symbol GENERIC_IOMAP and we avoid the
+situation where select forces a symbol equals to 'y'.
+
+Build as module only
+~~~~~~~~~~~~~~~~~~~~
+To restrict a component build to module-only, qualify its config symbol
+with "depends on m".  E.g.:
+
+config FOO
+	depends on BAR && m
+
+limits FOO to module (=m) or disabled (=n).
+

package/config/kxgettext.c

@@ -43,6 +43,10 @@ static char *escape(const char* text, char *bf, int len)
 			++text;
 			goto next;
 		}
+		else if (*text == '\\') {
+			*bfp++ = '\\';
+			len--;
+		}
 		*bfp++ = *text++;
 next:
 		--len;

package/config/lex.zconf.c_shipped

@@ -27,7 +27,7 @@
 #define FLEX_SCANNER
 #define YY_FLEX_MAJOR_VERSION 2
 #define YY_FLEX_MINOR_VERSION 5
-#define YY_FLEX_SUBMINOR_VERSION 33
+#define YY_FLEX_SUBMINOR_VERSION 35
 #if YY_FLEX_SUBMINOR_VERSION > 0
 #define FLEX_BETA
 #endif
@@ -49,7 +49,7 @@
 
 /* C99 systems have <inttypes.h>. Non-C99 systems may or may not. */
 
-#if __STDC_VERSION__ >= 199901L
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 199901L
 
 /* C99 says to define __STDC_LIMIT_MACROS before including stdint.h,
  * if you want the limit (max/min) macros for int types. 
@@ -72,7 +72,6 @@ typedef int flex_int32_t;
 typedef unsigned char flex_uint8_t; 
 typedef unsigned short int flex_uint16_t;
 typedef unsigned int flex_uint32_t;
-#endif /* ! C99 */
 
 /* Limits of integral types. */
 #ifndef INT8_MIN
@@ -103,6 +102,8 @@ typedef unsigned int flex_uint32_t;
 #define UINT32_MAX             (4294967295U)
 #endif
 
+#endif /* ! C99 */
+
 #endif /* ! FLEXINT_H */
 
 #ifdef __cplusplus
@@ -112,11 +113,12 @@ typedef unsigned int flex_uint32_t;
 
 #else	/* ! __cplusplus */
 
-#if __STDC__
+/* C99 requires __STDC__ to be defined as 1. */
+#if defined (__STDC__)
 
 #define YY_USE_CONST
 
-#endif	/* __STDC__ */
+#endif	/* defined (__STDC__) */
 #endif	/* ! __cplusplus */
 
 #ifdef YY_USE_CONST
@@ -196,14 +198,9 @@ extern FILE *zconfin, *zconfout;
 
 #define unput(c) yyunput( c, (yytext_ptr)  )
 
-/* The following is because we cannot portably get our hands on size_t
- * (without autoconf's help, which isn't available because we want
- * flex-generated scanners to compile on their own).
- */
-
 #ifndef YY_TYPEDEF_YY_SIZE_T
 #define YY_TYPEDEF_YY_SIZE_T
-typedef unsigned int yy_size_t;
+typedef size_t yy_size_t;
 #endif
 
 #ifndef YY_STRUCT_YY_BUFFER_STATE
@@ -767,6 +764,7 @@ int zconf_flex_debug = 0;
 #define YY_MORE_ADJ 0
 #define YY_RESTORE_YY_MORE_OFFSET
 char *zconftext;
+#define YY_NO_INPUT 1
 
 /*
  * Copyright (C) 2002 Roman Zippel <zippel@linux-m68k.org>
@@ -815,12 +813,6 @@ void new_string(void)
 void append_string(const char *str, int size)
 {
 	int new_size = text_size + size + 1;
-
-	if ((YY_START == 2 /* HELP */) && (size > 70)) {
-		fprintf (stderr, "%s:%d warning: Overlong line\n",
-		current_file->name, current_file->lineno);
-	}
-
 	if (new_size > text_asize) {
 		new_size += START_STRSIZE - 1;
 		new_size &= -START_STRSIZE;
@@ -859,6 +851,35 @@ void alloc_string(const char *str, int size)
 
 static int yy_init_globals (void );
 
+/* Accessor methods to globals.
+   These are made visible to non-reentrant scanners for convenience. */
+
+int zconflex_destroy (void );
+
+int zconfget_debug (void );
+
+void zconfset_debug (int debug_flag  );
+
+YY_EXTRA_TYPE zconfget_extra (void );
+
+void zconfset_extra (YY_EXTRA_TYPE user_defined  );
+
+FILE *zconfget_in (void );
+
+void zconfset_in  (FILE * in_str  );
+
+FILE *zconfget_out (void );
+
+void zconfset_out  (FILE * out_str  );
+
+int zconfget_leng (void );
+
+char *zconfget_text (void );
+
+int zconfget_lineno (void );
+
+void zconfset_lineno (int line_number  );
+
 /* Macros after this point can all be overridden by user definitions in
  * section 1.
  */
@@ -901,7 +922,7 @@ static int input (void );
 /* This used to be an fputs(), but since the string might contain NUL's,
  * we now use fwrite().
  */
-#define ECHO (void) fwrite( zconftext, zconfleng, 1, zconfout )
+#define ECHO fwrite( zconftext, zconfleng, 1, zconfout )
 #endif
 
 /* Gets input and stuffs it into "buf".  number of characters read, or YY_NULL,
@@ -1281,6 +1302,11 @@ YY_RULE_SETUP
 case 32:
 YY_RULE_SETUP
 {
+		while (zconfleng) {
+			if ((zconftext[zconfleng-1] != ' ') && (zconftext[zconfleng-1] != '\t'))
+				break;
+			zconfleng--;
+		}
 		append_string(zconftext, zconfleng);
 		if (!first_ts)
 			first_ts = last_ts;
@@ -1536,7 +1562,7 @@ static int yy_get_next_buffer (void)
 
 		/* Read in more data. */
 		YY_INPUT( (&YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[number_to_move]),
-			(yy_n_chars), num_to_read );
+			(yy_n_chars), (size_t) num_to_read );
 
 		YY_CURRENT_BUFFER_LVALUE->yy_n_chars = (yy_n_chars);
 		}
@@ -1560,6 +1586,14 @@ static int yy_get_next_buffer (void)
 	else
 		ret_val = EOB_ACT_CONTINUE_SCAN;
 
+	if ((yy_size_t) ((yy_n_chars) + number_to_move) > YY_CURRENT_BUFFER_LVALUE->yy_buf_size) {
+		/* Extend the array by 50%, plus the number we really need. */
+		yy_size_t new_size = (yy_n_chars) + number_to_move + ((yy_n_chars) >> 1);
+		YY_CURRENT_BUFFER_LVALUE->yy_ch_buf = (char *) zconfrealloc((void *) YY_CURRENT_BUFFER_LVALUE->yy_ch_buf,new_size  );
+		if ( ! YY_CURRENT_BUFFER_LVALUE->yy_ch_buf )
+			YY_FATAL_ERROR( "out of dynamic memory in yy_get_next_buffer()" );
+	}
+
 	(yy_n_chars) += number_to_move;
 	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars)] = YY_END_OF_BUFFER_CHAR;
 	YY_CURRENT_BUFFER_LVALUE->yy_ch_buf[(yy_n_chars) + 1] = YY_END_OF_BUFFER_CHAR;
@@ -1946,7 +1980,9 @@ static void zconfensure_buffer_stack (void)
 		(yy_buffer_stack) = (struct yy_buffer_state**)zconfalloc
 								(num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
-		
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in zconfensure_buffer_stack()" );
+								  
 		memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*));
 				
 		(yy_buffer_stack_max) = num_to_alloc;
@@ -1964,6 +2000,8 @@ static void zconfensure_buffer_stack (void)
 								((yy_buffer_stack),
 								num_to_alloc * sizeof(struct yy_buffer_state*)
 								);
+		if ( ! (yy_buffer_stack) )
+			YY_FATAL_ERROR( "out of dynamic memory in zconfensure_buffer_stack()" );
 
 		/* zero only the new slots.*/
 		memset((yy_buffer_stack) + (yy_buffer_stack_max), 0, grow_size * sizeof(struct yy_buffer_state*));
@@ -2008,7 +2046,7 @@ YY_BUFFER_STATE zconf_scan_buffer  (char * base, yy_size_t  size )
 
 /** Setup the input buffer state to scan a string. The next call to zconflex() will
  * scan from a @e copy of @a str.
- * @param str a NUL-terminated string to scan
+ * @param yystr a NUL-terminated string to scan
  * 
  * @return the newly allocated buffer state object.
  * @note If you want to scan bytes that may contain NUL values, then use
@@ -2332,11 +2370,14 @@ void zconf_nextfile(const char *name)
 	current_buf = buf;
 
 	if (file->flags & FILE_BUSY) {
-		printf("recursive scan (%s)?\n", name);
+		printf("%s:%d: do not source '%s' from itself\n",
+		       zconf_curname(), zconf_lineno(), name);
 		exit(1);
 	}
 	if (file->flags & FILE_SCANNED) {
-		printf("file %s already scanned?\n", name);
+		printf("%s:%d: file '%s' is already sourced from '%s'\n",
+		       zconf_curname(), zconf_lineno(), name,
+		       file->parent->name);
 		exit(1);
 	}
 	file->flags |= FILE_BUSY;

package/config/lkc.h

@@ -11,9 +11,9 @@
 #ifndef KBUILD_NO_NLS
 # include <libintl.h>
 #else
-# define gettext(Msgid) ((const char *) (Msgid))
-# define textdomain(Domainname) ((const char *) (Domainname))
-# define bindtextdomain(Domainname, Dirname) ((const char *) (Dirname))
+static inline const char *gettext(const char *txt) { return txt; }
+static inline void textdomain(const char *domainname) {}
+static inline void bindtextdomain(const char *name, const char *dir) {}
 #endif
 
 #ifdef __cplusplus
@@ -42,8 +42,17 @@ extern "C" {
 #define TF_PARAM	0x0002
 #define TF_OPTION	0x0004
 
+enum conf_def_mode {
+	def_default,
+	def_yes,
+	def_mod,
+	def_no,
+	def_random
+};
+
 #define T_OPT_MODULES		1
 #define T_OPT_DEFCONFIG_LIST	2
+#define T_OPT_ENV		3
 
 struct kconf_id {
 	int name;
@@ -65,15 +74,18 @@ char *zconf_curname(void);
 
 /* confdata.c */
 const char *conf_get_configname(void);
+const char *conf_get_autoconfig_name(void);
 char *conf_get_default_confname(void);
 void sym_set_change_count(int count);
 void sym_add_change_count(int count);
+void conf_set_all_new_symbols(enum conf_def_mode mode);
 
 /* kconfig_load.c */
 void kconfig_load(void);
 
 /* menu.c */
 void menu_init(void);
+void menu_warn(struct menu *menu, const char *fmt, ...);
 struct menu *menu_add_menu(void);
 void menu_end_menu(void);
 void menu_add_entry(struct symbol *sym);
@@ -103,6 +115,8 @@ void str_printf(struct gstr *gs, const char *fmt, ...);
 const char *str_get(struct gstr *gs);
 
 /* symbol.c */
+extern struct expr *sym_env_list;
+
 void sym_init(void);
 void sym_clear_all_valid(void);
 void sym_set_all_changed(void);
@@ -110,6 +124,7 @@ void sym_set_changed(struct symbol *sym);
 struct symbol *sym_check_deps(struct symbol *sym);
 struct property *prop_alloc(enum prop_type type, struct symbol *sym);
 struct symbol *prop_get_symbol(struct property *prop);
+struct property *sym_get_env_prop(struct symbol *sym);
 
 static inline tristate sym_get_tristate_value(struct symbol *sym)
 {

package/config/lkc_proto.h

@@ -21,7 +21,7 @@ P(menu_get_help,const char *,(struct menu *menu));
 /* symbol.c */
 P(symbol_hash,struct symbol *,[SYMBOL_HASHSIZE]);
 
-P(sym_lookup,struct symbol *,(const char *name, int isconst));
+P(sym_lookup,struct symbol *,(const char *name, int flags));
 P(sym_find,struct symbol *,(const char *name));
 P(sym_re_search,struct symbol **,(const char *pattern));
 P(sym_type_name,const char *,(enum symbol_type type));

package/config/lxdialog/check-lxdialog.sh

@@ -36,19 +36,23 @@ trap "rm -f $tmp" 0 1 2 3 15
 
 # Check if we can link to ncurses
 check() {
-	echo "main() {}" | $cc -xc - -o $tmp 2> /dev/null
+        $cc -xc - -o $tmp 2>/dev/null <<'EOF'
+#include CURSES_LOC
+main() {}
+EOF
 	if [ $? != 0 ]; then
-		echo " *** Unable to find the ncurses libraries."          1>&2
-		echo " *** make menuconfig require the ncurses libraries"  1>&2
-		echo " *** "                                               1>&2
-		echo " *** Install ncurses (ncurses-devel) and try again"  1>&2
-		echo " *** "                                               1>&2
-		exit 1
+	    echo " *** Unable to find the ncurses libraries or the"       1>&2
+	    echo " *** required header files."                            1>&2
+	    echo " *** 'make menuconfig' requires the ncurses libraries." 1>&2
+	    echo " *** "                                                  1>&2
+	    echo " *** Install ncurses (ncurses-devel) and try again."    1>&2
+	    echo " *** "                                                  1>&2
+	    exit 1
 	fi
 }
 
 usage() {
-	printf "Usage: $0 [-check compiler options|-header|-library]\n"
+	printf "Usage: $0 [-check compiler options|-ccflags|-ldflags compiler options]\n"
 }
 
 if [ $# -eq 0 ]; then

package/config/lxdialog/checklist.c

@@ -41,7 +41,8 @@ static void print_item(WINDOW * win, int choice, int selected)
 	wmove(win, choice, check_x);
 	wattrset(win, selected ? dlg.check_selected.atr
 		 : dlg.check.atr);
-	wprintw(win, "(%c)", item_is_tag('X') ? 'X' : ' ');
+	if (!item_is_tag(':'))
+		wprintw(win, "(%c)", item_is_tag('X') ? 'X' : ' ');
 
 	wattrset(win, selected ? dlg.tag_selected.atr : dlg.tag.atr);
 	mvwaddch(win, choice, item_x, item_str()[0]);
@@ -97,8 +98,8 @@ static void print_buttons(WINDOW * dialog, int height, int width, int selected)
 	int x = width / 2 - 11;
 	int y = height - 2;
 
-	print_button(dialog, "Select", y, x, selected == 0);
-	print_button(dialog, " Help ", y, x + 14, selected == 1);
+	print_button(dialog, gettext("Select"), y, x, selected == 0);
+	print_button(dialog, gettext(" Help "), y, x + 14, selected == 1);
 
 	wmove(dialog, y, x + 1 + 14 * selected);
 	wrefresh(dialog);