diff options
98 files changed, 909 insertions, 179 deletions
@@ -1,3 +1,46 @@ +2013.08, Released August 31th, 2013: + + Minor fixes. + + Documentation build fixed. + + Updated/fixed packages: ltrace, strongswan + +2013.08-rc3, Released August 29th, 2013: + + Fixes all over the tree. + + External toolchain lib32/lib64 handling, ABI name for EABIhf, + misc fixes for generatelocales, apply-patches and module + stripping. + + Top level menu names reordered and renamed for clarity. + + Updated/fixed packages: acl, attr, bash, dbus, directfb, + dvb-apps, kexec, kmod, libbsd, linux-fusion, mesa3d, minidlna, + openssh, openssl, pulseaudio, python-setuptools, qt5, + qt5webkit, redis, strongswan, sunxi-mali + + Issues resolved (http://bugs.uclibc.org): + + #6464: dbus-daemon-launch-helper needs setuid + +2013.08-rc2, Released August 16th 2013: + + Documentation improvements. + + External toolchains fixes. + + Updated/fixed packages: aircrack-ng, bash, boost, cairo, + cppcms, eglibc, ffmpeg, gcc, git, gnupg, imagemagick, libcec, + libffi, libgcrypt, linux, linux-headers, ltrace, netatalk, + opencv, opengl, readline, samba, strongswan, sunxi-cedarx, + uclibc, udev, wayland, webkit, zeromq. + + Issues resolved (http://bugs.uclibc.org): + + #6440: typo in ffmpeg makefile + 2013.08-rc1, Released August 5th, 2013: Architectures: @@ -450,14 +450,14 @@ source "toolchain/Config.in" source "system/Config.in" -source "package/Config.in" +source "linux/Config.in" -source "package/Config.in.host" +source "package/Config.in" source "fs/Config.in" source "boot/Config.in" -source "linux/Config.in" +source "package/Config.in.host" source "Config.in.legacy" diff --git a/Config.in.legacy b/Config.in.legacy index b92b656fc5..763f16cb53 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -47,6 +47,17 @@ endif ############################################################################### comment "Legacy options removed in 2013.08" +config BR2_ARM_OABI + bool "ARM OABI support has been removed" + select BR2_LEGACY + help + The support for the ARM OABI was deprecated since a while, + and has been removed completely from Buildroot. It is also + deprecated in upstream gcc, since gcc 4.7. People should + switch to EABI instead, which should not be a problem as + long as you don't have pre-built OABI binaries in your + system that you can't recompile. + config BR2_PACKAGE_DOSFSTOOLS_DOSFSCK bool "dosfstools dosfsck renamed to fsck.fat" select BR2_LEGACY @@ -418,10 +418,20 @@ world: toolchain $(TARGETS_ALL) $(BUILD_DIR) $(HOST_DIR) $(BINARIES_DIR) $(STAMP_DIR) $(LEGAL_INFO_DIR) $(REDIST_SOURCES_DIR): @mkdir -p $@ +# We make a symlink lib32->lib or lib64->lib as appropriate +# MIPS64/n32 requires lib32 even though it's a 64-bit arch. +ifeq ($(BR2_ARCH_IS_64)$(BR2_MIPS_NABI32),y) +LIB_SYMLINK = lib64 +else +LIB_SYMLINK = lib32 +endif + $(STAGING_DIR): @mkdir -p $(STAGING_DIR)/bin @mkdir -p $(STAGING_DIR)/lib + @ln -snf lib $(STAGING_DIR)/$(LIB_SYMLINK) @mkdir -p $(STAGING_DIR)/usr/lib + @ln -snf lib $(STAGING_DIR)/usr/$(LIB_SYMLINK) @mkdir -p $(STAGING_DIR)/usr/include @mkdir -p $(STAGING_DIR)/usr/bin @ln -snf $(STAGING_DIR) $(BASE_DIR)/staging @@ -437,6 +447,9 @@ $(BUILD_DIR)/.root: --exclude .hg --exclude=CVS --exclude '*~' \ $(TARGET_SKELETON)/ $(TARGET_DIR)/ cp support/misc/target-dir-warning.txt $(TARGET_DIR_WARNING_FILE) + @ln -s lib $(TARGET_DIR)/$(LIB_SYMLINK) + @mkdir -p $(TARGET_DIR)/usr + @ln -s lib $(TARGET_DIR)/usr/$(LIB_SYMLINK) touch $@ $(TARGET_DIR): $(BUILD_DIR)/.root @@ -472,8 +485,9 @@ ifeq ($(BR2_PACKAGE_PYTHON_PYC_ONLY),y) find $(TARGET_DIR)/usr/lib/ -name '*.py' -print0 | xargs -0 rm -f endif $(STRIP_FIND_CMD) | xargs $(STRIPCMD) 2>/dev/null || true - find $(TARGET_DIR)/lib/modules -type f -name '*.ko' | \ - xargs -r $(KSTRIPCMD) || true + if test -d $(TARGET_DIR)/lib/modules; then \ + find $(TARGET_DIR)/lib/modules -type f -name '*.ko' | \ + xargs -r $(KSTRIPCMD); fi # See http://sourceware.org/gdb/wiki/FAQ, "GDB does not see any threads # besides the one in which crash occurred; or SIGTRAP kills my program when @@ -539,8 +553,8 @@ ifneq ($(GENERATE_LOCALE),) target-generatelocales: host-localedef $(Q)mkdir -p $(TARGET_DIR)/usr/lib/locale/ $(Q)for locale in $(GENERATE_LOCALE) ; do \ - inputfile=`echo $${locale} | cut -f1 -d'.'` ; \ - charmap=`echo $${locale} | cut -f2 -d'.'` ; \ + inputfile=`echo $${locale} | cut -f1 -d'.' -s` ; \ + charmap=`echo $${locale} | cut -f2 -d'.' -s` ; \ if test -z "$${charmap}" ; then \ charmap="UTF-8" ; \ fi ; \ diff --git a/board/freescale/mpc8315erdb/linux-3.8.config b/board/freescale/mpc8315erdb/linux-3.10.config index 120314c2a1..120314c2a1 100644 --- a/board/freescale/mpc8315erdb/linux-3.8.config +++ b/board/freescale/mpc8315erdb/linux-3.10.config diff --git a/board/freescale/p1010rdb/linux-3.8.config b/board/freescale/p1010rdb/linux-3.10.config index 5cdb4131d0..5cdb4131d0 100644 --- a/board/freescale/p1010rdb/linux-3.8.config +++ b/board/freescale/p1010rdb/linux-3.10.config diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig index 4a779e1512..492891590b 100644 --- a/configs/atngw100_defconfig +++ b/configs/atngw100_defconfig @@ -1,6 +1,10 @@ # Architecture BR2_avr32=y +# Lock down kernel headers version, to match the kernel version used +# below. +BR2_KERNEL_HEADERS_3_9=y + # Filesystems BR2_TARGET_ROOTFS_JFFS2=y BR2_TARGET_ROOTFS_JFFS2_FLASH_128=y @@ -17,6 +21,10 @@ BR2_TARGET_UBOOT_BOARDNAME="atngw100" BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2010.09" -# Kernel +# Kernel. Locked to 3.9.x, because 3.10.x fails to build with +# relocation truncated to fit: R_AVR32_16N_PCREL against symbol +# `_ctype' BR2_LINUX_KERNEL=y +BR2_LINUX_KERNEL_CUSTOM_VERSION=y +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.9.11" BR2_LINUX_KERNEL_DEFCONFIG="atngw100" diff --git a/configs/freescale_mpc8315erdb_defconfig b/configs/freescale_mpc8315erdb_defconfig index d32264ea90..12bb70e09c 100644 --- a/configs/freescale_mpc8315erdb_defconfig +++ b/configs/freescale_mpc8315erdb_defconfig @@ -16,9 +16,9 @@ BR2_KERNEL_HEADERS_3_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/mpc8315erdb/linux-3.8.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/mpc8315erdb/linux-3.10.config" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="mpc8315erdb" @@ -31,4 +31,4 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="MPC8315ERDB_NAND" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.07" diff --git a/configs/freescale_p1010rdb_defconfig b/configs/freescale_p1010rdb_defconfig index 9ee541fb67..21554d57ff 100644 --- a/configs/freescale_p1010rdb_defconfig +++ b/configs/freescale_p1010rdb_defconfig @@ -15,9 +15,9 @@ BR2_KERNEL_HEADERS_3_8=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.8.8" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y -BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-3.8.config" +BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/freescale/p1010rdb/linux-3.10.config" BR2_LINUX_KERNEL_UIMAGE=y BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="p1010rdb" @@ -30,4 +30,4 @@ BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BOARDNAME="P1010RDB_NOR" BR2_TARGET_UBOOT_CUSTOM_VERSION=y -BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.04" +BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2013.07" diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig index ce6f72d91e..c44e8fff69 100644 --- a/configs/qemu_arm_nuri_defconfig +++ b/configs/qemu_arm_nuri_defconfig @@ -15,11 +15,11 @@ BR2_TARGET_ROOTFS_INITRAMFS=y # Lock to 3.10 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.10.4" +BR2_DEFAULT_KERNEL_VERSION="3.10.7" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7" BR2_LINUX_KERNEL_DEFCONFIG="exynos4" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_arm_versatile_defconfig b/configs/qemu_arm_versatile_defconfig index 3a965ccc4c..ef710617f6 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -12,12 +12,12 @@ BR2_TARGET_ROOTFS_EXT2=y # Lock to 3.10 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.10.4" +BR2_DEFAULT_KERNEL_VERSION="3.10.7" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.10.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index 674fb72dee..3f970e961c 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -15,11 +15,11 @@ BR2_TARGET_ROOTFS_EXT2=y # Lock to 3.10 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.10.4" +BR2_DEFAULT_KERNEL_VERSION="3.10.7" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7" BR2_LINUX_KERNEL_DEFCONFIG="vexpress" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index d30678ca3a..15f36a7cff 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.10.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 7cbbc7c4ea..d313866094 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -19,7 +19,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.10.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index 7dd9e1cb30..61abdcf47d 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -12,12 +12,12 @@ BR2_TARGET_ROOTFS_EXT2=y # Lock to 3.10 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.10.4" +BR2_DEFAULT_KERNEL_VERSION="3.10.7" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.10.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig index 5df3f5a370..34e19e4e93 100644 --- a/configs/qemu_mips_malta_defconfig +++ b/configs/qemu_mips_malta_defconfig @@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_EXT2=y # Lock to 3.10 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.10.4" +BR2_DEFAULT_KERNEL_VERSION="3.10.7" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.10.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig index d568f3e424..72304f0596 100644 --- a/configs/qemu_mipsel_malta_defconfig +++ b/configs/qemu_mipsel_malta_defconfig @@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_EXT2=y # Lock to 3.10 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.10.4" +BR2_DEFAULT_KERNEL_VERSION="3.10.7" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.10.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index 00e4000d45..e8f0ecc891 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_EXT2=y # Lock to 3.10 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.10.4" +BR2_DEFAULT_KERNEL_VERSION="3.10.7" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.10.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index d30c6b9216..a4c29b3034 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -8,12 +8,12 @@ BR2_TARGET_ROOTFS_INITRAMFS=y # Lock to 3.10 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.10.4" +BR2_DEFAULT_KERNEL_VERSION="3.10.7" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7" BR2_LINUX_KERNEL_DEFCONFIG="mpc85xx" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_virtex_ml507_defconfig b/configs/qemu_ppc_virtex_ml507_defconfig index 0a3f5a1994..e4e3a34a16 100644 --- a/configs/qemu_ppc_virtex_ml507_defconfig +++ b/configs/qemu_ppc_virtex_ml507_defconfig @@ -8,7 +8,7 @@ BR2_TARGET_ROOTFS_INITRAMFS=y # Lock to 3.10 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.10.4" +BR2_DEFAULT_KERNEL_VERSION="3.10.7" # Use soft float BR2_SOFT_FLOAT=y @@ -16,7 +16,7 @@ BR2_SOFT_FLOAT=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7" BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_sh4_r2d_defconfig b/configs/qemu_sh4_r2d_defconfig index 9293859828..8636857911 100644 --- a/configs/qemu_sh4_r2d_defconfig +++ b/configs/qemu_sh4_r2d_defconfig @@ -12,7 +12,7 @@ BR2_TARGET_ROOTFS_EXT2=y # Lock to 3.2 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.2.49" +BR2_DEFAULT_KERNEL_VERSION="3.2.50" # The kernel wants to use the -m4-nofpu option to make sure that it # doesn't use floating point operations. @@ -21,7 +21,7 @@ BR2_EXTRA_GCC_CONFIG_OPTIONS="--with-multilib-list=m4,m4-nofpu" # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.49" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.2.50" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/sh4-r2d/linux-3.2.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index 67b40a5a4f..e09b37b207 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -11,11 +11,11 @@ BR2_TARGET_ROOTFS_EXT2=y # Lock to 3.10 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.10.4" +BR2_DEFAULT_KERNEL_VERSION="3.10.7" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.10.config" diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index c19a51615c..d451d2a94f 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -12,11 +12,11 @@ BR2_TARGET_ROOTFS_EXT2=y # Lock to 3.10 headers to avoid breaking with newer kernels BR2_KERNEL_HEADERS_VERSION=y -BR2_DEFAULT_KERNEL_VERSION="3.10.4" +BR2_DEFAULT_KERNEL_VERSION="3.10.7" # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.4" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.10.7" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.10.config" diff --git a/docs/download.html b/docs/download.html index 6c9060bad1..e2adcfcac6 100644 --- a/docs/download.html +++ b/docs/download.html @@ -6,23 +6,23 @@ <p> -The latest stable release is <b>2013.05</b>, which can be downloaded +The latest stable release is <b>2013.08</b>, which can be downloaded here:<p> -<a href="/downloads/buildroot-2013.05.tar.gz">buildroot-2013.05.tar.gz</a> +<a href="/downloads/buildroot-2013.08.tar.gz">buildroot-2013.08.tar.gz</a> or -<a href="/downloads/buildroot-2013.05.tar.bz2">buildroot-2013.05.tar.bz2</a>. +<a href="/downloads/buildroot-2013.08.tar.bz2">buildroot-2013.08.tar.bz2</a>. <p> - -The latest release candidate is <b>2013.08-rc1</b>, which can be +<!-- +The latest release candidate is <b>2013.08-rc3</b>, which can be downloaded here:<p> -<a href="/downloads/buildroot-2013.08-rc1.tar.gz">buildroot-2013.08-rc1.tar.gz</a> +<a href="/downloads/buildroot-2013.08-rc3.tar.gz">buildroot-2013.08-rc3.tar.gz</a> or -<a href="/downloads/buildroot-2013.08-rc1.tar.bz2">buildroot-2013.08-rc1.tar.bz2</a>. +<a href="/downloads/buildroot-2013.08-rc3.tar.bz2">buildroot-2013.08-rc3.tar.bz2</a>. <p> - +--> This and earlier releases can always be downloaded from <a href="/downloads/">http://buildroot.net/downloads/</a>. diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index faf70b1d89..4e50f8f689 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -99,24 +99,30 @@ of the shell script(s) needing fixing. All these names are relative to In addition, the scripts listed in +LIBFOO_CONFIG_SCRIPTS+ are removed from +$(TARGET_DIR)/usr/bin+, since they are not needed on the target. -Example 1: - +.Config script: 'divine' package +================================ Package divine installs shell script '$(STAGING_DIR)/usr/bin/divine-config'. -So it's fixup would be: +So its fixup would be: +-------------------------------- DIVINE_CONFIG_SCRIPTS = divine-config +-------------------------------- +================================ -Example 2: - +.Config script: 'imagemagick' package: +================================ Package imagemagick installs the following scripts: '$(STAGING_DIR)/usr/bin/{Magick,Magick++,MagickCore,MagickWand,Wand}-config' So it's fixup would be: +-------------------------------- IMAGEMAGICK_CONFIG_SCRIPTS = \ Magick-config Magick++-config \ MagickCore-config MagickWand-config Wand-config +-------------------------------- +================================ On line 14, we specify the list of dependencies this package relies on. These dependencies are listed in terms of lower-case package names, @@ -358,6 +364,13 @@ LIBFOO_VERSION = 2.32 Now, the variables that define what should be performed at the different steps of the build process. +* +LIBFOO_EXTRACT_CMDS+ lists the actions to be performed to extract + the package. This is generally not needed as tarballs are + automatically handled by Buildroot. However, if the package uses a + non-standard archive format, such as a ZIP or RAR file, or has a + tarball with a non-standard organization, this variable allows to + override the package infrastructure default behavior. + * +LIBFOO_CONFIGURE_CMDS+ lists the actions to be performed to configure the package before its compilation. diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt index 0106df0a84..3736d61248 100644 --- a/docs/manual/contribute.txt +++ b/docs/manual/contribute.txt @@ -27,8 +27,8 @@ _rebase_ your development branch on top of the upstream tree before generating the patch set. To do so, run: --------------------- - $ git fetch --all --tags - $ git rebase origin/master +$ git fetch --all --tags +$ git rebase origin/master --------------------- Here, you are ready to generate then submit your patch set. @@ -36,23 +36,19 @@ Here, you are ready to generate then submit your patch set. To generate it, run: --------------------- - $ git format-patch -M -n -s -o outgoing origin/master +$ git format-patch -M -n -s -o outgoing origin/master --------------------- This will generate patch files in the +outgoing+ subdirectory, automatically adding the +signed-off-by+ line. -If you want to present the whole patch set in a separate mail, add -+--cover-letter+ to the previous command line (+man git-format-patch+ -for further information). - Once patch files are generated, you can review/edit the commit message before submitting them using your favorite text editor. Lastly, send/submit your patch set to the Buildroot mailing list: --------------------- - $ git send-email --to buildroot@busybox.net outgoing/* +$ git send-email --to buildroot@busybox.net outgoing/* --------------------- Note that +git+ should be configured to use your mail account. @@ -62,6 +58,77 @@ Make sure posted *patches are not line-wrapped*, otherwise they cannot easily be applied. In such a case, fix your e-mail client, or better, use +git send-email+ to send your patches. +Cover letter +~~~~~~~~~~~~ + +If you want to present the whole patch set in a separate mail, add ++--cover-letter+ to the +git format-patch+ command (see +man +git-format-patch+ for further information). This will generate a +template for an introduction e-mail to your patch series. + +A 'cover letter' may be useful to introduce the changes you propose +in the following cases: + +* large number of commits in the series; + +* deep impact of the changes in the rest of the project; + +* RFC footnote:[RFC: (Request for comments) change proposal]; + +* whenever you feel it will help presenting your work, your choices, + the review process, etc. + +Patch revision changelog +~~~~~~~~~~~~~~~~~~~~~~~~ + +When improvements are requested, the new revision of each commit +should include a changelog of the modifications between each +submission. Note that when your patch series is introduced by a cover +letter, the changelog may be added in the cover letter rather than in +the individual commits. + +When added to the individual commits, this changelog is added when +editing the commit message. Below the +Signed-off-by+ section, add ++---+ and your changelog. + +Although the changelog will be visible for the reviewers in the mail +thread, as well as in http://patchwork.buildroot.org[patchwork], +git+ +will automatically ignores lines below +---+ when the patch will be +merged. This is the intended behavior: the changelog is not meant to +be preserved forever in the +git+ history of the project. + +Hereafter the recommended layout: + +--------------- +Patch title less than 80-character length + +Some more paragraph giving some more details. + +And yet another paragraph giving more details. + +Signed-off-by John Doe <john.doe@noname.org> +--- +Changes v2 -> v3: + - foo bar (suggested by Jane) + - bar buz + +Changes v1 -> v2: + - alpha bravo (suggested by John) + - charly delta +--------------- + +Any patch revision should include the version number. The version number +is simply composed of the letter +v+ followed by an +integer+ greater or +equal to two (i.e. "PATCH v2", "PATCH v3" ...). + +This can be easily handled with +git format-patch+ by using the option ++--subject-prefix+: + +--------------------- +$ git format-patch --subject-prefix "PATCH v4" \ + -M -o outgoing origin/master +--------------------- + Reviewing/Testing patches ------------------------- diff --git a/docs/manual/make-tips.txt b/docs/manual/make-tips.txt index b4a9c123da..c3fd155721 100644 --- a/docs/manual/make-tips.txt +++ b/docs/manual/make-tips.txt @@ -29,8 +29,7 @@ The result of the search shows the help message of the matching items. $ make help -------------------- -.Not all targets are always available, - +Not all targets are always available, some settings in the +.config+ file may hide some targets: * +linux-menuconfig+ and +linux-savedefconfig+ only work when @@ -54,12 +53,32 @@ and target trees, the images and the toolchain): $ make clean -------------------- +.Generating the manual: + +The present manual sources are located in the 'docs/manual' directory. +To generate the manual: + +--------------------------------- + $ make manual-clean + $ make manual +--------------------------------- + +The manual outputs will be generated in 'output/docs/manual'. + +.Notes +- +asciidoc+ is required to build the documentation (see: + xref:requirement-optional[]). +- There is a known issue that you can't build it under Debian Squeeze. + +.Reseting Buildroot for a new target: + To delete all build products as well as the configuration: -------------------- $ make distclean -------------------- -Note that if +ccache+ is enabled, running +make clean+ or +distclean+ does +.Notes +If +ccache+ is enabled, running +make clean+ or +distclean+ does not empty the compiler cache used by Buildroot. To delete it, refer to xref:ccache[]. diff --git a/docs/news.html b/docs/news.html index beb2a40253..25a70f0f37 100644 --- a/docs/news.html +++ b/docs/news.html @@ -5,6 +5,41 @@ <p> <ul> + <li><b>31 August 2013 -- 2013.08 released</b> + + <p>The stable 2013.08 release is out - Thanks to everyone + contributing and testing the release candidates. See the + <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.08">CHANGES</a> + file for more details + and go to the <a href="/downloads/">downloads page</a> to pick up the + <a href="/downloads/buildroot-2013.08.tar.bz2">2013.08 release</a>.</p> + + <li><b>29 August 2013 -- 2013.08-rc3 released</b> + + <p>Another week, another release candidate with more cleanups and + build fixes. See the <a + href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.08_rc3">CHANGES</a> + file for details.</p> + + <p>Head to the <a href="/downloads/">downloads page</a> to pick up the + <a href="/downloads/buildroot-2013.08-rc3.tar.bz2">2013.08-rc3 + release candidate</a>, and report any problems found to the <a + href="lists.html">mailing list</a> or <a + href="https://bugs.uclibc.org">bug tracker</a>.</p> + + <li><b>16 August 2013 -- 2013.08-rc2 released</b> + + <p>We have a new release candidate! Lots of changes all over the + tree, see + the <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.08_rc2">CHANGES</a> + file for details.</p> + + <p>Head to the <a href="/downloads/">downloads page</a> to pick up the + <a href="/downloads/buildroot-2013.08-rc2.tar.bz2">2013.08-rc2 + release candidate</a>, and report any problems found to the <a + href="lists.html">mailing list</a> or <a + href="https://bugs.uclibc.org">bug tracker</a>.</p> + <li><b>5 August 2013 -- 2013.08-rc1 released</b> <p>We have a new release candidate! Lots of changes all over the diff --git a/linux/Config.in b/linux/Config.in index 7274481b7b..49c4b5cacb 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -21,7 +21,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_LATEST_VERSION - bool "3.10.4" + bool "3.10.10" config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "Same as toolchain kernel headers" @@ -68,7 +68,6 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_REPO_URL config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION string "Custom Git version" - default "HEAD" depends on BR2_LINUX_KERNEL_CUSTOM_GIT help Git revision to use in the format used by git rev-parse, @@ -76,7 +75,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION config BR2_LINUX_KERNEL_VERSION string - default "3.10.4" if BR2_LINUX_KERNEL_LATEST_VERSION + default "3.10.10" if BR2_LINUX_KERNEL_LATEST_VERSION default BR2_DEFAULT_KERNEL_HEADERS if BR2_LINUX_KERNEL_SAME_AS_HEADERS default BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE if BR2_LINUX_KERNEL_CUSTOM_VERSION default "custom" if BR2_LINUX_KERNEL_CUSTOM_TARBALL diff --git a/package/Config.in b/package/Config.in index 53e401ba3c..6306947379 100644 --- a/package/Config.in +++ b/package/Config.in @@ -1,4 +1,4 @@ -menu "Package Selection for the target" +menu "Target packages" source "package/busybox/Config.in" diff --git a/package/Makefile.in b/package/Makefile.in index aed28d5a27..91ae1b9bc8 100644 --- a/package/Makefile.in +++ b/package/Makefile.in @@ -46,11 +46,9 @@ ABI=gnueabi else ABI=eabi endif -else ifeq ($(BR2_ARM_EABIHF),y) -ifeq ($(LIBC),uclibc) -ABI=gnueabihf -else -ABI=eabihf + +ifeq ($(BR2_ARM_EABIHF),y) +ABI:=$(ABI)hf endif endif diff --git a/package/acl/acl-01-support-static-installation.patch b/package/acl/acl-01-support-static-installation.patch new file mode 100644 index 0000000000..4cb473ffc2 --- /dev/null +++ b/package/acl/acl-01-support-static-installation.patch @@ -0,0 +1,29 @@ +Support installation of .a file when doing static linking + +When doing static linking (i.e ENABLE_SHARED != yes), the acl build +logic wasn't installing any library at all, not even the .a file which +is needed for static linking. This patch fixes that. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: b/include/buildmacros +=================================================================== +--- a/include/buildmacros ++++ b/include/buildmacros +@@ -97,7 +97,15 @@ + + INSTALL_LTLIB_STATIC = \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ +- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); ++ ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ ++ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR); \ ++ ../$(INSTALL) -m 644 $(LIBNAME).la $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ ++ ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ ++ ../$(INSTALL) -T so_base $(LIBNAME).la $(PKG_LIB_DIR); \ ++ if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \ ++ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ ++ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ ++ fi + + INSTALL_MAN = \ + @for d in $(MAN_PAGES); do \ diff --git a/package/aircrack-ng/aircrack-ng.mk b/package/aircrack-ng/aircrack-ng.mk index fbefd741eb..00f4bac436 100644 --- a/package/aircrack-ng/aircrack-ng.mk +++ b/package/aircrack-ng/aircrack-ng.mk @@ -13,7 +13,8 @@ AIRCRACK_NG_DEPENDENCIES = openssl ifeq ($(BR2_PACKAGE_SQLITE),y) AIRCRACK_NG_MAKE_OPTS = sqlite=true - AIRCRACK_NG_MAKE_OPTS += LIBSQL="-lsqlite3" + AIRCRACK_NG_MAKE_OPTS += \ + LIBSQL="-lsqlite3$(if $(BR2_PREFER_STATIC_LIB), -ldl -lpthread)" AIRCRACK_NG_DEPENDENCIES += sqlite else diff --git a/package/attr/attr-01-support-static-installation.patch b/package/attr/attr-01-support-static-installation.patch new file mode 100644 index 0000000000..87858ac75e --- /dev/null +++ b/package/attr/attr-01-support-static-installation.patch @@ -0,0 +1,29 @@ +Support installation of .a file when doing static linking + +When doing static linking (i.e ENABLE_SHARED != yes), the attr build +logic wasn't installing any library at all, not even the .a file which +is needed for static linking. This patch fixes that. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: b/include/buildmacros +=================================================================== +--- a/include/buildmacros ++++ b/include/buildmacros +@@ -97,7 +97,15 @@ + + INSTALL_LTLIB_STATIC = \ + cd $(TOPDIR)/$(LIBNAME)/.libs; \ +- ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); ++ ../$(INSTALL) -m 755 -d $(PKG_DEVLIB_DIR); \ ++ ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).la $(PKG_DEVLIB_DIR); \ ++ ../$(INSTALL) -m 644 $(LIBNAME).la $(PKG_DEVLIB_DIR)/$(LIBNAME).la ; \ ++ ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ ++ ../$(INSTALL) -T so_base $(LIBNAME).la $(PKG_LIB_DIR); \ ++ if test "x$(PKG_DEVLIB_DIR)" != "x$(PKG_LIB_DIR)" ; then \ ++ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).a $(PKG_LIB_DIR)/$(LIBNAME).a; \ ++ ../$(INSTALL) -S $(PKG_DEVLIB_DIR)/$(LIBNAME).la $(PKG_LIB_DIR)/$(LIBNAME).la; \ ++ fi + + INSTALL_MAN = \ + @for d in $(MAN_PAGES); do \ diff --git a/package/bash/bash.mk b/package/bash/bash.mk index d51e2037dd..0c8a954b20 100644 --- a/package/bash/bash.mk +++ b/package/bash/bash.mk @@ -16,6 +16,15 @@ BASH_CONF_ENV += \ bash_cv_func_sigsetjmp=present \ bash_cv_printf_a_format=yes +# Parallel build sometimes fails because some of the generator tools +# are built twice (i.e. while executing). +BASH_MAKE = $(MAKE1) + +# The static build needs some trickery +ifeq ($(BR2_PREFER_STATIC_LIB),y) +BASH_CONF_OPT += --enable-static-link --without-bash-malloc +endif + # Make sure we build after busybox so that /bin/sh links to bash ifeq ($(BR2_PACKAGE_BUSYBOX),y) BASH_DEPENDENCIES += busybox diff --git a/package/boost/boost-0001-fix-ambiguous-format-call-on-64bit-builds.patch b/package/boost/boost-0001-fix-ambiguous-format-call-on-64bit-builds.patch new file mode 100644 index 0000000000..e8972fd726 --- /dev/null +++ b/package/boost/boost-0001-fix-ambiguous-format-call-on-64bit-builds.patch @@ -0,0 +1,27 @@ +boost: fix ambiguous format call on 64-bit builds + +Fixes problem: + +libs/locale/src/icu/formatter.cpp: In member function +'virtual std::basic_string<_CharT, std::char_traits<_CharT>, std::allocator<_CharT> > boost::locale::impl_icu::number_format<CharType>::format(boost::int64_t, size_t&) const': +libs/locale/src/icu/formatter.cpp:61: error: call of overloaded 'format(boost::int64_t&, icu_49::UnicodeString&)' is ambiguous +/ec/include/unicode/numfmt.h:317: note: candidates are: icu_49::UnicodeString& icu_49::NumberFormat::format(double, icu_49::UnicodeString&) const +/ec/include/unicode/numfmt.h:330: note: icu_49::UnicodeString& icu_49::NumberFormat::format(int32_t, icu_49::UnicodeString&) const +/ec/include/unicode/numfmt.h:343: note: icu_49::UnicodeString& icu_49::NumberFormat::format(int64_t, icu_49::UnicodeString&) const + +Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> +Backported-from: https://svn.boost.org/trac/boost/ticket/6851 + + +diff -ruN boost_1_49_0.orig/libs/locale/src/icu/formatter.cpp boost_1_49_0/libs/locale/src/icu/formatter.cpp +--- boost_1_49_0.orig/libs/locale/src/icu/formatter.cpp 2011-07-12 14:57:36.000000000 +0100 ++++ boost_1_49_0/libs/locale/src/icu/formatter.cpp 2012-05-01 14:27:54.000000000 +0100 +@@ -58,7 +58,7 @@ + virtual string_type format(int64_t value,size_t &code_points) const + { + icu::UnicodeString tmp; +- icu_fmt_->format(value,tmp); ++ icu_fmt_->format(::int64_t(value),tmp); + code_points=tmp.countChar32(); + return cvt_.std(tmp); + } diff --git a/package/cairo/cairo-001-blackfin-build-fix.patch b/package/cairo/cairo-001-blackfin-build-fix.patch new file mode 100644 index 0000000000..94dff6bb0f --- /dev/null +++ b/package/cairo/cairo-001-blackfin-build-fix.patch @@ -0,0 +1,36 @@ +Fix build on platforms where __USER_LABEL_PREFIX__ is not empty + +On most platforms, a C language symbol and its assembly equivalent are +identical. However, on the Blackfin architecture, this isn't the case, +the corresponding C language symbol in assembly is prepended with a +"_". Blackfin therefore has __USER_LABEL_PREFIX__ defined to "_". + +Cairo already has some code to cope with __USER_LABEL_PREFIX__, but +this code isn't completely correct: it prepends both assembly symbols +and C symbols with __USER_LABEL_PREFIX__, which cannot work. + +This patch fixes that by using the existing slim_hidden_asmname() to +define assembly symbols, and introduce a new slim_hidden_realname() +for C symbols. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> + +Index: b/src/cairo-compiler-private.h +=================================================================== +--- a/src/cairo-compiler-private.h ++++ b/src/cairo-compiler-private.h +@@ -93,12 +93,13 @@ + __asm__ (slim_hidden_asmname (internal)) + # define slim_hidden_def1(name, internal) \ + extern __typeof (name) EXT_##name __asm__(slim_hidden_asmname(name)) \ +- __attribute__((__alias__(slim_hidden_asmname(internal)))) ++ __attribute__((__alias__(slim_hidden_realname(internal)))) + # define slim_hidden_ulp slim_hidden_ulp1(__USER_LABEL_PREFIX__) + # define slim_hidden_ulp1(x) slim_hidden_ulp2(x) + # define slim_hidden_ulp2(x) #x + # define slim_hidden_asmname(name) slim_hidden_asmname1(name) + # define slim_hidden_asmname1(name) slim_hidden_ulp #name ++# define slim_hidden_realname(name) #name + #else + # define slim_hidden_proto(name) int _cairo_dummy_prototype(void) + # define slim_hidden_proto_no_warn(name) int _cairo_dummy_prototype(void) diff --git a/package/cppcms/cppcms.mk b/package/cppcms/cppcms.mk index d2b11096e7..8d4a519c1d 100644 --- a/package/cppcms/cppcms.mk +++ b/package/cppcms/cppcms.mk @@ -7,7 +7,7 @@ CPPCMS_VERSION = 1.0.3 CPPCMS_SOURCE = cppcms-$(CPPCMS_VERSION).tar.bz2 CPPCMS_LICENSE = LGPLv3 -CPPCMS_LICENSE_FILE = COPYING.TXT +CPPCMS_LICENSE_FILES = COPYING.TXT CPPCMS_SITE = http://downloads.sourceforge.net/project/cppcms/cppcms/$(CPPCMS_VERSION) CPPCMS_INSTALL_STAGING = YES diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 7fbfb4c179..d50f6309cb 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -10,6 +10,10 @@ DBUS_LICENSE = AFLv2.1 GPLv2+ DBUS_LICENSE_FILES = COPYING DBUS_INSTALL_STAGING = YES +define DBUS_PERMISSIONS +/usr/libexec/dbus-daemon-launch-helper f 4755 0 0 - - - - - +endef + DBUS_DEPENDENCIES = host-pkgconf DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes diff --git a/package/directfb/directfb-use-gcc-link.patch b/package/directfb/directfb-use-gcc-link.patch new file mode 100644 index 0000000000..ec6c0ea501 --- /dev/null +++ b/package/directfb/directfb-use-gcc-link.patch @@ -0,0 +1,35 @@ +Add patch to use 'gcc' instead of 'ld' for linking + +The patch has been sent upstream but it has not been merged yet + +Signed-off-by: Markos Chandras <markos.chandras@imgtec.com> + +From 176ce06b40897a357fe76a558af517197325f188 Mon Sep 17 00:00:00 2001 +From: Markos Chandras <markos.chandras@imgtec.com> +Date: Wed, 28 Aug 2013 10:56:32 +0100 +Subject: [PATCH] rules/libobject.make: Use gcc for linking + +Invoking 'ld' directly may miss some necessary linker flags which +are usually passed by gcc. Therefore, use gcc for linking. + +Signed-off-by: Markos Chandras <markos.chandras@imgtec.com> +--- + rules/libobject.make | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/rules/libobject.make b/rules/libobject.make +index bc670da..2cba658 100644 +--- a/rules/libobject.make ++++ b/rules/libobject.make +@@ -3,7 +3,7 @@ + if test -d $<.tmp; then rmdir $<.tmp; fi + mkdir $<.tmp + (cd $<.tmp && $(AR) x ../../$<) +- $(LD) -o $@ -r $<.tmp/*.o ++ $(CC) -nostdlib -o $@ -r $<.tmp/*.o + rm -f $<.tmp/*.o && rmdir $<.tmp + + .PHONY: $(LTLIBRARIES:%.la=.libs/%.a) +-- +1.8.3.2 + diff --git a/package/directfb/directfb.mk b/package/directfb/directfb.mk index c065eef851..1d83a0b623 100644 --- a/package/directfb/directfb.mk +++ b/package/directfb/directfb.mk @@ -11,6 +11,8 @@ DIRECTFB_SOURCE = DirectFB-$(DIRECTFB_VERSION).tar.gz DIRECTFB_LICENSE = LGPLv2.1+ DIRECTFB_LICENSE_FILES = COPYING DIRECTFB_INSTALL_STAGING = YES +DIRECTFB_AUTORECONF = YES + DIRECTFB_CONF_OPT = \ --localstatedir=/var \ --disable-explicit-deps \ diff --git a/package/dvb-apps/dvb-apps-0001-Fix-generate-keynames.patch b/package/dvb-apps/dvb-apps-0001-Fix-generate-keynames.patch new file mode 100644 index 0000000000..498607d97d --- /dev/null +++ b/package/dvb-apps/dvb-apps-0001-Fix-generate-keynames.patch @@ -0,0 +1,30 @@ +Fix generate-keynames.sh script for cross-compilation + +generate-keynames.sh reads /usr/include/linux to find the keyname +symbols. However, when cross-compiling, the include path points +somewhere else. Allow the user to pass CROSS_ROOT to point to the +root of the cross-compilation environment. + +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> +--- +diff -rup dvb-apps-83c746462ccb.orig/util/av7110_loadkeys/generate-keynames.sh dvb-apps-83c746462ccb/util/av7110_loadkeys/generate-keynames.sh +--- dvb-apps-83c746462ccb.orig/util/av7110_loadkeys/generate-keynames.sh 2012-12-06 10:38:07.000000000 +0100 ++++ dvb-apps-83c746462ccb/util/av7110_loadkeys/generate-keynames.sh 2013-08-29 21:47:09.717991439 +0200 +@@ -18,7 +18,7 @@ echo "};" >> $1 + echo >> $1 + echo >> $1 + echo "static struct input_key_name key_name [] = {" >> $1 +-for x in $(cat /usr/include/linux/input.h input_fake.h | \ ++for x in $(cat ${CROSS_ROOT}/usr/include/linux/input.h input_fake.h | \ + egrep "#define[ \t]+KEY_" | grep -v KEY_MAX | \ + cut -f 1 | cut -f 2 -d " " | sort -u) ; do + echo " { \"$(echo $x | cut -b 5-)\", $x }," >> $1 +@@ -26,7 +26,7 @@ done + echo "};" >> $1 + echo >> $1 + echo "static struct input_key_name btn_name [] = {" >> $1 +-for x in $(cat /usr/include/linux/input.h input_fake.h | \ ++for x in $(cat ${CROSS_ROOT}/usr/include/linux/input.h input_fake.h | \ + egrep "#define[ \t]+BTN_" | \ + cut -f 1 | cut -f 2 -d " " | sort -u) ; do + echo " { \"$(echo $x | cut -b 5-)\", $x }," >> $1 diff --git a/package/dvb-apps/dvb-apps.mk b/package/dvb-apps/dvb-apps.mk index 1e50aa4f30..8cf6a7958b 100644 --- a/package/dvb-apps/dvb-apps.mk +++ b/package/dvb-apps/dvb-apps.mk @@ -34,7 +34,8 @@ endif DVB_APPS_INSTALL_STAGING = YES define DVB_APPS_BUILD_CMDS - $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(DVB_APPS_LDFLAGS)" $(MAKE) -C $(@D) V=1 + $(TARGET_CONFIGURE_OPTS) LDFLAGS="$(DVB_APPS_LDFLAGS)" \ + $(MAKE) -C $(@D) CROSS_ROOT=$(STAGING_DIR) V=1 endef define DVB_APPS_INSTALL_STAGING_CMDS diff --git a/package/eglibc/eglibc.mk b/package/eglibc/eglibc.mk index 253dabd4f0..8873a06fee 100644 --- a/package/eglibc/eglibc.mk +++ b/package/eglibc/eglibc.mk @@ -36,6 +36,9 @@ endif # # 2. We have to execute the configure script with bash and not sh. # +# Note that as mentionned in +# http://patches.openembedded.org/patch/38849/, eglibc must be built +# with -O2, so we pass our own CFLAGS and CXXFLAGS below. define EGLIBC_CONFIGURE_CMDS mkdir -p $(@D)/build # Do the configuration diff --git a/package/gcc/4.2.2-avr32-2.1.5/990-fix-300-libstdc++-pic.patch b/package/gcc/4.2.2-avr32-2.1.5/990-fix-300-libstdc++-pic.patch new file mode 100644 index 0000000000..a63b3ad233 --- /dev/null +++ b/package/gcc/4.2.2-avr32-2.1.5/990-fix-300-libstdc++-pic.patch @@ -0,0 +1,20 @@ +libstdc++-v3: fix the effects of pre-applied 300-libstdc++-pic.patch + +This version of GCC comes with a number of pre-applied patches, among which is +300-libstdc++-pic.patch that makes a PIC version of libstdc++. The resulting +Makefile.in incorrectly refers to object files that should be insde the library. + +Signed-off-by: Alexander Lukichev <alexander.lukichev@gmail.com> + +diff -uNrp host-gcc-final-4.2.2-avr32-2.1.5.orig/libstdc++-v3/src/Makefile.in host-gcc-final-4.2.2-avr32-2.1.5/libstdc++-v3/src/Makefile.in +--- host-gcc-final-4.2.2-avr32-2.1.5.orig/libstdc++-v3/src/Makefile.in 2008-07-04 00:18:42.000000000 +0300 ++++ host-gcc-final-4.2.2-avr32-2.1.5/libstdc++-v3/src/Makefile.in 2013-08-08 16:15:56.201258882 +0300 +@@ -804,7 +804,7 @@ install_debug: + + install-exec-local: + ifeq ($(enable_shared),yes) +- $(AR) cru libstdc++_pic.a *.o $(top_builddir)/libsupc++/*.o ++ $(AR) cru libstdc++_pic.a .libs/*.o $(top_builddir)/libsupc++/*.o + $(INSTALL_DATA) libstdc++_pic.a $(DESTDIR)$(toolexeclibdir) + endif + diff --git a/package/gcc/gcc-final/gcc-final.mk b/package/gcc/gcc-final/gcc-final.mk index 0d9d581ac7..b62dfe2df4 100644 --- a/package/gcc/gcc-final/gcc-final.mk +++ b/package/gcc/gcc-final/gcc-final.mk @@ -41,6 +41,7 @@ GCC_FINAL_CROSS_LANGUAGES = $(subst $(space),$(comma),$(GCC_FINAL_CROSS_LANGUAGE HOST_GCC_FINAL_CONF_OPT = \ $(HOST_GCC_COMMON_CONF_OPT) \ --enable-languages=$(GCC_FINAL_CROSS_LANGUAGES) \ + $(DISABLE_LARGEFILE) \ --with-build-time-tools=$(HOST_DIR)/usr/$(GNU_TARGET_NAME)/bin ifeq ($(BR2_GCC_ENABLE_OPENMP),y) @@ -54,20 +55,6 @@ endif HOST_GCC_FINAL_CONF_OPT += \ $(call qstrip,$(BR2_EXTRA_GCC_CONFIG_OPTIONS)) -# Handle lib64 -define HOST_GCC_FINAL_HANDLE_LIB64 - if [ -d "$(STAGING_DIR)/lib64" ]; then \ - if [ ! -e "$(STAGING_DIR)/lib" ]; then \ - mkdir -p "$(STAGING_DIR)/lib"; \ - fi; \ - mv "$(STAGING_DIR)/lib64/"* "$(STAGING_DIR)/lib/"; \ - rmdir "$(STAGING_DIR)/lib64"; \ - rm "$(STAGING_DIR)/usr/$(GNU_TARGET_NAME)/lib64";\ - fi -endef - -HOST_GCC_FINAL_POST_INSTALL_HOOKS += HOST_GCC_FINAL_HANDLE_LIB64 - # Make sure we have 'cc' define HOST_GCC_FINAL_CREATE_CC_SYMLINKS if [ ! -e $(HOST_DIR)/usr/bin/$(GNU_TARGET_NAME)-cc ]; then \ diff --git a/package/git/Config.in b/package/git/Config.in index 931d460d4f..854c0d4ebf 100644 --- a/package/git/Config.in +++ b/package/git/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_GIT bool "git" depends on BR2_LARGEFILE + depends on BR2_USE_MMU # uses fork() select BR2_PACKAGE_ZLIB select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help diff --git a/package/gnupg/gnupg.mk b/package/gnupg/gnupg.mk index 39088c3c8c..f0c4b034c6 100644 --- a/package/gnupg/gnupg.mk +++ b/package/gnupg/gnupg.mk @@ -4,7 +4,7 @@ # ################################################################################ -GNUPG_VERSION = 1.4.13 +GNUPG_VERSION = 1.4.14 GNUPG_SOURCE = gnupg-$(GNUPG_VERSION).tar.bz2 GNUPG_SITE = ftp://ftp.gnupg.org/gcrypt/gnupg GNUPG_LICENSE = GPLv3+ diff --git a/package/imagemagick/imagemagick.mk b/package/imagemagick/imagemagick.mk index 12b9f4b253..21495749d0 100644 --- a/package/imagemagick/imagemagick.mk +++ b/package/imagemagick/imagemagick.mk @@ -19,7 +19,7 @@ IMAGEMAGICK_AUTORECONF = YES IMAGEMAGICK_CONFIG_SCRIPTS = \ $(addsuffix -config,Magick MagickCore MagickWand Wand) -ifeq ($(BR2_INSTALL_LIBSTDCPP),y) +ifeq ($(BR2_INSTALL_LIBSTDCPP)$(BR2_USE_WCHAR),yy) IMAGEMAGICK_CONFIG_SCRIPTS += Magick++-config endif diff --git a/package/kexec/Config.in b/package/kexec/Config.in index 886144f9c7..66bc343c9c 100644 --- a/package/kexec/Config.in +++ b/package/kexec/Config.in @@ -7,7 +7,7 @@ config BR2_PACKAGE_KEXEC Kexec is a user space utiltity for loading another kernel and asking the currently running kernel to do something with it. - http://www.kernel.org/pub/linux/kernel/people/horms/kexec-tools/ + https://www.kernel.org/pub/linux/utils/kernel/kexec/ config BR2_PACKAGE_KEXEC_ZLIB bool "zlib support" diff --git a/package/kmod/kmod-0001-Add-configure-check-for-_Static_assert.patch b/package/kmod/kmod-0001-Add-configure-check-for-_Static_assert.patch new file mode 100644 index 0000000000..2def358a6f --- /dev/null +++ b/package/kmod/kmod-0001-Add-configure-check-for-_Static_assert.patch @@ -0,0 +1,57 @@ +From d4a1e5daf0d50aa79ae0ed2f947f5657343cf2f7 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Date: Wed, 28 Aug 2013 17:31:40 +0200 +Subject: [PATCH] Add configure check for _Static_assert() + +Commit 8efede20ef ("Use _Static_assert") introduced the usage of +_Static_assert(). However, _Static_assert() is a fairly new thing, +since it was introduced only in gcc 4.6. In order to support older +compilers, this patch adds a configure.in test that checks whether +_Static_assert() is usable or not, and adjust the behavior of the +assert_cc() macro accordingly. + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Upstream-status: submitted + http://article.gmane.org/gmane.linux.kernel.modules/1136 +--- + configure.ac | 6 ++++++ + libkmod/macro.h | 4 ++++ + 2 files changed, 10 insertions(+) + +diff --git a/configure.ac b/configure.ac +index 40e54cf..cbe12f3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -52,6 +52,12 @@ AC_CHECK_MEMBERS([struct stat.st_mtim], [], [], [#include <sys/stat.h>]) + # Check kernel headers + AC_CHECK_HEADERS_ONCE([linux/module.h]) + ++AC_MSG_CHECKING([whether _Static_assert() is supported]) ++AC_COMPILE_IFELSE( ++ [AC_LANG_SOURCE([[_Static_assert(1, "Test");]])], ++ [AC_DEFINE([HAVE_STATIC_ASSERT], [1], [Define is _Static_assert() is available]) ++ AC_MSG_RESULT([yes])], ++ [AC_MSG_RESULT([no])]) + + ##################################################################### + # --with- +diff --git a/libkmod/macro.h b/libkmod/macro.h +index c6ba855..5992026 100644 +--- a/libkmod/macro.h ++++ b/libkmod/macro.h +@@ -21,8 +21,12 @@ + + #include <stddef.h> + ++#if defined(HAVE_STATIC_ASSERT) + #define assert_cc(expr) \ + _Static_assert((expr), #expr) ++#else ++#define assert_cc(expr) ++#endif + + #if HAVE_TYPEOF + #define check_types_match(expr1, expr2) \ +-- +1.8.1.2 + diff --git a/package/kmod/kmod.mk b/package/kmod/kmod.mk index 72a24afb36..c5826cff0a 100644 --- a/package/kmod/kmod.mk +++ b/package/kmod/kmod.mk @@ -10,6 +10,9 @@ KMOD_SITE = $(BR2_KERNEL_MIRROR)/linux/utils/kernel/kmod/ KMOD_INSTALL_STAGING = YES KMOD_DEPENDENCIES = host-pkgconf +# Some patches are touching configure.in +KMOD_AUTORECONF = YES + # license info for libkmod only, conditionally add more below KMOD_LICENSE = LGPLv2.1+ KMOD_LICENSE_FILES = libkmod/COPYING diff --git a/package/libbsd/Config.in b/package/libbsd/Config.in index 1fa94978b2..bae5700ae1 100644 --- a/package/libbsd/Config.in +++ b/package/libbsd/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBBSD bool "libbsd" # libbsd requires a.out.h, which is only available for those # architectures: arm, m68k, x86 (and alpha, but we don't care.) - depends on ( BR2_arm || BR2_armeb || BR2_m68k || BR2_i386 || BR2_x86_64 ) + depends on ( BR2_i386 || BR2_x86_64 ) depends on BR2_TOOLCHAIN_HAS_THREADS help This library provides useful functions commonly found on BSD @@ -14,5 +14,5 @@ config BR2_PACKAGE_LIBBSD http://libbsd.freedesktop.org/ comment "libbsd requires a toolchain with thread support" - depends on ( BR2_arm || BR2_armeb || BR2_m68k || BR2_i386 || BR2_x86_64 ) + depends on ( BR2_i386 || BR2_x86_64 ) depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libcec/Config.in b/package/libcec/Config.in index b1fa03b057..7a67952144 100644 --- a/package/libcec/Config.in +++ b/package/libcec/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBCEC bool "libcec" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS help libcec allows you in combination with the right hardware to control your home theater devices with your TV remote @@ -8,5 +9,5 @@ config BR2_PACKAGE_LIBCEC http://libcec.pulse-eight.com -comment "libcec requires C++ support in toolchain" - depends on !BR2_INSTALL_LIBSTDCPP +comment "libcec requires C++ and threading support in toolchain" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libcec/libcec.mk b/package/libcec/libcec.mk index 49fa067dda..8a58e1ec5f 100644 --- a/package/libcec/libcec.mk +++ b/package/libcec/libcec.mk @@ -7,7 +7,7 @@ LIBCEC_VERSION = libcec-2.1.1 LIBCEC_SITE = http://github.com/Pulse-Eight/libcec/tarball/$(LIBCEC_VERSION) LIBCEC_LICENSE = GPLv2+ -LIBCEC_LICENSE_FILE = COPYING +LIBCEC_LICENSE_FILES = COPYING # Autoreconf required due to being a dev tarball and not a release tarball. LIBCEC_AUTORECONF = YES diff --git a/package/libffi/libffi-002-Fix-use-of-compact-eh-frames-on-MIPS.patch b/package/libffi/libffi-002-Fix-use-of-compact-eh-frames-on-MIPS.patch new file mode 100644 index 0000000000..15d1c96ea7 --- /dev/null +++ b/package/libffi/libffi-002-Fix-use-of-compact-eh-frames-on-MIPS.patch @@ -0,0 +1,27 @@ +Newer MIPS toolchains use a different (compact) eh_frame format. +libffi don't like them, so we have to switch to the older format. + +This patch add -mno-compact-eh to CFLAGS when compiling for +Mips and compiler support it. + +Signed-off-by: Jérôme Pouiller <jezz@sysmic.org> + +--- a/configure.ac 2013-08-08 14:53:11.884267155 +0200 ++++ b/configure.ac 2013-08-08 14:54:14.437493244 +0200 +@@ -430,6 +430,16 @@ + AM_CONDITIONAL(FFI_EXEC_TRAMPOLINE_TABLE, test x$FFI_EXEC_TRAMPOLINE_TABLE = x1) + AC_SUBST(FFI_EXEC_TRAMPOLINE_TABLE) + ++if test x$TARGET = xMIPS; then ++ save_CFLAGS="$CFLAGS" ++ CFLAGS=-mno-compact-eh ++ AC_MSG_CHECKING([whether the C compiler needs -mno-compact-eh]) ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([])], ++ [AC_MSG_RESULT([yes])]; [save_CFLAGS="$save_CFLAGS -mno-compact-eh"], ++ [AC_MSG_RESULT([no])]) ++ CFLAGS="$save_CFLAGS" ++fi ++ + if test x$TARGET = xX86_64; then + AC_CACHE_CHECK([assembler supports unwind section type], + libffi_cv_as_x86_64_unwind_section_type, [ diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk index 51cbbce8cd..0ad5c84ec0 100644 --- a/package/libffi/libffi.mk +++ b/package/libffi/libffi.mk @@ -11,12 +11,6 @@ LIBFFI_LICENSE_FILES = LICENSE LIBFFI_INSTALL_STAGING = YES LIBFFI_AUTORECONF = YES -# Newer CS MIPS toolchains use a different (compact) eh_frame format -# libffi don't like them, just switch to the older format -ifeq ($(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209)$(BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203),y) -LIBFFI_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -mno-compact-eh" -endif - # Move the headers to the usual location, and adjust the .pc file # accordingly. define LIBFFI_MOVE_STAGING_HEADERS diff --git a/package/libgcrypt/libgcrypt.mk b/package/libgcrypt/libgcrypt.mk index f8c0860037..82a824fc8d 100644 --- a/package/libgcrypt/libgcrypt.mk +++ b/package/libgcrypt/libgcrypt.mk @@ -4,7 +4,7 @@ # ################################################################################ -LIBGCRYPT_VERSION = 1.5.2 +LIBGCRYPT_VERSION = 1.5.3 LIBGCRYPT_SOURCE = libgcrypt-$(LIBGCRYPT_VERSION).tar.bz2 LIBGCRYPT_LICENSE = LGPLv2.1+ LIBGCRYPT_LICENSE_FILES = COPYING.LIB diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk index ff319341d7..6f3d50adae 100644 --- a/package/linux-fusion/linux-fusion.mk +++ b/package/linux-fusion/linux-fusion.mk @@ -4,7 +4,7 @@ # ################################################################################ -LINUX_FUSION_VERSION = 9.0.0 +LINUX_FUSION_VERSION = 9.0.2 LINUX_FUSION_SOURCE = linux-fusion-$(LINUX_FUSION_VERSION).tar.gz LINUX_FUSION_SITE = http://directfb.org/downloads/Core/linux-fusion LINUX_FUSION_INSTALL_STAGING = YES diff --git a/package/linux-headers/3.0.88/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch b/package/linux-headers/3.0.94/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch index 8777b71639..8777b71639 100644 --- a/package/linux-headers/3.0.88/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch +++ b/package/linux-headers/3.0.94/linux-headers-headers_install-fix-__packed-in-exported-kernel-head.patch diff --git a/package/linux-headers/Config.in.host b/package/linux-headers/Config.in.host index 4380e2d291..ef76733352 100644 --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@ -72,16 +72,16 @@ config BR2_DEFAULT_KERNEL_VERSION config BR2_DEFAULT_KERNEL_HEADERS string - default "3.0.88" if BR2_KERNEL_HEADERS_3_0 + default "3.0.94" if BR2_KERNEL_HEADERS_3_0 default "3.1.10" if BR2_KERNEL_HEADERS_3_1 - default "3.2.49" if BR2_KERNEL_HEADERS_3_2 + default "3.2.50" if BR2_KERNEL_HEADERS_3_2 default "3.3.8" if BR2_KERNEL_HEADERS_3_3 - default "3.4.55" if BR2_KERNEL_HEADERS_3_4 + default "3.4.60" if BR2_KERNEL_HEADERS_3_4 default "3.5.7" if BR2_KERNEL_HEADERS_3_5 default "3.6.11" if BR2_KERNEL_HEADERS_3_6 default "3.7.10" if BR2_KERNEL_HEADERS_3_7 default "3.8.13" if BR2_KERNEL_HEADERS_3_8 default "3.9.11" if BR2_KERNEL_HEADERS_3_9 - default "3.10.4" if BR2_KERNEL_HEADERS_3_10 + default "3.10.10" if BR2_KERNEL_HEADERS_3_10 default "2.6" if BR2_KERNEL_HEADERS_SNAP default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION diff --git a/package/ltrace/ltrace.mk b/package/ltrace/ltrace.mk index 7b8d859b0e..0ea8ff3272 100644 --- a/package/ltrace/ltrace.mk +++ b/package/ltrace/ltrace.mk @@ -13,4 +13,22 @@ LTRACE_CONF_OPT = --disable-werror LTRACE_LICENSE = GPLv2 LTRACE_LICENSE_FILES = COPYING +# symlink missing from tarball +define LTRACE_MIPS_SYMLINK + cd $(@D)/sysdeps/linux-gnu; ln -sf mipsel mips +endef + +LTRACE_POST_EXTRACT_HOOKS += LTRACE_MIPS_SYMLINK + +# ltrace can use libunwind only if libc has backtrace() support +# We don't normally do so for uClibc and we can't know if it's external +ifeq ($(BR2_PACKAGE_LIBUNWIND),y) +ifeq ($(BR2_TOOLCHAIN_USES_UCLIBC),) +LTRACE_CONF_OPT += --with-libunwind=yes +LTRACE_DEPENDENCIES += libunwind +else +LTRACE_CONF_OPT += --with-libunwind=no +endif +endif + $(eval $(autotools-package)) diff --git a/package/midori/Config.in b/package/midori/Config.in index d35874097f..66279f96e6 100644 --- a/package/midori/Config.in +++ b/package/midori/Config.in @@ -8,6 +8,8 @@ config BR2_PACKAGE_MIDORI depends on BR2_INSTALL_LIBSTDCPP # webkit depends on BR2_TOOLCHAIN_HAS_THREADS # webkit -> enchant -> libglib2 depends on BR2_USE_WCHAR # webkit + depends on (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel || \ + BR2_powerpc || BR2_sh || BR2_sparc || BR2_x86_64) # webkit help Midori is a lightweight web browser based on WebKit diff --git a/package/minidlna/minidlna.mk b/package/minidlna/minidlna.mk index 10e3b33b67..077e2572c0 100644 --- a/package/minidlna/minidlna.mk +++ b/package/minidlna/minidlna.mk @@ -19,12 +19,23 @@ MINIDLNA_CFLAGS=$(TARGET_CFLAGS) \ -I"$(STAGING_DIR)/usr/include/libavcodec" \ -I"$(STAGING_DIR)/usr/include/libavformat" +MINIDLNA_COMMON_LIBS = \ + -lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec \ + -lid3tag -lFLAC -logg -lvorbis + ifeq ($(BR2_PACKAGE_GETTEXT),y) MINIDLNA_DEPENDENCIES += gettext # we need to link with libintl -MINIDLNA_MAKE_OPTS += LIBS='-lpthread -lexif -ljpeg -lsqlite3 -lavformat -lavutil -lavcodec -lid3tag -lFLAC -logg -lvorbis -lintl' +MINIDLNA_COMMON_LIBS += -lintl +endif + +ifeq ($(BR2_PACKAGE_LIBICONV),y) +MINIDLNA_DEPENDENCIES += libiconv +MINIDLNA_COMMON_LIBS += -liconv endif +MINIDLNA_MAKE_OPTS += LIBS='$(MINIDLNA_COMMON_LIBS)' + define MINIDLNA_BUILD_CMDS PREFIX=$(STAGING_DIR)/usr \ $(TARGET_MAKE_ENV) $(MAKE) $(TARGET_CONFIGURE_OPTS) \ diff --git a/package/multimedia/ffmpeg/ffmpeg.mk b/package/multimedia/ffmpeg/ffmpeg.mk index 6223a79d4b..b102af12c2 100644 --- a/package/multimedia/ffmpeg/ffmpeg.mk +++ b/package/multimedia/ffmpeg/ffmpeg.mk @@ -146,12 +146,12 @@ endif ifeq ($(BR2_arm7tdmi)$(BR2_arm720t)$(BR2_arm920t)$(BR2_arm922t)$(BR2_strongarm)$(BR2_fa526),y) FFMPEG_CONF_OPT += --disable-armv5te endif -ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf-s),y) +ifeq ($(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s),y) FFMPEG_CONF_OPT += --enable-armv6 else FFMPEG_CONF_OPT += --disable-armv6 --disable-armv6t2 endif -ifeq ($(BR2_arm10)$(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf-s)$(BR2_cortex_a5)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a15),y) +ifeq ($(BR2_arm10)$(BR2_arm1136jf_s)$(BR2_arm1176jz_s)$(BR2_arm1176jzf_s)$(BR2_cortex_a5)$(BR2_cortex_a8)$(BR2_cortex_a9)$(BR2_cortex_a15),y) FFMPEG_CONF_OPT += --enable-armvfp else FFMPEG_CONF_OPT += --disable-armvfp diff --git a/package/multimedia/gst1-plugins-bad/Config.in b/package/multimedia/gst1-plugins-bad/Config.in index 878bf53991..f30f2b395e 100644 --- a/package/multimedia/gst1-plugins-bad/Config.in +++ b/package/multimedia/gst1-plugins-bad/Config.in @@ -355,6 +355,7 @@ config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_DIRECTFB config BR2_PACKAGE_GST1_PLUGINS_BAD_PLUGIN_WAYLAND bool "wayland" + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland select BR2_PACKAGE_WAYLAND help Wayland Video Sink diff --git a/package/multimedia/pulseaudio/pulseaudio.mk b/package/multimedia/pulseaudio/pulseaudio.mk index 910e4a7fe8..195eb19e71 100644 --- a/package/multimedia/pulseaudio/pulseaudio.mk +++ b/package/multimedia/pulseaudio/pulseaudio.mk @@ -55,7 +55,19 @@ endef PULSEAUDIO_POST_PATCH_HOOKS += PULSEAUDIO_FORCE_CC endif -PULSEAUDIO_CONF_OPT += $(if $(BR2_ARM_ENABLE_NEON),--enable-neon-opt=yes,--enable-neon-opt=no) +# neon intrinsics not available with float-abi=soft +ifeq ($(BR2_ARM_SOFT_FLOAT),) +ifeq ($(BR2_ARM_CPU_HAS_NEON),y) +PULSEAUDIO_USE_NEON = y +endif +endif + +ifeq ($(PULSEAUDIO_USE_NEON),y) +PULSEAUDIO_CONF_OPT += --enable-neon-opt=yes +else +PULSEAUDIO_CONF_OPT += --enable-neon-opt=no +endif + # pulseaudio alsa backend needs pcm/mixer apis ifneq ($(BR2_PACKAGE_ALSA_LIB_PCM)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy) PULSEAUDIO_CONF_OPT += --disable-alsa diff --git a/package/netatalk/Config.in b/package/netatalk/Config.in index 26f14c3d48..e3deaefba4 100644 --- a/package/netatalk/Config.in +++ b/package/netatalk/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_NETATALK bool "netatalk" + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_BERKELEYDB select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_LIBGCRYPT @@ -9,3 +10,6 @@ config BR2_PACKAGE_NETATALK high-performance and reliable file server for Macintosh computers. http://netatalk.sourceforge.net/ + +comment "netatalk requires a toolchain with thread support" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/opencv/Config.in b/package/opencv/Config.in index c6ec3fed23..e98ba8ab9d 100644 --- a/package/opencv/Config.in +++ b/package/opencv/Config.in @@ -150,7 +150,7 @@ comment "gstreamer support requires a toolchain with WCHAR and threading support config BR2_PACKAGE_OPENCV_WITH_GTK bool "gtk support" - depends on BR2_PACKAGE_XORG7||BR2_PACKAGE_DIRECTFB + depends on BR2_PACKAGE_XORG7 depends on BR2_USE_WCHAR # libgtk2 -> libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # libgtk2 -> libglib2 depends on BR2_INSTALL_LIBSTDCPP diff --git a/package/opengl/libegl/libegl.mk b/package/opengl/libegl/libegl.mk index 97a4b85b57..c194b02764 100644 --- a/package/opengl/libegl/libegl.mk +++ b/package/opengl/libegl/libegl.mk @@ -18,6 +18,10 @@ ifeq ($(BR2_PACKAGE_SUNXI_MALI),y) LIBEGL_DEPENDENCIES += sunxi-mali endif +ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q),y) +LIBEGL_DEPENDENCIES += gpu-viv-bin-mx6q +endif + ifeq ($(LIBEGL_DEPENDENCIES),) define LIBEGL_CONFIGURE_CMDS echo "No libEGL implementation selected. Configuration error." diff --git a/package/opengl/libgles/libgles.mk b/package/opengl/libgles/libgles.mk index 2945496492..ec157ac506 100644 --- a/package/opengl/libgles/libgles.mk +++ b/package/opengl/libgles/libgles.mk @@ -18,6 +18,10 @@ ifeq ($(BR2_PACKAGE_SUNXI_MALI),y) LIBGLES_DEPENDENCIES += sunxi-mali endif +ifeq ($(BR2_PACKAGE_GPU_VIV_BIN_MX6Q),y) +LIBGLES_DEPENDENCIES += gpu-viv-bin-mx6q +endif + ifeq ($(LIBGLES_DEPENDENCIES),) define LIBGLES_CONFIGURE_CMDS echo "No libGLES implementation selected. Configuration error." diff --git a/package/openssh/S50sshd b/package/openssh/S50sshd index 89f1b9a8d1..b65b3c8a70 100644 --- a/package/openssh/S50sshd +++ b/package/openssh/S50sshd @@ -23,7 +23,7 @@ if [ ! -f /etc/ssh_host_dsa_key ] ; then echo Generating DSA Key... echo THIS CAN TAKE A MINUTE OR TWO DEPENDING ON YOUR PROCESSOR! echo - /usr/bin/ssh-keygen -t dsa -f /etc/ssh_host_dsa_key -C '' -N '' + /usr/bin/ssh-keygen -t dsa -f /etc/ssh_host_dsa_key -C '' -N '' fi # Check for the SSH2 ECDSA key @@ -33,35 +33,35 @@ if [ ! -f /etc/ssh_host_ecdsa_key ]; then echo /usr/bin/ssh-keygen -t ecdsa -f /etc/ssh_host_ecdsa_key -C '' -N '' fi - + umask 077 start() { - echo -n "Starting sshd: " + echo -n "Starting sshd: " /usr/sbin/sshd touch /var/lock/sshd echo "OK" -} +} stop() { echo -n "Stopping sshd: " - killall sshd + killall sshd rm -f /var/lock/sshd - echo "OK" + echo "OK" } restart() { stop start -} +} case "$1" in start) - start + start ;; stop) - stop + stop ;; restart|reload) - restart + restart ;; *) echo "Usage: $0 {start|stop|restart}" diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk index a0e103b3ac..4b8b0a4a1b 100644 --- a/package/openssl/openssl.mk +++ b/package/openssl/openssl.mk @@ -85,6 +85,7 @@ define OPENSSL_CONFIGURE_CMDS ) $(SED) "s:-march=[-a-z0-9] ::" -e "s:-mcpu=[-a-z0-9] ::g" $(@D)/Makefile $(SED) "s:-O[0-9]:$(OPENSSL_CFLAGS):" $(@D)/Makefile + $(SED) "s: build_tests::" $(@D)/Makefile endef define HOST_OPENSSL_BUILD_CMDS diff --git a/package/python-setuptools/python-setuptools.mk b/package/python-setuptools/python-setuptools.mk index cd5ee4d043..73c819f275 100644 --- a/package/python-setuptools/python-setuptools.mk +++ b/package/python-setuptools/python-setuptools.mk @@ -20,19 +20,18 @@ endef define PYTHON_SETUPTOOLS_BUILD_CMDS (cd $(@D); \ - PYTHONPATH="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \ + PYTHONPATH="$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \ $(HOST_DIR)/usr/bin/python setup.py build) endef define HOST_PYTHON_SETUPTOOLS_INSTALL_CMDS (cd $(@D); \ - PYTHONPATH="$(HOST_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \ $(HOST_DIR)/usr/bin/python setup.py install --prefix=$(HOST_DIR)/usr) endef define PYTHON_SETUPTOOLS_INSTALL_TARGET_CMDS (cd $(@D); \ - PYTHONPATH="/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \ + PYTHONPATH="$(TARGET_DIR)/usr/lib/python$(PYTHON_VERSION_MAJOR)/site-packages" \ $(HOST_DIR)/usr/bin/python setup.py install --executable=/usr/bin/python \ --single-version-externally-managed --root=/ --prefix=$(TARGET_DIR)/usr) endef diff --git a/package/qt5/qt5.mk b/package/qt5/qt5.mk index c96cdf5c7f..9e71c83ce3 100644 --- a/package/qt5/qt5.mk +++ b/package/qt5/qt5.mk @@ -1,5 +1,5 @@ QT5_VERSION = 5.0.2 -QT5_SITE = http://releases.qt-project.org/qt5/$(QT5_VERSION)/submodules/ +QT5_SITE = http://download.qt-project.org/archive/qt/5.0/$(QT5_VERSION)/submodules/ include package/qt5/*/*.mk define QT5_LA_PRL_FILES_FIXUP diff --git a/package/qt5/qt5webkit/Config.in b/package/qt5/qt5webkit/Config.in index 319d84a0d1..48b512504f 100644 --- a/package/qt5/qt5webkit/Config.in +++ b/package/qt5/qt5webkit/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_QT5WEBKIT bool "qt5webkit" select BR2_PACKAGE_QT5BASE select BR2_PACKAGE_QT5BASE_ICU + select BR2_PACKAGE_QT5BASE_GUI select BR2_PACKAGE_SQLITE # This module does not support static linking depends on !BR2_PREFER_STATIC_LIB diff --git a/package/readline/readline.mk b/package/readline/readline.mk index 0c883bcf92..ff5519924c 100644 --- a/package/readline/readline.mk +++ b/package/readline/readline.mk @@ -13,14 +13,10 @@ READLINE_CONF_ENV = bash_cv_func_sigsetjmp=yes READLINE_LICENSE = GPLv3+ READLINE_LICENSE_FILES = COPYING -define READLINE_INSTALL_TARGET_CMDS - $(MAKE1) DESTDIR=$(TARGET_DIR) -C $(@D) uninstall - $(MAKE1) DESTDIR=$(TARGET_DIR) -C $(@D) install-shared uninstall-doc - chmod 775 $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) \ - $(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION) - $(STRIPCMD) $(STRIP_STRIP_UNNEEDED) \ - $(TARGET_DIR)/usr/lib/libreadline.so.$(READLINE_VERSION) \ - $(TARGET_DIR)/usr/lib/libhistory.so.$(READLINE_VERSION) +define READLINE_PURGE_EXAMPLES + rm -rf $(TARGET_DIR)/usr/share/readline endef +READLINE_POST_INSTALL_TARGET_HOOKS += READLINE_PURGE_EXAMPLES + $(eval $(autotools-package)) diff --git a/package/redis/redis-001-uclibc.patch b/package/redis/redis-001-uclibc.patch index 8762ca2fb9..01657d0ea8 100644 --- a/package/redis/redis-001-uclibc.patch +++ b/package/redis/redis-001-uclibc.patch @@ -39,7 +39,7 @@ diff -ur old/src/Makefile new/src/Makefile echo PREV_FINAL_CFLAGS=$(FINAL_CFLAGS) >> .make-settings echo PREV_FINAL_LDFLAGS=$(FINAL_LDFLAGS) >> .make-settings - -(cd ../deps && $(MAKE) $(DEPENDENCY_TARGETS)) -+ -(cd ../deps && $(MAKE) CC=$(CC) $(DEPENDENCY_TARGETS)) ++ -(cd ../deps && $(MAKE) CC="$(CC)" $(DEPENDENCY_TARGETS)) .PHONY: persist-settings diff --git a/package/samba/samba.mk b/package/samba/samba.mk index fd90d96d90..71fba08aeb 100644 --- a/package/samba/samba.mk +++ b/package/samba/samba.mk @@ -4,7 +4,7 @@ # ################################################################################ -SAMBA_VERSION = 3.6.16 +SAMBA_VERSION = 3.6.17 SAMBA_SITE = http://ftp.samba.org/pub/samba/stable SAMBA_SUBDIR = source3 SAMBA_INSTALL_STAGING = YES diff --git a/package/strongswan/strongswan-0001-force-tls-when-needed.patch b/package/strongswan/strongswan-0001-force-tls-when-needed.patch new file mode 100644 index 0000000000..8949f62278 --- /dev/null +++ b/package/strongswan/strongswan-0001-force-tls-when-needed.patch @@ -0,0 +1,72 @@ +Force libtls when libpttls is enabled + +The libpttls library expects libtls.la to be present: +libpttls_la_LIBADD = $(top_builddir)/src/libtls/libtls.la +but there is no expressed dependency between them. Therefore, it is possible to +create a configuration where libpttls is enabled and libtls is not, causing a +build failure: + +make[4]: *** No rule to make target `../../src/libtls/libtls.la', needed by `libpttls.la'. Stop. + +libpttls is enabled through USE_PTTLS, set when tnc_tnccs == true. + tnc_tnccs is true when any of tnc-imc, tnc_imv, tnccs_11, tnccs_dynamic or eap_tnc is true. + +libtls is enabled through USE_TLS, set when tls == true. + tls is true when any of eap_tls, eap_ttls or eap_peap is true. + +This patch forces tls to true, when tnc_tnccs is true, so that the required libtls.la dependency +is built before it is used by libpttls. + +Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> +Upstream-status: will be submitted + +diff --git a/configure b/configure +--- a/configure ++++ b/configure +@@ -15900,10 +15900,6 @@ if test x$eap_sim = xtrue; then + simaka=true; + fi + +-if test x$eap_tls = xtrue -o x$eap_ttls = xtrue -o x$eap_peap = xtrue; then +- tls=true; +-fi +- + if test x$eap_radius = xtrue -o x$radattr = xtrue -o x$tnc_pdp = xtrue; then + radius=true; + fi +@@ -15912,6 +15908,10 @@ if test x$tnc_imc = xtrue -o x$tnc_imv = + tnc_tnccs=true; + fi + ++if test x$eap_tls = xtrue -o x$eap_ttls = xtrue -o x$eap_peap = xtrue -o x$tnc_tnccs = xtrue; then ++ tls=true; ++fi ++ + if test x$imc_test = xtrue -o x$imv_test = xtrue -o x$imc_scanner = xtrue -o x$imv_scanner = xtrue -o x$imc_os = xtrue -o x$imv_os = xtrue -o x$imc_attestation = xtrue -o x$imv_attestation = xtrue; then + imcv=true; + fi +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -313,10 +313,6 @@ if test x$eap_sim = xtrue; then + simaka=true; + fi + +-if test x$eap_tls = xtrue -o x$eap_ttls = xtrue -o x$eap_peap = xtrue; then +- tls=true; +-fi +- + if test x$eap_radius = xtrue -o x$radattr = xtrue -o x$tnc_pdp = xtrue; then + radius=true; + fi +@@ -325,6 +321,10 @@ if test x$tnc_imc = xtrue -o x$tnc_imv = + tnc_tnccs=true; + fi + ++if test x$eap_tls = xtrue -o x$eap_ttls = xtrue -o x$eap_peap = xtrue -o x$tnc_tnccs = xtrue; then ++ tls=true; ++fi ++ + if test x$imc_test = xtrue -o x$imv_test = xtrue -o x$imc_scanner = xtrue -o x$imv_scanner = xtrue -o x$imc_os = xtrue -o x$imv_os = xtrue -o x$imc_attestation = xtrue -o x$imv_attestation = xtrue; then + imcv=true; + fi diff --git a/package/strongswan/strongswan-0002-fix-dependency-to-libtnccs.patch b/package/strongswan/strongswan-0002-fix-dependency-to-libtnccs.patch new file mode 100644 index 0000000000..059fc424c2 --- /dev/null +++ b/package/strongswan/strongswan-0002-fix-dependency-to-libtnccs.patch @@ -0,0 +1,26 @@ +It looks like there is a typing error in dependencies of tnccs_20. + +Signed-off-by: Jérôme Pouiller <jezz@sysmic.org> + +--- a/configure 2013-08-19 12:09:33.934651935 +0200 ++++ b/configure 2013-08-19 11:50:34.465118187 +0200 +@@ -15897,7 +15897,7 @@ + radius=true; + fi + +-if test x$tnc_imc = xtrue -o x$tnc_imv = xtrue -o x$tnccs_11 = xtrue -o x$tnccs_11 = xtrue -o x$tnccs_dynamic = xtrue -o x$eap_tnc = xtrue; then ++if test x$tnc_imc = xtrue -o x$tnc_imv = xtrue -o x$tnccs_11 = xtrue -o x$tnccs_20 = xtrue -o x$tnccs_dynamic = xtrue -o x$eap_tnc = xtrue; then + tnc_tnccs=true; + fi + +--- a/configure.in 2013-08-19 12:08:41.762913778 +0200 ++++ b/configure.in 2013-08-19 11:50:22.222886206 +0200 +@@ -317,7 +317,7 @@ + radius=true; + fi + +-if test x$tnc_imc = xtrue -o x$tnc_imv = xtrue -o x$tnccs_11 = xtrue -o x$tnccs_11 = xtrue -o x$tnccs_dynamic = xtrue -o x$eap_tnc = xtrue; then ++if test x$tnc_imc = xtrue -o x$tnc_imv = xtrue -o x$tnccs_11 = xtrue -o x$tnccs_20 = xtrue -o x$tnccs_dynamic = xtrue -o x$eap_tnc = xtrue; then + tnc_tnccs=true; + fi + diff --git a/package/strongswan/strongswan.mk b/package/strongswan/strongswan.mk index b75c70dbdd..aa63d0d701 100644 --- a/package/strongswan/strongswan.mk +++ b/package/strongswan/strongswan.mk @@ -9,7 +9,9 @@ STRONGSWAN_SOURCE = strongswan-$(STRONGSWAN_VERSION).tar.bz2 STRONGSWAN_SITE = http://download.strongswan.org STRONGSWAN_LICENSE = GPLv2+ STRONGSWAN_LICENSE_FILES = COPYING LICENSE +STRONGSWAN_DEPENDENCIES = host-pkgconf STRONGSWAN_CONF_OPT += \ + --without-lib-prefix \ --enable-pkcs11=yes \ --enable-kernel-netlink=$(if $(BR2_INET_IPV6),yes,no) \ --enable-socket-default=$(if $(BR2_INET_IPV6),yes,no) \ @@ -65,4 +67,12 @@ STRONGSWAN_DEPENDENCIES += \ $(if $(BR2_PACKAGE_MYSQL_CLIENT),mysql_client) endif +# Strongswan uses AC_LIB_PREFIX, which is relatively new. +# Avoid make to try reconfiguring due to timestamp changes, +# after patching configure{,.in}. +define STRONGSWAN_AVOID_RECONF_HOOK + touch $(@D)/aclocal.m4 +endef +STRONGSWAN_POST_PATCH_HOOKS += STRONGSWAN_AVOID_RECONF_HOOK + $(eval $(autotools-package)) diff --git a/package/sunxi-cedarx/sunxi-cedarx.mk b/package/sunxi-cedarx/sunxi-cedarx.mk index b1c37175c5..07c85d457a 100644 --- a/package/sunxi-cedarx/sunxi-cedarx.mk +++ b/package/sunxi-cedarx/sunxi-cedarx.mk @@ -9,14 +9,13 @@ SUNXI_CEDARX_SITE = http://github.com/linux-sunxi/cedarx-libs/tarball/$(SUNXI_CE SUNXI_CEDARX_INSTALL_STAGING = YES +SUNXI_CEDARX_CONFIGURE_OPTS = \ + CROSS_COMPILE=$(TARGET_CROSS) + ifeq ($(BR2_ARM_EABIHF),y) SUNXI_CEDARX_BIN_DIR = $(@D)/libcedarv/linux-armhf -else -SUNXI_CEDARX_BIN_DIR = $(@D)/libcedarv/linux-armel -endif - -define SUNXI_CEDARX_BUILD_CMDS - $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(SUNXI_CEDARX_BIN_DIR) +# libavheap.so is only available on EABIHF +define SUNXI_CEDARX_BUILD_AVHEAP $(TARGET_CC) $(TARGET_CFLAGS) \ -c $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/avheap.c \ -o $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/avheap.o \ @@ -26,6 +25,19 @@ define SUNXI_CEDARX_BUILD_CMDS -o $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/libavheap.so \ $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/avheap.o endef +define SUNXI_CEDARX_INSTALL_AVHEAP + $(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/libavheap.so \ + $(1)/usr/lib/libavheap.so +endef +else +SUNXI_CEDARX_BIN_DIR = $(@D)/libcedarv/linux-armel +endif + +define SUNXI_CEDARX_BUILD_CMDS + $(TARGET_MAKE_ENV) $(TARGET_CONFIGURE_OPTS) $(MAKE) -C $(SUNXI_CEDARX_BIN_DIR) \ + $(SUNXI_CEDARX_CONFIGURE_OPTS) + $(SUNXI_CEDARX_BUILD_AVHEAP) +endef define SUNXI_CEDARX_INSTALL_STAGING_CMDS $(INSTALL) -d -m 755 $(STAGING_DIR)/usr/include/libvecore @@ -35,15 +47,13 @@ define SUNXI_CEDARX_INSTALL_STAGING_CMDS $(STAGING_DIR)/usr/include/ $(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/libvecore/libvecore.so \ $(STAGING_DIR)/usr/lib/libvecore.so - $(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/libavheap.so \ - $(STAGING_DIR)/usr/lib/libavheap.so + $(call SUNXI_CEDARX_INSTALL_AVHEAP, $(STAGING_DIR)) endef define SUNXI_CEDARX_INSTALL_TARGET_CMDS $(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/libvecore/libvecore.so \ $(TARGET_DIR)/usr/lib/libvecore.so - $(INSTALL) -D -m 755 $(SUNXI_CEDARX_BIN_DIR)/adapter/avheap/libavheap.so \ - $(TARGET_DIR)/usr/lib/libavheap.so + $(call SUNXI_CEDARX_INSTALL_AVHEAP, $(TARGET_DIR)) endef $(eval $(generic-package)) diff --git a/package/sunxi-mali/S80mali b/package/sunxi-mali/S80mali index 6f51cc4745..ecfbab97b4 100644 --- a/package/sunxi-mali/S80mali +++ b/package/sunxi-mali/S80mali @@ -5,7 +5,7 @@ install_driver() { OPTS=$2 modprobe $DRIVER $OPTS - maj=$(awk "$$2==\"${DRIVER}\" { print $$1; }" /proc/devices) + maj=$(awk "\$2==\"${DRIVER}\" { print \$1; }" /proc/devices) rm -f /dev/${DRIVER} diff --git a/package/sunxi-mali/glesv2.pc b/package/sunxi-mali/glesv2.pc index 4e112eeafb..9273678093 100644 --- a/package/sunxi-mali/glesv2.pc +++ b/package/sunxi-mali/glesv2.pc @@ -7,6 +7,6 @@ Name: glesv2 Description: ARM Mali implementation of OpenGL ESv2 Version: 2.0 Requires: -Libs: -L${libdir} -lGLESv2 -lGLES_CM -lUMP +Libs: -L${libdir} -lGLESv2 -lGLESv1_CM -lUMP Cflags: -I${includedir}/GLES2 diff --git a/package/uclibc/0.9.33-arc/fix-susv3-legacy-bcmp.patch b/package/uclibc/0.9.33-arc/fix-susv3-legacy-bcmp.patch new file mode 100644 index 0000000000..e0884ea7bc --- /dev/null +++ b/package/uclibc/0.9.33-arc/fix-susv3-legacy-bcmp.patch @@ -0,0 +1,37 @@ +From 0594ba53b9b8d9a1ac409fd187e4d1ba8f2e7f2a Mon Sep 17 00:00:00 2001 +From: Vineet Gupta <vgupta@synopsys.com> +Date: Thu, 8 Aug 2013 15:41:51 +0530 +Subject: [PATCH] ARC: SuSv3 legacy support: Add "bcmp" alias for memcmp + +Although uClibc provides this already as UCLIBC_SUSV3_LEGACY_MACROS, +that however requires UCLIBC_SUSV3_LEGACY to be switched off, causing a +bunch of other things to be not available (usleep) + +Signed-off-by: Vineet Gupta <vgupta@synopsys.com> +--- + libc/string/arc/memcmp.S | 5 +++++ + 1 file changed, 5 insertions(+) + +diff --git a/libc/string/arc/memcmp.S b/libc/string/arc/memcmp.S +index 0c7c345..cb25990 100644 +--- a/libc/string/arc/memcmp.S ++++ b/libc/string/arc/memcmp.S +@@ -1,6 +1,7 @@ + /* Copyright (C) 2007 ARC International (UK) LTD */ + + #include <bits/asm.h> ++#include <features.h> + + #ifdef __LITTLE_ENDIAN__ + #define WORD2 r2 +@@ -115,3 +116,7 @@ ENTRY(memcmp) + j_s.d [blink] + mov r0,0 + ENDFUNC(memcmp) ++ ++#ifdef __UCLIBC_SUSV3_LEGACY__ ++strong_alias(memcmp,bcmp) ++#endif +-- +1.8.1.2 + diff --git a/package/uclibc/uclibc.mk b/package/uclibc/uclibc.mk index e3681c7689..39877bbbf9 100644 --- a/package/uclibc/uclibc.mk +++ b/package/uclibc/uclibc.mk @@ -85,7 +85,7 @@ define UCLIBC_ARM_BX_CONFIG endef else define UCLIBC_ARM_BX_CONFIG - $(call UCLIBC_OPT_UNSET,USE_BX,y,$(@D)) + $(call UCLIBC_OPT_UNSET,USE_BX,$(@D)) endef endif diff --git a/package/udev/Config.in b/package/udev/Config.in index ed32c8975e..dd5ad7bd2c 100644 --- a/package/udev/Config.in +++ b/package/udev/Config.in @@ -32,7 +32,7 @@ config BR2_PACKAGE_UDEV_ALL_EXTRAS libacl, hwdata and libglib2 comment "enabling all extras requires a toolchain with WCHAR and threading support" - depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_USE_THREADS + depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS endif diff --git a/package/wayland/Config.in b/package/wayland/Config.in index e5d26493e1..591e0f08f7 100644 --- a/package/wayland/Config.in +++ b/package/wayland/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_WAYLAND bool "wayland" + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBFFI select BR2_PACKAGE_EXPAT help @@ -8,3 +9,6 @@ config BR2_PACKAGE_WAYLAND of the protocol. http://wayland.freedesktop.org/ + +comment "wayland requires a toolchain with thread support" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/webkit/Config.in b/package/webkit/Config.in index 92cbc62ecd..44a208a411 100644 --- a/package/webkit/Config.in +++ b/package/webkit/Config.in @@ -4,6 +4,8 @@ config BR2_PACKAGE_WEBKIT depends on BR2_USE_WCHAR # enchant -> libglib2 depends on BR2_TOOLCHAIN_HAS_THREADS # enchant -> libglib2 depends on BR2_PACKAGE_LIBGTK2 + depends on (BR2_arm || BR2_armeb || BR2_i386 || BR2_mips || BR2_mipsel || \ + BR2_powerpc || BR2_sh || BR2_sparc || BR2_x86_64) select BR2_PACKAGE_ICU select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBXML2 @@ -24,5 +26,5 @@ config BR2_PACKAGE_WEBKIT http://webkit.org/ comment "webkit requires libgtk2 and a toolchain with C++, WCHAR, threading support" - depends on BR2_PACKAGE_LIBGTK2 || !BR2_INSTALL_LIBSTDCPP || \ + depends on !BR2_PACKAGE_LIBGTK2 || !BR2_INSTALL_LIBSTDCPP || \ !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/weston/Config.in b/package/weston/Config.in index 8871ce56d1..56eb135686 100644 --- a/package/weston/Config.in +++ b/package/weston/Config.in @@ -11,6 +11,7 @@ config BR2_PACKAGE_WESTON select BR2_PACKAGE_JPEG select BR2_PACKAGE_MTDEV depends on BR2_PACKAGE_UDEV + depends on BR2_TOOLCHAIN_HAS_THREADS # wayland # Runtime dependency select BR2_PACKAGE_XKEYBOARD_CONFIG # Make sure at least one backend is selected diff --git a/package/x11r7/mesa3d/mesa3d.mk b/package/x11r7/mesa3d/mesa3d.mk index f9d35a92b5..d4080d47d0 100644 --- a/package/x11r7/mesa3d/mesa3d.mk +++ b/package/x11r7/mesa3d/mesa3d.mk @@ -6,7 +6,7 @@ MESA3D_VERSION = 7.10.3 MESA3D_SOURCE = MesaLib-$(MESA3D_VERSION).tar.gz -MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/$(MESA3D_VERSION) +MESA3D_SITE = ftp://ftp.freedesktop.org/pub/mesa/older-versions/7.x/$(MESA3D_VERSION) MESA3D_LICENSE = MIT, SGI, Khronos MESA3D_LICENSE_FILES = docs/license.html diff --git a/package/zeromq/zeromq-0001-test-collect-delay-end-of-line.patch b/package/zeromq/zeromq-0001-test-collect-delay-end-of-line.patch new file mode 100644 index 0000000000..6a1a6551df --- /dev/null +++ b/package/zeromq/zeromq-0001-test-collect-delay-end-of-line.patch @@ -0,0 +1,15 @@ +test_connect_delay: add missing newline at end of file + +Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> +Backported-from: https://github.com/zeromq/zeromq3-x/commit/143ae519b4a325bb68d29e6f7e00cb98a440dd12 + +diff --git a/tests/test_connect_delay.cpp b/tests/test_connect_delay.cpp +--- a/tests/test_connect_delay.cpp ++++ b/tests/test_connect_delay.cpp +@@ -257,4 +257,4 @@ int main (void) + + rc = zmq_ctx_destroy(context2); + assert (rc == 0); +-} +\ No newline at end of file ++} diff --git a/support/scripts/apply-patches.sh b/support/scripts/apply-patches.sh index 2995ea9972..e9c68695db 100755 --- a/support/scripts/apply-patches.sh +++ b/support/scripts/apply-patches.sh @@ -80,7 +80,7 @@ function apply_patch { echo "" echo "Applying $patch using ${type}: " echo $patch >> ${builddir}/.applied_patches_list - ${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}" + ${uncomp} "${path}/$patch" | patch -g0 -p1 -E -d "${builddir}" -t if [ $? != 0 ] ; then echo "Patch failed! Please fix ${patch}!" exit 1 diff --git a/support/scripts/gen-manual-lists.py b/support/scripts/gen-manual-lists.py index ae1d4ff420..35688430e6 100755 --- a/support/scripts/gen-manual-lists.py +++ b/support/scripts/gen-manual-lists.py @@ -185,7 +185,7 @@ class Buildroot: list_info = { 'target-packages': { 'filename': "package-list", - 'root_menu': "Package Selection for the target", + 'root_menu': "Target packages", 'filter': "_is_package", 'sorted': True, 'sub_menu': True, diff --git a/toolchain/helpers.mk b/toolchain/helpers.mk index 4c988a5c9a..44b6018fd9 100644 --- a/toolchain/helpers.mk +++ b/toolchain/helpers.mk @@ -125,7 +125,7 @@ copy_toolchain_lib_root = \ # $1: main sysroot directory of the toolchain # $2: arch specific sysroot directory of the toolchain # $3: arch specific subdirectory in the sysroot -# $4: directory of libraries ('lib' or 'lib64') +# $4: directory of libraries ('lib', 'lib32' or 'lib64') # $5: support lib directories (for toolchains storing libgcc_s, # libstdc++ and other gcc support libraries outside of the # sysroot) @@ -135,9 +135,11 @@ copy_toolchain_sysroot = \ ARCH_SUBDIR="$(strip $3)"; \ ARCH_LIB_DIR="$(strip $4)" ; \ SUPPORT_LIB_DIR="$(strip $5)" ; \ - for i in etc $${ARCH_LIB_DIR} sbin usr ; do \ + for i in etc $${ARCH_LIB_DIR} sbin usr usr/$${ARCH_LIB_DIR}; do \ if [ -d $${ARCH_SYSROOT_DIR}/$$i ] ; then \ - rsync -au --chmod=Du+w --exclude 'usr/lib/locale' $${ARCH_SYSROOT_DIR}/$$i $(STAGING_DIR)/ ; \ + rsync -au --chmod=Du+w --exclude 'usr/lib/locale' \ + --exclude lib --exclude lib32 --exclude lib64 \ + $${ARCH_SYSROOT_DIR}/$$i/ $(STAGING_DIR)/$$i/ ; \ fi ; \ done ; \ if [ `readlink -f $${SYSROOT_DIR}` != `readlink -f $${ARCH_SYSROOT_DIR}` ] ; then \ @@ -159,19 +161,6 @@ copy_toolchain_sysroot = \ find $(STAGING_DIR) -type d | xargs chmod 755 # -# Create lib64 -> lib and usr/lib64 -> usr/lib symbolic links in the -# target and staging directories. This is needed for some 64 bits -# toolchains such as the Crosstool-NG toolchains, for which the path -# to the dynamic loader and other libraries is /lib64, but the -# libraries are stored in /lib. -# -create_lib64_symlinks = \ - (cd $(TARGET_DIR) ; ln -s lib lib64) ; \ - (cd $(TARGET_DIR)/usr ; ln -s lib lib64) ; \ - (cd $(STAGING_DIR) ; ln -s lib lib64) ; \ - (cd $(STAGING_DIR)/usr ; ln -s lib lib64) - -# # Check the availability of a particular glibc feature. This function # is used to check toolchain options that are always supported by # glibc, so we simply check that the corresponding option is properly diff --git a/toolchain/toolchain-external/Config.in b/toolchain/toolchain-external/Config.in index 324401f4f5..ad1f203139 100644 --- a/toolchain/toolchain-external/Config.in +++ b/toolchain/toolchain-external/Config.in @@ -190,6 +190,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201305 bool "Sourcery CodeBench MIPS 2013.05" depends on BR2_mips || BR2_mipsel || BR2_mips64 || BR2_mips64el depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on !BR2_MIPS_NABI32 select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_INSTALL_LIBSTDCPP @@ -260,6 +261,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201209 bool "Sourcery CodeBench MIPS 2012.09" depends on BR2_mips || BR2_mipsel depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on !BR2_MIPS_NABI32 select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_INSTALL_LIBSTDCPP @@ -330,6 +332,7 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203 bool "Sourcery CodeBench MIPS 2012.03" depends on BR2_mips || BR2_mipsel depends on BR2_HOSTARCH = "x86_64" || BR2_HOSTARCH = "x86" + depends on !BR2_MIPS_NABI32 select BR2_TOOLCHAIN_EXTERNAL_GLIBC select BR2_TOOLCHAIN_HAS_NATIVE_RPC select BR2_INSTALL_LIBSTDCPP @@ -396,6 +399,9 @@ config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_MIPS201203 - MIPS32 little endian soft float uclibc Not usable in Buildroot yet. +comment "Sourcery CodeBench toolchains are only available for MIPS/MIPS64 o32 and n64" + depends on BR2_MIPS_NABI32 + config BR2_TOOLCHAIN_EXTERNAL_CODESOURCERY_POWERPC201103 bool "Sourcery CodeBench PowerPC 2011.03" depends on BR2_powerpc diff --git a/toolchain/toolchain-external/ext-tool.mk b/toolchain/toolchain-external/ext-tool.mk index a3c40c873b..38f6e22906 100644 --- a/toolchain/toolchain-external/ext-tool.mk +++ b/toolchain/toolchain-external/ext-tool.mk @@ -449,7 +449,6 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked fi ; \ fi ; \ ARCH_SUBDIR=`echo $${ARCH_SYSROOT_DIR} | sed -r -e "s:^$${SYSROOT_DIR}(.*)/$$:\1:"` ; \ - mkdir -p $(TARGET_DIR)/lib ; \ if test -z "$(BR2_PREFER_STATIC_LIB)" ; then \ $(call MESSAGE,"Copying external toolchain libraries to target...") ; \ for libs in $(LIB_EXTERNAL_LIBS); do \ @@ -461,9 +460,6 @@ $(STAMP_DIR)/ext-toolchain-installed: $(STAMP_DIR)/ext-toolchain-checked fi ; \ $(call MESSAGE,"Copying external toolchain sysroot to staging...") ; \ $(call copy_toolchain_sysroot,$${SYSROOT_DIR},$${ARCH_SYSROOT_DIR},$${ARCH_SUBDIR},$${ARCH_LIB_DIR},$${SUPPORT_LIB_DIR}) ; \ - if [ -L $${ARCH_SYSROOT_DIR}/lib64 -o -d $${ARCH_SYSROOT_DIR}/lib64 ] ; then \ - $(call create_lib64_symlinks) ; \ - fi ; \ if test "$(BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY)" = "y"; then \ $(call MESSAGE,"Copying gdbserver") ; \ gdbserver_found=0 ; \ @@ -531,8 +527,9 @@ ifeq ($(BR2_BFIN_INSTALL_FLAT_SHARED),y) TOOLCHAIN_EXTERNAL_INSTALL += $(STAMP_DIR)/ext-toolchain-bfin-shared-flat-installed endif -# Build toolchain wrapper for preprocessor, C and C++ compiler, and setup -# symlinks for everything else +# Build toolchain wrapper for preprocessor, C and C++ compiler and setup +# symlinks for everything else. Skip gdb symlink when we are building our +# own gdb to prevent two gdb's in output/host/usr/bin. $(HOST_DIR)/usr/bin/ext-toolchain-wrapper: $(TOOLCHAIN_EXTERNAL_INSTALL) $(Q)$(call MESSAGE,"Building ext-toolchain wrapper") mkdir -p $(HOST_DIR)/usr/bin; cd $(HOST_DIR)/usr/bin; \ @@ -542,6 +539,11 @@ $(HOST_DIR)/usr/bin/ext-toolchain-wrapper: $(TOOLCHAIN_EXTERNAL_INSTALL) *cc|*cc-*|*++|*++-*|*cpp) \ ln -sf $(@F) $$base; \ ;; \ + *gdb|*gdbtui) \ + if test "$(BR2_PACKAGE_HOST_GDB)" != "y"; then \ + ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \ + fi \ + ;; \ *) \ ln -sf $$(echo $$i | sed 's%^$(HOST_DIR)%../..%') .; \ ;; \ |
