diff --git a/0001-build-remove-inline-keyword-from-crc64.patch b/0001-build-remove-inline-keyword-from-crc64.patch deleted file mode 100644 index f13819d..0000000 --- a/0001-build-remove-inline-keyword-from-crc64.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 96e990f72720c87c0bd85b31f819bddcdfdb22d7 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Fri, 4 Apr 2014 10:08:17 +0200 -Subject: [PATCH] build: remove inline keyword from crc64 - -In optimization levels like -O2, crc64 gets inlined for me and a -linker error follows, because there is no more crc64 function in the -object output. ---- - bcache.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bcache.c b/bcache.c -index 8f37445..8b4b986 100644 ---- a/bcache.c -+++ b/bcache.c -@@ -115,7 +115,7 @@ static const uint64_t crc_table[256] = { - 0x9AFCE626CE85B507ULL - }; - --inline uint64_t crc64(const void *_data, size_t len) -+uint64_t crc64(const void *_data, size_t len) - { - uint64_t crc = 0xFFFFFFFFFFFFFFFFULL; - const unsigned char *data = _data; --- -1.8.4.5 - diff --git a/0001-udev-do-not-rely-on-DRIVER-variable.patch b/1001-udev-do-not-rely-on-DRIVER-variable.patch similarity index 100% rename from 0001-udev-do-not-rely-on-DRIVER-variable.patch rename to 1001-udev-do-not-rely-on-DRIVER-variable.patch diff --git a/bcache-tools-1.0.8.tar.xz b/bcache-tools-1.0.8.tar.xz deleted file mode 100644 index 19abbad..0000000 --- a/bcache-tools-1.0.8.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:32a8dbea58085cb20afee158a0bcd06c2841686336f3cfe8e062aa25661912f6 -size 20284 diff --git a/bcache-tools-1.0.9.tar.xz b/bcache-tools-1.0.9.tar.xz new file mode 100644 index 0000000..3230f4c --- /dev/null +++ b/bcache-tools-1.0.9.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:d49581949114d493165b15705fce0ddbcbc8c572ac2e7d8b39f8c0731cdeb527 +size 29152 diff --git a/bcache-tools.changes b/bcache-tools.changes index 8a68da7..8129232 100644 --- a/bcache-tools.changes +++ b/bcache-tools.changes @@ -1,4 +1,17 @@ ------------------------------------------------------------------- +Fri Sep 14 07:27:58 UTC 2018 - colyli@suse.com + +- Update bcache-tools to 1.0.9, this is required by yast2 bcache module + development. In this version a new program named "bcache" is added, + by this program people may avoid many operations on sysfs entries. + (bsc#1109460) +- Remove the following patche since it is in upstream, + - 0001-build-remove-inline-keyword-from-crc64.patch +- Rename prefix of + 0001-udev-do-not-rely-on-DRIVER-variable.patch + to a SUSE specific patch prefix + 1001-udev-do-not-rely-on-DRIVER-variable.patch +------------------------------------------------------------------- Fri Mar 27 18:02:05 UTC 2015 - jengelh@inai.de - Update to new upstream release 1.0.8 diff --git a/bcache-tools.spec b/bcache-tools.spec index 14d2792..e91f09f 100644 --- a/bcache-tools.spec +++ b/bcache-tools.spec @@ -1,7 +1,7 @@ # # spec file for package bcache-tools # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 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 @@ -12,24 +12,25 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # Name: bcache-tools Summary: Configuration utilities for bcache -License: GPL-2.0 +License: GPL-2.0-only Group: System/Base -Version: 1.0.8 +Version: 1.0.9 Release: 0 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 +Patch1001: 1001-udev-do-not-rely-on-DRIVER-variable.patch + BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: libblkid-devel +BuildRequires: libsmartcols-devel BuildRequires: libuuid-devel BuildRequires: pkg-config BuildRequires: xz @@ -39,12 +40,12 @@ This package contains utilities for configuring the bcache Module. %prep %setup -qn %name -%patch -P 1 -P 2 -p1 +%patch1001 -p1 %build export SUSE_ASNEEDED=0 -make all CFLAGS="%optflags $(pkg-config blkid uuid --cflags) -std=gnu99" \ - LDFLAGS="$(pkg-config blkid uuid --libs)" %{?_smp_mflags} +make all CFLAGS="%optflags $(pkg-config blkid uuid smartcols --cflags) -std=gnu99" \ + LDFLAGS="$(pkg-config blkid uuid smartcols --libs)" %{?_smp_mflags} %install b="%buildroot" @@ -63,6 +64,7 @@ mv "$b/lib/udev" "$b/%_prefix/lib/" %defattr(-,root,root) %_sbindir/bcache-super-show %_sbindir/make-bcache +%_sbindir/bcache %_prefix/lib/udev %_libexecdir/dracut/ %_mandir/man8/*.8*