From d68327b44529f4cc51cd5d74396a4facee044e5802516dc379b57d79c51fb59e Mon Sep 17 00:00:00 2001 From: David Sterba Date: Thu, 8 Sep 2016 11:36:39 +0000 Subject: [PATCH] Accepting request 425693 from home:dsterba:branches:filesystems - removed btrfsprogs-only-install-udev-rules-for-udev-190.patch: fix build OBS-URL: https://build.opensuse.org/request/show/425693 OBS-URL: https://build.opensuse.org/package/show/filesystems/btrfsprogs?expand=0&rev=251 --- ...only-install-udev-rules-for-udev-190.patch | 32 ------------------- btrfsprogs.changes | 5 +++ btrfsprogs.spec | 2 -- 3 files changed, 5 insertions(+), 34 deletions(-) delete mode 100644 btrfsprogs-only-install-udev-rules-for-udev-190.patch diff --git a/btrfsprogs-only-install-udev-rules-for-udev-190.patch b/btrfsprogs-only-install-udev-rules-for-udev-190.patch deleted file mode 100644 index 6c7c890..0000000 --- a/btrfsprogs-only-install-udev-rules-for-udev-190.patch +++ /dev/null @@ -1,32 +0,0 @@ -From: Jeff Mahoney -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 ---- - - 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 diff --git a/btrfsprogs.changes b/btrfsprogs.changes index 6929809..56fa19b 100644 --- a/btrfsprogs.changes +++ b/btrfsprogs.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +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 diff --git a/btrfsprogs.spec b/btrfsprogs.spec index 668efc9..5691212 100644 --- a/btrfsprogs.spec +++ b/btrfsprogs.spec @@ -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