Merge branch 'master' of openslx.org:openslx-ng/buildroot

5 files changed, 336 insertions, 22 deletions

diff --git a/openslx/config.openslx b/openslx/config.buildroot
index 53de2c990..e484095a7 100644
--- a/openslx/config.openslx
+++ b/openslx/config.buildroot
@@ -1,6 +1,6 @@
 #
 # Automatically generated make config: don't edit
-# Buildroot 2012.05 Configuration
+# Buildroot 2012.08-git-00176-g463e9b8 Configuration
 #
 BR2_HAVE_DOT_CONFIG=y
 # BR2_arm is not set
@@ -31,10 +31,6 @@ BR2_x86_i586=y
 # BR2_x86_nocona is not set
 # BR2_x86_core2 is not set
 # BR2_x86_atom is not set
-
-#
-# atom needs gcc >= 4.5.x
-#
 # BR2_x86_k6 is not set
 # BR2_x86_k6_2 is not set
 # BR2_x86_athlon is not set
@@ -111,18 +107,16 @@ BR2_TOOLCHAIN_BUILDROOT=y
 #
 # Kernel Header Options
 #
-# BR2_KERNEL_HEADERS_2_6_35 is not set
-# BR2_KERNEL_HEADERS_2_6_36 is not set
-# BR2_KERNEL_HEADERS_2_6_37 is not set
 # BR2_KERNEL_HEADERS_2_6_38 is not set
 # BR2_KERNEL_HEADERS_2_6_39 is not set
 # BR2_KERNEL_HEADERS_3_0 is not set
 # BR2_KERNEL_HEADERS_3_1 is not set
 # BR2_KERNEL_HEADERS_3_2 is not set
-BR2_KERNEL_HEADERS_3_3=y
+# BR2_KERNEL_HEADERS_3_3 is not set
+BR2_KERNEL_HEADERS_3_4=y
 # BR2_KERNEL_HEADERS_VERSION is not set
 # BR2_KERNEL_HEADERS_SNAP is not set
-BR2_DEFAULT_KERNEL_HEADERS="3.3.7"
+BR2_DEFAULT_KERNEL_HEADERS="3.4.3"
 
 #
 # uClibc Options
@@ -132,7 +126,7 @@ BR2_DEFAULT_KERNEL_HEADERS="3.3.7"
 BR2_UCLIBC_VERSION_0_9_33=y
 # BR2_UCLIBC_VERSION_SNAPSHOT is not set
 BR2_UCLIBC_VERSION_STRING="0.9.33.2"
-BR2_UCLIBC_CONFIG="uclib.config"
+BR2_UCLIBC_CONFIG="openslx/config.uclibc"
 # BR2_PTHREAD_DEBUG is not set
 # BR2_UCLIBC_INSTALL_TEST_SUITE is not set
 
@@ -228,9 +222,9 @@ BR2_ROOTFS_POST_BUILD_SCRIPT=""
 #
 BR2_PACKAGE_BUSYBOX=y
 # BR2_BUSYBOX_VERSION_1_19_X is not set
-BR2_BUSYBOX_VERSION_1_20_X=y
+# BR2_BUSYBOX_VERSION_1_20_X is not set
 # BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set
-BR2_BUSYBOX_VERSION="1.20.1"
+BR2_PACKAGE_BUSYBOX_OPENSLX=y
 BR2_PACKAGE_BUSYBOX_CONFIG="package/busybox/busybox-1.20.x.config"
 # BR2_PACKAGE_BUSYBOX_SHOW_OTHERS is not set
 # BR2_PACKAGE_BUSYBOX_WATCHDOG is not set
@@ -295,6 +289,7 @@ BR2_PACKAGE_LTRACE=y
 BR2_PACKAGE_MEMSTAT=y
 BR2_PACKAGE_NETPERF=y
 # BR2_PACKAGE_OPROFILE is not set
+# BR2_PACKAGE_RAMSPEED is not set
 # BR2_PACKAGE_RT_TESTS is not set
 BR2_PACKAGE_STRACE=y
 # BR2_PACKAGE_STRESS is not set
@@ -353,7 +348,14 @@ BR2_PACKAGE_GMP=y
 # BR2_PACKAGE_DIRECTFB is not set
 # BR2_PACKAGE_FBDUMP is not set
 # BR2_PACKAGE_FBGRAB is not set
+
+#
+# fbterm requires a toolchain with C++, WCHAR and locale support
+#
 BR2_PACKAGE_FBV=y
+BR2_PACKAGE_FBV_PNG=y
+BR2_PACKAGE_FBV_JPEG=y
+BR2_PACKAGE_FBV_GIF=y
 # BR2_PACKAGE_IMAGEMAGICK is not set
 # BR2_PACKAGE_SDL is not set
 
@@ -531,7 +533,7 @@ BR2_PACKAGE_XDRIVER_XF86_VIDEO_CHIPS=y
 BR2_PACKAGE_XDRIVER_XF86_VIDEO_CIRRUS=y
 BR2_PACKAGE_XDRIVER_XF86_VIDEO_DUMMY=y
 BR2_PACKAGE_XDRIVER_XF86_VIDEO_FBDEV=y
-BR2_PACKAGE_XDRIVER_XF86_VIDEO_GEODE=y
+# BR2_PACKAGE_XDRIVER_XF86_VIDEO_GEODE is not set
 BR2_PACKAGE_XDRIVER_XF86_VIDEO_GLINT=y
 BR2_PACKAGE_XDRIVER_XF86_VIDEO_I128=y
 BR2_PACKAGE_XDRIVER_XF86_VIDEO_I740=y
@@ -541,7 +543,7 @@ BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA=y
 BR2_PACKAGE_XDRIVER_XF86_VIDEO_NEOMAGIC=y
 BR2_PACKAGE_XDRIVER_XF86_VIDEO_NEWPORT=y
 BR2_PACKAGE_XDRIVER_XF86_VIDEO_NV=y
-BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME=y
+# BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME is not set
 BR2_PACKAGE_XDRIVER_XF86_VIDEO_R128=y
 BR2_PACKAGE_XDRIVER_XF86_VIDEO_RENDITION=y
 BR2_PACKAGE_XDRIVER_XF86_VIDEO_S3=y
@@ -564,8 +566,8 @@ BR2_PACKAGE_XDRIVER_XF86_VIDEO_V4L=y
 BR2_PACKAGE_XDRIVER_XF86_VIDEO_VESA=y
 BR2_PACKAGE_XDRIVER_XF86_VIDEO_VMWARE=y
 BR2_PACKAGE_XDRIVER_XF86_VIDEO_VOODOO=y
-BR2_PACKAGE_XDRIVER_XF86_VIDEO_XGI=y
-BR2_PACKAGE_XDRIVER_XF86_VIDEO_XGIXP=y
+# BR2_PACKAGE_XDRIVER_XF86_VIDEO_XGI is not set
+# BR2_PACKAGE_XDRIVER_XF86_VIDEO_XGIXP is not set
 
 #
 # X11R7 Fonts
@@ -675,6 +677,7 @@ BR2_PACKAGE_LIBERATION=y
 # BR2_PACKAGE_ALSAMIXERGUI is not set
 # BR2_PACKAGE_DOCKER is not set
 # BR2_PACKAGE_FEH is not set
+# BR2_PACKAGE_FREERDP is not set
 # BR2_PACKAGE_GOB2 is not set
 
 #
@@ -699,10 +702,12 @@ BR2_PACKAGE_DBUS=y
 BR2_DBUS_EXPAT=y
 # BR2_DBUS_LIBXML2 is not set
 BR2_PACKAGE_DBUS_GLIB=y
+# BR2_PACKAGE_DMIDECODE is not set
 # BR2_PACKAGE_DMRAID is not set
 # BR2_PACKAGE_DOSFSTOOLS is not set
 # BR2_PACKAGE_E2FSPROGS is not set
 # BR2_PACKAGE_EEPROG is not set
+# BR2_PACKAGE_FLASHROM is not set
 # BR2_PACKAGE_FCONFIG is not set
 # BR2_PACKAGE_FIS is not set
 # BR2_PACKAGE_FMTOOLS is not set
@@ -757,6 +762,7 @@ BR2_PACKAGE_LM_SENSORS_FANCONTROL=y
 # BR2_PACKAGE_LM_SENSORS_ISASET is not set
 BR2_PACKAGE_LM_SENSORS_PWMCONFIG=y
 BR2_PACKAGE_LM_SENSORS_SENSORS_DETECT=y
+# BR2_PACKAGE_LSHW is not set
 # BR2_PACKAGE_LSUIO is not set
 BR2_PACKAGE_LVM2=y
 # BR2_PACKAGE_LVM2_DMSETUP_ONLY is not set
@@ -804,9 +810,11 @@ BR2_PACKAGE_MTD_UBIRENAME=y
 BR2_PACKAGE_MTD_UBIRMVOL=y
 BR2_PACKAGE_MTD_UBIRSVOL=y
 BR2_PACKAGE_MTD_UBIUPDATEVOL=y
+# BR2_PACKAGE_NANOCOM is not set
 BR2_PACKAGE_NTFS_3G=y
 BR2_PACKAGE_NTFS_3G_ENCRYPTED=y
 BR2_PACKAGE_NTFS_3G_NTFSPROGS=y
+# BR2_PACKAGE_OFONO is not set
 # BR2_PACKAGE_OPEN2300 is not set
 # BR2_PACKAGE_OPENOCD is not set
 BR2_PACKAGE_PARTED=y
@@ -903,6 +911,7 @@ BR2_PACKAGE_LIBSNDFILE=y
 # BR2_PACKAGE_SPEEX is not set
 # BR2_PACKAGE_TAGLIB is not set
 # BR2_PACKAGE_TREMOR is not set
+# BR2_PACKAGE_WEBRTC_AUDIO_PROCESSING is not set
 
 #
 # Compression and decompression
@@ -983,9 +992,11 @@ BR2_PACKAGE_PIXMAN=y
 # BR2_PACKAGE_LIBAIO is not set
 # BR2_PACKAGE_LIBRAW1394 is not set
 BR2_PACKAGE_TSLIB=y
+# BR2_PACKAGE_LIBFREEFARE is not set
 # BR2_PACKAGE_LIBFTDI is not set
 BR2_PACKAGE_LIBHID=y
 # BR2_PACKAGE_LIBIQRF is not set
+# BR2_PACKAGE_LIBNFC is not set
 BR2_PACKAGE_LIBUSB=y
 BR2_PACKAGE_LIBUSB_COMPAT=y
 # BR2_PACKAGE_LIBV4L is not set
@@ -1011,6 +1022,7 @@ BR2_PACKAGE_LIBUSB_COMPAT=y
 # BR2_PACKAGE_LIBPLAYER is not set
 # BR2_PACKAGE_LIBTHEORA is not set
 # BR2_PACKAGE_LIVE555 is not set
+# BR2_PACKAGE_MEDIASTREAMER is not set
 
 #
 # Networking
@@ -1031,14 +1043,19 @@ BR2_PACKAGE_GLIB_NETWORKING=y
 # BR2_PACKAGE_LIBMODBUS is not set
 # BR2_PACKAGE_LIBMBUS is not set
 BR2_PACKAGE_LIBNETFILTER_CONNTRACK=y
+# BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT is not set
 BR2_PACKAGE_LIBNFNETLINK=y
 BR2_PACKAGE_LIBNL=y
+# BR2_PACKAGE_LIBNL_TOOLS is not set
+# BR2_PACKAGE_LIBOPING is not set
 BR2_PACKAGE_LIBPCAP=y
 # BR2_PACKAGE_LIBOSIP2 is not set
 BR2_PACKAGE_LIBRSYNC=y
 # BR2_PACKAGE_LIBSOUP is not set
+# BR2_PACKAGE_LIBTORRENT is not set
 BR2_PACKAGE_LIBUPNP=y
 BR2_PACKAGE_LIBVNCSERVER=y
+# BR2_PACKAGE_ORTP is not set
 # BR2_PACKAGE_ZEROMQ is not set
 
 #
@@ -1089,6 +1106,7 @@ BR2_PACKAGE_READLINE=y
 #
 # JSON/XML
 #
+# BR2_PACKAGE_CJSON is not set
 BR2_PACKAGE_EXPAT=y
 # BR2_PACKAGE_EZXML is not set
 # BR2_PACKAGE_JSON_C is not set
@@ -1103,7 +1121,9 @@ BR2_PACKAGE_LIBXML2=y
 #
 # Miscellaneous
 #
+# BR2_PACKAGE_COLLECTD is not set
 BR2_PACKAGE_EMPTY=y
+# BR2_PACKAGE_MOBILE_BROADBAND_PROVIDER_INFO is not set
 BR2_PACKAGE_SHARED_MIME_INFO=y
 
 #
@@ -1123,10 +1143,7 @@ BR2_PACKAGE_BLUEZ_UTILS_USB=y
 BR2_PACKAGE_BRIDGE_UTILS=y
 BR2_PACKAGE_BWM_NG=y
 # BR2_PACKAGE_CAN_UTILS is not set
-
-#
-# connman needs a toolchain with resolver support
-#
+# BR2_PACKAGE_CONNMAN is not set
 # BR2_PACKAGE_CTORRENT is not set
 BR2_PACKAGE_CIFS_UTILS=y
 # BR2_PACKAGE_CONNTRACK_TOOLS is not set
@@ -1156,6 +1173,7 @@ BR2_PACKAGE_IPTABLES=y
 BR2_PACKAGE_IW=y
 # BR2_PACKAGE_KISMET is not set
 # BR2_PACKAGE_LINKS is not set
+# BR2_PACKAGE_LINPHONE is not set
 # BR2_PACKAGE_LRZSZ is not set
 BR2_PACKAGE_MII_DIAG=y
 # BR2_PACKAGE_MROUTED is not set
@@ -1212,12 +1230,13 @@ BR2_PACKAGE_PORTMAP=y
 # BR2_PACKAGE_RADVD is not set
 # BR2_PACKAGE_RSH_REDONE is not set
 BR2_PACKAGE_RSYNC=y
+# BR2_PACKAGE_RTORRENT is not set
 BR2_PACKAGE_SAMBA=y
+# BR2_PACKAGE_SAMBA_LIBICONV is not set
 
 #
 # Samba tools selection
 #
-BR2_PACKAGE_SAMBA_CIFS=y
 BR2_PACKAGE_SAMBA_EVENTLOGADM=y
 
 #
@@ -1278,12 +1297,14 @@ BR2_PACKAGE_VPNC=y
 BR2_PACKAGE_WIRELESS_TOOLS=y
 BR2_PACKAGE_WIRELESS_TOOLS_LIB=y
 # BR2_PACKAGE_WPA_SUPPLICANT is not set
+# BR2_PACKAGE_XINETD is not set
 BR2_PACKAGE_XL2TP=y
 
 #
 # Package managers
 #
 # BR2_PACKAGE_IPKG is not set
+# BR2_PACKAGE_OPKG is not set
 
 #
 # Real-Time
@@ -1299,6 +1320,7 @@ BR2_PACKAGE_XL2TP=y
 BR2_PACKAGE_INOTIFY_TOOLS=y
 BR2_PACKAGE_LOCKFILE_PROGS=y
 # BR2_PACKAGE_LOGROTATE is not set
+# BR2_PACKAGE_LOGSURFER is not set
 BR2_PACKAGE_SCREEN=y
 BR2_PACKAGE_SUDO=y
 # BR2_PACKAGE_XMLSTARLET is not set
@@ -1310,6 +1332,7 @@ BR2_PACKAGE_ACL=y
 BR2_PACKAGE_ATTR=y
 BR2_PACKAGE_HTOP=y
 BR2_PACKAGE_KMOD=y
+# BR2_PACKAGE_MONIT is not set
 BR2_PACKAGE_SYSTEMD=y
 BR2_PACKAGE_UTIL_LINUX=y
 # BR2_PACKAGE_UTIL_LINUX_MOUNT is not set
diff --git a/openslx/busybox.config b/openslx/config.busybox
index 1360b5f76..1360b5f76 100644
--- a/openslx/busybox.config
+++ b/openslx/config.busybox
diff --git a/openslx/config.uclibc b/openslx/config.uclibc
new file mode 100644
index 000000000..5f3815d5c
--- /dev/null
+++ b/openslx/config.uclibc
@@ -0,0 +1,278 @@
+#
+# Automatically generated make config: don't edit
+# Version: 0.9.32-git
+# Fri Jul  9 22:31:59 2010
+#
+# TARGET_alpha is not set
+# TARGET_arm is not set
+# TARGET_avr32 is not set
+# TARGET_bfin is not set
+# TARGET_cris is not set
+# TARGET_e1 is not set
+# TARGET_frv is not set
+# TARGET_h8300 is not set
+# TARGET_hppa is not set
+# TARGET_i386 is not set
+# TARGET_i960 is not set
+# TARGET_ia64 is not set
+# TARGET_m68k is not set
+# TARGET_microblaze is not set
+# TARGET_mips is not set
+# TARGET_nios is not set
+# TARGET_nios2 is not set
+# TARGET_powerpc is not set
+# TARGET_sh is not set
+# TARGET_sh64 is not set
+# TARGET_sparc is not set
+# TARGET_v850 is not set
+# TARGET_vax is not set
+# TARGET_x86_64 is not set
+# TARGET_xtensa is not set
+# TARGET_c6x is not set
+
+# CONFIG_GENERIC_ARM is not set
+# CONFIG_ARM610 is not set
+# CONFIG_ARM710 is not set
+# CONFIG_ARM7TDMI is not set
+# CONFIG_ARM720T is not set
+# CONFIG_ARM920T is not set
+# CONFIG_ARM922T is not set
+# CONFIG_ARM926T is not set
+# CONFIG_ARM10T is not set
+# CONFIG_ARM1136JF_S is not set
+# CONFIG_ARM1176JZ_S is not set
+# CONFIG_ARM1176JZF_S is not set
+# CONFIG_ARM_CORTEX_M3 is not set
+# CONFIG_ARM_CORTEX_M1 is not set
+# CONFIG_ARM_SA110 is not set
+# CONFIG_ARM_SA1100 is not set
+# CONFIG_ARM_XSCALE is not set
+# CONFIG_ARM_IWMMXT is not set
+
+# COMPILE_IN_THUMB_MODE is not set
+USE_BX=y
+
+TARGET_SUBARCH=""
+#
+# Target Architecture Features and Options
+#
+TARGET_ARCH="none"
+FORCE_OPTIONS_FOR_ARCH=y
+#
+# Using ELF file format
+#
+# ARCH_LITTLE_ENDIAN is not set
+# ARCH_BIG_ENDIAN is not set
+# ARCH_WANTS_LITTLE_ENDIAN is not set
+# ARCH_WANTS_BIG_ENDIAN is not set
+ARCH_HAS_MMU=y
+ARCH_USE_MMU=y
+UCLIBC_HAS_FLOATS=y
+UCLIBC_HAS_FPU=y
+DO_C99_MATH=y
+# DO_XSI_MATH is not set
+# UCLIBC_HAS_FENV is not set
+UCLIBC_HAS_LONG_DOUBLE_MATH=y
+KERNEL_HEADERS="/usr/src/linux/include"
+HAVE_DOT_CONFIG=y
+
+#
+# General Library Settings
+#
+# HAVE_NO_PIC is not set
+DOPIC=y
+# ARCH_HAS_NO_SHARED is not set
+# ARCH_HAS_NO_LDSO is not set
+HAVE_SHARED=y
+# FORCE_SHAREABLE_TEXT_SEGMENTS is not set
+LDSO_LDD_SUPPORT=y
+# LDSO_CACHE_SUPPORT is not set
+LDSO_PRELOAD_ENV_SUPPORT=y
+# LDSO_PRELOAD_FILE_SUPPORT is not set
+# LDSO_STANDALONE_SUPPORT is not set
+# LDSO_PRELINK_SUPPORT is not set
+# UCLIBC_STATIC_LDCONFIG is not set
+LDSO_RUNPATH=y
+LDSO_SEARCH_INTERP_PATH=y
+LDSO_LD_LIBRARY_PATH=y
+# LDSO_NO_CLEANUP is not set
+UCLIBC_CTOR_DTOR=y
+# LDSO_GNU_HASH_SUPPORT is not set
+# HAS_NO_THREADS is not set
+LINUXTHREADS_OLD=y
+# LINUXTHREADS_NEW is not set
+# UCLIBC_HAS_THREADS_NATIVE is not set
+UCLIBC_HAS_THREADS=y
+# PTHREADS_DEBUG_SUPPORT is not set
+UCLIBC_HAS_SYSLOG=y
+UCLIBC_HAS_LFS=y
+# MALLOC is not set
+# MALLOC_SIMPLE is not set
+MALLOC_STANDARD=y
+MALLOC_GLIBC_COMPAT=y
+UCLIBC_DYNAMIC_ATEXIT=y
+# COMPAT_ATEXIT is not set
+UCLIBC_SUSV3_LEGACY=y
+# UCLIBC_SUSV3_LEGACY_MACROS is not set
+UCLIBC_SUSV4_LEGACY=y
+# UCLIBC_STRICT_HEADERS is not set
+# UCLIBC_HAS_STUBS is not set
+UCLIBC_HAS_SHADOW=y
+UCLIBC_HAS_PROGRAM_INVOCATION_NAME=y
+UCLIBC_HAS___PROGNAME=y
+UCLIBC_HAS_PTY=y
+ASSUME_DEVPTS=y
+UNIX98PTY_ONLY=y
+UCLIBC_HAS_GETPT=y
+UCLIBC_HAS_LIBUTIL=y
+UCLIBC_HAS_TM_EXTENSIONS=y
+UCLIBC_HAS_TZ_CACHING=y
+UCLIBC_HAS_TZ_FILE=y
+UCLIBC_HAS_TZ_FILE_READ_MANY=y
+UCLIBC_TZ_FILE_PATH="/etc/TZ"
+UCLIBC_FALLBACK_TO_ETC_LOCALTIME=y
+
+#
+# Advanced Library Settings
+#
+UCLIBC_PWD_BUFFER_SIZE=256
+UCLIBC_GRP_BUFFER_SIZE=256
+
+#
+# Support various families of functions
+#
+UCLIBC_LINUX_MODULE_26=y
+# UCLIBC_LINUX_MODULE_24 is not set
+UCLIBC_LINUX_SPECIFIC=y
+UCLIBC_HAS_GNU_ERROR=y
+UCLIBC_BSD_SPECIFIC=y
+UCLIBC_HAS_BSD_ERR=y
+# UCLIBC_HAS_OBSOLETE_BSD_SIGNAL is not set
+# UCLIBC_HAS_OBSOLETE_SYSV_SIGNAL is not set
+# UCLIBC_NTP_LEGACY is not set
+# UCLIBC_SV4_DEPRECATED is not set
+UCLIBC_HAS_REALTIME=y
+UCLIBC_HAS_ADVANCED_REALTIME=y
+UCLIBC_HAS_EPOLL=y
+UCLIBC_HAS_XATTR=y
+UCLIBC_HAS_PROFILING=y
+UCLIBC_HAS_CRYPT_IMPL=y
+# UCLIBC_HAS_SHA256_CRYPT_IMPL is not set
+# UCLIBC_HAS_SHA512_CRYPT_IMPL is not set
+UCLIBC_HAS_CRYPT=y
+UCLIBC_HAS_NETWORK_SUPPORT=y
+UCLIBC_HAS_SOCKET=y
+UCLIBC_HAS_IPV4=y
+# UCLIBC_HAS_IPV6 is not set
+# UCLIBC_HAS_RPC is not set
+# UCLIBC_HAS_FULL_RPC is not set
+# UCLIBC_HAS_REENTRANT_RPC is not set
+UCLIBC_USE_NETLINK=y
+UCLIBC_SUPPORT_AI_ADDRCONFIG=y
+# UCLIBC_HAS_BSD_RES_CLOSE is not set
+UCLIBC_HAS_COMPAT_RES_STATE=y
+# UCLIBC_HAS_EXTRA_COMPAT_RES_STATE is not set
+UCLIBC_HAS_RESOLVER_SUPPORT=y
+UCLIBC_HAS_LIBRESOLV_STUB=y
+UCLIBC_HAS_LIBNSL_STUB=y
+
+#
+# String and Stdio Support
+#
+# UCLIBC_HAS_STRING_GENERIC_OPT is not set
+UCLIBC_HAS_STRING_ARCH_OPT=y
+UCLIBC_HAS_CTYPE_TABLES=y
+UCLIBC_HAS_CTYPE_SIGNED=y
+# UCLIBC_HAS_CTYPE_UNSAFE is not set
+UCLIBC_HAS_CTYPE_CHECKED=y
+# UCLIBC_HAS_CTYPE_ENFORCED is not set
+# UCLIBC_HAS_WCHAR is not set
+# UCLIBC_HAS_LOCALE is not set
+UCLIBC_HAS_HEXADECIMAL_FLOATS=y
+# UCLIBC_HAS_GLIBC_DIGIT_GROUPING is not set
+UCLIBC_HAS_GLIBC_CUSTOM_PRINTF=y
+# USE_OLD_VFPRINTF is not set
+UCLIBC_PRINTF_SCANF_POSITIONAL_ARGS=9
+UCLIBC_HAS_SCANF_GLIBC_A_FLAG=y
+# UCLIBC_HAS_STDIO_BUFSIZ_NONE is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_256 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_512 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_1024 is not set
+# UCLIBC_HAS_STDIO_BUFSIZ_2048 is not set
+UCLIBC_HAS_STDIO_BUFSIZ_4096=y
+# UCLIBC_HAS_STDIO_BUFSIZ_8192 is not set
+UCLIBC_HAS_STDIO_BUILTIN_BUFFER_NONE=y
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_4 is not set
+# UCLIBC_HAS_STDIO_BUILTIN_BUFFER_8 is not set
+# UCLIBC_HAS_STDIO_SHUTDOWN_ON_ABORT is not set
+# UCLIBC_HAS_STDIO_GETC_MACRO is not set
+# UCLIBC_HAS_STDIO_PUTC_MACRO is not set
+UCLIBC_HAS_STDIO_AUTO_RW_TRANSITION=y
+# UCLIBC_HAS_FOPEN_LARGEFILE_MODE is not set
+UCLIBC_HAS_FOPEN_EXCLUSIVE_MODE=y
+# UCLIBC_HAS_FOPEN_CLOSEEXEC_MODE is not set
+UCLIBC_HAS_GLIBC_CUSTOM_STREAMS=y
+UCLIBC_HAS_PRINTF_M_SPEC=y
+UCLIBC_HAS_ERRNO_MESSAGES=y
+# UCLIBC_HAS_SYS_ERRLIST is not set
+UCLIBC_HAS_SIGNUM_MESSAGES=y
+# UCLIBC_HAS_SYS_SIGLIST is not set
+UCLIBC_HAS_GNU_GETOPT=y
+# UCLIBC_HAS_GNU_GETSUBOPT is not set
+
+#
+# Big and Tall
+#
+UCLIBC_HAS_REGEX=y
+# UCLIBC_HAS_REGEX_OLD is not set
+UCLIBC_HAS_FNMATCH=y
+# UCLIBC_HAS_FNMATCH_OLD is not set
+# UCLIBC_HAS_WORDEXP is not set
+UCLIBC_HAS_NFTW=y
+UCLIBC_HAS_FTW=y
+# UCLIBC_HAS_FTS is not set
+UCLIBC_HAS_GLOB=y
+UCLIBC_HAS_GNU_GLOB=y
+UCLIBC_HAS_UTMPX=y
+
+#
+# Library Installation Options
+#
+RUNTIME_PREFIX="/openslx/"
+DEVEL_PREFIX="/usr/"
+MULTILIB_DIR="lib"
+HARDWIRED_ABSPATH=y
+
+#
+# Security options
+#
+# UCLIBC_BUILD_PIE is not set
+# UCLIBC_HAS_ARC4RANDOM is not set
+# HAVE_NO_SSP is not set
+UCLIBC_HAS_SSP=y
+# UCLIBC_HAS_SSP_COMPAT is not set
+# SSP_QUICK_CANARY is not set
+PROPOLICE_BLOCK_ABRT=y
+# PROPOLICE_BLOCK_SEGV is not set
+# UCLIBC_BUILD_SSP is not set
+UCLIBC_BUILD_RELRO=y
+UCLIBC_BUILD_NOW=y
+UCLIBC_BUILD_NOEXECSTACK=y
+
+#
+# uClibc development/debugging options
+#
+CROSS_COMPILER_PREFIX=""
+UCLIBC_EXTRA_CFLAGS=""
+# DODEBUG is not set
+# DODEBUG_PT is not set
+DOSTRIP=y
+# DOASSERTS is not set
+# SUPPORT_LD_DEBUG is not set
+# SUPPORT_LD_DEBUG_EARLY is not set
+# UCLIBC_MALLOC_DEBUGGING is not set
+# UCLIBC_HAS_BACKTRACE is not set
+WARNINGS="-Wall"
+# EXTRA_WARNINGS is not set
+# DOMULTI is not set
+# UCLIBC_MJN3_ONLY is not set
diff --git a/package/collectd/Config.in b/package/collectd/Config.in
index 96438c0d4..4fae6d507 100644
--- a/package/collectd/Config.in
+++ b/package/collectd/Config.in
@@ -1,5 +1,7 @@
 config BR2_PACKAGE_COLLECTD
 	bool "collectd"
+	# Uses fork()
+	depends on BR2_USE_MMU
 	depends on BR2_TOOLCHAIN_HAS_THREADS
 	help
 	  collectd is a daemon which collects system performance
diff --git a/package/x11r7/mesa3d/mesa3d-bug-3133.patch b/package/x11r7/mesa3d/mesa3d-bug-3133.patch
new file mode 100644
index 000000000..60dfda993
--- /dev/null
+++ b/package/x11r7/mesa3d/mesa3d-bug-3133.patch
@@ -0,0 +1,11 @@
+--- a/src/mesa/main/imports.c	2011-02-18 18:26:04.000000000 +0100
++++ bsrc/mesa/main/imports.c	2011-02-18 18:31:05.000000000 +0100
+@@ -915,7 +915,7 @@ _mesa_atoi(const char *s)
+ double
+ _mesa_strtod( const char *s, char **end )
+ {
+-#ifdef _GNU_SOURCE
++#if defined(_GNU_SOURCE) && !defined(__UCLIBC__)
+    static locale_t loc = NULL;
+    if (!loc) {
+       loc = newlocale(LC_CTYPE_MASK, "C", NULL);