From: Peter Korsgaard Date: Tue, 3 Sep 2019 13:03:02 +0000 (+0200) Subject: Merge branch 'next' X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d8e6851f11a6dcacd7874993d4e09f82bc5c25da;p=buildroot.git Merge branch 'next' --- d8e6851f11a6dcacd7874993d4e09f82bc5c25da diff --cc .gitlab-ci.yml index 5d42d2a606,99940640a5..6243107ee9 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@@ -312,7 -317,9 +312,8 @@@ solidrun_macchiatobin_mainline_defconfi solidrun_macchiatobin_marvell_defconfig: { extends: .defconfig } stm32f429_disco_defconfig: { extends: .defconfig } stm32f469_disco_defconfig: { extends: .defconfig } + stm32mp157_dk_defconfig: { extends: .defconfig } toradex_apalis_imx6_defconfig: { extends: .defconfig } -ts4800_defconfig: { extends: .defconfig } ts4900_defconfig: { extends: .defconfig } ts5500_defconfig: { extends: .defconfig } ts7680_defconfig: { extends: .defconfig } diff --cc Config.in.legacy index 83dce8b3c8,ac3697b870..72c364ecb5 --- a/Config.in.legacy +++ b/Config.in.legacy @@@ -144,44 -144,23 +144,59 @@@ endi ############################################################################### + comment "Legacy options removed in 2019.11" + + config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_NEW + bool "new dbus support option in wpa_supplicant was renamed" + select BR2_PACKAGE_WPA_SUPPLICANT_DBUS if BR2_TOOLCHAIN_HAS_THREADS + select BR2_LEGACY + help + The new dbus support option was renamed. + + config BR2_PACKAGE_WPA_SUPPLICANT_DBUS_OLD + bool "old dbus support in wpa_supplicant was removed" + select BR2_LEGACY + help + The old dbus support was removed. + comment "Legacy options removed in 2019.08" +config BR2_TARGET_TS4800_MBRBOOT + bool "ts4800-mbrboot package was removed" + select BR2_LEGACY + help + The defconfig for the TS4800 platform has been removed, so + the ts4800-mbrboot package, containing the boot code for + this specific platform has been removed as welL. + +config BR2_PACKAGE_LIBAMCODEC + bool "liamcodec package was removed" + select BR2_LEGACY + help + Support for odroidc2 based systems was removed, making the + libamcodec package useless. + +config BR2_PACKAGE_ODROID_SCRIPTS + bool "odroid-scripts package was removed" + select BR2_LEGACY + help + Support for odroidc2 based systems was removed, making the + odroid-scripts package useless. + +config BR2_PACKAGE_ODROID_MALI + bool "odroid-mali package was removed" + select BR2_LEGACY + help + Support for odroidc2 based systems was removed, making the + odroid-mali package useless. + +config BR2_PACKAGE_KODI_PLATFORM_AML + bool "Kodi AMLogic support was removed" + select BR2_LEGACY + help + Support for AMLogic was removed due to the removal of the + odroidc2 defconfig. + config BR2_GCC_VERSION_6_X bool "gcc 6.x support removed" select BR2_LEGACY diff --cc docs/manual/common-usage.txt index a36301afd5,d9f086234c..a87980d4a2 --- a/docs/manual/common-usage.txt +++ b/docs/manual/common-usage.txt @@@ -310,10 -313,25 +313,25 @@@ installed (+python-matplotlib+ on most +argparse+ module if you're using a Python version older than 2.7 (+python-argparse+ on most distributions). -Just like for the duration graph, a +BR2_GRAPH_OUT+ environment is -supported to adjust the output file format. See xref:graph-depends[] +Just like for the duration graph, a +BR2_GRAPH_OUT+ environment variable +is supported to adjust the output file format. See xref:graph-depends[] for details about this environment variable. + Additionally, one may set the environment variable +BR2_GRAPH_SIZE_OPTS+ + to further control the generated graph. Accepted options are: + + * `--size-limit X`, `-l X`, will group all packages which individual + contribution is below `X` percent, to a single entry labelled _Others_ + in the graph. By default, `X=0.01`, which means packages each + contributing less than 1% are grouped under _Others_. Accepted values + are in the range `[0.0..1.0]`. + + * `--iec`, `--binary`, `--si`, `--decimal`, to use IEC (binary, powers + of 1024) or SI (decimal, powers of 1000; the default) prefixes. + + * `--biggest-first`, to sort packages in decreasing size order, rather + than in increasing size order. + .Note The collected filesystem size data is only meaningful after a complete clean rebuild. Be sure to run +make clean all+ before using +make diff --cc package/Config.in index 710ed12be0,9f544f955c..9336261c5d --- a/package/Config.in +++ b/package/Config.in @@@ -1502,8 -1505,10 +1503,9 @@@ endmen menu "Multimedia" source "package/bitstream/Config.in" + source "package/dav1d/Config.in" source "package/kvazaar/Config.in" source "package/libaacs/Config.in" - source "package/libamcodec/Config.in" source "package/libass/Config.in" source "package/libbdplus/Config.in" source "package/libbluray/Config.in" diff --cc package/gnutls/gnutls.mk index 700737050d,ecbedec5c8..94935a3f9e --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@@ -5,17 -5,11 +5,17 @@@ ################################################################################ GNUTLS_VERSION_MAJOR = 3.6 - GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).8 + GNUTLS_VERSION = $(GNUTLS_VERSION_MAJOR).9 GNUTLS_SOURCE = gnutls-$(GNUTLS_VERSION).tar.xz GNUTLS_SITE = https://www.gnupg.org/ftp/gcrypt/gnutls/v$(GNUTLS_VERSION_MAJOR) -GNUTLS_LICENSE = LGPL-2.1+ (core library), GPL-3.0+ (gnutls-openssl library) -GNUTLS_LICENSE_FILES = doc/COPYING doc/COPYING.LESSER +GNUTLS_LICENSE = LGPL-2.1+ (core library) +GNUTLS_LICENSE_FILES = doc/COPYING.LESSER + +ifeq ($(BR2_PACKAGE_GNUTLS_OPENSSL),y) +GNUTLS_LICENSE := $(GNUTLS_LICENSE), GPL-3.0+ (gnutls-openssl library) +GNUTLS_LICENSE_FILES += doc/COPYING +endif + GNUTLS_DEPENDENCIES = host-pkgconf libtasn1 nettle pcre GNUTLS_CONF_OPTS = \ --disable-doc \