diff --git a/0001-udev-do-not-rely-on-DRIVER-variable.patch b/0001-udev-do-not-rely-on-DRIVER-variable.patch new file mode 100644 index 0000000..2b2f9af --- /dev/null +++ b/0001-udev-do-not-rely-on-DRIVER-variable.patch @@ -0,0 +1,39 @@ +From b48c30983b1510d94745bd07494fa81a68a5896e Mon Sep 17 00:00:00 2001 +From: Jan Engelhardt +Date: Sat, 28 Mar 2015 10:50:57 +0100 +Subject: [PATCH] udev: do not rely on DRIVER variable + +The DRIVER variable will only be set on a single event (when the +module creates the first instance?). Any subsequent udev event, e.g. a +change event for bcache0, does not have the DRIVER tag set. In fact, +most events don't. (This can be reproduced with `udevadm trigger`.) +This leads to a change in the contents of the SYMLINK variable which +leads to removal of /dev/bcache/, since DRIVER is not set. + +Don't even bother to create such a volatile /dev/bcache/ in the +first place so users don't go chasing after it. + +References: https://bugzilla.opensuse.org/880858 +--- + 69-bcache.rules | 6 ------ + 1 file changed, 6 deletions(-) + +diff --git a/69-bcache.rules b/69-bcache.rules +index 9cc7f0d..096fde6 100644 +--- a/69-bcache.rules ++++ b/69-bcache.rules +@@ -22,11 +22,5 @@ RUN{builtin}+="kmod load bcache" + RUN+="bcache-register $tempnode" + LABEL="bcache_backing_end" + +-# Cached devices: symlink +-DRIVER=="bcache", ENV{CACHED_UUID}=="?*", \ +- SYMLINK+="bcache/by-uuid/$env{CACHED_UUID}" +-DRIVER=="bcache", ENV{CACHED_LABEL}=="?*", \ +- SYMLINK+="bcache/by-label/$env{CACHED_LABEL}" +- + LABEL="bcache_end" + +-- +2.1.4 + diff --git a/bcache-tools-0.9.tar.xz b/bcache-tools-0.9.tar.xz deleted file mode 100644 index f03af4d..0000000 --- a/bcache-tools-0.9.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:13b71741df3abfeea10256d5f8b8362d948132442a17b1df2e5a31d3a80d7e54 -size 19732 diff --git a/bcache-tools-1.0.8.tar.xz b/bcache-tools-1.0.8.tar.xz new file mode 100644 index 0000000..19abbad --- /dev/null +++ b/bcache-tools-1.0.8.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:32a8dbea58085cb20afee158a0bcd06c2841686336f3cfe8e062aa25661912f6 +size 20284 diff --git a/bcache-tools.changes b/bcache-tools.changes index dee934b..8a68da7 100644 --- a/bcache-tools.changes +++ b/bcache-tools.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Fri Mar 27 18:02:05 UTC 2015 - jengelh@inai.de + +- Update to new upstream release 1.0.8 +* bcache-register is now a C program +- Add 0001-udev-do-not-rely-on-DRIVER-variable.patch to entirely + disable /dev/bcache symlinks for now, rather than have it + half-working [bnc#880858] + ------------------------------------------------------------------- Mon Aug 18 14:59:41 UTC 2014 - meissner@suse.com diff --git a/bcache-tools.spec b/bcache-tools.spec index affe2c3..14d2792 100644 --- a/bcache-tools.spec +++ b/bcache-tools.spec @@ -1,7 +1,7 @@ # # spec file for package bcache-tools # -# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,14 +20,14 @@ Name: bcache-tools Summary: Configuration utilities for bcache License: GPL-2.0 Group: System/Base -Version: 0.9 +Version: 1.0.8 Release: 0 -#Git-Snapshot: v0.9 Url: http://bcache.evilpiepirate.org/ #Git-Clone: http://evilpiepirate.org/git/bcache-tools.git Source: %name-%version.tar.xz Patch1: 0001-build-remove-inline-keyword-from-crc64.patch +Patch2: 0001-udev-do-not-rely-on-DRIVER-variable.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libblkid-devel BuildRequires: libuuid-devel @@ -39,7 +39,7 @@ This package contains utilities for configuring the bcache Module. %prep %setup -qn %name -%patch -P 1 -p1 +%patch -P 1 -P 2 -p1 %build export SUSE_ASNEEDED=0 @@ -52,8 +52,10 @@ b="%buildroot" mkdir -p "$b"/{sbin,%_sbindir,%_mandir/man8,/lib/udev/rules.d} mkdir -p "$b/%_sysconfdir/initramfs-tools/scripts/init-premount" mkdir -p "$b/%_sysconfdir/initramfs-tools/hooks" -make install DESTDIR="$b" -rm -Rf "$b/%_sysconfdir/initramfs-tools" +make install DESTDIR="$b" DRACUTLIBDIR="%_libexecdir/dracut" +# Not used in openSUSE +rm -Rf "$b/%_sysconfdir/initramfs-tools" "$b/%_prefix/lib/initcpio" \ + "$b/%_datadir/initramfs-tools" mkdir -p "$b/%_prefix/lib" mv "$b/lib/udev" "$b/%_prefix/lib/" @@ -62,6 +64,7 @@ mv "$b/lib/udev" "$b/%_prefix/lib/" %_sbindir/bcache-super-show %_sbindir/make-bcache %_prefix/lib/udev +%_libexecdir/dracut/ %_mandir/man8/*.8* %doc COPYING