diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-12-01 21:56:44 +0100 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-12-01 21:56:44 +0100 |
| commit | 1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7 (patch) | |
| tree | dd26d5bc619271f8cccf0c9d7abdda9a1749d13f /package/imx-usb-loader | |
| parent | 57dcad243e6daefefbe21109e1fc97272053a7a0 (diff) | |
| parent | 787a31fed42f98a8e2e6a0bd2079376c861436f2 (diff) | |
| download | buildroot-1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7.tar.gz buildroot-1c8dda3e435cfadaffe1f0cc062ad3c8ffbe84a7.zip | |
Merge branch 'next'
This merges the next branch accumulated during the 2017.11 release
cycle back into the master branch.
A few conflicts had to be resolved:
- In the DEVELOPERS file, because Fabrice Fontaine was added as a
developer for libupnp in master, and for libupnp18 in
next. Resolution is simple: add him for both.
- linux/Config.in, because we updated the 4.13.x release used by
default in master, while we moved to 4.14 in next. Resolution: use
4.14.
- package/libupnp/libupnp.hash: a hash for the license file was added
in master, while the package was bumped into next. Resolution: keep
the hash for the license file, and keep the hash for the newest
version of libupnp.
- package/linux-headers/Config.in.host: default version of the kernel
headers for 4.13 was bumped to the latest 4.13.x in master, but was
changed to 4.14 in next. Resolution: use 4.14.
- package/samba4/: samba was bumped to 4.6.11 in master for security
reasons, but was bumped to 4.7.3 in next. Resolution: keep 4.7.3.
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/imx-usb-loader')
| -rw-r--r-- | package/imx-usb-loader/imx-usb-loader.hash | 2 | ||||
| -rw-r--r-- | package/imx-usb-loader/imx-usb-loader.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/package/imx-usb-loader/imx-usb-loader.hash b/package/imx-usb-loader/imx-usb-loader.hash index 6cb581147f..e246ff85f2 100644 --- a/package/imx-usb-loader/imx-usb-loader.hash +++ b/package/imx-usb-loader/imx-usb-loader.hash @@ -1,2 +1,2 @@ # locally computed -sha256 5232292cb1ad853905357de59ed251b57060562dc8d7f1cce0bb6c0c8d280dae imx-usb-loader-f04f225ebc1c38e81eb24745333c8622deda6b49.tar.gz +sha256 717b64cec31f7e1167d4a31e4f511eea97ab80039dd435b7b183c6f41352213a imx-usb-loader-7e77787c83288a421080a9bf2f67063931f561be.tar.gz diff --git a/package/imx-usb-loader/imx-usb-loader.mk b/package/imx-usb-loader/imx-usb-loader.mk index 7593e3ce7a..946a1f3d55 100644 --- a/package/imx-usb-loader/imx-usb-loader.mk +++ b/package/imx-usb-loader/imx-usb-loader.mk @@ -4,7 +4,7 @@ # ################################################################################ -IMX_USB_LOADER_VERSION = f04f225ebc1c38e81eb24745333c8622deda6b49 +IMX_USB_LOADER_VERSION = 7e77787c83288a421080a9bf2f67063931f561be IMX_USB_LOADER_SITE = $(call github,boundarydevices,imx_usb_loader,$(IMX_USB_LOADER_VERSION)) IMX_USB_LOADER_LICENSE = LGPL-2.1+ IMX_USB_LOADER_LICENSE_FILES = COPYING |
