diff options
| -rw-r--r-- | boot/u-boot/Config.in | 6 | ||||
| -rw-r--r-- | package/Config.in | 1 | ||||
| -rw-r--r-- | package/games/magiccube4d/Config.in | 11 | ||||
| -rw-r--r-- | package/games/magiccube4d/magiccube4d-2_2-add-installer.patch | 13 | ||||
| -rw-r--r-- | package/games/magiccube4d/magiccube4d-2_2-no-warn-err.patch | 11 | ||||
| -rw-r--r-- | package/games/magiccube4d/magiccube4d.mk | 15 | ||||
| -rw-r--r-- | package/grep/grep.mk | 6 | ||||
| -rw-r--r-- | package/lsof/lsof.mk | 8 | ||||
| -rw-r--r-- | package/mrouted/mrouted.mk | 6 | ||||
| -rw-r--r-- | package/x11r7/mesa3d/Config.in | 1 | ||||
| -rw-r--r-- | toolchain/toolchain-buildroot/Config.in.2 | 2 | ||||
| -rw-r--r-- | toolchain/uClibc/Config.in | 5 | ||||
| -rw-r--r-- | toolchain/uClibc/uClibc-0.9.32.config | 263 |
13 files changed, 288 insertions, 60 deletions
diff --git a/boot/u-boot/Config.in b/boot/u-boot/Config.in index 86c656df5..60aeb1a91 100644 --- a/boot/u-boot/Config.in +++ b/boot/u-boot/Config.in @@ -12,10 +12,13 @@ config BR2_TARGET_UBOOT_BOARDNAME choice prompt "U-Boot Version" - default BR2_TARGET_UBOOT_2010_09 + default BR2_TARGET_UBOOT_2010_12 help Select the specific U-Boot version you want to use +config BR2_TARGET_UBOOT_2010_12 + bool "2010.12" + config BR2_TARGET_UBOOT_2010_09 bool "2010.09" @@ -45,6 +48,7 @@ endif config BR2_TARGET_UBOOT_VERSION string + default "2010.12" if BR2_TARGET_UBOOT_2010_12 default "2010.09" if BR2_TARGET_UBOOT_2010_09 default "2010.06" if BR2_TARGET_UBOOT_2010_06 default "2010.03" if BR2_TARGET_UBOOT_2010_03 diff --git a/package/Config.in b/package/Config.in index d3ae75e61..225d8739f 100644 --- a/package/Config.in +++ b/package/Config.in @@ -80,7 +80,6 @@ endmenu menu "Games" source "package/games/ace_of_penguins/Config.in" source "package/games/gnuchess/Config.in" -source "package/games/magiccube4d/Config.in" source "package/games/prboom/Config.in" source "package/games/doom-wad/Config.in" source "package/games/rubix/Config.in" diff --git a/package/games/magiccube4d/Config.in b/package/games/magiccube4d/Config.in deleted file mode 100644 index 871c3c76b..000000000 --- a/package/games/magiccube4d/Config.in +++ /dev/null @@ -1,11 +0,0 @@ -config BR2_PACKAGE_MAGICCUBE4D - bool "magiccube4d" - depends on BR2_INSTALL_LIBSTDCPP - depends on BR2_PACKAGE_XORG7 - help - Another rubiks cube-like game in 4D - - http://avr32linux.org/twiki/bin/viewfile/Main - -comment "magiccube4d requires a toolchain with C++ support enabled" - depends on !BR2_INSTALL_LIBSTDCPP && BR2_PACKAGE_XORG7 diff --git a/package/games/magiccube4d/magiccube4d-2_2-add-installer.patch b/package/games/magiccube4d/magiccube4d-2_2-add-installer.patch deleted file mode 100644 index afe543ba3..000000000 --- a/package/games/magiccube4d/magiccube4d-2_2-add-installer.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/Makefile.in 2000-04-01 22:45:36.000000000 -0500 -+++ b/Makefile.in 2008-02-29 13:18:24.000000000 -0500 -@@ -126,6 +126,10 @@ tgz: $(SRCTGZ) - - bindist: $(BINTGZ) - -+install : -+ mkdir -p $(GAMESDIR) -+ install -c magiccube4d $(GAMESDIR) -+ - rpm: $(SRCTGZ) - rpm -ta $(SRCTGZ) - diff --git a/package/games/magiccube4d/magiccube4d-2_2-no-warn-err.patch b/package/games/magiccube4d/magiccube4d-2_2-no-warn-err.patch deleted file mode 100644 index 8bbc483ab..000000000 --- a/package/games/magiccube4d/magiccube4d-2_2-no-warn-err.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/configure 2000-02-10 23:19:34.000000000 -0500 -+++ b/configure 2008-02-29 13:12:33.000000000 -0500 -@@ -686,7 +686,7 @@ fi - - - if test "$GXX" = "yes" ; then -- WFLAGS="$WFLAGS -pedantic -Wall -W -Wunused -Werror" -+ WFLAGS="$WFLAGS -pedantic -Wall -W -Wunused" - fi - echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 - echo "configure:693: checking how to run the C preprocessor" >&5 diff --git a/package/games/magiccube4d/magiccube4d.mk b/package/games/magiccube4d/magiccube4d.mk deleted file mode 100644 index 20b42317b..000000000 --- a/package/games/magiccube4d/magiccube4d.mk +++ /dev/null @@ -1,15 +0,0 @@ -############################################################# -# -# magiccube4d -# -############################################################# -MAGICCUBE4D_VERSION = 2_2 -MAGICCUBE4D_SOURCE = magiccube4d-src-$(MAGICCUBE4D_VERSION).tar.gz -MAGICCUBE4D_SITE = http://avr32linux.org/twiki/pub/Main/MagicCube4D -MAGICCUBE4D_INSTALL_STAGING = NO -MAGICCUBE4D_INSTALL_TARGET = YES -MAGICCUBE4D_INSTALL_TARGET_OPT = GAMESDIR=$(TARGET_DIR)/usr/games install -MAGICCUBE4D_DEPENDENCIES = xserver_xorg-server - -$(eval $(call AUTOTARGETS,package/games,magiccube4d)) - diff --git a/package/grep/grep.mk b/package/grep/grep.mk index e323b1de9..bfc911663 100644 --- a/package/grep/grep.mk +++ b/package/grep/grep.mk @@ -9,4 +9,10 @@ GREP_SITE = $(BR2_GNU_MIRROR)/grep GREP_CONF_OPT = --disable-perl-regexp --without-included-regex GREP_DEPENDENCIES = $(if $(BR2_NEEDS_GETTEXT_IF_LOCALE),gettext libintl) +# link with iconv if enabled +ifeq ($(BR2_PACKAGE_LIBICONV),y) +GREP_CONF_ENV += LIBS=-liconv +GREP_DEPENDENCIES += libiconv +endif + $(eval $(call AUTOTARGETS,package,grep)) diff --git a/package/lsof/lsof.mk b/package/lsof/lsof.mk index 05365dae3..167cb2041 100644 --- a/package/lsof/lsof.mk +++ b/package/lsof/lsof.mk @@ -18,16 +18,16 @@ endif ifeq ($(BR2_USE_WCHAR),) define LSOF_CONFIGURE_WCHAR_FIXUPS $(SED) 's,^#define[[:space:]]*HASWIDECHAR.*,#undef HASWIDECHAR,' \ - $(@D)/lsof_$(LSOF_VERSION)_src/machine.h + $(@D)/machine.h $(SED) 's,^#define[[:space:]]*WIDECHARINCL.*,,' \ - $(@D)/lsof_$(LSOF_VERSION)_src/machine.h + $(@D)/machine.h endef endif ifeq ($(BR2_ENABLE_LOCALE),) define LSOF_CONFIGURE_LOCALE_FIXUPS $(SED) 's,^#define[[:space:]]*HASSETLOCALE.*,#undef HASSETLOCALE,' \ - $(@D)/lsof_$(LSOF_VERSION)_src/machine.h + $(@D)/machine.h endef endif @@ -60,7 +60,7 @@ define LSOF_UNINSTALL_TARGET_CMDS endef define LSOF_CLEAN_CMDS - -$(MAKE) -C $(@D)/lsof_$(LSOF_VERSION)_src clean + -$(MAKE) -C $(@D) clean endef $(eval $(call GENTARGETS,package,lsof)) diff --git a/package/mrouted/mrouted.mk b/package/mrouted/mrouted.mk index da4ef72f3..9ebb85779 100644 --- a/package/mrouted/mrouted.mk +++ b/package/mrouted/mrouted.mk @@ -4,9 +4,9 @@ # # ############################################################# -MROUTED_VERSION = 3.9.4 -MROUTED_SITE = https://github.com/troglobit/mrouted.git -MROUTED_SITE_METHOD = git +MROUTED_VERSION = 3.9.4 +MROUTED_SOURCE = mrouted-$(MROUTED_VERSION).tar.bz2 +MROUTED_SITE = http://ftp.vmlinux.org/pub/People/jocke/mrouted define MROUTED_BUILD_CMDS $(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D) diff --git a/package/x11r7/mesa3d/Config.in b/package/x11r7/mesa3d/Config.in index 52876e335..596eea391 100644 --- a/package/x11r7/mesa3d/Config.in +++ b/package/x11r7/mesa3d/Config.in @@ -8,6 +8,7 @@ config BR2_PACKAGE_MESA3D select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_EXPAT depends on BR2_PACKAGE_XSERVER_XORG_SERVER + depends on BR2_PACKAGE_XSERVER_xorg depends on BR2_INSTALL_LIBSTDCPP help Mesa 3D, an open-source implementation of the OpenGL specification. diff --git a/toolchain/toolchain-buildroot/Config.in.2 b/toolchain/toolchain-buildroot/Config.in.2 index fe93e70d5..d76aa7adf 100644 --- a/toolchain/toolchain-buildroot/Config.in.2 +++ b/toolchain/toolchain-buildroot/Config.in.2 @@ -100,7 +100,7 @@ choice config BR2_PTHREADS_NATIVE bool "Native POSIX Threading (NPTL)" select BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_UCLIBC_VERSION_SNAPSHOT + depends on BR2_UCLIBC_VERSION_SNAPSHOT || BR2_UCLIBC_VERSION_0_9_32 endchoice source "toolchain/elf2flt/Config.in" diff --git a/toolchain/uClibc/Config.in b/toolchain/uClibc/Config.in index 9aa300676..6c4d21df0 100644 --- a/toolchain/uClibc/Config.in +++ b/toolchain/uClibc/Config.in @@ -20,6 +20,9 @@ choice config BR2_UCLIBC_VERSION_0_9_31 bool "uClibc 0.9.31.x" + config BR2_UCLIBC_VERSION_0_9_32 + bool "uClibc 0.9.32-rc1" + config BR2_UCLIBC_VERSION_SNAPSHOT bool "daily snapshot" @@ -37,6 +40,7 @@ config BR2_UCLIBC_VERSION_STRING default 0.9.29 if BR2_UCLIBC_VERSION_0_9_29 default 0.9.30.3 if BR2_UCLIBC_VERSION_0_9_30 default 0.9.31 if BR2_UCLIBC_VERSION_0_9_31 + default 0.9.32-rc1 if BR2_UCLIBC_VERSION_0_9_32 default $BR2_USE_UCLIBC_SNAPSHOT if BR2_UCLIBC_VERSION_SNAPSHOT config BR2_UCLIBC_CONFIG @@ -44,6 +48,7 @@ config BR2_UCLIBC_CONFIG default "toolchain/uClibc/uClibc-0.9.29.config" if BR2_UCLIBC_VERSION_0_9_29 default "toolchain/uClibc/uClibc-0.9.30.config" if BR2_UCLIBC_VERSION_0_9_30 default "toolchain/uClibc/uClibc-0.9.31.config" if BR2_UCLIBC_VERSION_0_9_31 + default "toolchain/uClibc/uClibc-0.9.32.config" if BR2_UCLIBC_VERSION_0_9_32 default "toolchain/uClibc/uClibc-snapshot.config" if BR2_UCLIBC_VERSION_SNAPSHOT help Some people may wish to use their own modified uClibc configuration diff --git a/toolchain/uClibc/uClibc-0.9.32.config b/toolchain/uClibc/uClibc-0.9.32.config new file mode 100644 index 000000000..e59919844 --- /dev/null +++ b/toolchain/uClibc/uClibc-0.9.32.config @@ -0,0 +1,263 @@ +# +# 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 + +# 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 + +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 +# UCLIBC_STATIC_LDCONFIG is not set +LDSO_RUNPATH=y +LDSO_SEARCH_INTERP_PATH=y +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_HAS_STUBS is not set +UCLIBC_HAS_SHADOW=y +# UCLIBC_HAS_PROGRAM_INVOCATION_NAME is not set +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_24=y +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_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 is not set +# 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_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 is not set +UCLIBC_HAS_CTYPE_ENFORCED=y +# 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_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_GLOB=y +UCLIBC_HAS_GNU_GLOB=y +# UCLIBC_HAS_UTMPX is not set + +# +# Library Installation Options +# +RUNTIME_PREFIX="/" +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 +WARNINGS="-Wall" +# EXTRA_WARNINGS is not set +# DOMULTI is not set +# UCLIBC_MJN3_ONLY is not set |