From: Peter Korsgaard Date: Mon, 7 Jun 2021 15:14:37 +0000 (+0200) Subject: Merge branch 'next' X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8d07baab43b5624ad6d73ee58f5a9d4ab8b27049;p=buildroot.git Merge branch 'next' Signed-off-by: Peter Korsgaard --- 8d07baab43b5624ad6d73ee58f5a9d4ab8b27049 diff --cc DEVELOPERS index a7f9cdeb61,a0a9cebfe6..0ab898d94d --- a/DEVELOPERS +++ b/DEVELOPERS @@@ -670,8 -677,14 +672,15 @@@ N: Derrick Lyndon Pallas + F: board/aarch64-efi/ + F: board/pc/ + F: board/qemu/aarch64-sbsa/ + F: boot/arm-trusted-firmware/ + F: boot/edk2/ + F: configs/qemu_aarch64_sbsa_defconfig F: package/bearssl/ +F: package/bitcoin/ + F: package/edk2-platforms/ F: package/execline/ F: package/mdevd/ F: package/s6-dns/ diff --cc package/pkg-meson.mk index 1857450564,dafad3b1eb..16a90d157b --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@@ -89,9 -89,8 +89,9 @@@ define $(2)_CONFIGURE_CMD --prefix=/usr \ --libdir=lib \ --default-library=$(if $(BR2_STATIC_LIBS),static,shared) \ - --buildtype=$(if $(BR2_ENABLE_DEBUG),debug,release) \ + --buildtype=$(if $(BR2_ENABLE_RUNTIME_DEBUG),debug,release) \ --cross-file=$$($$(PKG)_SRCDIR)/build/cross-compilation.conf \ + -Db_pie=false \ -Dstrip=false \ -Dbuild.pkg_config_path=$$(HOST_DIR)/lib/pkgconfig \ $$($$(PKG)_CONF_OPTS) \ diff --cc package/udisks/udisks.mk index 9f7a02e10c,3a75421f2a..1090f77846 --- a/package/udisks/udisks.mk +++ b/package/udisks/udisks.mk @@@ -4,13 -4,11 +4,12 @@@ # ################################################################################ - UDISKS_VERSION = 1.0.5 - UDISKS_SITE = http://hal.freedesktop.org/releases + UDISKS_VERSION = 2.9.2 + UDISKS_SOURCE = udisks-$(UDISKS_VERSION).tar.bz2 + UDISKS_SITE = https://github.com/storaged-project/udisks/releases/download/udisks-$(UDISKS_VERSION) UDISKS_LICENSE = GPL-2.0+ UDISKS_LICENSE_FILES = COPYING +UDISKS_CPE_ID_VENDOR = freedesktop - # For 0002-Fix-systemd-service-file.patch - UDISKS_AUTORECONF = YES UDISKS_DEPENDENCIES = \ host-pkgconf \