From 44fdd8c2e85a2ae93304900677a2d0e3f14dfec4 Mon Sep 17 00:00:00 2001 From: Rolf Fokkens Date: Dec 05 2014 22:49:58 +0000 Subject: Updated to upstream 1.0.8 --- diff --git a/.gitignore b/.gitignore index fabbeaf..dd8cce8 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ /bcache-tools-20131018.tar.gz /bcache-status-20140220.tar.gz /bcache-tools-0.9.tar.gz +/bcache-tools-1.0.8.tar.gz diff --git a/bcache-tools-1.0.8-noprobe.patch b/bcache-tools-1.0.8-noprobe.patch new file mode 100644 index 0000000..6d2d9f5 --- /dev/null +++ b/bcache-tools-1.0.8-noprobe.patch @@ -0,0 +1,32 @@ +diff -ruN bcache-tools-1.0.8.orig/69-bcache.rules bcache-tools-1.0.8/69-bcache.rules +--- bcache-tools-1.0.8.orig/69-bcache.rules 2014-12-04 23:51:24.000000000 +0100 ++++ bcache-tools-1.0.8/69-bcache.rules 2014-12-05 19:38:42.284643952 +0100 +@@ -7,17 +7,10 @@ + KERNEL=="fd*|sr*", GOTO="bcache_end" + + # blkid was run by the standard udev rules +-# It recognised bcache (util-linux 2.24+) +-ENV{ID_FS_TYPE}=="bcache", GOTO="bcache_backing_found" +-# It recognised something else; bail +-ENV{ID_FS_TYPE}=="?*", GOTO="bcache_backing_end" +- + # Backing devices: scan, symlink, register +-IMPORT{program}="probe-bcache -o udev $tempnode" + ENV{ID_FS_TYPE}!="bcache", GOTO="bcache_backing_end" + ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" + +-LABEL="bcache_backing_found" + RUN{builtin}+="kmod load bcache" + RUN+="bcache-register $tempnode" + LABEL="bcache_backing_end" +diff -ruN bcache-tools-1.0.8.orig/dracut/module-setup.sh bcache-tools-1.0.8/dracut/module-setup.sh +--- bcache-tools-1.0.8.orig/dracut/module-setup.sh 2014-12-04 23:51:24.000000000 +0100 ++++ bcache-tools-1.0.8/dracut/module-setup.sh 2014-12-05 19:32:37.771480651 +0100 +@@ -29,6 +29,6 @@ + } + + install() { +- inst_multiple ${udevdir}/probe-bcache ${udevdir}/bcache-register ++ inst_multiple ${udevdir}/bcache-register + inst_rules 69-bcache.rules + } diff --git a/bcache-tools-20131018-noprobe.patch b/bcache-tools-20131018-noprobe.patch deleted file mode 100644 index 1467b40..0000000 --- a/bcache-tools-20131018-noprobe.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- bcache-tools-20131018/69-bcache.rules.2 2013-10-18 19:34:38.907431161 +0200 -+++ bcache-tools-20131018/69-bcache.rules 2013-10-18 19:41:18.540320493 +0200 -@@ -6,17 +6,10 @@ - ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="bcache_end" - - # blkid was run by the standard udev rules --# It recognised bcache (util-linux 2.24+) --ENV{ID_FS_TYPE}=="bcache", GOTO="bcache_backing_found" --# It recognised something else; bail --ENV{ID_FS_TYPE}=="?*", GOTO="bcache_backing_end" -- - # Backing devices: scan, symlink, register --IMPORT{program}="probe-bcache -o udev $tempnode" - ENV{ID_FS_TYPE}!="bcache", GOTO="bcache_backing_end" - ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}" - --LABEL="bcache_backing_found" - RUN+="bcache-register $tempnode" - LABEL="bcache_backing_end" - ---- bcache-tools-20131018/dracut/module-setup.sh.udevfix 2013-10-11 13:21:56.000000000 +0200 -+++ bcache-tools-20131018/dracut/module-setup.sh 2013-10-18 19:11:37.596140492 +0200 -@@ -29,6 +29,6 @@ - } - - install() { -- inst_multiple ${udevdir}/probe-bcache ${udevdir}/bcache-register -+ inst_multiple ${udevdir}/bcache-register - inst_rules 69-bcache.rules - } diff --git a/bcache-tools-20131018-udev-dmfix.patch b/bcache-tools-20131018-udev-dmfix.patch deleted file mode 100644 index 46b1bf8..0000000 --- a/bcache-tools-20131018-udev-dmfix.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- bcache-tools-20131018/69-bcache.rules.orig 2013-10-18 19:33:45.991178453 +0200 -+++ bcache-tools-20131018/69-bcache.rules 2013-10-18 19:34:38.907431161 +0200 -@@ -3,6 +3,7 @@ - - SUBSYSTEM!="block", GOTO="bcache_end" - ACTION=="remove", GOTO="bcache_end" -+ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="bcache_end" - - # blkid was run by the standard udev rules - # It recognised bcache (util-linux 2.24+) diff --git a/bcache-tools.spec b/bcache-tools.spec index 3803cea..9871684 100644 --- a/bcache-tools.spec +++ b/bcache-tools.spec @@ -2,18 +2,17 @@ Summary: Tools for Linux kernel block layer cache Name: bcache-tools -Version: 0.9 -Release: 3%{?dist} +Version: 1.0.8 +Release: 1%{?dist} License: GPLv2 Group: System Environment/Base URL: http://bcache.evilpiepirate.org/ -VCS: http://evilpiepirate.org/git/bcache-tools.git -# For now I am using a prerelease version obtained by: -# git clone http://evilpiepirate.org/git/bcache-tools.git +VCS: https://github.com/g2p/bcache-tools.git +# git clone https://github.com/g2p/bcache-tools.git # cd bcache-tools/ -# git archive --format=tar --prefix=bcache-tools-0.9/ v0.9 | gzip > ../bcache-tools-0.9.tar.gz +# git archive --format=tar --prefix=bcache-tools-1.0.8/ v1.0.8 | gzip > ../bcache-tools-1.0.8.tar.gz Source0: %{name}-%{version}.tar.gz -# This part is also a prerelease version obtained by https://gist.github.com/djwong/6343451: +# This part is a prerelease version obtained by https://gist.github.com/djwong/6343451: # git clone https://gist.github.com/6343451.git # cd 6343451/ # git archive --format=tar --prefix=bcache-status-20140220/ 6d278f9886ab5f64bd896080b1b543ba7ef6c7a6 | gzip > ../bcache-status-20140220.tar.gz @@ -23,15 +22,12 @@ Source1: bcache-status-20140220.tar.gz # man page for it # http://article.gmane.org/gmane.linux.kernel.bcache.devel/1946 Patch0: %{name}-status-20130826-man.patch -# Skip DM devices marked private - will be in git repo later -# https://github.com/g2p/bcache-tools/commit/15f17ed3e9a8dbe44a0e60cd981f70b7a61d6f7a -Patch1: %{name}-20131018-udev-dmfix.patch # configure is not "Fedora compliant", do a small step in the # right direction Patch2: %{name}-20131018-fedconf.patch # util-linux takes care of bcache superblock identification so we remove # the probe-cache call (which is Fedora specific): -Patch3: %{name}-20131018-noprobe.patch +Patch3: %{name}-1.0.8-noprobe.patch Requires: python # This is a kind of soft dependency: because we don't include probe-bcache @@ -54,7 +50,6 @@ This package contains the utilities for manipulating bcache. %setup -q -n bcache-tools-%{version} tar xzf %{SOURCE1} --strip-components=1 %patch0 -p1 -b .man -%patch1 -p1 -b .dmfix %patch2 -p1 -b .fedconfmake chmod +x configure %patch3 -p1 -b .noprobe @@ -80,6 +75,9 @@ mkdir -p \ # prevent complaints when checking for unpackaged files rm %{buildroot}%{_udevlibdir}/probe-bcache rm %{buildroot}%{_mandir}/man8/probe-bcache.8 +rm %{buildroot}%{_prefix}/lib/initcpio/install/bcache +rm %{buildroot}%{_datarootdir}/initramfs-tools/hooks/bcache + install -p -m 755 bcache-status %{buildroot}%{_sbindir}/bcache-status @@ -94,8 +92,8 @@ install -p -m 755 bcache-status %{buildroot}%{_sbindir}/bcache-status %{dracutlibdir}/modules.d/90bcache %changelog -* Fri Aug 15 2014 Fedora Release Engineering -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild +* Fri Dec 05 2014 Rolf Fokkens - 1.0.8-1 +- Sourced now from https://github.com/g2p/bcache-tools.git * Sat Jun 07 2014 Fedora Release Engineering - 0.9-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild diff --git a/sources b/sources index e07e60e..6f9a650 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ 18fa816e496899ab59a9615d4a92bcde bcache-status-20140220.tar.gz -3e3f639bb5c95ba76f33c6bb83c2b6ac bcache-tools-0.9.tar.gz +8ab15ce3fd501b3e06d913cb40810c94 bcache-tools-1.0.8.tar.gz