diff options
116 files changed, 674 insertions, 272 deletions
@@ -1,3 +1,38 @@ +2013.02, Released February 28th, 2013: + + Misc manual updates. + + Updated/fixed packages: busybox, collectd, flashbench, + libgtk2, libupnp, mii-diag, quota + +2013.02-rc3, Released February 26th, 2013 + + Minor fixes. + + Updated/fixed packages: conntrack-tools, dialog, + enlightenment, haserl, keyutils, libfif, libmad, + linux-firmware, linux-fusion, matchbox-desktop, matchbox-wm, + ruby, spawn-fcgi, vtun + + Issues resolved (http://bugs.uclibc.org): + + #5960: fusion.ko driver does not install to target rootfs + +2013.02-rc2, Released February 19th, 2013 + + Fixes all over the tree. + + Various manual updates and fixes. + + Updated/fixed packages: busybox, collectd, gesftpserver, + glib-networking, gnutls, inotify-tools, libcurl, libffi, + libglib2, libtorrent, libvorbis, neard, network-manager, + ntfs-3g, openssl, qt, rpi-userland, rtorrent, thttpd, vim. + + Issues resolved (http://bugs.uclibc.org): + + #5906: collectd client headers not exported + 2013.02-rc1, Released February 10th, 2013 Toolchain: Crosstool-ng 1.17.0, default to GCC 4.6.3, target diff --git a/configs/qemu_arm_nuri_defconfig b/configs/qemu_arm_nuri_defconfig index 4bc7bb289..a18f5a9a2 100644 --- a/configs/qemu_arm_nuri_defconfig +++ b/configs/qemu_arm_nuri_defconfig @@ -20,6 +20,6 @@ BR2_KERNEL_HEADERS_3_7=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8" 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 cbd7dd172..65ee19867 100644 --- a/configs/qemu_arm_versatile_defconfig +++ b/configs/qemu_arm_versatile_defconfig @@ -16,7 +16,7 @@ BR2_KERNEL_HEADERS_3_7=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/arm-versatile/linux-3.7.config" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_arm_vexpress_defconfig b/configs/qemu_arm_vexpress_defconfig index 8ff5a468c..7b8a7bacb 100644 --- a/configs/qemu_arm_vexpress_defconfig +++ b/configs/qemu_arm_vexpress_defconfig @@ -20,6 +20,6 @@ BR2_KERNEL_HEADERS_3_7=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8" 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 46430170a..6e47edf2b 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.7.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux-3.7.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 6ecbd4c7d..8be173a4b 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.7.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux-3.7.config" BR2_LINUX_KERNEL_LINUX_BIN=y diff --git a/configs/qemu_mips64_malta_defconfig b/configs/qemu_mips64_malta_defconfig index b8ca9488a..1b0b6221e 100644 --- a/configs/qemu_mips64_malta_defconfig +++ b/configs/qemu_mips64_malta_defconfig @@ -16,7 +16,7 @@ BR2_KERNEL_HEADERS_3_7=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips64-malta/linux-3.7.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mips_malta_defconfig b/configs/qemu_mips_malta_defconfig index 6b034f62a..f5a6e09c0 100644 --- a/configs/qemu_mips_malta_defconfig +++ b/configs/qemu_mips_malta_defconfig @@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_7=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mips-malta/linux-3.7.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_mipsel_malta_defconfig b/configs/qemu_mipsel_malta_defconfig index adaaedd79..a7685562a 100644 --- a/configs/qemu_mipsel_malta_defconfig +++ b/configs/qemu_mipsel_malta_defconfig @@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_7=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/mipsel-malta/linux-3.7.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_g3beige_defconfig b/configs/qemu_ppc_g3beige_defconfig index 080ee4d94..8cbf170a8 100644 --- a/configs/qemu_ppc_g3beige_defconfig +++ b/configs/qemu_ppc_g3beige_defconfig @@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_7=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/powerpc-g3beige/linux-3.7.config" BR2_LINUX_KERNEL_VMLINUX=y diff --git a/configs/qemu_ppc_mpc8544ds_defconfig b/configs/qemu_ppc_mpc8544ds_defconfig index 68211a008..ddaaa45c9 100644 --- a/configs/qemu_ppc_mpc8544ds_defconfig +++ b/configs/qemu_ppc_mpc8544ds_defconfig @@ -12,7 +12,7 @@ BR2_KERNEL_HEADERS_3_7=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8" 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 9dfbe5245..f7f957d2a 100644 --- a/configs/qemu_ppc_virtex_ml507_defconfig +++ b/configs/qemu_ppc_virtex_ml507_defconfig @@ -15,7 +15,7 @@ BR2_SOFT_FLOAT=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8" BR2_LINUX_KERNEL_DEFCONFIG="44x/virtex5" BR2_LINUX_KERNEL_VMLINUX=y BR2_LINUX_KERNEL_DTS_SUPPORT=y diff --git a/configs/qemu_sparc_ss10_defconfig b/configs/qemu_sparc_ss10_defconfig index 906671b29..6b883653c 100644 --- a/configs/qemu_sparc_ss10_defconfig +++ b/configs/qemu_sparc_ss10_defconfig @@ -12,6 +12,6 @@ BR2_KERNEL_HEADERS_3_7=y # Linux kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8" BR2_LINUX_KERNEL_DEFCONFIG="sparc32" BR2_LINUX_KERNEL_ZIMAGE=y diff --git a/configs/qemu_x86_64_defconfig b/configs/qemu_x86_64_defconfig index 74011fc30..45f0e0a55 100644 --- a/configs/qemu_x86_64_defconfig +++ b/configs/qemu_x86_64_defconfig @@ -15,6 +15,6 @@ BR2_KERNEL_HEADERS_3_7=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86_64/linux-3.7.config" diff --git a/configs/qemu_x86_defconfig b/configs/qemu_x86_defconfig index 2734fdb9c..60ceacc1c 100644 --- a/configs/qemu_x86_defconfig +++ b/configs/qemu_x86_defconfig @@ -16,6 +16,6 @@ BR2_KERNEL_HEADERS_3_7=y # Kernel BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.6" +BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="3.7.8" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/x86/linux-3.7.config" diff --git a/docs/download.html b/docs/download.html index f7369d603..10bf5d854 100644 --- a/docs/download.html +++ b/docs/download.html @@ -6,22 +6,22 @@ <p> -The latest stable release is <b>2012.11.1</b>, which can be downloaded +The latest stable release is <b>2013.02</b>, which can be downloaded here:<p> -<a href="/downloads/buildroot-2012.11.1.tar.gz">buildroot-2012.11.1.tar.gz</a> +<a href="/downloads/buildroot-2013.02.tar.gz">buildroot-2013.02.tar.gz</a> or -<a href="/downloads/buildroot-2012.11.1.tar.bz2">buildroot-2012.11.1.tar.bz2</a>. - +<a href="/downloads/buildroot-2013.02.tar.bz2">buildroot-2013.02.tar.bz2</a>. +<!-- <p> -The latest release candidate is <b>2013.02-rc1</b>, which can be +The latest release candidate is <b>2013.02-rc3</b>, which can be downloaded here:<p> -<a href="/downloads/buildroot-2013.02-rc1.tar.gz">buildroot-2013.02-rc1.tar.gz</a> +<a href="/downloads/buildroot-2013.02-rc3.tar.gz">buildroot-2013.02-rc3.tar.gz</a> or -<a href="/downloads/buildroot-2013.02-rc1.tar.bz2">buildroot-2013.02-rc1.tar.bz2</a>. +<a href="/downloads/buildroot-2013.02-rc3.tar.bz2">buildroot-2013.02-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-autotools.txt b/docs/manual/adding-packages-autotools.txt index 84d76f929..1d5f30bc3 100644 --- a/docs/manual/adding-packages-autotools.txt +++ b/docs/manual/adding-packages-autotools.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Infrastructure for autotools-based packages ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -17,24 +18,25 @@ package, with an example : 03: # libfoo 04: # 05: ############################################################# -06: LIBFOO_VERSION = 1.0 -07: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz -08: LIBFOO_SITE = http://www.foosoftware.org/download -09: LIBFOO_INSTALL_STAGING = YES -10: LIBFOO_INSTALL_TARGET = NO -11: LIBFOO_CONF_OPT = --disable-shared -12: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf -13: -14: $(eval $(autotools-package)) +06: +07: LIBFOO_VERSION = 1.0 +08: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz +09: LIBFOO_SITE = http://www.foosoftware.org/download +10: LIBFOO_INSTALL_STAGING = YES +11: LIBFOO_INSTALL_TARGET = NO +12: LIBFOO_CONF_OPT = --disable-shared +13: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf +14: +15: $(eval $(autotools-package)) ------------------------ -On line 6, we declare the version of the package. +On line 7, we declare the version of the package. -On line 7 and 8, we declare the name of the tarball and the location +On line 8 and 9, we declare the name of the tarball and the location of the tarball on the Web. Buildroot will automatically download the tarball from this location. -On line 9, we tell Buildroot to install the package to the staging +On line 10, we tell Buildroot to install the package to the staging directory. The staging directory, located in +output/staging/+ is the directory where all the packages are installed, including their development files, etc. By default, packages are not installed to the @@ -44,7 +46,7 @@ other libraries or applications depending on them. Also by default, when staging installation is enabled, packages are installed in this location using the +make install+ command. -On line 10, we tell Buildroot to not install the package to the +On line 11, we tell Buildroot to not install the package to the target directory. This directory contains what will become the root filesystem running on the target. For purely static libraries, it is not necessary to install them in the target directory because they will @@ -52,14 +54,14 @@ not be used at runtime. By default, target installation is enabled; setting this variable to NO is almost never needed. Also by default, packages are installed in this location using the +make install+ command. -On line 11, we tell Buildroot to pass a custom configure option, that +On line 12, we tell Buildroot to pass a custom configure option, that will be passed to the +./configure+ script before configuring and building the package. -On line 12, we declare our dependencies, so that they are built +On line 13, we declare our dependencies, so that they are built before the build process of our package starts. -Finally, on line line 14, we invoke the +autotools-package+ +Finally, on line line 15, we invoke the +autotools-package+ macro that generates all the Makefile rules that actually allows the package to be built. diff --git a/docs/manual/adding-packages-cmake.txt b/docs/manual/adding-packages-cmake.txt index bb1705bfd..6ac073c35 100644 --- a/docs/manual/adding-packages-cmake.txt +++ b/docs/manual/adding-packages-cmake.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Infrastructure for CMake-based packages ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -17,24 +18,25 @@ with an example : 03: # libfoo 04: # 05: ############################################################# -06: LIBFOO_VERSION = 1.0 -07: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz -08: LIBFOO_SITE = http://www.foosoftware.org/download -09: LIBFOO_INSTALL_STAGING = YES -10: LIBFOO_INSTALL_TARGET = NO -11: LIBFOO_CONF_OPT = -DBUILD_DEMOS=ON -12: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf -13: -14: $(eval $(cmake-package)) +06: +07: LIBFOO_VERSION = 1.0 +08: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz +09: LIBFOO_SITE = http://www.foosoftware.org/download +10: LIBFOO_INSTALL_STAGING = YES +11: LIBFOO_INSTALL_TARGET = NO +12: LIBFOO_CONF_OPT = -DBUILD_DEMOS=ON +13: LIBFOO_DEPENDENCIES = libglib2 host-pkgconf +14: +15: $(eval $(cmake-package)) ------------------------ -On line 6, we declare the version of the package. +On line 7, we declare the version of the package. -On line 7 and 8, we declare the name of the tarball and the location +On line 8 and 9, we declare the name of the tarball and the location of the tarball on the Web. Buildroot will automatically download the tarball from this location. -On line 9, we tell Buildroot to install the package to the staging +On line 10, we tell Buildroot to install the package to the staging directory. The staging directory, located in +output/staging/+ is the directory where all the packages are installed, including their development files, etc. By default, packages are not installed to the @@ -44,7 +46,7 @@ other libraries or applications depending on them. Also by default, when staging installation is enabled, packages are installed in this location using the +make install+ command. -On line 10, we tell Buildroot to not install the package to the +On line 11, we tell Buildroot to not install the package to the target directory. This directory contains what will become the root filesystem running on the target. For purely static libraries, it is not necessary to install them in the target directory because they will @@ -52,13 +54,13 @@ not be used at runtime. By default, target installation is enabled; setting this variable to NO is almost never needed. Also by default, packages are installed in this location using the +make install+ command. -On line 11, we tell Buildroot to pass custom options to CMake when it is +On line 12, we tell Buildroot to pass custom options to CMake when it is configuring the package. -On line 12, we declare our dependencies, so that they are built +On line 13, we declare our dependencies, so that they are built before the build process of our package starts. -Finally, on line line 14, we invoke the +cmake-package+ +Finally, on line line 15, we invoke the +cmake-package+ macro that generates all the Makefile rules that actually allows the package to be built. diff --git a/docs/manual/adding-packages-conclusion.txt b/docs/manual/adding-packages-conclusion.txt index 0f6f0ca0a..8e1b2c6a7 100644 --- a/docs/manual/adding-packages-conclusion.txt +++ b/docs/manual/adding-packages-conclusion.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Conclusion ~~~~~~~~~~ diff --git a/docs/manual/adding-packages-directory.txt b/docs/manual/adding-packages-directory.txt index cc6849710..6296596d7 100644 --- a/docs/manual/adding-packages-directory.txt +++ b/docs/manual/adding-packages-directory.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Package directory ~~~~~~~~~~~~~~~~~ diff --git a/docs/manual/adding-packages-generic.txt b/docs/manual/adding-packages-generic.txt index 78df24ade..a615ae2c9 100644 --- a/docs/manual/adding-packages-generic.txt +++ b/docs/manual/adding-packages-generic.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Infrastructure for packages with specific build systems ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -19,42 +20,43 @@ system is based on hand-written Makefiles or shell scripts. 03: # libfoo 04: # 05: ############################################################# -06: LIBFOO_VERSION = 1.0 -07: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz -08: LIBFOO_SITE = http://www.foosoftware.org/download -09: LIBFOO_LICENSE = GPLv3+ -10: LIBFOO_LICENSE_FILES = COPYING -11: LIBFOO_INSTALL_STAGING = YES -12: LIBFOO_CONFIG_SCRIPTS = libfoo-config -13: LIBFOO_DEPENDENCIES = host-libaaa libbbb -14: -15: define LIBFOO_BUILD_CMDS -16: $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) all -17: endef -18: -19: define LIBFOO_INSTALL_STAGING_CMDS -20: $(INSTALL) -D -m 0755 $(@D)/libfoo.a $(STAGING_DIR)/usr/lib/libfoo.a -21: $(INSTALL) -D -m 0644 $(@D)/foo.h $(STAGING_DIR)/usr/include/foo.h -22: $(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(STAGING_DIR)/usr/lib -23: endef -24: -25: define LIBFOO_INSTALL_TARGET_CMDS -26: $(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(TARGET_DIR)/usr/lib -27: $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/foo.d -28: endef -29: -30: define LIBFOO_DEVICES -31: /dev/foo c 666 0 0 42 0 - - - -32: endef -33: -34: define LIBFOO_PERMISSIONS -35: /bin/foo f 4755 0 0 - - - - - -36: endef -37: -38: $(eval $(generic-package)) +06: +07: LIBFOO_VERSION = 1.0 +08: LIBFOO_SOURCE = libfoo-$(LIBFOO_VERSION).tar.gz +09: LIBFOO_SITE = http://www.foosoftware.org/download +10: LIBFOO_LICENSE = GPLv3+ +11: LIBFOO_LICENSE_FILES = COPYING +12: LIBFOO_INSTALL_STAGING = YES +13: LIBFOO_CONFIG_SCRIPTS = libfoo-config +14: LIBFOO_DEPENDENCIES = host-libaaa libbbb +15: +16: define LIBFOO_BUILD_CMDS +17: $(MAKE) CC="$(TARGET_CC)" LD="$(TARGET_LD)" -C $(@D) all +18: endef +19: +20: define LIBFOO_INSTALL_STAGING_CMDS +21: $(INSTALL) -D -m 0755 $(@D)/libfoo.a $(STAGING_DIR)/usr/lib/libfoo.a +22: $(INSTALL) -D -m 0644 $(@D)/foo.h $(STAGING_DIR)/usr/include/foo.h +23: $(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(STAGING_DIR)/usr/lib +24: endef +25: +26: define LIBFOO_INSTALL_TARGET_CMDS +27: $(INSTALL) -D -m 0755 $(@D)/libfoo.so* $(TARGET_DIR)/usr/lib +28: $(INSTALL) -d -m 0755 $(TARGET_DIR)/etc/foo.d +29: endef +30: +31: define LIBFOO_DEVICES +32: /dev/foo c 666 0 0 42 0 - - - +33: endef +34: +35: define LIBFOO_PERMISSIONS +36: /bin/foo f 4755 0 0 - - - - - +37: endef +38: +39: $(eval $(generic-package)) -------------------------------- -The Makefile begins on line 6 to 10 with metadata information: the +The Makefile begins on line 7 to 11 with metadata information: the version of the package (+LIBFOO_VERSION+), the name of the tarball containing the package (+LIBFOO_SOURCE+) the Internet location at which the tarball can be downloaded from @@ -64,13 +66,13 @@ the same prefix, +LIBFOO_+ in this case. This prefix is always the uppercased version of the package name (see below to understand where the package name is defined). -On line 11, we specify that this package wants to install something to +On line 12, we specify that this package wants to install something to the staging space. This is often needed for libraries, since they must install header files and other development files in the staging space. This will ensure that the commands listed in the +LIBFOO_INSTALL_STAGING_CMDS+ variable will be executed. -On line 12, we specify that there is some fixing to be done to some +On line 13, we specify that there is some fixing to be done to some of the 'libfoo-config' files that were installed during +LIBFOO_INSTALL_STAGING_CMDS+ phase. These *-config files are executable shell script files that are @@ -112,14 +114,14 @@ IMAGEMAGICK_CONFIG_SCRIPTS = \ Magick-config Magick++-config \ MagickCore-config MagickWand-config Wand-config -On line 13, we specify the list of dependencies this package relies +On line 14, we specify the list of dependencies this package relies on. These dependencies are listed in terms of lower-case package names, which can be packages for the target (without the +host-+ prefix) or packages for the host (with the +host-+) prefix). Buildroot will ensure that all these packages are built and installed 'before' the current package starts its configuration. -The rest of the Makefile, lines 14..27, defines what should be done +The rest of the Makefile, lines 16..29, defines what should be done at the different steps of the package configuration, compilation and installation. +LIBFOO_BUILD_CMDS+ tells what steps should be performed to @@ -132,13 +134,13 @@ All these steps rely on the +$(@D)+ variable, which contains the directory where the source code of the package has been extracted. -On line 29..31, we define a device-node file used by this package +On line 31..33, we define a device-node file used by this package (+LIBFOO_DEVICES+). -On line 33..35, we define the permissions to set to specific files +On line 35..37, we define the permissions to set to specific files installed by this package (+LIBFOO_PERMISSIONS+). -Finally, on line 37, we call the +generic-package+ function, which +Finally, on line 39, we call the +generic-package+ function, which generates, according to the variables defined previously, all the Makefile code necessary to make your package working. diff --git a/docs/manual/adding-packages-gettext.txt b/docs/manual/adding-packages-gettext.txt index 58fd98d4e..98c994cda 100644 --- a/docs/manual/adding-packages-gettext.txt +++ b/docs/manual/adding-packages-gettext.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Gettext integration and interaction with packages ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/manual/adding-packages-tips.txt b/docs/manual/adding-packages-tips.txt index acdee40e7..21e520bcd 100644 --- a/docs/manual/adding-packages-tips.txt +++ b/docs/manual/adding-packages-tips.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Tips and tricks ~~~~~~~~~~~~~~~ diff --git a/docs/manual/adding-packages.txt b/docs/manual/adding-packages.txt index b909d47a8..0123b32f8 100644 --- a/docs/manual/adding-packages.txt +++ b/docs/manual/adding-packages.txt @@ -1,4 +1,5 @@ -// -*- mode:doc -*- ; +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: [[adding-packages]] Adding new packages to Buildroot diff --git a/docs/manual/advanced.txt b/docs/manual/advanced.txt index 314d30098..764b71a5c 100644 --- a/docs/manual/advanced.txt +++ b/docs/manual/advanced.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Advanced usage -------------- diff --git a/docs/manual/appendix.txt b/docs/manual/appendix.txt index 6f1e9f361..ef34169f8 100644 --- a/docs/manual/appendix.txt +++ b/docs/manual/appendix.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Appendix ======== diff --git a/docs/manual/beyond-buildroot.txt b/docs/manual/beyond-buildroot.txt index a87b584aa..a0d4af0a7 100644 --- a/docs/manual/beyond-buildroot.txt +++ b/docs/manual/beyond-buildroot.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Beyond Buildroot ================ diff --git a/docs/manual/ccache-support.txt b/docs/manual/ccache-support.txt index 95cd66203..4969180a2 100644 --- a/docs/manual/ccache-support.txt +++ b/docs/manual/ccache-support.txt @@ -1,4 +1,5 @@ -// -*- mode:doc -*- ; +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: [[ccache]] Using +ccache+ in Buildroot diff --git a/docs/manual/common-usage.txt b/docs/manual/common-usage.txt index 5566a39b0..c7f511ad7 100644 --- a/docs/manual/common-usage.txt +++ b/docs/manual/common-usage.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Daily use --------- diff --git a/docs/manual/configure.txt b/docs/manual/configure.txt index 65e0eeb2f..4f9a6bbcf 100644 --- a/docs/manual/configure.txt +++ b/docs/manual/configure.txt @@ -1,4 +1,5 @@ -// -*- mode:doc -*- ; +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: [[configure]] Details on Buildroot configuration @@ -63,6 +64,7 @@ Type+ option in the +Toolchain+ menu. Once one solution has been chosen, a number of configuration options appear, they are detailed in the following sections. +[[internal-toolchain-backend]] Internal toolchain backend ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -137,6 +139,7 @@ Drawbacks of this backend: using the _External toolchain backend_. * Limited to the _uClibc_ C library. +[[external-toolchain-backend]] External toolchain backend ^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -239,6 +242,7 @@ Drawbacks of this backend: fix from the toolchain vendor, unless you build your external toolchain by yourself using Crosstool-NG. +[[crosstool-ng-toolchain-backend]] Crosstool-NG toolchain backend ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/docs/manual/contribute.txt b/docs/manual/contribute.txt index a33aab2af..9425effdd 100644 --- a/docs/manual/contribute.txt +++ b/docs/manual/contribute.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Contibuting to Buildroot ======================== diff --git a/docs/manual/customize-busybox-config.txt b/docs/manual/customize-busybox-config.txt index fe9cddaad..981d534af 100644 --- a/docs/manual/customize-busybox-config.txt +++ b/docs/manual/customize-busybox-config.txt @@ -1,4 +1,5 @@ -// -*- mode:doc -*- ; +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: [[busybox-custom]] Customizing the Busybox configuration diff --git a/docs/manual/customize-kernel-config.txt b/docs/manual/customize-kernel-config.txt index 107227040..a2d31ed84 100644 --- a/docs/manual/customize-kernel-config.txt +++ b/docs/manual/customize-kernel-config.txt @@ -1,4 +1,5 @@ -// -*- mode:doc -*- ; +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: [[kernel-custom]] Customizing the Linux kernel configuration diff --git a/docs/manual/customize-rootfs.txt b/docs/manual/customize-rootfs.txt index b1662cb79..7ff8d8b1e 100644 --- a/docs/manual/customize-rootfs.txt +++ b/docs/manual/customize-rootfs.txt @@ -1,4 +1,5 @@ -// -*- mode:doc -*- ; +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: [[rootfs-custom]] Customizing the generated target filesystem @@ -24,18 +25,18 @@ there are a few ways to customize the resulting target filesystem. directories, +.empty+ files and files ending with +~+ are excluded. _Among these first 3 methods, this one should be preferred_. -* In the Buildroot configuration, you can specify the path to a - *post-build script*, that gets called 'after' Buildroot builds all the - selected software, but 'before' the rootfs packages are - assembled. The +BR2_ROOTFS_POST_BUILD_SCRIPT+ will allow you to - specify the location of your post-build script. This option can be +* In the Buildroot configuration, you can specify the paths to one or + more *post-build scripts*. These scripts are called in the given order, + 'after' Buildroot builds all the selected software, but 'before' the + rootfs images are assembled. The +BR2_ROOTFS_POST_BUILD_SCRIPT+ allows + you to specify the location of your post-build scripts. This option can be found in the +System configuration+ menu. The destination root - filesystem folder is given as the first argument to this script, - and this script can then be used to remove or modify any file in your + filesystem folder is given as the first argument to these scripts, + and these scripts can then be used to remove or modify any file in your target filesystem. You should, however, use this feature with care. Whenever you find that a certain package generates wrong or unneeded - files, you should fix that package rather than work around it with a - post-build cleanup script. + files, you should fix that package rather than work around it with some + post-build cleanup scripts. You may also use these variables in your post-build script: - +BUILDROOT_CONFIG+: the path to the Buildroot .config file - +HOST_DIR+, +STAGING_DIR+, +TARGET_DIR+: see @@ -54,23 +55,25 @@ there are a few ways to customize the resulting target filesystem. installation. Note that this method is *not recommended*, as it duplicates the entire skeleton, which prevents from taking advantage of the fixes or improvements brought to the default Buildroot - skeleton. The recommended method is to use the _post-build script_ + skeleton. The recommended method is to use the _post-build scripts_ mechanism described in the previous item. -Note also that if you want to perform some specific actions *after* -all filesystem images have been created (for example to automatically +Note also that you can use the *post-image scripts* +if you want to perform some specific actions 'after' all +filesystem images have been created (for example to automatically extract your root filesystem tarball in a location exported by your NFS server, or to create a special firmware image that bundles your root filesystem and kernel image, or any other custom action), you can specify a space-separated list of scripts in the -+BR2_ROOTFS_POST_IMAGE_SCRIPT+ configuration option. ++BR2_ROOTFS_POST_IMAGE_SCRIPT+ configuration option. This option can be +found in the +System configuration+ menu as well. Each of those scripts will be called with the path to the +images+ output directory as first and unique argument, and will be executed with the main Buildroot source directory as the current directory. Those scripts will be executed as the user that executes Buildroot, which should normally not be the root user. Therefore, any -action requiring root permissions in one of these post-image script +action requiring root permissions in one of these _post-image scripts_ will require special handling (usage of fakeroot or sudo), which is left to the script developer. diff --git a/docs/manual/customize-store.txt b/docs/manual/customize-store.txt index 63ea82dcf..5083339ec 100644 --- a/docs/manual/customize-store.txt +++ b/docs/manual/customize-store.txt @@ -1,4 +1,5 @@ -// -*- mode:doc -*- +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: [[customize-store]] Storing the configuration @@ -12,10 +13,13 @@ consists of the buildroot configuration, the configuration files for packages that you use (kernel, busybox, uClibc, ...), and your rootfs modifications. + +[[customize-store-basics]] Basics for storing the configuration ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -[[customize-store-basics]] + +[[customize-store-buildroot-config]] Buildroot configuration ^^^^^^^^^^^^^^^^^^^^^^^ @@ -34,6 +38,7 @@ Alternatively, you can copy the file to any other place and rebuild with +make defconfig BR2_DEFCONFIG=<path-to-defconfig-file>+. +[[customize-store-package-config]] Other package configuration ^^^^^^^^^^^^^^^^^^^^^^^^^^^ @@ -70,6 +75,7 @@ configuration files easier. resp. +BR2_TARGET_AT91BOOTSTRAP3_CUSTOM_CONFIG_FILE+. +[[customize-store-board-support]] Creating your own board support ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/manual/customize-toolchain.txt b/docs/manual/customize-toolchain.txt index 2b244120b..811a6dc7f 100644 --- a/docs/manual/customize-toolchain.txt +++ b/docs/manual/customize-toolchain.txt @@ -1,4 +1,5 @@ -// -*- mode:doc -*- ; +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: [[toolchain-custom]] Customizing the toolchain @@ -14,7 +15,7 @@ There is no way of tuning an external toolchain since Buildroot does not generate it. It also requires to set the Buildroot settings according to the toolchain ones -(see xref:external-toolchain[]). +(see xref:external-toolchain-backend[]). Using the internal Buildroot toolchain backend ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/docs/manual/customize-uclibc-config.txt b/docs/manual/customize-uclibc-config.txt index 38a1575a5..7fd20f706 100644 --- a/docs/manual/customize-uclibc-config.txt +++ b/docs/manual/customize-uclibc-config.txt @@ -1,4 +1,5 @@ -// -*- mode:doc -*- ; +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: [[uclibc-custom]] Customizing the uClibc configuration diff --git a/docs/manual/customize.txt b/docs/manual/customize.txt index a13ba8f3e..3b1a5a734 100644 --- a/docs/manual/customize.txt +++ b/docs/manual/customize.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Customization ------------- diff --git a/docs/manual/developer-guide.txt b/docs/manual/developer-guide.txt index 500289707..43272f567 100644 --- a/docs/manual/developer-guide.txt +++ b/docs/manual/developer-guide.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Developer Guidelines ==================== diff --git a/docs/manual/download-infra.txt b/docs/manual/download-infra.txt index 63908adad..fe031a640 100644 --- a/docs/manual/download-infra.txt +++ b/docs/manual/download-infra.txt @@ -1,4 +1,5 @@ -// -*- mode:doc -*- ; +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: [[download-infra]] diff --git a/docs/manual/download-location.txt b/docs/manual/download-location.txt index 36a13562e..4aa8cead3 100644 --- a/docs/manual/download-location.txt +++ b/docs/manual/download-location.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Location of downloaded packages ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/manual/eclipse-integration.txt b/docs/manual/eclipse-integration.txt index 3d8179fa6..d1a42cf07 100644 --- a/docs/manual/eclipse-integration.txt +++ b/docs/manual/eclipse-integration.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Integration with Eclipse ------------------------ diff --git a/docs/manual/faq-troubleshooting.txt b/docs/manual/faq-troubleshooting.txt index 5d9531b12..f91a8ef50 100644 --- a/docs/manual/faq-troubleshooting.txt +++ b/docs/manual/faq-troubleshooting.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Frequently Asked Questions & Troubleshooting ============================================ diff --git a/docs/manual/get-involved.txt b/docs/manual/get-involved.txt index 59ddd711b..8515d34dc 100644 --- a/docs/manual/get-involved.txt +++ b/docs/manual/get-involved.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Getting involved ================ diff --git a/docs/manual/getting.txt b/docs/manual/getting.txt index a51caa0e7..6b2a824f9 100644 --- a/docs/manual/getting.txt +++ b/docs/manual/getting.txt @@ -1,4 +1,5 @@ -// -*- mode:doc -*- ; +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: [[getting-buildroot]] Getting Buildroot diff --git a/docs/manual/going-further.txt b/docs/manual/going-further.txt index 070e0a33a..d3f183037 100644 --- a/docs/manual/going-further.txt +++ b/docs/manual/going-further.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Going further in Buildroot's innards ==================================== diff --git a/docs/manual/how-buildroot-works.txt b/docs/manual/how-buildroot-works.txt index ec08f9520..68ddd1379 100644 --- a/docs/manual/how-buildroot-works.txt +++ b/docs/manual/how-buildroot-works.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: How Buildroot works ------------------- diff --git a/docs/manual/introduction.txt b/docs/manual/introduction.txt index a567cec64..c014565ab 100644 --- a/docs/manual/introduction.txt +++ b/docs/manual/introduction.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: About Buildroot =============== diff --git a/docs/manual/legal-notice.txt b/docs/manual/legal-notice.txt index 0f30234b2..51292f6d3 100644 --- a/docs/manual/legal-notice.txt +++ b/docs/manual/legal-notice.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: [[legal-info]] diff --git a/docs/manual/make-tips.txt b/docs/manual/make-tips.txt index 8cd77c030..b4a9c123d 100644 --- a/docs/manual/make-tips.txt +++ b/docs/manual/make-tips.txt @@ -1,4 +1,5 @@ -// -*- mode:doc -*- ; +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: [[make-tips]] 'make' tips diff --git a/docs/manual/makedev-syntax.txt b/docs/manual/makedev-syntax.txt index 27517b3b9..2c985312b 100644 --- a/docs/manual/makedev-syntax.txt +++ b/docs/manual/makedev-syntax.txt @@ -1,4 +1,5 @@ -// -*- mode:doc -*- ; +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: [[makedev-syntax]] Makedev syntax documentation diff --git a/docs/manual/manual.mk b/docs/manual/manual.mk index d664603a6..aa205341d 100644 --- a/docs/manual/manual.mk +++ b/docs/manual/manual.mk @@ -18,7 +18,7 @@ $(1): $(1)-$(3) $(1)-$(3): $$(O)/docs/$(1)/$(1).$(4) $$(O)/docs/$(1)/$(1).$(4): docs/$(1)/$(1).txt $$($(call UPPERCASE,$(1))_SOURCES) - @echo "Generating $(5) $(1)..." + @$(call MESSAGE,"Generating $(5) $(1)...") $(Q)mkdir -p $$(@D) $(Q)a2x $(6) -f $(2) -d book -L -r $(TOPDIR)/docs/images \ -D $$(@D) $$< diff --git a/docs/manual/manual.txt b/docs/manual/manual.txt index c34e0ca46..ffb6fb93e 100644 --- a/docs/manual/manual.txt +++ b/docs/manual/manual.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: The Buildroot user manual ========================= diff --git a/docs/manual/package-make-target.txt b/docs/manual/package-make-target.txt index 7374957b8..dc9d31072 100644 --- a/docs/manual/package-make-target.txt +++ b/docs/manual/package-make-target.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: [[pkg-build-steps]] diff --git a/docs/manual/patch-policy.txt b/docs/manual/patch-policy.txt index 9bc6537ca..0f55b26dc 100644 --- a/docs/manual/patch-policy.txt +++ b/docs/manual/patch-policy.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: [[patch-policy]] @@ -33,12 +34,18 @@ Most patches are provided within Buildroot, in the package directory; these typically aim to fix cross-compilation, libc support, or other such issues. -These patch files should be named +<packagename>-*.patch+. +These patch files should be named +<packagename>-<number>-<description>.patch+. A +series+ file, as used by +quilt+, may also be added in the package directory. In that case, the +series+ file defines the patch application order. +.Notes +- The patch files coming with Buildroot should not contain any package version +reference in their filename. +- The field +<number>+ in the patch file name refers to the 'apply order'. + + How patches are applied ~~~~~~~~~~~~~~~~~~~~~~~ @@ -55,9 +62,12 @@ How patches are applied * If a +series+ file exists in the package directory, then patches are applied according to the +series+ file; + -* Otherwise, patch files matching `<packagename>-*.patch` or - `<packagename>-*.patch.<arch>` (where +<arch>+ is the architecture - name) are applied following the +ls+ command order. +* Otherwise, patch files matching +<packagename>-*.patch+ + are applied in alphabetical order. + So, to ensure they are applied in the right order, it is hightly + recommended to named the patch files like this: + +<packagename>-<number>-<description>.patch+, where +<number>+ + refers to the 'apply order'. . Run the +<packagename>_POST_PATCH_HOOKS+ commands if defined. diff --git a/docs/manual/prerequisite.txt b/docs/manual/prerequisite.txt index 21e46273d..5a9d049e0 100644 --- a/docs/manual/prerequisite.txt +++ b/docs/manual/prerequisite.txt @@ -1,4 +1,5 @@ -// -*- mode:doc -*- ; +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: [[requirement]] System requirements diff --git a/docs/manual/rebuilding-packages.txt b/docs/manual/rebuilding-packages.txt index d6a77a7fc..044c90896 100644 --- a/docs/manual/rebuilding-packages.txt +++ b/docs/manual/rebuilding-packages.txt @@ -1,4 +1,5 @@ -// -*- mode:doc -*- ; +// -*- mode:doc; -*- +// vim: set syntax=asciidoc: [[full-rebuild]] Understanding when a full rebuild is necessary diff --git a/docs/manual/starting-up.txt b/docs/manual/starting-up.txt index 2999fd488..7326f60c7 100644 --- a/docs/manual/starting-up.txt +++ b/docs/manual/starting-up.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Starting up =========== diff --git a/docs/manual/using-buildroot-toolchain.txt b/docs/manual/using-buildroot-toolchain.txt index 750fa9948..b4db68625 100644 --- a/docs/manual/using-buildroot-toolchain.txt +++ b/docs/manual/using-buildroot-toolchain.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Using the generated toolchain outside Buildroot ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/docs/manual/using.txt b/docs/manual/using.txt index 857aa333b..de29ad6b5 100644 --- a/docs/manual/using.txt +++ b/docs/manual/using.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Using Buildroot --------------- diff --git a/docs/manual/working-with.txt b/docs/manual/working-with.txt index fb6bc40e3..4432b548d 100644 --- a/docs/manual/working-with.txt +++ b/docs/manual/working-with.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Working with Buildroot ====================== @@ -24,4 +25,5 @@ interested in hacking it to add: * new packages: refer to the xref:adding-packages[Developer guide] -* new board support: refer to the xref:board-support[Developer guide] +* new board support: refer to the + xref:customize-store-board-support[Developer guide]. diff --git a/docs/manual/writing-rules.txt b/docs/manual/writing-rules.txt index f6382b56d..c9816a440 100644 --- a/docs/manual/writing-rules.txt +++ b/docs/manual/writing-rules.txt @@ -1,4 +1,5 @@ // -*- mode:doc; -*- +// vim: set syntax=asciidoc: Coding style ------------ diff --git a/docs/news.html b/docs/news.html index bc8a16acb..db203ac1a 100644 --- a/docs/news.html +++ b/docs/news.html @@ -5,12 +5,48 @@ <p> <ul> + <li><b>28 February 2013 -- 2013.02 released</b> + + <p>The stable 2013.02 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.02">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.02.tar.bz2">2013.02 release</a>.</p> + + <li><b>26 February 2013 -- 2013.02-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.02_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.02-rc3.tar.bz2">2013.02-rc3 + release candidate</a>, and report any problems found to the <a + href="lists.html">mailing list</a> or <a + href="https://bugs.uclibc.org">bug tracker</a>.</p> + + <li><b>19 February 2013 -- 2013.02-rc2 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.02_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.02-rc2.tar.bz2">2013.02-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>10 February 2013 -- 2013.02-rc1 released</b> <p>We have a new release candidate! Lots of changes all over the tree, see the <a href="http://git.buildroot.net/buildroot/plain/CHANGES?id=2013.02_rc1">CHANGES</a> - file for details.</p> + file for details, and read the + <a href="http://lists.busybox.net/pipermail/buildroot/2013-February/067148.html">announcement</a>.</p> <p>Head to the <a href="/downloads/">downloads page</a> to pick up the <a href="/downloads/buildroot-2013.02-rc1.tar.bz2">2013.02-rc1 diff --git a/linux/Config.in b/linux/Config.in index 3c50acc22..f48e6609e 100644 --- a/linux/Config.in +++ b/linux/Config.in @@ -21,7 +21,7 @@ choice prompt "Kernel version" config BR2_LINUX_KERNEL_3_7 - bool "3.7.6" + bool "3.7.8" config BR2_LINUX_KERNEL_SAME_AS_HEADERS bool "Same as toolchain kernel headers" @@ -76,7 +76,7 @@ config BR2_LINUX_KERNEL_CUSTOM_GIT_VERSION config BR2_LINUX_KERNEL_VERSION string - default "3.7.6" if BR2_LINUX_KERNEL_3_7 + default "3.7.8" if BR2_LINUX_KERNEL_3_7 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/linux/linux.mk b/linux/linux.mk index 91a9f500b..0352acd50 100644 --- a/linux/linux.mk +++ b/linux/linux.mk @@ -198,6 +198,13 @@ define LINUX_INSTALL_DTB $(addprefix $(KERNEL_ARCH_PATH)/boot/dts/,$(KERNEL_DTBS))),dts/),$(KERNEL_DTBS)) \ $(BINARIES_DIR)/ endef +define LINUX_INSTALL_DTB_TARGET + # dtbs moved from arch/$ARCH/boot to arch/$ARCH/boot/dts since 3.8-rc1 + cp $(addprefix \ + $(KERNEL_ARCH_PATH)/boot/$(if $(wildcard \ + $(addprefix $(KERNEL_ARCH_PATH)/boot/dts/,$(KERNEL_DTBS))),dts/),$(KERNEL_DTBS)) \ + $(TARGET_DIR)/boot/ +endef endif endif @@ -234,6 +241,7 @@ endef ifeq ($(BR2_LINUX_KERNEL_INSTALL_TARGET),y) define LINUX_INSTALL_KERNEL_IMAGE_TO_TARGET install -m 0644 -D $(LINUX_IMAGE_PATH) $(TARGET_DIR)/boot/$(LINUX_IMAGE_NAME) + $(LINUX_INSTALL_DTB_TARGET) endef endif diff --git a/package/Config.in b/package/Config.in index 139365248..8a0250630 100644 --- a/package/Config.in +++ b/package/Config.in @@ -636,6 +636,7 @@ source "package/dnsmasq/Config.in" source "package/dropbear/Config.in" source "package/ebtables/Config.in" source "package/ethtool/Config.in" +source "package/gesftpserver/Config.in" source "package/heirloom-mailx/Config.in" source "package/hiawatha/Config.in" source "package/hostapd/Config.in" @@ -652,7 +653,6 @@ source "package/ipsec-tools/Config.in" source "package/ipset/Config.in" source "package/iptables/Config.in" source "package/iw/Config.in" -source "package/gesftpserver/Config.in" source "package/kismet/Config.in" source "package/lighttpd/Config.in" source "package/links/Config.in" diff --git a/package/busybox/Config.in b/package/busybox/Config.in index 2890c492d..4d9899dbf 100644 --- a/package/busybox/Config.in +++ b/package/busybox/Config.in @@ -64,12 +64,14 @@ config BR2_PACKAGE_BUSYBOX_WATCHDOG if BR2_PACKAGE_BUSYBOX_WATCHDOG config BR2_PACKAGE_BUSYBOX_WATCHDOG_PERIOD - int "Delay between reset" + string "Delay between reset" default "5" help Select the number of seconds between each reset of the watchdog (default 5) + Use ms suffix to specify milliseconds (e.g. 500ms) + endif endif diff --git a/package/busybox/busybox-1.21.0/busybox-1.21.0-platform.patch b/package/busybox/busybox-1.21.0/busybox-1.21.0-platform.patch new file mode 100644 index 000000000..9be6cb8f2 --- /dev/null +++ b/package/busybox/busybox-1.21.0/busybox-1.21.0-platform.patch @@ -0,0 +1,24 @@ +--- busybox-1.21.0/archival/libarchive/decompress_unxz.c ++++ busybox-1.21.0-platform/archival/libarchive/decompress_unxz.c +@@ -30,8 +30,8 @@ static uint32_t xz_crc32(const uint8_t * + /* We use arch-optimized unaligned accessors */ + #define get_unaligned_le32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_LE32(v); }) + #define get_unaligned_be32(buf) ({ uint32_t v; move_from_unaligned32(v, buf); SWAP_BE32(v); }) +-#define put_unaligned_le32(val, buf) move_to_unaligned16(buf, SWAP_LE32(val)) +-#define put_unaligned_be32(val, buf) move_to_unaligned16(buf, SWAP_BE32(val)) ++#define put_unaligned_le32(val, buf) move_to_unaligned32(buf, SWAP_LE32(val)) ++#define put_unaligned_be32(val, buf) move_to_unaligned32(buf, SWAP_BE32(val)) + + #include "unxz/xz_dec_bcj.c" + #include "unxz/xz_dec_lzma2.c" +--- busybox-1.21.0/include/platform.h ++++ busybox-1.21.0-platform/include/platform.h +@@ -228,7 +228,7 @@ typedef uint32_t bb__aliased_uint32_t FI + # define move_from_unaligned32(v, u32p) (memcpy(&(v), (u32p), 4)) + # define move_to_unaligned16(u16p, v) do { \ + uint16_t __t = (v); \ +- memcpy((u16p), &__t, 4); \ ++ memcpy((u16p), &__t, 2); \ + } while (0) + # define move_to_unaligned32(u32p, v) do { \ + uint32_t __t = (v); \ diff --git a/package/busybox/busybox-1.21.0/busybox-1.21.0-xz.patch b/package/busybox/busybox-1.21.0/busybox-1.21.0-xz.patch new file mode 100644 index 000000000..56ba1a273 --- /dev/null +++ b/package/busybox/busybox-1.21.0/busybox-1.21.0-xz.patch @@ -0,0 +1,84 @@ +--- busybox-1.21.0/archival/libarchive/decompress_unxz.c ++++ busybox-1.21.0-xz/archival/libarchive/decompress_unxz.c +@@ -40,6 +40,7 @@ static uint32_t xz_crc32(const uint8_t * + IF_DESKTOP(long long) int FAST_FUNC + unpack_xz_stream(transformer_aux_data_t *aux, int src_fd, int dst_fd) + { ++ enum xz_ret xz_result; + struct xz_buf iobuf; + struct xz_dec *state; + unsigned char *membuf; +@@ -63,9 +64,8 @@ unpack_xz_stream(transformer_aux_data_t + /* Limit memory usage to about 64 MiB. */ + state = xz_dec_init(XZ_DYNALLOC, 64*1024*1024); + ++ xz_result = X_OK; + while (1) { +- enum xz_ret r; +- + if (iobuf.in_pos == iobuf.in_size) { + int rd = safe_read(src_fd, membuf, BUFSIZ); + if (rd < 0) { +@@ -73,28 +73,57 @@ unpack_xz_stream(transformer_aux_data_t + total = -1; + break; + } ++ if (rd == 0 && xz_result == XZ_STREAM_END) ++ break; + iobuf.in_size = rd; + iobuf.in_pos = 0; + } ++ if (xz_result == XZ_STREAM_END) { ++ /* ++ * Try to start decoding next concatenated stream. ++ * Stream padding must always be a multiple of four ++ * bytes to preserve four-byte alignment. To keep the ++ * code slightly smaller, we aren't as strict here as ++ * the .xz spec requires. We just skip all zero-bytes ++ * without checking the alignment and thus can accept ++ * files that aren't valid, e.g. the XZ utils test ++ * files bad-0pad-empty.xz and bad-0catpad-empty.xz. ++ */ ++ do { ++ if (membuf[iobuf.in_pos] != 0) { ++ xz_dec_reset(state); ++ goto do_run; ++ } ++ iobuf.in_pos++; ++ } while (iobuf.in_pos < iobuf.in_size); ++ } ++ do_run: + // bb_error_msg(">in pos:%d size:%d out pos:%d size:%d", + // iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size); +- r = xz_dec_run(state, &iobuf); ++ xz_result = xz_dec_run(state, &iobuf); + // bb_error_msg("<in pos:%d size:%d out pos:%d size:%d r:%d", +-// iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, r); ++// iobuf.in_pos, iobuf.in_size, iobuf.out_pos, iobuf.out_size, xz_result); + if (iobuf.out_pos) { + xwrite(dst_fd, iobuf.out, iobuf.out_pos); + IF_DESKTOP(total += iobuf.out_pos;) + iobuf.out_pos = 0; + } +- if (r == XZ_STREAM_END) { +- break; ++ if (xz_result == XZ_STREAM_END) { ++ /* ++ * Can just "break;" here, if not for concatenated ++ * .xz streams. ++ * Checking for padding may require buffer ++ * replenishment. Can't do it here. ++ */ ++ continue; + } +- if (r != XZ_OK && r != XZ_UNSUPPORTED_CHECK) { ++ if (xz_result != XZ_OK && xz_result != XZ_UNSUPPORTED_CHECK) { + bb_error_msg("corrupted data"); + total = -1; + break; + } + } ++ + xz_dec_end(state); + free(membuf); + diff --git a/package/busybox/busybox.mk b/package/busybox/busybox.mk index 599e14553..900896f70 100644 --- a/package/busybox/busybox.mk +++ b/package/busybox/busybox.mk @@ -168,7 +168,7 @@ define BUSYBOX_INSTALL_WATCHDOG_SCRIPT [ -f $(TARGET_DIR)/etc/init.d/S15watchdog ] || \ install -D -m 0755 package/busybox/S15watchdog \ $(TARGET_DIR)/etc/init.d/S15watchdog && \ - sed -i s/PERIOD/$(BR2_PACKAGE_BUSYBOX_WATCHDOG_PERIOD)/ \ + sed -i s/PERIOD/$(call qstrip,$(BR2_PACKAGE_BUSYBOX_WATCHDOG_PERIOD))/ \ $(TARGET_DIR)/etc/init.d/S15watchdog endef endif diff --git a/package/collectd/collectd.mk b/package/collectd/collectd.mk index a50be9c60..88f67370d 100644 --- a/package/collectd/collectd.mk +++ b/package/collectd/collectd.mk @@ -8,6 +8,7 @@ COLLECTD_VERSION = 5.1.2 COLLECTD_SITE = http://collectd.org/files COLLECTD_MAKE_OPT = LDFLAGS="$(TARGET_LDFLAGS) -lm" COLLECTD_CONF_ENV = ac_cv_lib_yajl_yajl_alloc=yes +COLLECTD_INSTALL_STAGING = YES COLLECTD_LICENSE = GPLv2 LGPLv2.1 COLLECTD_LICENSE_FILES = COPYING @@ -121,6 +122,14 @@ ifeq ($(BR2_PACKAGE_LIBGCRYPT),y) COLLECTD_CONF_OPT += --with-libgcrypt=$(STAGING_DIR)/usr endif +# released software should not break on minor warnings +define COLLECTD_DROP_WERROR + $(SED) 's/-Werror//' \ + $(@D)/src/Makefile.in $(@D)/src/libcollectdclient/Makefile.in +endef + +COLLECTD_POST_PATCH_HOOKS += COLLECTD_DROP_WERROR + define COLLECTD_INSTALL_TARGET_CMDS $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install rm -f $(TARGET_DIR)/usr/bin/collectd-nagios diff --git a/package/conntrack-tools/Config.in b/package/conntrack-tools/Config.in index ddede0eea..50f200036 100644 --- a/package/conntrack-tools/Config.in +++ b/package/conntrack-tools/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_CONNTRACK_TOOLS bool "conntrack-tools" depends on BR2_INET_IPV6 depends on BR2_LARGEFILE + depends on BR2_USE_MMU # fork() select BR2_PACKAGE_LIBNETFILTER_CONNTRACK select BR2_PACKAGE_LIBNETFILTER_CTHELPER select BR2_PACKAGE_LIBNETFILTER_CTTIMEOUT diff --git a/package/dialog/Config.in b/package/dialog/Config.in index db5197fb7..b3efd8d85 100644 --- a/package/dialog/Config.in +++ b/package/dialog/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_DIALOG bool "dialog" depends on BR2_TOOLCHAIN_HAS_THREADS # fork() + depends on BR2_USE_MMU # fork() select BR2_PACKAGE_NCURSES select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE help diff --git a/package/enlightenment/enlightenment.mk b/package/enlightenment/enlightenment.mk index cd3b21f7f..5d77869ff 100644 --- a/package/enlightenment/enlightenment.mk +++ b/package/enlightenment/enlightenment.mk @@ -28,6 +28,13 @@ ENLIGHTENMENT_CONF_OPT = --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \ --with-eet-eet=$(HOST_DIR)/usr/bin/eet \ --disable-rpath +# alsa backend needs mixer support +ifeq ($(BR2_PACKAGE_ALSA_LIB)$(BR2_PACKAGE_ALSA_LIB_MIXER),yy) +ENLIGHTENMENT_DEPENDENCIES += alsa-lib +else +ENLIGHTENMENT_CONF_ENV += enable_alsa=no +endif + ifeq ($(BR2_HAVE_DOCUMENTATION),) define ENLIGHTENMENT_REMOVE_DOCUMENTATION rm -rf $(TARGET_DIR)/usr/share/enlightenment/doc/ diff --git a/package/flashbench/flashbench.mk b/package/flashbench/flashbench.mk index faf8ae69e..45d054004 100644 --- a/package/flashbench/flashbench.mk +++ b/package/flashbench/flashbench.mk @@ -11,8 +11,8 @@ FLASHBENCH_LICENSE_FILES = COPYING FLASHBENCH_CFLAGS = $(TARGET_CFLAGS) -ifeq ($(BR2_microblaze),y) -# microblaze toolchain only provides LLONG_MAX when used with gnu99 dialect +ifeq ($(BR2_microblaze)$(BR2_sh2a),y) +# microblaze and sh2a toolchains only provide LLONG_MAX when used with gnu99 dialect FLASHBENCH_CFLAGS += -std=gnu99 endif diff --git a/package/gesftpserver/Config.in b/package/gesftpserver/Config.in index bc38c51ee..57bbf293b 100644 --- a/package/gesftpserver/Config.in +++ b/package/gesftpserver/Config.in @@ -3,6 +3,7 @@ config BR2_PACKAGE_GESFTPSERVER select BR2_PACKAGE_LIBICONV if !BR2_ENABLE_LOCALE depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS + depends on BR2_USE_MMU # fork() help Green End SFTP Server diff --git a/package/glib-networking/glib-networking.mk b/package/glib-networking/glib-networking.mk index e8d71e548..4812fd6c5 100644 --- a/package/glib-networking/glib-networking.mk +++ b/package/glib-networking/glib-networking.mk @@ -5,8 +5,8 @@ ############################################################# GLIB_NETWORKING_MAJOR_VERSION = 2.30 -GLIB_NETWORLING_MINOR_VERSION = 2 -GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_MAJOR_VERSION).$(GLIB_NETWORLING_MINOR_VERSION) +GLIB_NETWORKING_MINOR_VERSION = 2 +GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_MAJOR_VERSION).$(GLIB_NETWORKING_MINOR_VERSION) GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_MAJOR_VERSION) GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index cadc14785..ff9cffa87 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -4,7 +4,7 @@ # ############################################################# -GNUTLS_VERSION = 3.1.7 +GNUTLS_VERSION = 3.1.8 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1 GNUTLS_LICENSE = GPLv3+ LGPLv3 diff --git a/package/haserl/Config.in b/package/haserl/Config.in index 7710fa1c3..36bfca75c 100644 --- a/package/haserl/Config.in +++ b/package/haserl/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_HASERL bool "haserl" + depends on BR2_USE_MMU # fork() help Haserl is a small cgi wrapper that enables shell scripts to be embedded into html documents. It is intended for environments diff --git a/package/inotify-tools/Config.in b/package/inotify-tools/Config.in index ed94b3f0e..0a8c7c9f7 100644 --- a/package/inotify-tools/Config.in +++ b/package/inotify-tools/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_INOTIFY_TOOLS bool "inotify-tools" depends on BR2_LARGEFILE + depends on BR2_USE_MMU # fork() help inotify-tools is a C library and a set of command-line programs for Linux providing a simple interface to inotify. diff --git a/package/keyutils/Config.in b/package/keyutils/Config.in index 9b9f9bc65..6978687f1 100644 --- a/package/keyutils/Config.in +++ b/package/keyutils/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_KEYUTILS bool "keyutils" depends on !BR2_avr32 && !BR2_microblaze + depends on BR2_USE_MMU # fork() help These tools are used to control the key management system built into the Linux kernel. diff --git a/package/libcurl/Config.in b/package/libcurl/Config.in index 10ee0e415..1d6d08e68 100644 --- a/package/libcurl/Config.in +++ b/package/libcurl/Config.in @@ -1,6 +1,5 @@ config BR2_PACKAGE_LIBCURL bool "libcurl" - depends on BR2_USE_MMU # Uses fork() help cURL is a tool for getting files from FTP, HTTP, Gopher, Telnet, and Dict servers, using any of the supported protocols. diff --git a/package/libcurl/libcurl-cve-2013-0249.patch b/package/libcurl/libcurl-cve-2013-0249.patch new file mode 100644 index 000000000..7d2af2ac8 --- /dev/null +++ b/package/libcurl/libcurl-cve-2013-0249.patch @@ -0,0 +1,65 @@ +From ee45a34907ffeb5fd95b0513040d8491d565b663 Mon Sep 17 00:00:00 2001 +From: Eldar Zaitov <kyprizel@volema.com> +Date: Wed, 30 Jan 2013 23:22:27 +0100 +Subject: [PATCH] Curl_sasl_create_digest_md5_message: fix buffer overflow + +When negotiating SASL DIGEST-MD5 authentication, the function +Curl_sasl_create_digest_md5_message() uses the data provided from the +server without doing the proper length checks and that data is then +appended to a local fixed-size buffer on the stack. + +This vulnerability can be exploited by someone who is in control of a +server that a libcurl based program is accessing with POP3, SMTP or +IMAP. For applications that accept user provided URLs, it is also +thinkable that a malicious user would feed an application with a URL to +a server hosting code targetting this flaw. + +Bug: http://curl.haxx.se/docs/adv_20130206.html +--- + lib/curl_sasl.c | 23 ++++++----------------- + 1 file changed, 6 insertions(+), 17 deletions(-) + +diff --git a/lib/curl_sasl.c b/lib/curl_sasl.c +index 57116b6..d07387d 100644 +--- a/lib/curl_sasl.c ++++ b/lib/curl_sasl.c +@@ -346,9 +346,7 @@ CURLcode Curl_sasl_create_digest_md5_message(struct SessionHandle *data, + snprintf(&HA1_hex[2 * i], 3, "%02x", digest[i]); + + /* Prepare the URL string */ +- strcpy(uri, service); +- strcat(uri, "/"); +- strcat(uri, realm); ++ snprintf(uri, sizeof(uri), "%s/%s", service, realm); + + /* Calculate H(A2) */ + ctxt = Curl_MD5_init(Curl_DIGEST_MD5); +@@ -392,20 +390,11 @@ CURLcode Curl_sasl_create_digest_md5_message(struct SessionHandle *data, + for(i = 0; i < MD5_DIGEST_LEN; i++) + snprintf(&resp_hash_hex[2 * i], 3, "%02x", digest[i]); + +- strcpy(response, "username=\""); +- strcat(response, userp); +- strcat(response, "\",realm=\""); +- strcat(response, realm); +- strcat(response, "\",nonce=\""); +- strcat(response, nonce); +- strcat(response, "\",cnonce=\""); +- strcat(response, cnonce); +- strcat(response, "\",nc="); +- strcat(response, nonceCount); +- strcat(response, ",digest-uri=\""); +- strcat(response, uri); +- strcat(response, "\",response="); +- strcat(response, resp_hash_hex); ++ snprintf(response, sizeof(response), ++ "username=\"%s\",realm=\"%s\",nonce=\"%s\"," ++ "cnonce=\"%s\",nc=\"%s\",digest-uri=\"%s\",response=%s", ++ userp, realm, nonce, ++ cnonce, nonceCount, uri, resp_hash_hex); + + /* Base64 encode the reply */ + return Curl_base64_encode(data, response, 0, outptr, outlen); +-- +1.7.10.4 + diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index 38ca854b2..a631953af 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -10,7 +10,13 @@ LIBCURL_SITE = http://curl.haxx.se/download LIBCURL_LICENSE = ICS LIBCURL_LICENSE_FILES = COPYING LIBCURL_INSTALL_STAGING = YES -LIBCURL_CONF_OPT = --disable-verbose --disable-manual --enable-hidden-symbols + +# We disable NTLM support because it uses fork(), which doesn't work +# on non-MMU platforms. Moreover, this authentication method is +# probably almost never used. See +# http://curl.haxx.se/docs/manpage.html#--ntlm. +LIBCURL_CONF_OPT = --disable-verbose --disable-manual \ + --enable-hidden-symbols --disable-ntlm-wb LIBCURL_CONFIG_SCRIPTS = curl-config ifeq ($(BR2_PACKAGE_OPENSSL),y) diff --git a/package/libffi/libffi-002-fix-ppc-nofpr.patch b/package/libffi/libffi-002-fix-ppc-nofpr.patch new file mode 100644 index 000000000..729bae812 --- /dev/null +++ b/package/libffi/libffi-002-fix-ppc-nofpr.patch @@ -0,0 +1,29 @@ +From: Gilles Talis <gilles.talis@gmail.com> + +On PPC, if __NO_FPRS__ is defined, fparg_count and NUM_FPR_ARG_REGISTERS +are not defined, thus must not be used. + +Signed-off-by: Gilles Talis <gilles.talis@gmail.com> +--- + src/powerpc/ffi.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/powerpc/ffi.c b/src/powerpc/ffi.c +index f3a96a1..9c69584 100644 +--- a/src/powerpc/ffi.c ++++ b/src/powerpc/ffi.c +@@ -376,9 +376,10 @@ ffi_prep_args_SYSV (extended_cif *ecif, unsigned *const stack) + with the number found in ffi_prep_cif_machdep(). However, intarg_count + is incremeneted whenever we place an FP arg on the stack, so account for + that before our assert test. */ ++#ifndef __NO_FPRS__ + if (fparg_count > NUM_FPR_ARG_REGISTERS) + intarg_count -= fparg_count - NUM_FPR_ARG_REGISTERS; +-#ifndef __NO_FPRS__ ++ + FFI_ASSERT (fpr_base.u + <= stacktop.u - ASM_NEEDS_REGISTERS - NUM_GPR_ARG_REGISTERS); + #endif +-- +1.7.10.4 + diff --git a/package/libffi/libffi.mk b/package/libffi/libffi.mk index 9fb86d71c..28a29162d 100644 --- a/package/libffi/libffi.mk +++ b/package/libffi/libffi.mk @@ -4,15 +4,11 @@ # ############################################################# -LIBFFI_VERSION = bcc0c28001b6d427d5cd8037d2e3c892babc6b4c -LIBFFI_SITE = http://github.com/atgreen/libffi/tarball/$(LIBFFI_VERSION) +LIBFFI_VERSION = 3.0.12 +LIBFFI_SITE = ftp://sourceware.org/pub/libffi/ LIBFFI_LICENSE = MIT LIBFFI_LICENSE_FILES = LICENSE LIBFFI_INSTALL_STAGING = YES - -# We're using a version from Git which strangely bundles a generated -# configure script, but it's broken (doesn't generate the libffi.pc -# file). LIBFFI_AUTORECONF = YES # Newer CS MIPS toolchains use a different (compact) eh_frame format @@ -22,13 +18,11 @@ LIBFFI_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -mno-compact-eh" endif # Move the headers to the usual location, and adjust the .pc file -# accordingly. For some reason, the libffi build system forgets to -# install the .pc file, so we do it manually. +# accordingly. define LIBFFI_MOVE_STAGING_HEADERS mv $(STAGING_DIR)/usr/lib/libffi-*/include/*.h $(STAGING_DIR)/usr/include/ - $(INSTALL) -D -m 0644 $(@D)/libffi.pc $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc - $(SED) '/^includedir.*/d' $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc - $(SED) '/^Cflags:.*/d' $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc + $(SED) '/^includedir.*/d' -e '/^Cflags:.*/d' \ + $(STAGING_DIR)/usr/lib/pkgconfig/libffi.pc rm -rf $(TARGET_DIR)/usr/lib/libffi-* endef @@ -43,18 +37,7 @@ endef LIBFFI_POST_INSTALL_TARGET_HOOKS += LIBFFI_MOVE_TARGET_HEADERS -# We're using a version from Git which strangely bundles a generated -# configure script, but it's broken (doesn't generate the libffi.pc -# file). HOST_LIBFFI_AUTORECONF = YES -# For some reason, the libffi build system forgets to install the .pc -# file, so we do it manually. -define HOST_LIBFFI_INSTALL_PC_FILE - $(INSTALL) -D $(@D)/libffi.pc $(HOST_DIR)/usr/lib/pkgconfig/libffi.pc -endef - -HOST_LIBFFI_POST_INSTALL_HOOKS += HOST_LIBFFI_INSTALL_PC_FILE - $(eval $(autotools-package)) $(eval $(host-autotools-package)) diff --git a/package/libglib2/libglib2.mk b/package/libglib2/libglib2.mk index a3684327f..278e6355b 100644 --- a/package/libglib2/libglib2.mk +++ b/package/libglib2/libglib2.mk @@ -45,12 +45,17 @@ LIBGLIB2_CONF_ENV = \ gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) # old uClibc versions don't provide qsort_r -ifeq ($(BR2_UCLIBC_VERSION_0_9_31)$(BR2_UCLIBC_VERSION_0_9_32)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC),y) +ifeq ($(BR2_UCLIBC_VERSION_0_9_31)$(BR2_UCLIBC_VERSION_0_9_32)$(BR2_TOOLCHAIN_CTNG_uClibc)$(BR2_TOOLCHAIN_EXTERNAL_UCLIBC)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y) LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=no else LIBGLIB2_CONF_ENV += glib_cv_have_qsort_r=yes endif +# old toolchains don't have working inotify support +ifeq ($(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEEL_V2)$(BR2_TOOLCHAIN_EXTERNAL_XILINX_MICROBLAZEBE_V2),y) +LIBGLIB2_CONF_ENV += ac_cv_header_sys_inotify_h=no +endif + HOST_LIBGLIB2_CONF_OPT = \ --disable-gtk-doc \ --enable-debug=no \ diff --git a/package/libgtk2/Config.in b/package/libgtk2/Config.in index 3e8cf7538..88f4cc195 100644 --- a/package/libgtk2/Config.in +++ b/package/libgtk2/Config.in @@ -29,3 +29,6 @@ config BR2_PACKAGE_LIBGTK2_DEMO comment "libgtk2 requires a toolchain with WCHAR and C++ support" depends on !BR2_USE_WCHAR || !BR2_INSTALL_LIBSTDCPP + +comment "WARNING: Libgtk2 directfb backend is deprecated" + depends on BR2_PACKAGE_LIBGTK2 && !BR2_PACKAGE_XORG7 diff --git a/package/libmad/Config.in b/package/libmad/Config.in index d0edc497c..80ed85357 100644 --- a/package/libmad/Config.in +++ b/package/libmad/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBMAD bool "libmad" + select BR2_PACKAGE_LIBMAD_ASO if BR2_avr32 help High-quality MPEG audio decoder. All computations are performed with fixed-point integer arithmetic, making it ideal for systems diff --git a/package/libtorrent/Config.in b/package/libtorrent/Config.in index f0315a4f3..379f4a5c7 100644 --- a/package/libtorrent/Config.in +++ b/package/libtorrent/Config.in @@ -1,11 +1,12 @@ config BR2_PACKAGE_LIBTORRENT bool "libtorrent" depends on BR2_INSTALL_LIBSTDCPP + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBSIGC help BitTorrent library written in C++ for *nix http://libtorrent.rakshasa.no/ -comment "libtorrent requires a toolchain with C++ support enabled" - depends on !BR2_INSTALL_LIBSTDCPP +comment "libtorrent requires a toolchain with C++ and threads support enabled" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libupnp/Config.in b/package/libupnp/Config.in index 2e6edcdb5..52fa73920 100644 --- a/package/libupnp/Config.in +++ b/package/libupnp/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_LIBUPNP bool "libupnp" depends on BR2_LARGEFILE + depends on BR2_TOOLCHAIN_HAS_THREADS help The portable SDK for UPnP(tm) Devices (libupnp) provides developers with an API and open source code for building control points, @@ -9,5 +10,5 @@ config BR2_PACKAGE_LIBUPNP http://pupnp.sourceforge.net/ -comment "libupnp requires a toolchain with LARGEFILE support" - depends on !BR2_LARGEFILE +comment "libupnp requires a toolchain with LARGEFILE and thread support" + depends on !(BR2_LARGEFILE && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package/libvorbis/libvorbis.mk b/package/libvorbis/libvorbis.mk index ace8147c9..5b9048ead 100644 --- a/package/libvorbis/libvorbis.mk +++ b/package/libvorbis/libvorbis.mk @@ -6,7 +6,7 @@ LIBVORBIS_VERSION = 1.3.3 LIBVORBIS_SOURCE = libvorbis-$(LIBVORBIS_VERSION).tar.gz -LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis/$(LIBVORBIS-SOURCE) +LIBVORBIS_SITE = http://downloads.xiph.org/releases/vorbis/ LIBVORBIS_INSTALL_STAGING = YES LIBVORBIS_CONF_OPT = --disable-oggtest LIBVORBIS_DEPENDENCIES = host-pkgconf libogg diff --git a/package/linux-firmware/linux-firmware.mk b/package/linux-firmware/linux-firmware.mk index 9268608fd..0cb08b4aa 100644 --- a/package/linux-firmware/linux-firmware.mk +++ b/package/linux-firmware/linux-firmware.mk @@ -3,8 +3,9 @@ # linux-firmware # ############################################################# + LINUX_FIRMWARE_VERSION = 65a5163b8bb77bd7759efa3ca780867fcaed89b0 -LINUX_FIRMWARE_SITE = git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git +LINUX_FIRMWARE_SITE = http://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git LINUX_FIRMWARE_SITE_METHOD = git # rt2501/rt61 diff --git a/package/linux-fusion/linux-fusion.mk b/package/linux-fusion/linux-fusion.mk index 5ea7900f1..a2340bd4b 100644 --- a/package/linux-fusion/linux-fusion.mk +++ b/package/linux-fusion/linux-fusion.mk @@ -3,7 +3,7 @@ # linux-fusion # ############################################################# -LINUX_FUSION_VERSION = 8.10.4 +LINUX_FUSION_VERSION = 9.0.0 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/matchbox/Config.in b/package/matchbox/Config.in index e4b6149d7..d89a1762e 100644 --- a/package/matchbox/Config.in +++ b/package/matchbox/Config.in @@ -19,6 +19,7 @@ config BR2_PACKAGE_MATCHBOX_PANEL config BR2_PACKAGE_MATCHBOX_DESKTOP bool "Matchbox Desktop" depends on BR2_PACKAGE_MATCHBOX + select BR2_PACKAGE_ZLIB help A PDA style application launcher or 'item browser'. diff --git a/package/matchbox/matchbox-desktop/matchbox-desktop.mk b/package/matchbox/matchbox-desktop/matchbox-desktop.mk index f8e854c95..13ea73074 100644 --- a/package/matchbox/matchbox-desktop/matchbox-desktop.mk +++ b/package/matchbox/matchbox-desktop/matchbox-desktop.mk @@ -10,7 +10,7 @@ MATCHBOX_DESKTOP_SOURCE = matchbox-desktop-$(MATCHBOX_DESKTOP_VERSION).tar.bz2 MATCHBOX_DESKTOP_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-desktop/$(MATCHBOX_DESKTOP_VERSION_MAJOR) MATCHBOX_DESKTOP_LICENSE = GPLv2+ MATCHBOX_DESKTOP_LICENSE_FILES = COPYING -MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib +MATCHBOX_DESKTOP_DEPENDENCIES = matchbox-lib zlib MATCHBOX_DESKTOP_CONF_OPT = --enable-expat # The bundled configure script does not properly replace LIBADD_DL, so diff --git a/package/matchbox/matchbox-wm/matchbox-wm-defaulttheme.patch b/package/matchbox/matchbox-wm/matchbox-wm-defaulttheme.patch new file mode 100644 index 000000000..b4da66409 --- /dev/null +++ b/package/matchbox/matchbox-wm/matchbox-wm-defaulttheme.patch @@ -0,0 +1,47 @@ +[PATCH] fix mbtheme build issue when png support is disabled + +DEFAULTTHEME{,NAME} is not defined when png support is disabled, leading +to compile errors in mbtheme.c: + +mbtheme.c: In function 'show_parse_error': +mbtheme.c:2422:28: error: 'DEFAULTTHEME' undeclared (first use in this function) +mbtheme.c:2422:28: note: each undeclared identifier is reported only once for each function it appears in +mbtheme.c: In function 'mbtheme_init': +mbtheme.c:2448:30: error: 'DEFAULTTHEME' undeclared (first use in this function) +mbtheme.c:2470:25: error: 'DEFAULTTHEMENAME' undeclared (first use in this function) + +Fix it by unconditionally defining them as the values used are the same +in png / !png cases anyway. + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> +--- + src/structs.h | 9 --------- + 1 file changed, 9 deletions(-) + +Index: matchbox-window-manager-1.2/src/structs.h +=================================================================== +--- matchbox-window-manager-1.2.orig/src/structs.h ++++ matchbox-window-manager-1.2/src/structs.h +@@ -81,8 +81,6 @@ + + #define GENERIC_ICON PKGDATADIR "/mbnoapp.xpm" + +-#ifdef MB_HAVE_PNG +- + #define DEFAULT_THEME DATADIR "/themes/Default/matchbox/theme.xml" + + #define DEFAULTTHEME DATADIR "/themes/Default/matchbox/theme.xml" +@@ -91,13 +89,6 @@ + + #define DEFAULTTHEMENAME "Default" + +-#else +- +-#define DEFAULT_THEME DATADIR "/themes/Default/matchbox/theme.xml" +-#define DEFAULT_THEME_NAME "Default" +- +-#endif +- + #define CONFDEFAULTS PKGDATADIR "/defaults" + + /* Simple Macros */ diff --git a/package/mii-diag/mii-diag.mk b/package/mii-diag/mii-diag.mk index a4ad4744c..b9d763c85 100644 --- a/package/mii-diag/mii-diag.mk +++ b/package/mii-diag/mii-diag.mk @@ -21,11 +21,11 @@ endef MII_DIAG_POST_PATCH_HOOKS = MII_DIAG_DEBIAN_PATCHES define MII_DIAG_BUILD_CMDS - $(MAKE) $(MII_DIAG_MAKE_OPT) -C $(@D) + $(MAKE) $(MII_DIAG_MAKE_OPT) -C $(@D) mii-diag endef define MII_DIAG_INSTALL_TARGET_CMDS - $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install + $(MAKE) DESTDIR=$(TARGET_DIR) -C $(@D) install-mii-diag endef define MII_DIAG_UNINSTALL_TARGET_CMDS diff --git a/package/neard/neard-fix-missing-linux-nfc-header.patch b/package/neard/neard-fix-missing-linux-nfc-header.patch index b04c5daff..377269e57 100644 --- a/package/neard/neard-fix-missing-linux-nfc-header.patch +++ b/package/neard/neard-fix-missing-linux-nfc-header.patch @@ -8,17 +8,26 @@ As a workaround until all reasonable toolchains get this header included, add a configure check in neard to test whether this header is available or not, and if not, use our own private copy of it. +Since symbols from the v3.7 kernel header are used, but linux/nfc.h +already exists since the v3.1 kernel, check for one of the most +recently added symbols: NFC_LLCP_RAW_HEADER_SIZE. + Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Index: b/configure.ac =================================================================== --- a/configure.ac +++ b/configure.ac -@@ -88,6 +88,8 @@ +@@ -88,6 +88,12 @@ AC_SUBST(NETLINK_CFLAGS) AC_SUBST(NETLINK_LIBS) -+AC_CHECK_HEADER(linux/nfc.h, [AC_DEFINE(HAVE_LINUX_NFC_H, 1, [Defines if linux/nfc.h header is available])], [], [#include <sys/socket.h>]) ++AC_TRY_COMPILE([ ++#include <sys/socket.h> ++#include <linux/nfc.h> ++ ], [int err[NFC_LLCP_RAW_HEADER_SIZE-2];], ++ [AC_DEFINE(HAVE_LINUX_NFC_H, 1, [Defines if linux/nfc.h header is available])], []) + AC_ARG_ENABLE(test, AC_HELP_STRING([--enable-test], [enable test/example scripts]), diff --git a/package/network-manager/network-manager.mk b/package/network-manager/network-manager.mk index 2a68c96a7..b3715d8df 100644 --- a/package/network-manager/network-manager.mk +++ b/package/network-manager/network-manager.mk @@ -8,7 +8,7 @@ NETWORK_MANAGER_SOURCE = NetworkManager-$(NETWORK_MANAGER_VERSION).tar.bz2 NETWORK_MANAGER_SITE = http://ftp.gnome.org/pub/GNOME/sources/NetworkManager/0.9/ NETWORK_MANAGER_INSTALL_STAGING = YES NETWORK_MANAGER_DEPENDENCIES = host-pkgconf udev dbus-glib libnl gnutls \ - libgcrypt wireless_tools util-linux + libgcrypt wireless_tools util-linux host-intltool NETWORK_MANAGER_CONF_ENV = \ ac_cv_path_LIBGCRYPT_CONFIG=$(STAGING_DIR)/usr/bin/libgcrypt-config diff --git a/package/ntfs-3g/Config.in b/package/ntfs-3g/Config.in index 1d3e2fb9b..be19a579e 100644 --- a/package/ntfs-3g/Config.in +++ b/package/ntfs-3g/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_NTFS_3G bool "ntfs-3g" depends on BR2_LARGEFILE depends on BR2_USE_WCHAR + depends on BR2_USE_MMU help The NTFS-3G driver is an open source, freely available read/write NTFS driver for Linux, FreeBSD, Mac OS X, NetBSD, diff --git a/package/openssl/openssl.mk b/package/openssl/openssl.mk index b4a367462..96f817d2b 100644 --- a/package/openssl/openssl.mk +++ b/package/openssl/openssl.mk @@ -4,7 +4,7 @@ # ############################################################# -OPENSSL_VERSION = 1.0.1d +OPENSSL_VERSION = 1.0.1e OPENSSL_SITE = http://www.openssl.org/source OPENSSL_LICENSE = OpenSSL or SSLeay OPENSSL_LICENSE_FILES = LICENSE diff --git a/package/qt/qt.mk b/package/qt/qt.mk index 376781057..bd3dd338e 100644 --- a/package/qt/qt.mk +++ b/package/qt/qt.mk @@ -416,10 +416,10 @@ else QT_CONFIGURE_OPTS += -no-declarative endif -# ccache and precompiled headers don't play well together -ifeq ($(BR2_CCACHE),y) +# -no-pch is needed to workaround the issue described at +# http://comments.gmane.org/gmane.comp.lib.qt.devel/5933. +# In addition, ccache and precompiled headers don't play well together QT_CONFIGURE_OPTS += -no-pch -endif # x86x86fix # Workaround Qt Embedded bug when crosscompiling for x86 under x86 with linux diff --git a/package/quota/Config.in b/package/quota/Config.in index f7d0fe921..f6341d319 100644 --- a/package/quota/Config.in +++ b/package/quota/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_QUOTA bool "quota" depends on BR2_LARGEFILE depends on BR2_USE_WCHAR + depends on BR2_USE_MMU # fork() select BR2_PACKAGE_UTIL_LINUX select BR2_PACKAGE_UTIL_LINUX_MOUNT select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE diff --git a/package/rpi-userland/rpi-userland-0002-Test-for-the-existence-of-execinfo-h.patch b/package/rpi-userland/rpi-userland-0002-Test-for-the-existence-of-execinfo-h.patch deleted file mode 100644 index ccc67d975..000000000 --- a/package/rpi-userland/rpi-userland-0002-Test-for-the-existence-of-execinfo-h.patch +++ /dev/null @@ -1,69 +0,0 @@ -From 93ae1bcd8005216baf7361ba860b53a2cf2e0401 Mon Sep 17 00:00:00 2001 -From: Floris Bos <bos@je-eigen-domein.nl> -Date: Sun, 25 Nov 2012 19:05:07 +0100 -Subject: [PATCH] Test for the existence of execinfo.h - -Previous code assumed that on Linux the execinfo.h functions are always available, which is a glibc extension. -This change fixes building the library under buildroot, which uses uClibc by default ---- - interface/vcos/glibc/vcos_backtrace.c | 7 +++++-- - makefiles/cmake/arm-linux.cmake | 4 ++++ - makefiles/cmake/cmake_config.h.in | 3 +++ - 3 files changed, 12 insertions(+), 2 deletions(-) - -diff --git a/interface/vcos/glibc/vcos_backtrace.c b/interface/vcos/glibc/vcos_backtrace.c -index 474a328..3bb8aa3 100644 ---- a/interface/vcos/glibc/vcos_backtrace.c -+++ b/interface/vcos/glibc/vcos_backtrace.c -@@ -26,7 +26,10 @@ - */ - - #include <interface/vcos/vcos.h> --#ifdef __linux__ -+#ifdef HAVE_CMAKE_CONFIG -+#include "cmake_config.h" -+#endif -+#ifdef HAVE_EXECINFO_H - #include <execinfo.h> - #endif - #include <stdio.h> -@@ -35,7 +38,7 @@ - - void vcos_backtrace_self(void) - { --#ifdef __linux__ -+#ifdef HAVE_EXECINFO_H - void *stack[64]; - int depth = backtrace(stack, sizeof(stack)/sizeof(stack[0])); - char **names = backtrace_symbols(stack, depth); -diff --git a/makefiles/cmake/arm-linux.cmake b/makefiles/cmake/arm-linux.cmake -index 89d8bbf..6f2114f 100644 ---- a/makefiles/cmake/arm-linux.cmake -+++ b/makefiles/cmake/arm-linux.cmake -@@ -115,6 +115,10 @@ try_compile(HAVE_MTRACE - ${CMAKE_SOURCE_DIR}/makefiles/cmake/srcs/test-mtrace.c - OUTPUT_VARIABLE foo) - -+# test for existence of execinfo.h header -+include(CheckIncludeFile) -+check_include_file(execinfo.h HAVE_EXECINFO_H) -+ - add_definitions(-DHAVE_CMAKE_CONFIG) - configure_file ( - "makefiles/cmake/cmake_config.h.in" -diff --git a/makefiles/cmake/cmake_config.h.in b/makefiles/cmake/cmake_config.h.in -index 5f08ad5..080b8e8 100644 ---- a/makefiles/cmake/cmake_config.h.in -+++ b/makefiles/cmake/cmake_config.h.in -@@ -8,5 +8,8 @@ - /** Do we have support for GLIBC mtrace() ? */ - #cmakedefine HAVE_MTRACE - -+/** Do we have the execinfo.h include file ? */ -+#cmakedefine HAVE_EXECINFO_H -+ - #endif - --- -1.7.10 - diff --git a/package/rpi-userland/rpi-userland.mk b/package/rpi-userland/rpi-userland.mk index ece37d488..522a97f85 100644 --- a/package/rpi-userland/rpi-userland.mk +++ b/package/rpi-userland/rpi-userland.mk @@ -4,7 +4,7 @@ # ############################################################# -RPI_USERLAND_VERSION = 9852ce28826889e50c4d6786b942f51bccccac54 +RPI_USERLAND_VERSION = 5e9a740a88a889dfc8a18bb1b00c17e5dd9d0108 RPI_USERLAND_SITE = http://github.com/raspberrypi/userland/tarball/master RPI_USERLAND_LICENSE = BSD-3c RPI_USERLAND_LICENSE_FILE = LICENCE diff --git a/package/rtorrent/Config.in b/package/rtorrent/Config.in index 142ff8b41..7b21b5af1 100644 --- a/package/rtorrent/Config.in +++ b/package/rtorrent/Config.in @@ -2,6 +2,7 @@ config BR2_PACKAGE_RTORRENT bool "rtorrent" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_USE_WCHAR + depends on BR2_TOOLCHAIN_HAS_THREADS select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBSIGC select BR2_PACKAGE_LIBTORRENT @@ -12,5 +13,5 @@ config BR2_PACKAGE_RTORRENT http://libtorrent.rakshasa.no/ -comment "rtorrent requires a toolchain with C++ and WCHAR support" - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR) +comment "rtorrent requires a toolchain with C++, threads and WCHAR support" + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package/ruby/ruby.mk b/package/ruby/ruby.mk index ee1f9ed28..692e2652a 100644 --- a/package/ruby/ruby.mk +++ b/package/ruby/ruby.mk @@ -4,11 +4,12 @@ # ############################################################# -RUBY_VERSION = 1.9.3-p362 +RUBY_VERSION = 1.9.3-p392 RUBY_SITE = ftp://ftp.ruby-lang.org/pub/ruby/1.9 RUBY_DEPENDENCIES = host-pkgconf host-ruby HOST_RUBY_DEPENDENCIES = host-pkgconf RUBY_MAKE_ENV = $(TARGET_MAKE_ENV) +RUBY_MAKE = $(MAKE1) RUBY_CONF_OPT = --disable-install-doc --disable-rpath HOST_RUBY_CONF_OPT = --disable-install-doc --with-out-ext=curses,readline RUBY_LICENSE = Ruby diff --git a/package/spawn-fcgi/Config.in b/package/spawn-fcgi/Config.in index 34cbbb173..59791e8d8 100644 --- a/package/spawn-fcgi/Config.in +++ b/package/spawn-fcgi/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_SPAWN_FCGI bool "spawn-fcgi" + depends on BR2_USE_MMU # fork() help FastCGI process spawner. Project split from lighttpd. diff --git a/package/thttpd/Config.in b/package/thttpd/Config.in index 172a2d69e..d35978543 100644 --- a/package/thttpd/Config.in +++ b/package/thttpd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_THTTPD bool "thttpd" + depends on BR2_USE_MMU # fork() help thttpd is a simple, small, portable, fast, and secure HTTP server diff --git a/package/ushare/Config.in b/package/ushare/Config.in index f7b2124de..5b8708728 100644 --- a/package/ushare/Config.in +++ b/package/ushare/Config.in @@ -1,6 +1,7 @@ config BR2_PACKAGE_USHARE bool "ushare" depends on BR2_LARGEFILE + depends on BR2_TOOLCHAIN_HAS_THREADS # libupnp select BR2_PACKAGE_LIBUPNP select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT_IF_LOCALE help @@ -10,5 +11,5 @@ config BR2_PACKAGE_USHARE http://ushare.geexbox.org/ -comment "ushare requires a toolchain with LARGEFILE support" - depends on !BR2_LARGEFILE +comment "ushare requires a toolchain with LARGEFILE and thread support" + depends on !(BR2_LARGEFILE && BR2_TOOLCHAIN_HAS_THREADS) diff --git a/package/vim/vim.mk b/package/vim/vim.mk index fa5f8aef9..cb08cd9c0 100644 --- a/package/vim/vim.mk +++ b/package/vim/vim.mk @@ -36,8 +36,15 @@ define VIM_INSTALL_RUNTIME_CMDS $(MAKE) DESTDIR=$(TARGET_DIR) installmacros endef +define VIM_REMOVE_DOCS + find $(TARGET_DIR)/usr/share/vim -type f -name "*.txt" -delete +endef + ifeq ($(BR2_PACKAGE_VIM_RUNTIME),y) VIM_POST_INSTALL_TARGET_HOOKS += VIM_INSTALL_RUNTIME_CMDS +ifneq ($(BR2_HAVE_DOCUMENTATION),y) +VIM_POST_INSTALL_TARGET_HOOKS += VIM_REMOVE_DOCS +endif endif $(eval $(autotools-package)) diff --git a/toolchain/kernel-headers/Config.in b/toolchain/kernel-headers/Config.in index 38e051f92..ea65b4fbd 100644 --- a/toolchain/kernel-headers/Config.in +++ b/toolchain/kernel-headers/Config.in @@ -58,13 +58,13 @@ config BR2_DEFAULT_KERNEL_VERSION config BR2_DEFAULT_KERNEL_HEADERS string - default "3.0.62" if BR2_KERNEL_HEADERS_3_0 + default "3.0.64" if BR2_KERNEL_HEADERS_3_0 default "3.1.10" if BR2_KERNEL_HEADERS_3_1 default "3.2.38" if BR2_KERNEL_HEADERS_3_2 default "3.3.8" if BR2_KERNEL_HEADERS_3_3 - default "3.4.29" if BR2_KERNEL_HEADERS_3_4 + default "3.4.31" 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.6" if BR2_KERNEL_HEADERS_3_7 + default "3.7.8" if BR2_KERNEL_HEADERS_3_7 default "2.6" if BR2_KERNEL_HEADERS_SNAP default $BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION diff --git a/toolchain/kernel-headers/kernel-headers.mk b/toolchain/kernel-headers/kernel-headers.mk index 76602d849..073d609e1 100644 --- a/toolchain/kernel-headers/kernel-headers.mk +++ b/toolchain/kernel-headers/kernel-headers.mk @@ -36,15 +36,6 @@ LINUX_HEADERS_CAT:=$(BZCAT) LINUX_HEADERS_UNPACK_DIR:=$(TOOLCHAIN_DIR)/linux-$(LINUX_HEADERS_VERSION) LINUX_HEADERS_DIR:=$(TOOLCHAIN_DIR)/linux -# long term support kernels are stored in a longterm/v2.6.x subdir -ifeq ($(BR2_KERNEL_HEADERS_2_6_35),y) -DEFAULT_KERNEL_HEADERS_MAJOR := \ - $(shell echo $(DEFAULT_KERNEL_HEADERS) | sed 's/\.[0-9]*$$//') -# += adds a space between -LINUX_HEADERS_SITE:= \ - $(LINUX_HEADERS_SITE)longterm/v$(DEFAULT_KERNEL_HEADERS_MAJOR)/ -endif - LINUX_HEADERS_DEPENDS:= $(LINUX_HEADERS_UNPACK_DIR)/.unpacked: $(DL_DIR)/$(LINUX_HEADERS_SOURCE) diff --git a/toolchain/kernel-headers/linux-3.0.62-headers_install-fix-__packed-in-exported-kernel-head.patch b/toolchain/kernel-headers/linux-3.0.64-headers_install-fix-__packed-in-exported-kernel-head.patch index 8777b7163..8777b7163 100644 --- a/toolchain/kernel-headers/linux-3.0.62-headers_install-fix-__packed-in-exported-kernel-head.patch +++ b/toolchain/kernel-headers/linux-3.0.64-headers_install-fix-__packed-in-exported-kernel-head.patch diff --git a/toolchain/uClibc/uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch b/toolchain/uClibc/uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch new file mode 100644 index 000000000..2ad00328d --- /dev/null +++ b/toolchain/uClibc/uClibc-0.9.33.2-bits-time.h-sync-with-glibc-2.16.patch @@ -0,0 +1,36 @@ +From 3d1b82c7d9dce11c733fe23a85df7f975c7e2486 Mon Sep 17 00:00:00 2001 +From: Peter Korsgaard <jacmet@sunsite.dk> +Date: Tue, 3 Jul 2012 15:54:57 +0200 +Subject: [PATCH] bits/time.h: sync with glibc 2.16 + +CLOCK_MONOTONIC_RAW is available since 2.6.28 +(2d42244ae71d: clocksource: introduce CLOCK_MONOTONIC_RAW), and +CLOCK_*_COARSE since 2.6.32 (da15cfdae033: time: Introduce +CLOCK_REALTIME_COARSE). + +Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk> +Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> +--- + libc/sysdeps/linux/common/bits/time.h | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/libc/sysdeps/linux/common/bits/time.h b/libc/sysdeps/linux/common/bits/time.h +index 7ed54bf..c871223 100644 +--- a/libc/sysdeps/linux/common/bits/time.h ++++ b/libc/sysdeps/linux/common/bits/time.h +@@ -54,6 +54,12 @@ + # define CLOCK_PROCESS_CPUTIME_ID 2 + /* Thread-specific CPU-time clock. */ + # define CLOCK_THREAD_CPUTIME_ID 3 ++/* Monotonic system-wide clock, not adjusted for frequency scaling. */ ++# define CLOCK_MONOTONIC_RAW 4 ++/* Identifier for system-wide realtime clock, updated only on ticks. */ ++# define CLOCK_REALTIME_COARSE 5 ++/* Monotonic system-wide clock, updated only on ticks. */ ++# define CLOCK_MONOTONIC_COARSE 6 + + /* Flag to indicate time is absolute. */ + # define TIMER_ABSTIME 1 +-- +1.7.10.4 + |