Accepting request 425694 from filesystems
- removed btrfsprogs-only-install-udev-rules-for-udev-190.patch: fix build (forwarded request 425693 from dsterba) OBS-URL: https://build.opensuse.org/request/show/425694 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/btrfsprogs?expand=0&rev=78
This commit is contained in:
parent
c7d65ca4db
commit
ae62938cd3
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:5c74d02bcbfcfadd79f435aa98afa4d6221f8604aeef37768e21211be341d0d4
|
||||
size 1575197
|
3
btrfs-progs-v4.7.2.tar.gz
Normal file
3
btrfs-progs-v4.7.2.tar.gz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b242bf7753947cdb31f2db815e50995250b1c16125dac52ccc649e7bd3d4cbd5
|
||||
size 1601740
|
@ -1,32 +0,0 @@
|
||||
From: Jeff Mahoney <jeffm@suse.com>
|
||||
Subject: btrfsprogs: only install udev rules for udev >= 190
|
||||
Patch-mainline: Submitted, linux-btrfs 30 Aug 2016
|
||||
|
||||
Prior to udev v190, there was no btrfs builtin helper. Installing it on
|
||||
systems with an older udev will cause problems.
|
||||
|
||||
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
|
||||
---
|
||||
|
||||
configure.ac | 8 +++++++-
|
||||
1 file changed, 7 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 97e89f2..8fd8f42 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -161,7 +161,13 @@ PKG_STATIC(UUID_LIBS_STATIC, [uuid])
|
||||
PKG_CHECK_MODULES(ZLIB, [zlib])
|
||||
PKG_STATIC(ZLIB_LIBS_STATIC, [zlib])
|
||||
|
||||
-UDEVDIR="$(pkg-config udev --variable=udevdir)"
|
||||
+# udev v190 introduced the btrfs builtin and a udev rule to use it.
|
||||
+# Our udev rule gives us the friendly dm names but isn't required (or valid)
|
||||
+# on earlier releases.
|
||||
+UDEVDIR=
|
||||
+if pkg-config udev --atleast-version 190; then
|
||||
+ UDEVDIR="$(pkg-config udev --variable=udevdir)"
|
||||
+fi
|
||||
AC_SUBST(UDEVDIR)
|
||||
|
||||
dnl lzo library does not provide pkg-config, let use classic way
|
@ -1,3 +1,25 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Sep 8 00:00:00 CEST 2016 - dsterba@suse.cz
|
||||
|
||||
- removed btrfsprogs-only-install-udev-rules-for-udev-190.patch: fix build
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Sep 6 00:00:00 CEST 2016 - dsterba@suse.cz
|
||||
|
||||
- update to 4.7.2
|
||||
* check:
|
||||
* urgent fix: false report of backref mismatches; do not --repair
|
||||
last unaffected version 4.6.1 (code reverted to that state)
|
||||
* fuzzing and fixes
|
||||
* added more sanity checks for various structures
|
||||
* testing images added
|
||||
* build: udev compatibility: do not install .rules on version < 190
|
||||
* other:
|
||||
* dump-super: do not crash on garbage value in csum_type
|
||||
* minor improvements in messages and help strings
|
||||
* documentation:
|
||||
* filesystem features
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Aug 30 20:11:10 UTC 2016 - jeffm@suse.com
|
||||
|
||||
|
@ -28,7 +28,7 @@
|
||||
%endif
|
||||
|
||||
Name: btrfsprogs
|
||||
Version: 4.7.1
|
||||
Version: 4.7.2
|
||||
Release: 0
|
||||
Summary: Utilities for the Btrfs filesystem
|
||||
License: GPL-2.0
|
||||
@ -46,7 +46,6 @@ Patch167: 0167-Btrfs-progs-make-find_and_setup_root-return-an-error.patch
|
||||
Patch168: 0168-Btrfs-progs-don-t-bug-out-if-we-can-t-find-the-last-.patch
|
||||
|
||||
Patch1000: local-version-override.patch
|
||||
Patch1001: btrfsprogs-only-install-udev-rules-for-udev-190.patch
|
||||
|
||||
BuildRequires: asciidoc
|
||||
BuildRequires: autoconf
|
||||
@ -142,7 +141,6 @@ thing.
|
||||
%patch167 -p1
|
||||
%patch168 -p1
|
||||
%patch1000 -p1
|
||||
%patch1001 -p1
|
||||
|
||||
%build
|
||||
./autogen.sh
|
||||
|
@ -6,8 +6,8 @@ Index: btrfs-progs-v4.1/version.sh
|
||||
# Copyright 2008, Oracle
|
||||
# Released under the GNU GPLv2
|
||||
|
||||
-v="v4.7.1"
|
||||
+v="v4.7.1+20160829"
|
||||
-v="v4.7.2"
|
||||
+v="v4.7.2+20160906"
|
||||
|
||||
opt=$1
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user