From: Peter Korsgaard Date: Wed, 1 Mar 2017 16:37:33 +0000 (+0100) Subject: Merge branch 'next' X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fd89246426e73cd8d0f85eeb4c2c6977facbb9bb;p=buildroot.git Merge branch 'next' Signed-off-by: Peter Korsgaard --- fd89246426e73cd8d0f85eeb4c2c6977facbb9bb diff --cc package/e2fsprogs/e2fsprogs.mk index 3829053d71,e5016842de..6659c167db --- a/package/e2fsprogs/e2fsprogs.mk +++ b/package/e2fsprogs/e2fsprogs.mk @@@ -4,10 -4,10 +4,10 @@@ # ################################################################################ - E2FSPROGS_VERSION = 1.43.3 + E2FSPROGS_VERSION = 1.43.4 E2FSPROGS_SOURCE = e2fsprogs-$(E2FSPROGS_VERSION).tar.xz E2FSPROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/tytso/e2fsprogs/v$(E2FSPROGS_VERSION) -E2FSPROGS_LICENSE = GPLv2, libuuid BSD-3c, libss and libet MIT-like with advertising clause +E2FSPROGS_LICENSE = GPLv2, BSD-3c (libuuid), MIT-like with advertising clause (libss and libet) E2FSPROGS_LICENSE_FILES = NOTICE lib/uuid/COPYING lib/ss/mit-sipb-copyright.h lib/et/internal.h E2FSPROGS_INSTALL_STAGING = YES E2FSPROGS_DEPENDENCIES = host-pkgconf util-linux diff --cc package/libepoxy/libepoxy.mk index 1dd583e3ed,dbfd6b8819..1b0f52f6f0 --- a/package/libepoxy/libepoxy.mk +++ b/package/libepoxy/libepoxy.mk @@@ -4,12 -4,12 +4,12 @@@ # ################################################################################ - LIBEPOXY_VERSION = v1.3.1 - LIBEPOXY_SITE = $(call github,anholt,libepoxy,$(LIBEPOXY_VERSION)) + LIBEPOXY_VERSION_MAJOR = 1.4 + LIBEPOXY_VERSION = $(LIBEPOXY_VERSION_MAJOR).0 + LIBEPOXY_SITE = http://ftp.gnome.org/pub/gnome/sources/libepoxy/$(LIBEPOXY_VERSION_MAJOR) + LIBEPOXY_SOURCE = libepoxy-$(LIBEPOXY_VERSION).tar.xz LIBEPOXY_INSTALL_STAGING = YES - # For patches 0001-0006: - LIBEPOXY_AUTORECONF = YES -LIBEPOXY_DEPENDENCIES = xutil_util-macros +LIBEPOXY_DEPENDENCIES = host-pkgconf xutil_util-macros LIBEPOXY_LICENSE = MIT LIBEPOXY_LICENSE_FILES = COPYING diff --cc package/linux-headers/Config.in.host index ee02a45daf,3610426055..01fc9f7e0c --- a/package/linux-headers/Config.in.host +++ b/package/linux-headers/Config.in.host @@@ -222,7 -230,7 +230,8 @@@ config BR2_DEFAULT_KERNEL_HEADER default "3.19.8" if BR2_KERNEL_HEADERS_3_19 default "4.0.9" if BR2_KERNEL_HEADERS_4_0 default "4.1.38" if BR2_KERNEL_HEADERS_4_1 - default "4.4.48" if BR2_KERNEL_HEADERS_4_4 + default "4.4.52" if BR2_KERNEL_HEADERS_4_4 default "4.8.17" if BR2_KERNEL_HEADERS_4_8 + default "4.9.13" if BR2_KERNEL_HEADERS_4_9 + default "4.10" if BR2_KERNEL_HEADERS_4_10 default BR2_DEFAULT_KERNEL_VERSION if BR2_KERNEL_HEADERS_VERSION