From 20181c3f1b7191d2b6a1b78bfbe32c1f58e87359 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls <bernd.kuhls@t-online.de> Date: Sat, 8 Jan 2022 10:13:49 +0100 Subject: [PATCH] package/btrfs-progs: bump version to 5.15.1 Reformatted hashes. Upstream relicensed libbtrfsutil to LGPL-2.1+ and removed libbtrfsutil/COPYING.LESSER: https://github.com/kdave/btrfs-progs/commit/9e30f779e3cbf12a88ebe309ee371851fdfd3aa0 Add optional support for udev: https://github.com/kdave/btrfs-progs/commit/f74ebeee5c239e007a0144e93f0eee26949a85ec https://github.com/kdave/btrfs-progs/commit/1d0fa3781ef9374388b683cf96f9c48245025cf6 Changelog: https://github.com/kdave/btrfs-progs/blob/master/CHANGES Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> --- package/btrfs-progs/btrfs-progs.hash | 7 +++---- package/btrfs-progs/btrfs-progs.mk | 15 +++++++++++---- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/package/btrfs-progs/btrfs-progs.hash b/package/btrfs-progs/btrfs-progs.hash index aac144963e..339eab02aa 100644 --- a/package/btrfs-progs/btrfs-progs.hash +++ b/package/btrfs-progs/btrfs-progs.hash @@ -1,6 +1,5 @@ # From https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/sha256sums.asc -sha256 d41961b0a92160c80f894ad9a1882822889c2e1d084cbf3e08b8c214a5cf0137 btrfs-progs-v5.11.tar.xz +sha256 6230f8f33961bd62633d601b0d049a3c6b833c1a1a7a2f2782d0c5796e7ab920 btrfs-progs-v5.15.1.tar.xz # Locally computed -sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING -sha256 3972dc9744f6499f0f9b2dbf76696f2ae7ad8af9b23dde66d6af86c9dfb36986 libbtrfsutil/COPYING -sha256 e3a994d82e644b03a792a930f574002658412f62407f5fee083f2555c5f23118 libbtrfsutil/COPYING.LESSER +sha256 0d5bf346df9e635a29dcdddf832dc5b002ca6cdc1c5c9c6c567d2a61bb0c5c15 COPYING +sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 libbtrfsutil/COPYING diff --git a/package/btrfs-progs/btrfs-progs.mk b/package/btrfs-progs/btrfs-progs.mk index 96456d1238..50c8e59e50 100644 --- a/package/btrfs-progs/btrfs-progs.mk +++ b/package/btrfs-progs/btrfs-progs.mk @@ -4,14 +4,13 @@ # ################################################################################ -BTRFS_PROGS_VERSION = 5.11 +BTRFS_PROGS_VERSION = 5.15.1 BTRFS_PROGS_SITE = $(BR2_KERNEL_MIRROR)/linux/kernel/people/kdave/btrfs-progs BTRFS_PROGS_SOURCE = btrfs-progs-v$(BTRFS_PROGS_VERSION).tar.xz BTRFS_PROGS_DEPENDENCIES = host-pkgconf lzo util-linux zlib BTRFS_PROGS_CONF_OPTS = --disable-backtrace --disable-zstd --disable-python -BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-3.0+ (libbtrfsutil) -BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING \ - libbtrfsutil/COPYING.LESSER +BTRFS_PROGS_LICENSE = GPL-2.0, LGPL-2.1+ (libbtrfsutil) +BTRFS_PROGS_LICENSE_FILES = COPYING libbtrfsutil/COPYING BTRFS_PROGS_INSTALL_STAGING = YES # Doesn't autodetect static-only and tries to build both @@ -31,9 +30,17 @@ else BTRFS_PROGS_CONF_OPTS += --disable-convert endif +ifeq ($(BR2_PACKAGE_HAS_UDEV),y) +BTRFS_PROGS_CONF_OPTS += --enable-libudev +BTRFS_PROGS_DEPENDENCIES += udev +else +BTRFS_PROGS_CONF_OPTS += --disable-libudev +endif + HOST_BTRFS_PROGS_DEPENDENCIES = host-util-linux host-lzo host-zlib HOST_BTRFS_PROGS_CONF_OPTS = \ --disable-backtrace \ + --disable-libudev \ --disable-zstd \ --disable-python \ --disable-convert