From: Peter Korsgaard <peter@korsgaard.com>
Date: Mon, 2 Mar 2015 22:26:20 +0000 (+0100)
Subject: Merge branch 'next'
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7403ea730d75ce0af51cb1bd5665674bb5bfae42;p=buildroot.git

Merge branch 'next'

Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
---

7403ea730d75ce0af51cb1bd5665674bb5bfae42
diff --cc package/imagemagick/imagemagick.mk
index ab2b7921ba,3a12a9c7ab..03c1bd4e06
--- a/package/imagemagick/imagemagick.mk
+++ b/package/imagemagick/imagemagick.mk
@@@ -4,9 -4,12 +4,9 @@@
  #
  ################################################################################
  
- IMAGEMAGICK_VERSION = 6.9.0-4
+ IMAGEMAGICK_VERSION = 6.9.0-7
  IMAGEMAGICK_SOURCE = ImageMagick-$(IMAGEMAGICK_VERSION).tar.xz
 -# The official ImageMagick site only keeps the latest versions
 -# available, which is annoying. Use an alternate site that keeps all
 -# older versions.
 -IMAGEMAGICK_SITE = ftp://ftp.nluug.nl/pub/ImageMagick
 +IMAGEMAGICK_SITE = http://www.imagemagick.org/download/releases
  IMAGEMAGICK_LICENSE = Apache-2.0
  IMAGEMAGICK_LICENSE_FILES = LICENSE
  
diff --cc package/rpi-firmware/rpi-firmware.mk
index 945f890bee,1db1f0ed01..cbcf790095
--- a/package/rpi-firmware/rpi-firmware.mk
+++ b/package/rpi-firmware/rpi-firmware.mk
@@@ -11,12 -11,7 +11,8 @@@ RPI_FIRMWARE_LICENSE_FILES = boot/LICEN
  RPI_FIRMWARE_INSTALL_TARGET = NO
  RPI_FIRMWARE_INSTALL_IMAGES = YES
  
- ifeq ($(BR2_PACKAGE_RPI_FIRMWARE_INSTALL_DTBS),y)
  RPI_FIRMWARE_DEPENDENCIES += host-rpi-firmware
- # The Device Tree blobs are not yet in the master branch of the
- # raspberrypi firmware project, so we have to use a separate branch
- # for now.
- RPI_FIRMWARE_VERSION = 6c0acfbbdba9908a4a4d21eab63c49ab72cb528b
++
  define RPI_FIRMWARE_INSTALL_DTB
  	$(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b.dtb
  	$(INSTALL) -D -m 0644 $(@D)/boot/bcm2708-rpi-b-plus.dtb $(BINARIES_DIR)/rpi-firmware/bcm2708-rpi-b-plus.dtb