diff options
80 files changed, 709 insertions, 445 deletions
@@ -2,17 +2,24 @@ Fixes all over the tree. - Updated/fixed packages: aumix, avahi, busybox, cairo, fltk, gettext, - gmpc, grep, hal, iconv, libcgicc, libglib2, libidn, libmpd, - libpcap, libsoup, lmbench, ltrace, lvm2, make, mtd-utils, - mutt, netsnmp, ntp, pango, php, psmisc, qt, samba, sshfs, - startup-notification, uemacs, util-linux, vpnc + Updated/fixed packages: aumix, atk, avahi, bmon, busybox, cairo, + cdrkit, dbus-glib, dbus-python, docker, enchant, fltk, gamin, + gettext, gmpc, gob2, grep, gstreamer, gst-plugins-bad, + gst-plugins-base, gvfs, hal, iconv, icu, iperf, libcgicc, libdvdnav, + libdvdread, libglade, libglib2, libgtk2, libidn, libmms, + libmpd, libpcap, libsoup, lmbench, lsof, ltrace, lvm2, make, + metacity, mtd-utils, mutt, nbd, netsnmp, ntfsprogs, ntp, olsr, + pango, pciutils, pcmanfm, php, pkg-config, psmisc, qt, samba, + shared-mime-info, squashfs, squashfs3, sshfs, + startup-notification, swfdec, sylpheed, uemacs, util-linux, + valgrind, vpnc, vsftpd, webkit, xstroke Issues resolved (http://bugs.uclibc.org): #1693: NTP trys IPV6 even if not configured error: 'IPV6_MULTICAST... #1729: alsamixergui fails to build #1801: Avahi-autoipd doesn't create TARGET_DIR/var/lib + #1819: pciutils small bugs 2010.05-rc2, Released May 11th, 2010: diff --git a/configs/arm_toolchain_defconfig b/configs/arm_toolchain_defconfig index 460fe957c..e4c181e50 100644 --- a/configs/arm_toolchain_defconfig +++ b/configs/arm_toolchain_defconfig @@ -712,7 +712,7 @@ BR2_PACKAGE_XSERVER_none=y # # filesystem for target device # -BR2_ROOTFS_DEVICE_TABLE="target/device/generic/device_table.txt" +BR2_ROOTFS_DEVICE_TABLE="target/generic/device_table.txt" # BR2_TARGET_ROOTFS_CRAMFS is not set # BR2_TARGET_ROOTFS_CLOOP is not set # BR2_TARGET_ROOTFS_EXT2 is not set diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig index 995aee1c3..d7c9c1597 100644 --- a/configs/atngw100_defconfig +++ b/configs/atngw100_defconfig @@ -1,9 +1,9 @@ # # Automatically generated make config: don't edit -# Wed May 13 12:33:57 2009 +# Mon May 17 00:57:05 2010 # BR2_HAVE_DOT_CONFIG=y -BR2_VERSION="2009.05-rc1" +BR2_VERSION="2010.05-rc2" # BR2_alpha is not set # BR2_arm is not set # BR2_armeb is not set @@ -14,13 +14,13 @@ BR2_avr32=y # BR2_m68k is not set # BR2_mips is not set # BR2_mipsel is not set -# BR2_nios2 is not set # BR2_powerpc 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_xtensa is not set BR2_ARCH="avr32" BR2_ENDIAN="BIG" @@ -29,16 +29,8 @@ BR2_ENDIAN="BIG" # # -# Project Options -# -BR2_PROJECT="atngw100" -BR2_HOSTNAME="ngw.example.net" -BR2_BANNER="ATNGW100 ($(DATE))" - -# # Preset Devices # -# BR2_TARGET_AMD is not set BR2_BOARD_NAME="atngw100" BR2_BOARD_PATH="target/device/Atmel/$(BR2_BOARD_NAME)" BR2_TARGET_ATMEL=y @@ -59,7 +51,6 @@ BR2_TARGET_AT32AP7000=y # BR2_TARGET_AVR32_ATSTK1005 is not set BR2_TARGET_AVR32_ATNGW100=y # BR2_TARGET_AVR32_ATNGW100_BASE is not set -# BR2_TARGET_AVR32_ATNGW100_EXPANDED is not set # # Package support @@ -72,27 +63,24 @@ BR2_TARGET_ATMEL_COPYTO="" # BR2_TARGET_VALKA is not set # -# Generic System Support -# -# BR2_TARGET_GENERIC_ACCESS_POINT is not set -# BR2_TARGET_GENERIC_FIREWALL is not set - -# -# Generic development system requires a toolchain with WCHAR and PROGRAM_INVOCATION support +# Build options # # -# Build options +# Commands # BR2_WGET="wget --passive-ftp --retry-connrefused --waitretry=10" BR2_SVN_CO="svn co" BR2_SVN_UP="svn up" +BR2_BZR_CO="bzr co" +BR2_BZR_UP="bzr up" BR2_GIT="git clone" BR2_ZCAT="zcat" BR2_BZCAT="bzcat" BR2_TAR_OPTIONS="" BR2_DL_DIR="$(TOPDIR)/dl" BR2_COPYTO="" +BR2_STAGING_DIR="$(BASE_DIR)/staging" # # Mirrors and Download locations @@ -103,19 +91,10 @@ BR2_SOURCEFORGE_MIRROR="easynews" BR2_KERNEL_MIRROR="http://www.kernel.org/pub/" BR2_GNU_MIRROR="http://ftp.gnu.org/pub/gnu" BR2_DEBIAN_MIRROR="http://ftp.debian.org" - -# -# Atmel Mirrors -# BR2_ATMEL_MIRROR="ftp://www.at91.com/pub/buildroot/" BR2_AT91_PATCH_MIRROR="http://maxim.org.za/AT91RM9200/2.6/" -BR2_STAGING_DIR="$(BASE_DIR)/staging" -# BR2_FPU_SUFFIX is not set -BR2_TOPDIR_PREFIX="" -BR2_TOPDIR_SUFFIX="" BR2_JLEVEL=3 # BR2_DEPRECATED is not set -BR2_CONFIG_CACHE=y # BR2_ENABLE_DEBUG is not set BR2_STRIP_strip=y # BR2_STRIP_sstrip is not set @@ -130,6 +109,11 @@ BR2_OPTIMIZE_S=y # BR2_HAVE_DEVFILES is not set # +# Advanced +# +BR2_CONFIG_CACHE=y + +# # Toolchain # BR2_TOOLCHAIN_BUILDROOT=y @@ -138,69 +122,64 @@ BR2_TOOLCHAIN_BUILDROOT=y # # Kernel Header Options # -# 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 is not set -BR2_KERNEL_HEADERS_2_6_29=y +# BR2_KERNEL_HEADERS_2_6_29 is not set +# BR2_KERNEL_HEADERS_2_6_30 is not set +# BR2_KERNEL_HEADERS_2_6_31 is not set +# BR2_KERNEL_HEADERS_2_6_32 is not set +BR2_KERNEL_HEADERS_2_6_33=y +# BR2_KERNEL_HEADERS_VERSION is not set # BR2_KERNEL_HEADERS_SNAP is not set -BR2_DEFAULT_KERNEL_HEADERS="2.6.29.2" +BR2_DEFAULT_KERNEL_HEADERS="2.6.33.3" # # uClibc Options # # BR2_UCLIBC_VERSION_0_9_28_3 is not set # 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_0_9_30=y +# BR2_UCLIBC_VERSION_0_9_31 is not set # BR2_UCLIBC_VERSION_SNAPSHOT is not set -BR2_UCLIBC_VERSION_STRING="0.9.30.1" +BR2_UCLIBC_VERSION_STRING="0.9.30.3" BR2_UCLIBC_CONFIG="toolchain/uClibc/uClibc-0.9.30.config" # BR2_PTHREAD_DEBUG is not set -# BR2_PROGRAM_INVOCATION is not set # BR2_UCLIBC_INSTALL_TEST_SUITE is not set # # Binutils Options # # 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_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_18_AVR32_1_0_1=y # BR2_BINUTILS_VERSION_2_19 is not set # BR2_BINUTILS_VERSION_2_19_1 is not set +# BR2_BINUTILS_VERSION_2_20 is not set +# BR2_BINUTILS_VERSION_2_20_1 is not set BR2_BINUTILS_VERSION="2.18-avr32-1.0.1" BR2_EXTRA_BINUTILS_CONFIG_OPTIONS="" # # GCC Options # -# BR2_GCC_VERSION_3_4_6 is not set -# BR2_GCC_VERSION_4_0_4 is not set # BR2_GCC_VERSION_4_1_2 is not set # BR2_GCC_VERSION_4_2_1 is not set # BR2_GCC_VERSION_4_2_2 is not set BR2_GCC_VERSION_4_2_2_AVR32_2_1_5=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_3_4 is not set # BR2_GCC_VERSION_4_4_X is not set +# BR2_GCC_VERSION_SNAP is not set BR2_GCC_SUPPORTS_SYSROOT=y -# BR2_GCC_SUPPORTS_FINEGRAINEDMTUNE is not set BR2_GCC_VERSION="4.2.2-avr32-2.1.5" BR2_TOOLCHAIN_SYSROOT=y # BR2_GCC_USE_SJLJ_EXCEPTIONS is not set BR2_EXTRA_GCC_CONFIG_OPTIONS="" BR2_GCC_SHARED_LIBGCC=y +BR2_GCC_ENABLE_TLS=y # # Ccache Options @@ -212,14 +191,18 @@ BR2_CCACHE_DIR="$(TOOLCHAIN_DIR)/ccache-$(CCACHE_VER)/cache" # Gdb Options # # BR2_PACKAGE_GDB is not set + +# +# Gdb debugger for the target needs WCHAR support in toolchain +# BR2_PACKAGE_GDB_SERVER=y BR2_PACKAGE_GDB_HOST=y -# 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_7_1_AVR32_2_1_5=y # BR2_GDB_VERSION_6_8 is not set +# BR2_GDB_VERSION_7_0_1 is not set +# BR2_GDB_VERSION_7_1 is not set BR2_GDB_VERSION="6.7.1-avr32-2.1.5" # @@ -231,12 +214,14 @@ BR2_INET_RPC=y BR2_ENABLE_LOCALE=y # BR2_ENABLE_LOCALE_PURGE is not set BR2_USE_WCHAR=y +BR2_PREFER_SOFT_FLOAT=y BR2_SOFT_FLOAT=y BR2_USE_SSP=y # BR2_PTHREADS_NONE is not set # BR2_PTHREADS is not set BR2_PTHREADS_OLD=y # BR2_PTHREADS_NATIVE is not set +# BR2_PROGRAM_INVOCATION is not set BR2_GCC_CROSS_CXX=y BR2_INSTALL_LIBSTDCPP=y BR2_TARGET_OPTIMIZATION="-Os -pipe" @@ -252,230 +237,159 @@ 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 is not set -BR2_BUSYBOX_VERSION_1_14_X=y +# BR2_BUSYBOX_VERSION_1_14_X is not set +# BR2_BUSYBOX_VERSION_1_15_X is not set +BR2_BUSYBOX_VERSION_1_16_X=y # BR2_PACKAGE_BUSYBOX_SNAPSHOT is not set -BR2_BUSYBOX_VERSION="1.14.0" +BR2_BUSYBOX_VERSION="1.16.1" BR2_PACKAGE_BUSYBOX_FULLINSTALL=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 +# BR2_PACKAGE_CUSTOMIZE is not set # -# The minimum needed to build a uClibc development system +# Audio and video libraries and applications # -# BR2_PACKAGE_FLEX is not set -# BR2_PACKAGE_GCC_TARGET is not set -# BR2_PACKAGE_MAKE is not set +# BR2_PACKAGE_ALSA_LIB is not set +# BR2_PACKAGE_AUMIX is not set +# BR2_PACKAGE_FLAC is not set +# BR2_PACKAGE_GSTREAMER is not set +# BR2_PACKAGE_LIBCDAUDIO is not set +# BR2_PACKAGE_LIBDVDREAD is not set +# BR2_PACKAGE_LIBDVDNAV is not set +# BR2_PACKAGE_LIBID3TAG is not set +# BR2_PACKAGE_LIBMAD is not set +# BR2_PACKAGE_LIBMMS 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_SWFDEC is not set +# BR2_PACKAGE_FESTIVAL is not set +# BR2_PACKAGE_TAGLIB is not set +# BR2_PACKAGE_TREMOR is not set # -# Other development stuff +# Compressors and decompressors +# +# BR2_PACKAGE_LZOP is not set +# BR2_PACKAGE_LZMA is not set + +# +# Debugging, profiling and benchmark +# +# BR2_PACKAGE_DMALLOC is not set +# BR2_PACKAGE_KEXEC is not set +# BR2_PACKAGE_LMBENCH is not set +# BR2_PACKAGE_LSOF is not set +# BR2_PACKAGE_MEMSTAT is not set +# BR2_PACKAGE_NETPERF is not set +# BR2_PACKAGE_OPROFILE is not set +BR2_PACKAGE_STRACE=y + +# +# Development tools # # BR2_PACKAGE_AUTOCONF is not set # BR2_PACKAGE_AUTOMAKE is not set # BR2_PACKAGE_BISON is not set -# BR2_PACKAGE_CCACHE_TARGET is not set +# BR2_PACKAGE_BSDIFF is not set # BR2_PACKAGE_CVS is not set # BR2_PACKAGE_DISTCC is not set -# BR2_PACKAGE_DMALLOC is not set # BR2_PACKAGE_FAKEROOT is not set +# BR2_PACKAGE_FLEX is not set + +# +# native toolchain needs development files in target filesystem +# BR2_PACKAGE_GETTEXT=y BR2_PACKAGE_LIBINTL=y # BR2_PACKAGE_LIBGMP is not set # BR2_PACKAGE_GPERF is not set +# BR2_PACKAGE_INTLTOOL is not set +# BR2_PACKAGE_MAKE 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 # BR2_PACKAGE_PKG_CONFIG is not set -# BR2_PACKAGE_READLINE is not set -# BR2_PACKAGE_PCRE is not set # -# Other stuff +# Games # -# BR2_PACKAGE_AT is not set -# BR2_PACKAGE_BEECRYPT is not set -# BR2_PACKAGE_BERKELEYDB is not set -# BR2_PACKAGE_BSDIFF is not set -# BR2_PACKAGE_CUPS is not set -# BR2_PACKAGE_CUSTOMIZE is not set -# BR2_PACKAGE_FILE is not set -# BR2_PACKAGE_GAMIN is not set -# BR2_PACKAGE_ICU is not set -# 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_LIBGCRYPT is not set -# BR2_PACKAGE_LIBGPG_ERROR is not set -BR2_PACKAGE_LIBICONV=y -# 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_MEMSTAT is not set -# 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 +# BR2_PACKAGE_GNUCHESS is not set +# BR2_PACKAGE_PRBOOM is not set # -# Database +# Graphic libraries and applications (graphic/text) # -# BR2_PACKAGE_MYSQL_CLIENT is not set -# BR2_PACKAGE_SQLITE is not set # -# Networking +# graphic libraries # +# BR2_PACKAGE_DIRECTFB is not set +# BR2_PACKAGE_FBDUMP is not set +# BR2_PACKAGE_FBV is not set +# BR2_PACKAGE_IMAGEMAGICK is not set +# BR2_PACKAGE_LINUX_FUSION is not set +# BR2_PACKAGE_SDL is not set # -# Networking applications +# other GUIs # -# BR2_PACKAGE_ARGUS is not set -BR2_PACKAGE_AVAHI=y -BR2_PACKAGE_AVAHI_AUTOIPD=y -# BR2_PACKAGE_AVAHI_DAEMON is not set -# BR2_PACKAGE_AXEL is not set -# BR2_PACKAGE_BIND is not set -BR2_PACKAGE_BRIDGE=y -BR2_PACKAGE_DNSMASQ=y -BR2_PACKAGE_DNSMASQ_TFTP=y -BR2_PACKAGE_DROPBEAR=y -# BR2_PACKAGE_ETHTOOL is not set -BR2_PACKAGE_HASERL=y -# BR2_PACKAGE_HASERL_VERSION_0_8_X is not set -BR2_PACKAGE_HASERL_VERSION_0_9_X=y -BR2_PACKAGE_HASERL_VERSION="0.9.25" -# BR2_PACKAGE_IFPLUGD is not set -# BR2_PACKAGE_IPERF is not set -# BR2_PACKAGE_IPROUTE2 is not set -# BR2_PACKAGE_IPSEC_TOOLS is not set -BR2_PACKAGE_IPTABLES=y -# BR2_PACKAGE_KISMET is not set -# BR2_PACKAGE_L2TP is not set -# BR2_PACKAGE_LIBCGI is not set -# BR2_PACKAGE_LIBCGICC is not set -# 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=y -# BR2_PACKAGE_MDNSRESPONDER is not set -# BR2_PACKAGE_MIIDIAG is not set -# BR2_PACKAGE_MROUTED is not set -# BR2_PACKAGE_MUTT is not set -BR2_PACKAGE_NBD=y -BR2_PACKAGE_NCFTP=y +# BR2_PACKAGE_QT is not set +# BR2_PACKAGE_XORG7 is not set # -# ncFTP tools selection +# X libraries and helper libraries # -# BR2_PACKAGE_NCFTP_GET is not set -# BR2_PACKAGE_NCFTP_PUT is not set -# BR2_PACKAGE_NCFTP_LS is not set -# BR2_PACKAGE_NCFTP_BATCH is not set -# BR2_PACKAGE_NCFTP_BOOKMARKS is not set -# BR2_PACKAGE_NEON is not set -# BR2_PACKAGE_NETKITBASE is not set -# BR2_PACKAGE_NETKITTELNET is not set -# BR2_PACKAGE_NETPLUG is not set -# BR2_PACKAGE_NETSNMP is not set -# BR2_PACKAGE_NFS_UTILS is not set -BR2_PACKAGE_NTP=y -# BR2_PACKAGE_NTP_SNTP is not set -# BR2_PACKAGE_OLSR is not set -# BR2_PACKAGE_OPENNTPD is not set -# BR2_PACKAGE_OPENSSH is not set -# BR2_PACKAGE_OPENSSL is not set -# BR2_PACKAGE_OPENVPN is not set -BR2_PACKAGE_PORTMAP=y -# 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=y +# BR2_PACKAGE_LIBERATION is not set # -# quagga suite +# X Window managers # -# BR2_PACKAGE_QUAGGA_ZEBRA is not set -# BR2_PACKAGE_QUAGGA_BGPD is not set -# BR2_PACKAGE_QUAGGA_RIPD is not set -# BR2_PACKAGE_QUAGGA_RIPNGD is not set -# BR2_PACKAGE_QUAGGA_OSPFD is not set -# BR2_PACKAGE_QUAGGA_OSPF6D is not set -# BR2_PACKAGE_QUAGGA_WATCHQUAGGA is not set -# BR2_PACKAGE_QUAGGA_ISISD is not set -BR2_PACKAGE_RSYNC=y -# BR2_PACKAGE_SAMBA is not set -# BR2_PACKAGE_SOCAT is not set -# BR2_PACKAGE_STUNNEL is not set -# BR2_PACKAGE_TCPDUMP is not set -# BR2_PACKAGE_DHCPDUMP is not set -# BR2_PACKAGE_TFTPD is not set -# BR2_PACKAGE_TN5250 is not set -# BR2_PACKAGE_TTCP is not set -# BR2_PACKAGE_UDPCAST is not set -# 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=y -# BR2_PACKAGE_WPA_SUPPLICANT is not set # -# Hardware handling / blockdevices and filesystem maintenance +# X applications # +# BR2_PACKAGE_GOB2 is not set +# BR2_PACKAGE_SYLPHEED is not set # -# dbus not available (need expat or libxml2) +# Hardware handling # +# BR2_PACKAGE_CDRKIT is not set +# BR2_PACKAGE_CRAMFS is not set # -# dbus-glib needs dbus to be compiled with expat support +# dbus not available (need expat or libxml2) # -# BR2_PACKAGE_DEVMEM2 is not set -# BR2_PACKAGE_DM 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_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_GENEXT2FS is not set +# BR2_PACKAGE_GENROMFS is not set +# BR2_PACKAGE_GVFS 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_MAKEDEVS 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_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 @@ -487,156 +401,271 @@ BR2_PACKAGE_MTD_FLASH_ERASE=y BR2_PACKAGE_MTD_FLASH_ERASEALL=y BR2_PACKAGE_MTD_FLASH_INFO=y # BR2_PACKAGE_MTD_FLASH_LOCK is not set +# BR2_PACKAGE_MTD_FLASH_OTP_DUMP is not set +# BR2_PACKAGE_MTD_FLASH_OTP_INFO is not set # BR2_PACKAGE_MTD_FLASH_UNLOCK is not set # BR2_PACKAGE_MTD_FTL_CHECK is not set # BR2_PACKAGE_MTD_FTL_FORMAT is not set # BR2_PACKAGE_MTD_JFFS2DUMP is not set # BR2_PACKAGE_MTD_MKFSJFFS2 is not set -# BR2_PACKAGE_MTD_MKFSJFFS is not set BR2_PACKAGE_MTD_MTD_DEBUG=y # BR2_PACKAGE_MTD_NANDDUMP is not set +BR2_PACKAGE_MTD_NANDTEST=y # BR2_PACKAGE_MTD_NANDWRITE is not set -# BR2_PACKAGE_MTD_NFTL_FORMAT is not set # BR2_PACKAGE_MTD_NFTLDUMP is not set +# BR2_PACKAGE_MTD_NFTL_FORMAT is not set +# BR2_PACKAGE_MTD_RECV_IMAGE is not set +# BR2_PACKAGE_MTD_RFDDUMP is not set +# BR2_PACKAGE_MTD_RFDFORMAT is not set +# BR2_PACKAGE_MTD_SERVE_IMAGE is not set # BR2_PACKAGE_MTD_SUMTOOL is not set +BR2_PACKAGE_MTD_MTDINFO=y +BR2_PACKAGE_MTD_UBIATTACH=y +BR2_PACKAGE_MTD_UBICRC32=y +BR2_PACKAGE_MTD_UBIDETACH=y +BR2_PACKAGE_MTD_UBIFORMAT=y +BR2_PACKAGE_MTD_UBIMKVOL=y +BR2_PACKAGE_MTD_UBINFO=y +BR2_PACKAGE_MTD_UBINIZE=y +BR2_PACKAGE_MTD_UBIRENAME=y +BR2_PACKAGE_MTD_UBIRMVOL=y +BR2_PACKAGE_MTD_UBIRSVOL=y +BR2_PACKAGE_MTD_UBIUPDATEVOL=y # BR2_PACKAGE_NTFS_3G is not set +# BR2_PACKAGE_NTFSPROGS 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_SQUASHFS is not set +# BR2_PACKAGE_SYSSTAT is not set +# BR2_PACKAGE_USB_MODESWITCH 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 +# Interpreter languages and scripting # -# BR2_PACKAGE_ALSA_LIB is not set +BR2_PACKAGE_HASERL=y +# BR2_PACKAGE_HASERL_WITH_LUA is not set +# BR2_PACKAGE_HASERL_VERSION_0_8_X is not set +BR2_PACKAGE_HASERL_VERSION_0_9_X=y +BR2_PACKAGE_HASERL_VERSION="0.9.26" +# BR2_PACKAGE_LUA is not set +# BR2_PACKAGE_MICROPERL is not set +# BR2_PACKAGE_PHP is not set +# BR2_PACKAGE_PYTHON is not set +# BR2_PACKAGE_RUBY is not set +# BR2_PACKAGE_TCL is not set # -# asterisk - disabled (required openssl and mpg123) +# Libraries # -# 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 -# BR2_PACKAGE_TAGLIB is not set -# BR2_PACKAGE_VLC is not set # -# Graphic libraries and applications (graphic/text) +# Compression and decompression # +# BR2_PACKAGE_LIBARCHIVE is not set +BR2_PACKAGE_LZO=y +BR2_PACKAGE_ZLIB=y # -# text rendering libraries +# Crypto # -# BR2_PACKAGE_NCURSES is not set -# BR2_PACKAGE_NEWT is not set -# BR2_PACKAGE_SLANG is not set +# BR2_PACKAGE_BEECRYPT is not set +# BR2_PACKAGE_LIBGCRYPT is not set +# BR2_PACKAGE_LIBGPG_ERROR is not set +# BR2_PACKAGE_OPENSSL is not set # -# text rendering applications +# Database # -# BR2_PACKAGE_DIALOG is not set +# BR2_PACKAGE_BERKELEYDB is not set +# BR2_PACKAGE_MYSQL_CLIENT is not set +# BR2_PACKAGE_SQLITE is not set # -# graphic libraries +# Filesystem # -# BR2_PACKAGE_DIRECTFB is not set -# BR2_PACKAGE_FBDUMP is not set -# BR2_PACKAGE_IMAGEMAGICK is not set +# BR2_PACKAGE_GAMIN is not set +# BR2_PACKAGE_LIBCONFIG is not set +# BR2_PACKAGE_LIBCONFUSE is not set +# BR2_PACKAGE_LIBFUSE is not set +# BR2_PACKAGE_LIBLOCKFILE is not set +# BR2_PACKAGE_LIBSYSFS is not set + +# +# Graphics +# +# BR2_PACKAGE_ATK is not set +# BR2_PACKAGE_CAIRO is not set +# BR2_PACKAGE_FONTCONFIG is not set +# BR2_PACKAGE_FREETYPE 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=y +# BR2_PACKAGE_PANGO is not set # BR2_PACKAGE_PIXMAN is not set -# BR2_PACKAGE_SDL is not set # BR2_PACKAGE_TIFF is not set +# BR2_PACKAGE_WEBKIT is not set # -# busybox graphic applications +# Hardware handling # +# BR2_PACKAGE_LIBAIO is not set +# BR2_PACKAGE_LIBRAW1394 is not set +# BR2_PACKAGE_TSLIB is not set +# BR2_PACKAGE_LIBUSB is not set # -# --> May be broken in busybox +# Java # -# BR2_PACKAGE_FBV is not set -# BR2_PACKAGE_FBSET is not set +# BR2_PACKAGE_CLASSPATH is not set # -# other GUIs +# Networking # -# 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 +# BR2_PACKAGE_LIBCGI is not set +# BR2_PACKAGE_LIBCGICC is not set +# BR2_PACKAGE_LIBCURL is not set +# BR2_PACKAGE_LIBDNET is not set +# BR2_PACKAGE_LIBEXOSIP2 is not set +# BR2_PACKAGE_LIBIDN is not set +# BR2_PACKAGE_LIBMICROHTTPD is not set +# BR2_PACKAGE_NEON is not set +# BR2_PACKAGE_LIBNL is not set +# BR2_PACKAGE_LIBPCAP is not set +# BR2_PACKAGE_LIBOSIP2 is not set +# BR2_PACKAGE_LIBRSYNC is not set +# BR2_PACKAGE_LIBSOUP is not set +# BR2_PACKAGE_LIBUPNP is not set # -# X libraries and helper libraries +# Other # -# 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_LIBATOMIC_OPS is not set +# BR2_PACKAGE_LIBCAP is not set +BR2_PACKAGE_LIBDAEMON=y +# BR2_PACKAGE_LIBELF is not set +# BR2_PACKAGE_LIBEVENT is not set # BR2_PACKAGE_LIBGLIB12 is not set BR2_PACKAGE_LIBGLIB2=y -# BR2_PACKAGE_OPENMOTIF is not set -# BR2_PACKAGE_FONTCONFIG is not set -# BR2_PACKAGE_FREETYPE is not set -# BR2_PACKAGE_TSLIB is not set -# BR2_PACKAGE_WEBKIT is not set +# BR2_PACKAGE_LIBOIL is not set +# BR2_PACKAGE_STARTUP_NOTIFICATION is not set # -# X Window managers +# Text and terminal handling # -# BR2_PACKAGE_MATCHBOX is not set +# BR2_PACKAGE_ENCHANT is not set +# BR2_PACKAGE_ICU is not set +BR2_PACKAGE_LIBICONV=y +# BR2_PACKAGE_NCURSES is not set +# BR2_PACKAGE_NEWT is not set +# BR2_PACKAGE_PCRE is not set +# BR2_PACKAGE_POPT is not set +# BR2_PACKAGE_READLINE is not set +# BR2_PACKAGE_SLANG is not set # -# X applications +# XML # -# BR2_PACKAGE_ALSAMIXERGUI is not set +# BR2_PACKAGE_EXPAT is not set +# BR2_PACKAGE_EZXML is not set +# BR2_PACKAGE_LIBXML_PARSER_PERL is not set +# BR2_PACKAGE_LIBXML2 is not set +# BR2_PACKAGE_LIBXSLT is not set +# BR2_PACKAGE_XERCES is not set # -# dillo - disabled (requires jpeg,libglib12,libgtk12,zlib,libpng and Xorg(7)) +# Miscellaneous # -# BR2_PACKAGE_GQVIEW is not set -# BR2_PACKAGE_GOB2 is not set -# BR2_PACKAGE_LEAFPAD is not set +# BR2_PACKAGE_SHARED_MIME_INFO is not set # -# midori - disabled (requires Xorg(7)) +# Networking applications # -# 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 +# BR2_PACKAGE_ARGUS is not set +BR2_PACKAGE_AVAHI=y +BR2_PACKAGE_AVAHI_AUTOIPD=y +# BR2_PACKAGE_AVAHI_DAEMON is not set +# BR2_PACKAGE_AXEL is not set +# BR2_PACKAGE_BIND is not set +# BR2_PACKAGE_BMON is not set +BR2_PACKAGE_BRIDGE=y +# BR2_PACKAGE_CTORRENT is not set +# BR2_PACKAGE_CUPS is not set +BR2_PACKAGE_DNSMASQ=y +BR2_PACKAGE_DNSMASQ_TFTP=y +BR2_PACKAGE_DNSMASQ_DHCP=y +# BR2_PACKAGE_DNSMASQ_IDN is not set +BR2_PACKAGE_DROPBEAR=y +# BR2_PACKAGE_ETHTOOL is not set +# BR2_PACKAGE_HOSTAPD is not set +# BR2_PACKAGE_IFPLUGD is not set +# BR2_PACKAGE_IPERF is not set +# BR2_PACKAGE_IPROUTE2 is not set +# BR2_PACKAGE_IPSEC_TOOLS is not set +BR2_PACKAGE_IPTABLES=y +# BR2_PACKAGE_IW is not set +# BR2_PACKAGE_KISMET is not set +# BR2_PACKAGE_L2TP is not set +# BR2_PACKAGE_LINKS is not set +BR2_PACKAGE_LRZSZ=y +# BR2_PACKAGE_MIIDIAG is not set +# BR2_PACKAGE_MROUTED is not set +# BR2_PACKAGE_MUTT is not set +BR2_PACKAGE_NBD=y +BR2_NBD_CLIENT=y +# BR2_NBD_SERVER is not set +BR2_PACKAGE_NCFTP=y # -# Compressors / decompressors +# ncFTP tools selection # -BR2_PACKAGE_LZO=y -# 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 +# BR2_PACKAGE_NCFTP_GET is not set +# BR2_PACKAGE_NCFTP_PUT is not set +# BR2_PACKAGE_NCFTP_LS is not set +# BR2_PACKAGE_NCFTP_BATCH is not set +# BR2_PACKAGE_NCFTP_BOOKMARKS is not set +# BR2_PACKAGE_NETPLUG is not set +# BR2_PACKAGE_NETSNMP is not set +# BR2_PACKAGE_NETSTAT_NAT is not set +# BR2_PACKAGE_NFS_UTILS is not set +BR2_PACKAGE_NTP=y +# BR2_PACKAGE_NTP_SNTP is not set +# BR2_PACKAGE_OLSR is not set +# BR2_PACKAGE_OPENNTPD is not set +# BR2_PACKAGE_OPENSSH is not set +# BR2_PACKAGE_OPENVPN is not set +BR2_PACKAGE_PORTMAP=y +# 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=y +# BR2_PACKAGE_QUAGGA is not set +# BR2_PACKAGE_RSYNC is not set +# BR2_PACKAGE_SAMBA is not set +# BR2_PACKAGE_SER2NET is not set +# BR2_PACKAGE_SOCAT is not set +# BR2_PACKAGE_SPAWN_FCGI is not set +# BR2_PACKAGE_SQUID is not set +# BR2_PACKAGE_STUNNEL is not set +# BR2_PACKAGE_TCPDUMP is not set +# BR2_PACKAGE_DHCPDUMP is not set +# BR2_PACKAGE_TCPREPLAY is not set +# BR2_PACKAGE_TN5250 is not set +# BR2_PACKAGE_TTCP is not set +# BR2_PACKAGE_UDPCAST is not set +# 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=y +# BR2_PACKAGE_WPA_SUPPLICANT is not set # # Package managers @@ -645,47 +674,32 @@ BR2_PACKAGE_ZLIB=y # 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 +# Shell and utilities # -# 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_PACKAGE_AT is not set +# BR2_PACKAGE_DIALOG is not set +# BR2_PACKAGE_FILE is not set +# BR2_PACKAGE_LOCKFILE_PROGS is not set +# BR2_PACKAGE_LOGROTATE is not set +# BR2_PACKAGE_SCREEN is not set +# BR2_PACKAGE_SUDO is not set +# BR2_PACKAGE_WHICH is not set # -# Java +# System tools # -# BR2_PACKAGE_CLASSPATH is not set # -# Games +# Text editors and viewers # -# 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 +# BR2_PACKAGE_ED is not set +# BR2_PACKAGE_NANO is not set +# BR2_PACKAGE_UEMACS is not set # # Target filesystem options # -BR2_ROOTFS_PREFIX="rootfs" - -# -# filesystem for target device -# +BR2_ROOTFS_POST_BUILD_SCRIPT="" BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/atngw100/device_table.txt" # BR2_TARGET_ROOTFS_CRAMFS is not set # BR2_TARGET_ROOTFS_CLOOP is not set @@ -693,6 +707,7 @@ BR2_ROOTFS_DEVICE_TABLE="target/device/Atmel/atngw100/device_table.txt" 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_512_16K 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 @@ -705,8 +720,6 @@ BR2_TARGET_ROOTFS_JFFS2_NOCLEANMARKER=y # BR2_TARGET_ROOTFS_JFFS2_LE is not set BR2_TARGET_ROOTFS_JFFS2_BE=y # BR2_TARGET_ROOTFS_JFFS2_SUMMARY is not set - - # BR2_TARGET_ROOTFS_UBIFS is not set # BR2_TARGET_ROOTFS_SQUASHFS is not set BR2_TARGET_ROOTFS_TAR=y @@ -715,22 +728,24 @@ BR2_TARGET_ROOTFS_TAR_NONE=y # BR2_TARGET_ROOTFS_TAR_BZIP2 is not set # BR2_TARGET_ROOTFS_TAR_LZMA is not set BR2_TARGET_ROOTFS_TAR_OPTIONS="" - # BR2_TARGET_ROOTFS_CPIO is not set # BR2_TARGET_ROOTFS_INITRAMFS is not set # BR2_TARGET_ROOTFS_ROMFS is not set # -# bootloader for target device +# Bootloaders # BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="atngw100" +# BR2_TARGET_UBOOT_2010_03 is not set +# BR2_TARGET_UBOOT_2009_11 is not set +BR2_TARGET_UBOOT_2009_08=y +# BR2_TARGET_UBOOT_2009_06 is not set # 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_2008_10 is not set # BR2_TARGET_UBOOT_1_2_0_ATMEL is not set -BR2_UBOOT_VERSION="2008.10" +BR2_UBOOT_VERSION="2009.08" 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="" @@ -771,34 +786,27 @@ BR2_KERNEL_LINUX_ADVANCED=y BR2_PACKAGE_LINUX=y 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.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_PATCH_LEVEL="2" +BR2_KERNEL_CURRENT_VERSION="2.6.33.2" +BR2_KERNEL_LATEST_2_6_33="2" +BR2_KERNEL_LATEST_2_6_32="11" +BR2_KERNEL_LATEST_2_6_31="13" +BR2_KERNEL_LATEST_2_6_30="10" +BR2_KERNEL_LATEST_2_6_29="6" +BR2_KERNEL_LATEST_2_6_28="10" +BR2_KERNEL_LATEST_2_6_27="46" +BR2_KERNEL_PATCH_LEVEL="6" +BR2_KERNEL_NEXT_VERSION="2.6.30" 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_33 is not set +# BR2_LINUX_2_6_32 is not set +# BR2_LINUX_2_6_31 is not set +# BR2_LINUX_2_6_30 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 is not set -# BR2_LINUX_2_6_23 is not set -# 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_LINUX26_CUSTOM is not set # @@ -812,8 +820,6 @@ BR2_KERNEL_ADD_LATEST_MINORPATCH=y # BR2_KERNEL_ADD_RC_PATCH is not set # BR2_KERNEL_ADD_LATEST_SNAPSHOT is not set # BR2_KERNEL_ADD_SNAPSHOT is not set -# 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 is not set BR2_LINUX_BSP_PATCH="" diff --git a/docs/buildroot.html b/docs/buildroot.html index abe822f79..3702b449f 100644 --- a/docs/buildroot.html +++ b/docs/buildroot.html @@ -798,6 +798,8 @@ community support.</p> <li><a href="#manual-tutorial">Manual Makefile : tutorial</a></li> </ul> </li> + <li><a href="#gettext-integration">Gettext integration and + interaction with packages</a></li> </ul> <h3><a name="package-directory"></a>Package directory</h3> @@ -1583,6 +1585,62 @@ LIBFOO_POST_PATCH_HOOKS += LIBFOO_POST_PATCH_FIXUP line <a href="#ex2line40">40</a>, which is used by Buildroot to download, compile, and then install this package. </p> + <h3><a name="gettext-integration"></a>Gettext integration and + interaction with packages</h3> + + <p>Many packages that support internationalization use the gettext + library. Dependency on this library are fairly complicated and + therefore deserves a few explanations.</p> + + <p>The <i>uClibc</i> C library doesn't implement gettext + functionality, therefore with this C library, a separate gettext + must be compiled. On the other hand, the <i>glibc</i> C library + does integrate its own gettext, and in this case, the separate + gettext library should not be compiled, because it creates various + kind of build failures.</p> + + <p>Additionnaly, some packages (such as libglib2) do require + gettext unconditionnally, while other packages (those who + support <code>--disable-nls</code> in general) only require + gettext when locale support is enabled.</p> + + <p>Therefore, Buildroot defines two configuration options:</p> + + <ul> + <li><code>BR2_NEEDS_GETTEXT</code>, which is true as soon as the + toolchain doesn't provide its own gettext implementation</li> + + <li><code>BR2_NEEDS_GETTEXT_IF_LOCALE</code>, which is true if + the toolchain doesn't provide its own gettext implementation and + if locale support is enabled</li> + + </ul> + + <p>Therefore, packages that unconditionnally need gettext should:</p> + + <ol> + <li>Use <code>select BR2_PACKAGE_GNUTTEXT if + BR2_NEEDS_GETTEXT</code> and possibly <code>select + BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT</code> if libintl is + also needed</li> + + <li>Use <code>$(if $(BR2_NEEDS_GETTEXT),gettext)</code> in the + package <code>DEPENDENCIES</code> variable</li> + </ol> + + <p>Packages that need gettext only when locale support is enabled + should:</p> + + <ol> + <li>Use <code>select BR2_PACKAGE_GNUTTEXT if + BR2_NEEDS_GETTEXT_IF_LOCALE</code> and possibly <code>select + BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE</code> if + libintl is also needed</li> + + <li>Use <code>$(if + $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext)</code> in the + package <code>DEPENDENCIES</code> variable</li> + </ol> <h3>Conclusion</h3> diff --git a/fs/squashfs/squashfs.mk b/fs/squashfs/squashfs.mk index f11ba2090..a9041828d 100644 --- a/fs/squashfs/squashfs.mk +++ b/fs/squashfs/squashfs.mk @@ -8,10 +8,18 @@ ifeq ($(BR2_TARGET_ROOTFS_SQUASHFS4),y) ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs else ROOTFS_SQUASHFS_DEPENDENCIES = host-squashfs3 + +ifeq ($(BR2_ENDIAN),"BIG") +ROOTFS_SQUASHF_ARGS=-be +else +ROOTFS_SQUASHFS_ARGS=-le +endif + endif define ROOTFS_SQUASHFS_CMD - $(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $$@ -noappend + $(HOST_DIR)/usr/bin/mksquashfs $(TARGET_DIR) $$@ -noappend \ + $(ROOTFS_SQUASHFS_ARGS) endef -$(eval $(call ROOTFS_TARGET,squashfs))
\ No newline at end of file +$(eval $(call ROOTFS_TARGET,squashfs)) diff --git a/package/atk/Config.in b/package/atk/Config.in index e7f75b391..928fae746 100644 --- a/package/atk/Config.in +++ b/package/atk/Config.in @@ -1,5 +1,9 @@ config BR2_PACKAGE_ATK bool "atk" select BR2_PACKAGE_LIBGLIB2 + depends on BR2_USE_WCHAR # glib2 help The ATK accessibility toolkit, needed to build GTK+-2.x. + +comment "atk requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/avahi/Config.in b/package/avahi/Config.in index 338600515..eb3ccb67b 100644 --- a/package/avahi/Config.in +++ b/package/avahi/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_AVAHI bool "avahi" - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE + select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE help Avahi is a system which facilitates service discovery on a local network. diff --git a/package/avahi/avahi.mk b/package/avahi/avahi.mk index ca55e2786..66e2e6325 100644 --- a/package/avahi/avahi.mk +++ b/package/avahi/avahi.mk @@ -82,7 +82,7 @@ AVAHI_CONF_OPT = --localstatedir=/var \ --with-autoipd-user=default \ --with-autoipd-group=default -AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),gettext libintl) host-intltool +AVAHI_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-intltool ifneq ($(BR2_PACKAGE_AVAHI_DAEMON)$(BR2_PACKAGE_AVAHI_AUTOIPD),) AVAHI_DEPENDENCIES += libdaemon diff --git a/package/bmon/Config.in b/package/bmon/Config.in index f42d19ad6..667788bc0 100644 --- a/package/bmon/Config.in +++ b/package/bmon/Config.in @@ -1,5 +1,9 @@ config BR2_PACKAGE_BMON bool "bmon" + depends on BR2_INET_IPV6 select BR2_PACKAGE_NCURSES help Linux bandwidth monitor + +comment "bmon requires a toolchain with IPv6 support" + depends on !BR2_INET_IPV6 diff --git a/package/cairo/Config.in b/package/cairo/Config.in index e19efb5c4..752f61510 100644 --- a/package/cairo/Config.in +++ b/package/cairo/Config.in @@ -16,6 +16,7 @@ if BR2_PACKAGE_CAIRO config BR2_PACKAGE_CAIRO_PS bool "postscript support" select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_CAIRO_PDF config BR2_PACKAGE_CAIRO_PDF bool "pdf support" diff --git a/package/cdrkit/Config.in b/package/cdrkit/Config.in index 2e255819a..7ff50f3f4 100644 --- a/package/cdrkit/Config.in +++ b/package/cdrkit/Config.in @@ -1,11 +1,15 @@ config BR2_PACKAGE_CDRKIT - # Needed for libbz - select BR2_PACKAGE_BZIP2 - select BR2_PACKAGE_LIBCAP - bool "cdrkit" - help - cdrkit is a suite of programs for recording CDs and DVDs, - blanking CD-RW media, creating ISO-9660 filesystem images, - extracting audio CD data, and more. + # Needed for libbz + select BR2_PACKAGE_BZIP2 + select BR2_PACKAGE_LIBCAP + depends on BR2_LARGEFILE + bool "cdrkit" + help + cdrkit is a suite of programs for recording CDs and DVDs, + blanking CD-RW media, creating ISO-9660 filesystem images, + extracting audio CD data, and more. - http://www.cdrkit.org/ + http://www.cdrkit.org/ + +comment "cdrkit requires a toolchain with LARGEFILE support" + depends on !BR2_LARGEFILE diff --git a/package/config/Makefile.kconfig b/package/config/Makefile.kconfig index 6974cc3b5..6d89e597e 100644 --- a/package/config/Makefile.kconfig +++ b/package/config/Makefile.kconfig @@ -149,10 +149,15 @@ ifeq ($(gconf-target),1) 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 gconf.glade.h -clean-files += mconf qconf gconf -clean-files += config.pot linux.pot +clean-files := lkc_defs.h qconf.moc .tmp_qtcheck \ + .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h +clean-files += config.pot linux.pot +clean-files += conf $(conf-objs) +clean-files += mconf $(mconf-objs) +clean-files += qconf qconf.o +clean-files += gconf gconf.o +clean-files += kconfig_load.o zconf.tab.o +clean-files += $(kxgettext-objs) # Check that we have the required ncurses stuff installed for lxdialog (menuconfig) PHONY += $(obj)/dochecklxdialog diff --git a/package/dbus-glib/Config.in b/package/dbus-glib/Config.in index 7c992b03e..c019be73b 100644 --- a/package/dbus-glib/Config.in +++ b/package/dbus-glib/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_DBUS_GLIB bool "dbus-glib" depends on BR2_PACKAGE_DBUS depends on BR2_DBUS_EXPAT + depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 help GLib bindings for D-Bus. @@ -10,3 +11,6 @@ config BR2_PACKAGE_DBUS_GLIB comment "dbus-glib needs dbus to be compiled with expat support" depends on BR2_PACKAGE_DBUS && !BR2_DBUS_EXPAT + +comment "dbus-glib requires a toolchain with WCHAR support" + depends on BR2_PACKAGE_DBUS && !BR2_USE_WCHAR diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in index f5705a544..91c127d05 100644 --- a/package/dbus-python/Config.in +++ b/package/dbus-python/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_DBUS_PYTHON bool "dbus-python" + depends on BR2_USE_WCHAR # glib2 depends on BR2_PACKAGE_DBUS depends on BR2_PACKAGE_PYTHON select BR2_PACKAGE_DBUS_GLIB @@ -7,3 +8,6 @@ config BR2_PACKAGE_DBUS_PYTHON Python bindings for D-Bus http://dbus.freedesktop.org/doc/dbus-python/ + +comment "dbus-python requires a toolchain with WCHAR support" + depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON && !BR2_USE_WCHAR diff --git a/package/docker/Config.in b/package/docker/Config.in index 02ef83c2e..75bf5bede 100644 --- a/package/docker/Config.in +++ b/package/docker/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_DOCKER bool "docker" depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 help a system tray dock for X http://icculus.org/openbox/2/docker + +comment "docker requires a toolchain with WCHAR support" + depends on BR2_PACKAGE_XORG7 && !BR2_USE_WCHAR diff --git a/package/enchant/Config.in b/package/enchant/Config.in index e65d68116..33f36db41 100644 --- a/package/enchant/Config.in +++ b/package/enchant/Config.in @@ -1,9 +1,13 @@ config BR2_PACKAGE_ENCHANT bool "enchant" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 help Enchant is a spell-checking library that provides a consistent API across a number of spell-checking system backends. http://www.abisource.com/projects/enchant/ + +comment "enchant requires a toolchain with C++ and WCHAR support enabled" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR diff --git a/package/gamin/Config.in b/package/gamin/Config.in index d4e9bcc79..3ede2e4d7 100644 --- a/package/gamin/Config.in +++ b/package/gamin/Config.in @@ -1,7 +1,11 @@ config BR2_PACKAGE_GAMIN bool "gamin" + depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 help the File Alteration Monitor http://www.gnome.org/~veillard/gamin/sources + +comment "gamin requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/gettext/Config.in b/package/gettext/Config.in index c6792acd7..c1ae97f61 100644 --- a/package/gettext/Config.in +++ b/package/gettext/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_GETTEXT bool "gettext" depends on BR2_NEEDS_GETTEXT + depends on BR2_USE_WCHAR help The GNU `gettext' utilities are a set of tools that provide a framework to help other GNU packages produce multi-lingual @@ -8,6 +9,9 @@ config BR2_PACKAGE_GETTEXT http://www.gnu.org/software/gettext/ +comment "gettext requires a toolchain with WCHAR support" + depends on BR2_NEEDS_GETTEXT && !BR2_USE_WCHAR + config BR2_PACKAGE_GETTEXT_STATIC bool "Use libgettext.a instead of libgettext.so.*" depends on BR2_PACKAGE_GETTEXT diff --git a/package/gmpc/Config.in b/package/gmpc/Config.in index 056f5a077..7bfe611ea 100644 --- a/package/gmpc/Config.in +++ b/package/gmpc/Config.in @@ -1,9 +1,10 @@ config BR2_PACKAGE_GMPC bool "gmpc" depends on BR2_PACKAGE_LIBGTK2 + depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE + select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_LIBMPD select BR2_PACKAGE_LIBCURL @@ -14,3 +15,6 @@ config BR2_PACKAGE_GMPC Music Player Daemon. http://gmpcwiki.sarine.nl/index.php?title=GMPC + +comment "gmpc requires a toolchain with WCHAR support" + depends on BR2_PACKAGE_LIBGTK2 && !BR2_USE_WCHAR diff --git a/package/gmpc/gmpc.mk b/package/gmpc/gmpc.mk index aa74a2e2f..6016e7cfc 100644 --- a/package/gmpc/gmpc.mk +++ b/package/gmpc/gmpc.mk @@ -12,7 +12,7 @@ GMPC_CONF_ENV = ac_cv_lib_curl_curl_global_init=yes \ GMPC_CONF_OPT = --disable-mmkeys GMPC_DEPENDENCIES = libglib2 libgtk2 libglade libcurl libmpd host-gob2 host-intltool \ - $(if $(BR2_NEEDS_GETTEXT),gettext libintl) + $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) ifeq ($(BR2_PACKAGE_XLIB_LIBSM),y) GMPC_DEPENENCIES += xlib_libSM diff --git a/package/gob2/Config.in b/package/gob2/Config.in index 2545bafa6..562ac3123 100644 --- a/package/gob2/Config.in +++ b/package/gob2/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_GOB2 bool "gob2" + depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_FLEX select BR2_PACKAGE_FLEX_LIBFL @@ -9,3 +10,6 @@ config BR2_PACKAGE_GOB2 the writing of GObjects in C. http://www.jirka.org/gob.html + +comment "gob2 requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/gob2/gob2.mk b/package/gob2/gob2.mk index 5d50ed6cb..04b3798f7 100644 --- a/package/gob2/gob2.mk +++ b/package/gob2/gob2.mk @@ -6,6 +6,7 @@ GOB2_VERSION = 2.0.15 GOB2_SOURCE = gob2-$(GOB2_VERSION).tar.gz GOB2_SITE = http://ftp.5z.com/pub/gob/ +IPERF_CONF_ENV = ac_cv_lib_lex=-lfl GOB2_DEPENDENCIES = libglib2 flex bison host-pkg-config host-flex diff --git a/package/grep/Config.in b/package/grep/Config.in index f898fdf4a..430616b18 100644 --- a/package/grep/Config.in +++ b/package/grep/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_GREP bool "grep" - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE + select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE help The GNU regular expression matcher. diff --git a/package/grep/grep.mk b/package/grep/grep.mk index 93c6cafdd..5b945d5f2 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -8,6 +8,6 @@ GREP_SOURCE:=grep-$(GREP_VERSION).tar.bz2 GREP_SITE:=$(BR2_GNU_MIRROR)/grep GREP_CONF_OPT = --disable-perl-regexp --without-included-regex -GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),gettext libintl) +GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) $(eval $(call AUTOTARGETS,package,grep)) diff --git a/package/gvfs/Config.in b/package/gvfs/Config.in index 8a541e751..04fce93fa 100644 --- a/package/gvfs/Config.in +++ b/package/gvfs/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_GVFS bool "gvfs" depends on BR2_LARGEFILE + depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_EXPAT # needed by dbus(-glib) select BR2_PACKAGE_DBUS @@ -15,5 +16,5 @@ config BR2_PACKAGE_GVFS http://en.wikipedia.org/wiki/GVFS -comment "gvfs requires a toolchain with LARGEFILE support" - depends on !BR2_LARGEFILE +comment "gvfs requires a toolchain with LARGEFILE and WCHAR support" + depends on !BR2_LARGEFILE || !BR2_USE_WCHAR diff --git a/package/hal/Config.in b/package/hal/Config.in index 9518f1355..f8dc9dd8a 100644 --- a/package/hal/Config.in +++ b/package/hal/Config.in @@ -1,9 +1,10 @@ config BR2_PACKAGE_HAL bool "hal" + depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_EXPAT select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE + select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS_EXPAT @@ -13,3 +14,6 @@ config BR2_PACKAGE_HAL select BR2_PACKAGE_UDEV_VOLUME_ID help The Hardware Abstraction Layer (HAL) suite. + +comment "hal requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/hal/hal.mk b/package/hal/hal.mk index 62eca704a..801fe9275 100644 --- a/package/hal/hal.mk +++ b/package/hal/hal.mk @@ -79,7 +79,7 @@ $(TARGET_DIR)/$(HAL_TARGET_BINARY): $(HAL_DIR)/hald/hald rm -f $(TARGET_DIR)/usr/libexec/$$file; \ done -hal: host-pkg-config host-libxml-parser-perl dbus-glib hwdata udev $(if $(BR2_NEEDS_GETTEXT),gettext libintl) $(TARGET_DIR)/$(HAL_TARGET_BINARY) +hal: host-pkg-config host-libxml-parser-perl dbus-glib hwdata udev $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) $(TARGET_DIR)/$(HAL_TARGET_BINARY) hal-clean: rm -f $(TARGET_DIR)/etc/dbus-1/system.d/hal.conf diff --git a/package/icu/icu-both-elif-no-arguments.patch b/package/icu/icu-both-elif-no-arguments.patch new file mode 100644 index 000000000..8941c53b1 --- /dev/null +++ b/package/icu/icu-both-elif-no-arguments.patch @@ -0,0 +1,23 @@ +[PATCH] icu: fix #elif without arguments + +ParagraphLayout.cpp contains an #elif without any arguments, which +g++ >= 4.4 flags as an error. Fix it by replacing it with an #else. + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> +--- + source/layoutex/ParagraphLayout.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: source/layoutex/ParagraphLayout.cpp +=================================================================== +--- source.orig/layoutex/ParagraphLayout.cpp ++++ source/layoutex/ParagraphLayout.cpp +@@ -813,7 +813,7 @@ le_int32 ParagraphLayout::getLanguageCod + + return nullLanguageCode; + } +-#elif ++#else + + // TODO - dummy implementation for right now... + le_int32 ParagraphLayout::getLanguageCode(const Locale *locale) diff --git a/package/icu/icu.mk b/package/icu/icu.mk index 589c31fbb..17f153e64 100644 --- a/package/icu/icu.mk +++ b/package/icu/icu.mk @@ -21,6 +21,7 @@ $(ICU_DIR)/.unpacked: $(DL_DIR)/$(ICU_SOURCE) $(CONFIG_UPDATE) $(ICU_DIR) cp -a $(BUILD_DIR)/icu $(BUILD_DIR)/icu-host toolchain/patch-kernel.sh $(ICU_DIR) package/icu/ \*.patch + toolchain/patch-kernel.sh $(ICU_HOST_DIR) package/icu/ \*both\*.patch touch $(ICU_DIR)/.unpacked $(ICU_HOST_DIR)/.configured: $(ICU_DIR)/.unpacked @@ -45,13 +46,13 @@ $(ICU_DIR)/.configured: $(ICU_HOST_DIR)/.configured touch $(ICU_DIR)/.configured $(ICU_HOST_DIR)/.done: $(ICU_DIR)/.configured - $(MAKE) -C $(ICU_HOST_DIR) + $(MAKE1) -C $(ICU_HOST_DIR) ln -s -f $(ICU_HOST_DIR)/bin $(ICU_DIR)/bin-host ln -s -f $(ICU_HOST_DIR)/lib $(ICU_DIR)/lib-host touch $(ICU_HOST_DIR)/.done $(ICU_DIR)/.done: $(ICU_HOST_DIR)/.done - $(MAKE) -C $(ICU_DIR) + $(MAKE1) -C $(ICU_DIR) $(MAKE) -C $(ICU_DIR) install DESTDIR=$(STAGING_DIR) $(MAKE) -C $(ICU_DIR) install DESTDIR=$(TARGET_DIR) $(SED) "s,^default_prefix=.*,default_prefix=\'$(STAGING_DIR)/usr\',g" $(STAGING_DIR)/usr/bin/icu-config diff --git a/package/iperf/iperf.mk b/package/iperf/iperf.mk index 10e5a3783..3f8e3fc8c 100644 --- a/package/iperf/iperf.mk +++ b/package/iperf/iperf.mk @@ -14,7 +14,9 @@ IPERF_INSTALL_STAGING = NO IPERF_INSTALL_TARGET = YES IPERF_CONF_ENV = \ - ac_cv_func_malloc_0_nonnull=yes + ac_cv_func_malloc_0_nonnull=yes \ + ac_cv_type_bool=yes \ + ac_cv_sizeof_bool=1 IPERF_CONF_OPT = \ --disable-dependency-tracking \ diff --git a/package/libglade/Config.in b/package/libglade/Config.in index 2fb6eb60a..f7a9a1ce0 100644 --- a/package/libglade/Config.in +++ b/package/libglade/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBGLADE bool "libglade" depends on BR2_PACKAGE_LIBGTK2 + depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_ATK select BR2_PACKAGE_LIBXML2 @@ -10,3 +11,6 @@ config BR2_PACKAGE_LIBGLADE by far the easiest way to create the interface files. http://ftp.gnome.org/pub/GNOME/sources/libglade/ + +comment "libglade requires a toolchain with WCHAR support" + depends on BR2_PACKAGE_LIBGTK2 && !BR2_USE_WCHAR diff --git a/package/libglib2/Config.in b/package/libglib2/Config.in index cc1d6e27b..43ca7c007 100644 --- a/package/libglib2/Config.in +++ b/package/libglib2/Config.in @@ -3,7 +3,11 @@ config BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE + depends on BR2_USE_WCHAR # gettext help Low-level core library that forms the basis of GTK+ and GNOME. http://www.gtk.org/ + +comment "libglib2 requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in index 5c0482d61..5eec77a5c 100644 --- a/package/libgtk2/Config.in +++ b/package/libgtk2/Config.in @@ -7,7 +7,11 @@ config BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_PANGO depends on BR2_PACKAGE_XORG7||BR2_PACKAGE_DIRECTFB + depends on BR2_USE_WCHAR # glib2 help The GTK+ version 2 graphical user interface library http://www.gtk.org/ + +comment "libgtk2 requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/libidn/Config.in b/package/libidn/Config.in index 793fbc3d2..04f890072 100644 --- a/package/libidn/Config.in +++ b/package/libidn/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBIDN bool "libidn" + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help Libidn's purpose is to encode and decode internationalized domain names. diff --git a/package/libidn/libidn.mk b/package/libidn/libidn.mk index bc8e00140..4b3bea3a5 100644 --- a/package/libidn/libidn.mk +++ b/package/libidn/libidn.mk @@ -10,7 +10,7 @@ LIBIDN_INSTALL_STAGING = YES LIBIDN_INSTALL_TARGET = YES LIBIDN_CONF_OPT = --enable-shared --disable-java --enable-csharp=no LIBIDN_LIBTOOL_PATCH = NO -LIBIDN_DEPENDENCIES = host-pkg-config $(if $(BR2_NEEDS_GETTEXT),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv) +LIBIDN_DEPENDENCIES = host-pkg-config $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(if $(BR2_PACKAGE_LIBICONV),libiconv) $(eval $(call AUTOTARGETS,package,libidn)) diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in index 6bccd1116..2264b63cc 100644 --- a/package/libsoup/Config.in +++ b/package/libsoup/Config.in @@ -1,10 +1,16 @@ config BR2_PACKAGE_LIBSOUP bool "libsoup" + depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBGLIB2 + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT + select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT help libsoup is an HTTP client/server library. It uses GObject and the GLib main loop, to integrate well with GNOME applications. http://live.gnome.org/LibSoup + +comment "libsoup requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/libsoup/libsoup.mk b/package/libsoup/libsoup.mk index 45f62e8e4..9757698be 100644 --- a/package/libsoup/libsoup.mk +++ b/package/libsoup/libsoup.mk @@ -26,6 +26,6 @@ LIBSOUP_CONF_OPT = \ --without-gnome \ --disable-gtk-doc -LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),gettext libintl) host-pkg-config host-libglib2 libglib2 libxml2 +LIBSOUP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config host-libglib2 libglib2 libxml2 $(eval $(call AUTOTARGETS,package,libsoup)) diff --git a/package/lmbench/Config.in b/package/lmbench/Config.in index d09a333c9..c8423d1ef 100644 --- a/package/lmbench/Config.in +++ b/package/lmbench/Config.in @@ -9,4 +9,4 @@ config BR2_PACKAGE_LMBENCH http://sourceforge.net/projects/lmbench/ comment "lmbench requires a toolchain with RPC support" - depends on !BR2_INET_RPC + depends on !BR2_INET_RPC diff --git a/package/lsof/Config.in b/package/lsof/Config.in index cc7512c25..22b7f5eac 100644 --- a/package/lsof/Config.in +++ b/package/lsof/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_LSOF bool "lsof" + depends on BR2_INET_RPC help lsof (LiSt Open Files) The lsof tool lists information about files opened by processes. ftp://lsof.itap.purdue.edu/pub/tools/unix/lsof/ + +comment "lsof requires a toolchain with RPC support" + depends on !BR2_INET_RPC diff --git a/package/make/Config.in b/package/make/Config.in index 674e245e9..364bb1e18 100644 --- a/package/make/Config.in +++ b/package/make/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_MAKE bool "make" - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE + select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE help A tool which controls the generation of executables and other non-source files of a program from the program's source files. diff --git a/package/make/make.mk b/package/make/make.mk index 5dd06379f..0b2657d3f 100644 --- a/package/make/make.mk +++ b/package/make/make.mk @@ -56,7 +56,7 @@ $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY): $(GNUMAKE_DIR)/$(GNUMAKE_BINARY) rm -rf $(TARGET_DIR)/share/locale $(TARGET_DIR)/usr/info \ $(TARGET_DIR)/usr/man $(TARGET_DIR)/usr/share/doc -make: $(if $(BR2_NEEDS_GETTEXT),gettext) $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY) +make: $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext) $(TARGET_DIR)/$(GNUMAKE_TARGET_BINARY) make-clean: $(MAKE) DESTDIR=$(TARGET_DIR) -C $(GNUMAKE_DIR) uninstall diff --git a/package/metacity/Config.in b/package/metacity/Config.in index 12c54d117..c483c44e2 100644 --- a/package/metacity/Config.in +++ b/package/metacity/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_METACITY bool "metacity" - select BR2_PACKAGE_LIBGTK2 + depends on BR2_PACKAGE_LIBGTK2 depends on BR2_PACKAGE_XORG7 help Metacity is a window manager for the X Window System. diff --git a/package/mtd/Config.in b/package/mtd/Config.in index 0ba71d333..692654ca8 100644 --- a/package/mtd/Config.in +++ b/package/mtd/Config.in @@ -79,8 +79,12 @@ config BR2_PACKAGE_MTD_NFTL_FORMAT bool "nftl_format" config BR2_PACKAGE_MTD_RECV_IMAGE + depends on BR2_INET_IPV6 bool "recv_image" +comment "recv_image requires a toolchain with IPv6 support" + depends on !BR2_INET_IPV6 + config BR2_PACKAGE_MTD_RFDDUMP bool "rfddump" diff --git a/package/multimedia/gst-plugins-bad/Config.in b/package/multimedia/gst-plugins-bad/Config.in index 3d2480af6..e25b756df 100644 --- a/package/multimedia/gst-plugins-bad/Config.in +++ b/package/multimedia/gst-plugins-bad/Config.in @@ -58,7 +58,11 @@ config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DTMF config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDNAV bool "dvdnav" - select BR2_PACKAGE_LIBDVDNAV + depends on BR2_LARGEFILE # libdvdread + select BR2_PACKAGE_LIBDVDNAV + +comment "dvdnav requires a toolchain with LARGEFILE support" + depends on !BR2_LARGEFILE config BR2_PACKAGE_GST_PLUGINS_BAD_PLUGIN_DVDSPU bool "dvdspu" diff --git a/package/multimedia/gst-plugins-base/gst-plugins-base.mk b/package/multimedia/gst-plugins-base/gst-plugins-base.mk index 4d7f6dbc4..5cb8cb870 100644 --- a/package/multimedia/gst-plugins-base/gst-plugins-base.mk +++ b/package/multimedia/gst-plugins-base/gst-plugins-base.mk @@ -23,7 +23,8 @@ GST_PLUGINS_BASE_CONF_OPT = \ --disable-vorbistest \ --disable-freetypetest -GST_PLUGINS_BASE_DEPENDENCIES = gstreamer liboil +GST_PLUGINS_BASE_DEPENDENCIES = gstreamer liboil \ + $(if $(BR2_PACKAGE_ALSA_LIB),alsa-lib) ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE_PLUGIN_ADDER),y) GST_PLUGINS_BASE_CONF_OPT += --enable-adder diff --git a/package/multimedia/gstreamer/Config.in b/package/multimedia/gstreamer/Config.in index 8c8080173..a3ce85957 100644 --- a/package/multimedia/gstreamer/Config.in +++ b/package/multimedia/gstreamer/Config.in @@ -1,11 +1,15 @@ config BR2_PACKAGE_GSTREAMER bool "gstreamer" + depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 help GStreamer is an open source multimedia framework. http://gstreamer.freedesktop.org/ +comment "gstreamer requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR + config BR2_PACKAGE_GSTREAMER_LIBXML2 bool "require libxml2 for registry and load/save" default y diff --git a/package/multimedia/libdvdnav/Config.in b/package/multimedia/libdvdnav/Config.in index c4d73a031..5ba31e875 100644 --- a/package/multimedia/libdvdnav/Config.in +++ b/package/multimedia/libdvdnav/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBDVDNAV bool "libdvdnav" + depends on BR2_LARGEFILE # libdvdread select BR2_PACKAGE_LIBDVDREAD help libdvdnav is a library that allows easy use of sophisticated @@ -7,3 +8,6 @@ config BR2_PACKAGE_LIBDVDNAV playback and even interactive DVD games. http://www.mplayerhq.hu + +comment "libdvdnav requires a toolchain with LARGEFILE support" + depends on !BR2_LARGEFILE diff --git a/package/multimedia/libdvdread/Config.in b/package/multimedia/libdvdread/Config.in index dea59eb05..b63f08286 100644 --- a/package/multimedia/libdvdread/Config.in +++ b/package/multimedia/libdvdread/Config.in @@ -1,7 +1,11 @@ config BR2_PACKAGE_LIBDVDREAD bool "libdvdread" + depends on BR2_LARGEFILE help libdvdread provides a simple foundation for reading DVD-Video images. http://www.mplayerhq.hu/MPlayer/releases/dvdnav/ + +comment "libdvdread requires a toolchain with LARGEFILE support" + depends on !BR2_LARGEFILE diff --git a/package/multimedia/libmms/Config.in b/package/multimedia/libmms/Config.in index 02055c4c2..17cb406a6 100644 --- a/package/multimedia/libmms/Config.in +++ b/package/multimedia/libmms/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBMMS bool "libmms" + depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 help LibMMS is a common library for parsing mms:// and mmsh:// @@ -9,3 +10,6 @@ config BR2_PACKAGE_LIBMMS all. http://launchpad.net/libmms + +comment "libmms requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/multimedia/libmpd/Config.in b/package/multimedia/libmpd/Config.in index 4f3a7144f..9259c19ee 100644 --- a/package/multimedia/libmpd/Config.in +++ b/package/multimedia/libmpd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBMPD bool "libmpd" + depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help @@ -8,3 +9,6 @@ config BR2_PACKAGE_LIBMPD access to Music Player Daemon (mpd). http://gmpcwiki.sarine.nl/index.php?title=Libmpd + +comment "libmpd requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/multimedia/swfdec/Config.in b/package/multimedia/swfdec/Config.in index 7a51e2efa..2a79756d1 100644 --- a/package/multimedia/swfdec/Config.in +++ b/package/multimedia/swfdec/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_SWFDEC bool "swfdec" + depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBOIL select BR2_PACKAGE_ALSA_LIB select BR2_PACKAGE_PANGO @@ -15,6 +16,7 @@ config BR2_PACKAGE_SWFDEC_GTK_SUPPORT depends on BR2_PACKAGE_SWFDEC depends on BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_LIBSOUP + default y help Swfdec-gtk library is used for easy integration of swfdec in GTK applications @@ -22,8 +24,11 @@ config BR2_PACKAGE_SWFDEC_GTK_SUPPORT config BR2_PACKAGE_SWFDEC_GSTREAMER bool "gstreamer support" depends on BR2_PACKAGE_SWFDEC - select BR2_PACKAGE_GSTREAMER + depends on BR2_PACKAGE_GSTREAMER select BR2_PACKAGE_GST_PLUGINS_BASE + default y help Enables GStreamer support +comment "swfdec requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/mutt/Config.in b/package/mutt/Config.in index d345dfe15..754979a6a 100644 --- a/package/mutt/Config.in +++ b/package/mutt/Config.in @@ -1,8 +1,11 @@ config BR2_PACKAGE_MUTT - bool "mutt (BROKEN for wchar; FIXME!)" + bool "mutt" + depends on BR2_USE_WCHAR select BR2_PACKAGE_NCURSES help Mutt is a sophisticated text-based Mail User Agent (MUA) http://www.mutt.org/ +comment "mutt requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/nbd/Config.in b/package/nbd/Config.in index 66c24afa3..6e92f935d 100644 --- a/package/nbd/Config.in +++ b/package/nbd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_NBD bool "nbd" + depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 help NBD is a set of utilities to configure network block devices, @@ -9,6 +10,9 @@ config BR2_PACKAGE_NBD http://nbd.sf.net/ +comment "nbd requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR + if BR2_PACKAGE_NBD config BR2_NBD_CLIENT diff --git a/package/ntfsprogs/Config.in b/package/ntfsprogs/Config.in index 38b955e56..836a2b6fe 100644 --- a/package/ntfsprogs/Config.in +++ b/package/ntfsprogs/Config.in @@ -1,10 +1,11 @@ config BR2_PACKAGE_NTFSPROGS bool "ntfsprogs" depends on BR2_USE_WCHAR + depends on BR2_LARGEFILE help wide collection of NTFS utilities http://www.linux-ntfs.org/ -comment "ntfsprogs requires a toolchain with WCHAR support" - depends on !BR2_USE_WCHAR +comment "ntfsprogs requires a toolchain with WCHAR and LARGEFILE support" + depends on !BR2_USE_WCHAR || !BR2_LARGEFILE diff --git a/package/olsr/Config.in b/package/olsr/Config.in index ca45f73bd..ada82b406 100644 --- a/package/olsr/Config.in +++ b/package/olsr/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_OLSR bool "OLSR mesh networking Daemon" + depends on BR2_INET_IPV6 help The Optimized Link State Routing protocol (OLSR) is a routing protocol that is optimised for mobile ad-hoc @@ -9,3 +10,6 @@ config BR2_PACKAGE_OLSR compute optimal forwarding paths locally. http://www.olsr.org/ + +comment "olsr requires a toolchain with IPv6 support" + depends on !BR2_INET_IPV6 diff --git a/package/pango/Config.in b/package/pango/Config.in index bf2fc6e70..e4c084d0c 100644 --- a/package/pango/Config.in +++ b/package/pango/Config.in @@ -1,8 +1,11 @@ config BR2_PACKAGE_PANGO bool "pango" + depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_EXPAT select BR2_PACKAGE_CAIRO + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE + select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE help Pango is a library for laying out and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that @@ -11,3 +14,6 @@ config BR2_PACKAGE_PANGO core of text and font handling for GTK+-2.x. http://www.pango.org/ + +comment "pango requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/pango/pango.mk b/package/pango/pango.mk index c64004584..ad3824661 100644 --- a/package/pango/pango.mk +++ b/package/pango/pango.mk @@ -40,7 +40,7 @@ PANGO_CONF_ENV = ac_cv_func_posix_getpwuid_r=yes glib_cv_stack_grows=no \ PANGO_CONF_OPT = --enable-shared --enable-static \ --enable-explicit-deps=no --disable-debug -PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT),gettext libintl) host-pkg-config libglib2 cairo +PANGO_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) host-pkg-config libglib2 cairo ifeq ($(BR2_PACKAGE_XORG7),y) PANGO_CONF_OPT += --with-x \ diff --git a/package/pciutils/pciutils.mk b/package/pciutils/pciutils.mk index 2b999dfb5..a7d999664 100644 --- a/package/pciutils/pciutils.mk +++ b/package/pciutils/pciutils.mk @@ -15,6 +15,7 @@ PCIUTILS_DNS=no PCIUTILS_SHARED=yes define PCIUTILS_CONFIGURE_CMDS + $(SED) 's/wget --no-timestamping/wget/' $(PCIUTILS_DIR)/update-pciids.sh $(SED) 's/uname -s/echo Linux/' \ -e 's/uname -r/echo $(LINUX_HEADERS_VERSION)/' \ $(PCIUTILS_DIR)/lib/configure @@ -32,7 +33,7 @@ define PCIUTILS_BUILD_CMDS SHARED=$(PCIUTILS_SHARED) \ ZLIB=$(PCIUTILS_ZLIB) \ DNS=$(PCIUTILS_DNS) \ - SHAREDIR=/usr/share/misc + PREFIX=/usr endef # Ditch install-lib if SHARED is an option in the future diff --git a/package/pcmanfm/Config.in b/package/pcmanfm/Config.in index 9a00bc0e8..c8b4debff 100644 --- a/package/pcmanfm/Config.in +++ b/package/pcmanfm/Config.in @@ -1,11 +1,15 @@ config BR2_PACKAGE_PCMANFM bool "pcmanfm" depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_GAMIN select BR2_PACKAGE_STARTUP_NOTIFICATION - select BR2_PACKAGE_LIBGTK2 + depends on BR2_PACKAGE_LIBGTK2 help An extremly fast and lightweight file manager which features tabbed browsing and user-friendly interface. http://internap.dl.sourceforge.net/sourceforge/pcmanfm + +comment "pcmanfm requires a toolchain with WCHAR support" + depends on BR2_PACKAGE_XORG7 && !BR2_USE_WCHAR diff --git a/package/php/Config.ext b/package/php/Config.ext index 2fbd05e8a..0f5b98205 100644 --- a/package/php/Config.ext +++ b/package/php/Config.ext @@ -68,9 +68,13 @@ config BR2_PACKAGE_PHP_EXT_FTP config BR2_PACKAGE_PHP_EXT_GETTEXT bool "gettext" select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT + depends on BR2_USE_WCHAR help gettext support +comment "gettext support requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR + config BR2_PACKAGE_PHP_EXT_GMP bool "gmp" select BR2_PACKAGE_LIBGMP diff --git a/package/pkg-config/Config.in b/package/pkg-config/Config.in index 8ec805527..eae0a21f2 100644 --- a/package/pkg-config/Config.in +++ b/package/pkg-config/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_PKG_CONFIG bool "pkg-config" + depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 help pkg-config is a system for managing library compile/link @@ -8,3 +9,6 @@ config BR2_PACKAGE_PKG_CONFIG single tool. http://www.freedesktop.org/software/pkgconfig/ + +comment "pkg-config requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/psmisc/Config.in b/package/psmisc/Config.in index 31e982c64..a13820426 100644 --- a/package/psmisc/Config.in +++ b/package/psmisc/Config.in @@ -1,8 +1,8 @@ config BR2_PACKAGE_PSMISC bool "psmisc" select BR2_PACKAGE_NCURSES - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE + select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE help Helpful /proc related utilities such as pstree, fuser, and killall diff --git a/package/psmisc/psmisc.mk b/package/psmisc/psmisc.mk index b82883fa9..e4301da98 100644 --- a/package/psmisc/psmisc.mk +++ b/package/psmisc/psmisc.mk @@ -7,6 +7,6 @@ PSMISC_VERSION:=22.8 PSMISC_SOURCE:=psmisc-$(PSMISC_VERSION).tar.gz PSMISC_SITE:=http://$(BR2_SOURCEFORGE_MIRROR).dl.sourceforge.net/sourceforge/psmisc PSMISC_AUTORECONF:=NO -PSMISC_DEPENDENCIES:=ncurses $(if $(BR2_NEEDS_GETTEXT),gettext libintl) +PSMISC_DEPENDENCIES:=ncurses $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) $(eval $(call AUTOTARGETS,package,psmisc)) diff --git a/package/qt/Config.in b/package/qt/Config.in index 4371fc36e..b09d6429c 100644 --- a/package/qt/Config.in +++ b/package/qt/Config.in @@ -243,7 +243,7 @@ config BR2_PACKAGE_QT_EMB_PLATFORM default "x86_64" if BR2_x86_64 default "mips" if BR2_mips default "mips" if BR2_mipsel - default "ppc" if BR2_powerpc + default "powerpc" if BR2_powerpc # Not that I really believe these will work.. default "generic" if BR2_alpha default "generic" if BR2_chris @@ -263,13 +263,17 @@ endif config BR2_PACKAGE_QT_PHONON bool "Phonon Module" - select BR2_PACKAGE_GSTREAMER + depends on BR2_PACKAGE_GSTREAMER select BR2_PACKAGE_GST_PLUGINS_BASE + default y help Build the Phonon module. Support for different audio/video formats can be configured at the GStreamer package. If unsure, say n. +comment "Phonon module needs gstreamer" + depends on !BR2_PACKAGE_GSTREAMER + config BR2_PACKAGE_QT_PHONON_BACKEND bool "Phonon Module Backend" depends on BR2_PACKAGE_QT_PHONON diff --git a/package/shared-mime-info/Config.in b/package/shared-mime-info/Config.in index adc835ad0..b08c1fdaa 100644 --- a/package/shared-mime-info/Config.in +++ b/package/shared-mime-info/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_SHARED_MIME_INFO bool "shared-mime-info" + depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBXML2 help @@ -8,3 +9,6 @@ config BR2_PACKAGE_SHARED_MIME_INFO command used to extend it. http://freedesktop.org/wiki/Software/shared-mime-info + +comment "shared-mime-info requires a toolchain with WCHAR support" + depends on !BR2_USE_WCHAR diff --git a/package/squashfs/Config.in b/package/squashfs/Config.in index 3080cc3ab..f83100f0f 100644 --- a/package/squashfs/Config.in +++ b/package/squashfs/Config.in @@ -1,6 +1,10 @@ config BR2_PACKAGE_SQUASHFS bool "squashfs" + depends on BR2_LARGEFILE help Tools to generate SquashFS filesystems. http://squashfs.sourceforge.net/ + +comment "squashfs requires a toolchain with LARGEFILE support" + depends on !BR2_LARGEFILE diff --git a/package/squashfs3/Config.in b/package/squashfs3/Config.in index 2f7033dd8..32912722f 100644 --- a/package/squashfs3/Config.in +++ b/package/squashfs3/Config.in @@ -1,7 +1,11 @@ config BR2_PACKAGE_SQUASHFS3 bool "squashfs3" depends on BR2_DEPRECATED + depends on BR2_LARGEFILE help Tools to generate SquashFS 3.x filesystems. http://squashfs.sourceforge.net/ + +comment "squashfs3 requires a toolchain with LARGEFILE support" + depends on BR2_DEPRECATED && !BR2_LARGEFILE diff --git a/package/sshfs/Config.in b/package/sshfs/Config.in index fc820a306..61d9bf3cc 100644 --- a/package/sshfs/Config.in +++ b/package/sshfs/Config.in @@ -2,11 +2,12 @@ config BR2_PACKAGE_SSHFS bool "sshfs (FUSE)" select BR2_PACKAGE_LIBFUSE select BR2_PACKAGE_LIBGLIB2 - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE + select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE depends on BR2_PACKAGE_OPENSSH depends on BR2_LARGEFILE + depends on BR2_USE_WCHAR # glib2 help FUSE makes it possible to implement a filesystem in a userspace program. Features include: simple yet comprehensive API, secure @@ -15,5 +16,5 @@ config BR2_PACKAGE_SSHFS http://fuse.sourceforge.net/sshfs.html -comment "sshfs requires a toolchain with LARGEFILE support" - depends on !BR2_LARGEFILE +comment "sshfs requires a toolchain with LARGEFILE and WCHAR support" + depends on !BR2_LARGEFILE || !BR2_USE_WCHAR diff --git a/package/sshfs/sshfs.mk b/package/sshfs/sshfs.mk index d15aa00c2..09f1e93ba 100644 --- a/package/sshfs/sshfs.mk +++ b/package/sshfs/sshfs.mk @@ -11,6 +11,6 @@ SSHFS_AUTORECONF:=NO SSHFS_INSTALL_STAGING:=NO SSHFS_INSTALL_TARGET:=YES -SSHFS_DEPENDENCIES = libglib2 libfuse $(if $(BR2_NEEDS_GETTEXT),gettext libintl) +SSHFS_DEPENDENCIES = libglib2 libfuse $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) $(eval $(call AUTOTARGETS,package,sshfs)) diff --git a/package/sylpheed/Config.in b/package/sylpheed/Config.in index fe5aee664..16f03bef1 100644 --- a/package/sylpheed/Config.in +++ b/package/sylpheed/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_SYLPHEED bool "sylpheed" - select BR2_PACKAGE_LIBGTK2 + depends on BR2_PACKAGE_LIBGTK2 help lightweight and user-friendly e-mail client. diff --git a/package/util-linux/Config.in b/package/util-linux/Config.in index 533ef698b..434dae952 100644 --- a/package/util-linux/Config.in +++ b/package/util-linux/Config.in @@ -1,7 +1,7 @@ config BR2_PACKAGE_UTIL-LINUX bool "util-linux" - select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT - select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT + select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE + select BR2_PACKAGE_LIBINTL if BR2_NEEDS_GETTEXT_IF_LOCALE depends on BR2_INET_RPC help Various useful/essential Linux utilities. diff --git a/package/util-linux/util-linux.mk b/package/util-linux/util-linux.mk index 6446d37b0..001ca7529 100644 --- a/package/util-linux/util-linux.mk +++ b/package/util-linux/util-linux.mk @@ -18,7 +18,7 @@ else UTIL-LINUX_SCHED_UTILS:=--disable-schedutils endif -ifeq ($(BR2_NEEDS_GETTEXT),y) +ifeq ($(BR2_NEEDS_GETTEXT_IF_LOCALE),y) UTIL-LINUX_DEPENDENCIES += gettext libintl UTIL-LINUX_MAKE_OPT = LIBS=-lintl endif diff --git a/package/valgrind/Config.in b/package/valgrind/Config.in index d9113c9fb..db1bc3b19 100644 --- a/package/valgrind/Config.in +++ b/package/valgrind/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_VALGRIND bool "valgrind" - depends on BR2_i386 || BR2_powerpc || BR2_x86_64 + depends on BR2_i386 || BR2_x86_64 help Tool for debugging and profiling Linux programs. diff --git a/package/vsftpd/vsftpd-2.0.5-uclibc_lfs.patch b/package/vsftpd/vsftpd-2.0.7-uclibc_lfs.patch index ebd25ca78..610b782cd 100644 --- a/package/vsftpd/vsftpd-2.0.5-uclibc_lfs.patch +++ b/package/vsftpd/vsftpd-2.0.7-uclibc_lfs.patch @@ -5,7 +5,7 @@ diff -rdup vsftpd-2.0.5.orig/sysutil.c vsftpd-2.0.5/sysutil.c #include "utility.h" #include "tunables.h" -+#include "builddefs.h" ++#include <features.h> + +#if !defined __UCLIBC__ || (defined __UCLIBC__ && defined __UCLIBC_HAS_LFS__) /* Activate 64-bit file support on Linux/32bit plus others */ diff --git a/package/webkit/Config.in b/package/webkit/Config.in index 10c8b38ac..b0d69d787 100644 --- a/package/webkit/Config.in +++ b/package/webkit/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_WEBKIT bool "webkit" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR - select BR2_PACKAGE_LIBGTK2 + depends on BR2_PACKAGE_LIBGTK2 select BR2_PACKAGE_ICU select BR2_PACKAGE_CURL select BR2_PACKAGE_LIBXML2 @@ -21,22 +21,3 @@ config BR2_PACKAGE_WEBKIT comment "webkit requires a toolchain with C++ support and WCHAR enabled" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR - -if BR2_PACKAGE_WEBKIT - -choice - prompt "Rendering target" - default BR2_PACKAGE_WEBKIT_X - help - Selects which rendering target will be used. - -config BR2_PACKAGE_WEBKIT_X11 - bool "X11" - -config BR2_PACKAGE_WEBKIT_DIRECTFB - bool "DirectFB" - select BR2_PACKAGE_DIRECTFB - -endchoice - -endif diff --git a/package/webkit/webkit.mk b/package/webkit/webkit.mk index 2121f4b06..39debd362 100644 --- a/package/webkit/webkit.mk +++ b/package/webkit/webkit.mk @@ -14,12 +14,15 @@ WEBKIT_LIBTOOL_PATCH = NO WEBKIT_DEPENDENCIES = host-flex host-gperf icu curl libxml2 libxslt \ libgtk2 sqlite enchant libsoup -ifeq ($(BR2_PACKAGE_WEBKIT_X11),y) -WEBKIT_CONF_OPT = --with-target=x11 + +ifeq ($(BR2_PACKAGE_XORG7),y) + WEBKIT_CONF_OPT += --with-target=x11 + WEBKIT_DEPENDENCIES += xserver_xorg-server endif -ifeq ($(BR2_PACKAGE_WEBKIT_DIRECTFB),y) -WEBKIT_CONF_OPT = --with-target=directfb +ifeq ($(BR2_PACKAGE_DIRECTFB),y) + WEBKIT_CONF_OPT += --with-target=directfb + WEBKIT_DEPENDENCIES += directfb endif WEBKIT_CONF_OPT += --disable-video diff --git a/package/xstroke/Config.in b/package/xstroke/Config.in index dc904cb49..3d68b3e2f 100644 --- a/package/xstroke/Config.in +++ b/package/xstroke/Config.in @@ -1,8 +1,12 @@ config BR2_PACKAGE_XSTROKE bool "xstroke" depends on BR2_PACKAGE_XORG7 + depends on BR2_USE_WCHAR # glib2 select BR2_PACKAGE_DOCKER help Handwriting recognition for X http://avr32linux.org/twiki/pub/Main/XStroke + +comment "xstroke requires a toolchain with WCHAR support" + depends on BR2_PACKAGE_XORG7 && !BR2_USE_WCHAR diff --git a/target/generic/target_busybox_skeleton/etc/securetty b/target/generic/target_busybox_skeleton/etc/securetty index 0e7cf97cc..b25f4a5a9 100644 --- a/target/generic/target_busybox_skeleton/etc/securetty +++ b/target/generic/target_busybox_skeleton/etc/securetty @@ -30,3 +30,6 @@ ttyCPM0 ttyCPM1 ttyCPM2 ttyCPM3 +ttymxc0 +ttymxc1 +ttymxc2 diff --git a/toolchain/Config.in.2 b/toolchain/Config.in.2 index fc6759dd6..595ab8719 100644 --- a/toolchain/Config.in.2 +++ b/toolchain/Config.in.2 @@ -56,13 +56,20 @@ config BR2_ENABLE_LOCALE_WHITELIST will be available on the target - That purely depends on the support for that locale in the selected packages. -# uClibc toolchains require a separatly-compiled gettext/libintl when -# locale support is enabled. This isn't necessary with glibc -# toolchains as glibc includes gettext/libintl. +# glibc and eglibc directly include gettext, so a separatly compiled +# gettext isn't needed and shouldn't be built to avoid conflicts. Some +# packages always need gettext, other packages only need gettext when +# locale support is enabled. See the documentation for how packages +# should rely on the following two options. + config BR2_NEEDS_GETTEXT bool - default y if (BR2_TOOLCHAIN_BUILDROOT && BR2_ENABLE_LOCALE) - default y if (BR2_TOOLCHAIN_EXTERNAL_UCLIBC && BR2_ENABLE_LOCALE) + default y if BR2_TOOLCHAIN_BUILDROOT + default y if BR2_TOOLCHAIN_EXTERNAL_UCLIBC + +config BR2_NEEDS_GETTEXT_IF_LOCALE + bool + default y if (BR2_NEEDS_GETTEXT && BR2_ENABLE_LOCALE) config BR2_USE_WCHAR bool "Enable WCHAR support" diff --git a/toolchain/uClibc/uClibc-0.9.31.config b/toolchain/uClibc/uClibc-0.9.31.config index 57541b93f..87f241111 100644 --- a/toolchain/uClibc/uClibc-0.9.31.config +++ b/toolchain/uClibc/uClibc-0.9.31.config @@ -62,7 +62,7 @@ DOPIC=y # ARCH_HAS_NO_SHARED is not set # ARCH_HAS_NO_LDSO is not set HAVE_SHARED=y -FORCE_SHAREABLE_TEXT_SEGMENTS=y +# FORCE_SHAREABLE_TEXT_SEGMENTS is not set LDSO_LDD_SUPPORT=y # LDSO_CACHE_SUPPORT is not set # LDSO_PRELOAD_FILE_SUPPORT is not set |