bcache-tools-0.9
OBS-URL: https://build.opensuse.org/package/show/filesystems/bcache-tools?expand=0&rev=9
This commit is contained in:
parent
5ec2943abf
commit
fc50823f3c
28
0001-build-remove-inline-keyword-from-crc64.patch
Normal file
28
0001-build-remove-inline-keyword-from-crc64.patch
Normal file
@ -0,0 +1,28 @@
|
||||
From 96e990f72720c87c0bd85b31f819bddcdfdb22d7 Mon Sep 17 00:00:00 2001
|
||||
From: Jan Engelhardt <jengelh@inai.de>
|
||||
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
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9190de0872706ce2fe063211f3cb41b2d8ca7eb2aeead96787f326422da968de
|
||||
size 18540
|
3
bcache-tools-0.9.tar.xz
Normal file
3
bcache-tools-0.9.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:13b71741df3abfeea10256d5f8b8362d948132442a17b1df2e5a31d3a80d7e54
|
||||
size 19732
|
@ -1,3 +1,13 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Apr 4 07:57:33 UTC 2014 - jengelh@inai.de
|
||||
|
||||
- Update to new upstream release 0.9
|
||||
* Run probe-bcache a little later in the udev rule sequence
|
||||
(moving from position 61 to 69), fixing a machine hang on
|
||||
bcache reassemble (bnc#868938)
|
||||
- Add 0001-build-remove-inline-keyword-from-crc64.patch, this is
|
||||
a build fix.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 19 10:22:13 UTC 2014 - oneukum@suse.com
|
||||
|
||||
|
@ -20,16 +20,19 @@ Name: bcache-tools
|
||||
Summary: Configuration utilities for bcache
|
||||
License: GPL-2.0
|
||||
Group: System/Base
|
||||
Version: 0.1.g71
|
||||
Version: 0.9
|
||||
Release: 0
|
||||
#Snapshot: 0b57e166ae86d525ef42842cabf7692fc7c44039
|
||||
#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
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: libblkid-devel
|
||||
BuildRequires: libuuid-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: xz
|
||||
|
||||
%description
|
||||
@ -37,9 +40,12 @@ This package contains utilities for configuring the bcache Module.
|
||||
|
||||
%prep
|
||||
%setup -qn %name
|
||||
%patch -P 1 -p1
|
||||
|
||||
%build
|
||||
make all CFLAGS="%optflags" %{?_smp_mflags}
|
||||
export SUSE_ASNEEDED=0
|
||||
make all CFLAGS="%optflags $(pkg-config blkid uuid --cflags) -std=gnu99" \
|
||||
LDFLAGS="$(pkg-config blkid uuid --libs)" %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
b="%buildroot"
|
||||
@ -49,7 +55,6 @@ 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"
|
||||
mv "$b"/lib/udev/rules.d/61-bcache.rules "$b"/lib/udev/rules.d/74-bcache.rules
|
||||
mkdir -p "$b/%_prefix/lib"
|
||||
mv "$b/lib/udev" "$b/%_prefix/lib/"
|
||||
|
||||
@ -57,7 +62,6 @@ mv "$b/lib/udev" "$b/%_prefix/lib/"
|
||||
%defattr(-,root,root)
|
||||
%_sbindir/bcache-super-show
|
||||
%_sbindir/make-bcache
|
||||
/sbin/probe-bcache
|
||||
%_prefix/lib/udev
|
||||
%_mandir/man8/*.8*
|
||||
%doc COPYING
|
||||
|
Loading…
Reference in New Issue
Block a user