From 6b11c09783b7421379ade9972bcdd0679248028ca748785960b9e3aa78a3b77c Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 30 Jul 2020 16:02:43 +0000 Subject: [PATCH] - Update to release 5.9.0 OBS-URL: https://build.opensuse.org/package/show/hardware/libzbc?expand=0&rev=33 --- ...double-definition-of-zbc_log_drv-etc.patch | 65 ------------------- libzbc.changes | 8 +++ libzbc.spec | 5 +- v5.8.5.tar.gz | 3 - v5.9.0.tar.gz | 3 + 5 files changed, 13 insertions(+), 71 deletions(-) delete mode 100644 0001-build-avoid-double-definition-of-zbc_log_drv-etc.patch delete mode 100644 v5.8.5.tar.gz create mode 100644 v5.9.0.tar.gz diff --git a/0001-build-avoid-double-definition-of-zbc_log_drv-etc.patch b/0001-build-avoid-double-definition-of-zbc_log_drv-etc.patch deleted file mode 100644 index d50b303..0000000 --- a/0001-build-avoid-double-definition-of-zbc_log_drv-etc.patch +++ /dev/null @@ -1,65 +0,0 @@ -From abf34849c0b4e43900535a3a5d68753ab1107b65 Mon Sep 17 00:00:00 2001 -From: Jan Engelhardt -Date: Mon, 16 Mar 2020 08:01:44 +0100 -Subject: [PATCH] build: avoid double definition of zbc_log_drv etc. -Upstream: https://github.com/hgst/libzbc/pull/37 - -When -fno-common is in use, what compiler writers are trying to make -a standard, libzbc fails to build. - -$ make V=1 -Making all in . -make[1]: Entering directory '~/libzbc' -/bin/sh ./libtool --tag=CC --mode=link gcc -fPIC -fno-common -O2 -g -pthread -Wl,--version-script,./exports -release '5.8.5' -o libzbc.la -rpath /usr/lib lib/libzbc_la-zbc.lo lib/libzbc_la-zbc_block.lo lib/libzbc_la-zbc_sg.lo lib/libzbc_la-zbc_scsi.lo lib/libzbc_la-zbc_ata.lo lib/libzbc_la-zbc_fake.lo -libtool: link: gcc -shared -fPIC -DPIC lib/.libs/libzbc_la-zbc.o lib/.libs/libzbc_la-zbc_block.o lib/.libs/libzbc_la-zbc_sg.o lib/.libs/libzbc_la-zbc_scsi.o lib/.libs/libzbc_la-zbc_ata.o lib/.libs/libzbc_la-zbc_fake.o -O2 -g -pthread -Wl,--version-script -Wl,./exports -pthread -Wl,-soname -Wl,libzbc-5.8.5.so -o .libs/libzbc-5.8.5.so -/usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: lib/.libs/libzbc_la-zbc_block.o:~/libzbc/lib/zbc.h:269: multiple definition of `zbc_log_level'; lib/.libs/libzbc_la-zbc.o:~/libzbc/lib/zbc.h:269: first defined here -/usr/lib64/gcc/x86_64-suse-linux/9/../../../../x86_64-suse-linux/bin/ld: lib/.libs/libzbc_la-zbc_block.o:~/libzbc/lib/zbc.h:195: multiple definition of `zbc_fake_drv'; lib/.libs/libzbc_la-zbc.o:~/libzbc/lib/zbc.h:195: first defined here - -References: https://bugzilla.suse.com/show_bug.cgi?id=1160244 ---- - lib/zbc.h | 10 +++++----- - 1 file changed, 5 insertions(+), 5 deletions(-) - -diff --git a/lib/zbc.h b/lib/zbc.h -index 7dec298..73d76db 100644 ---- a/lib/zbc.h -+++ b/lib/zbc.h -@@ -177,22 +177,22 @@ static inline void zbc_set_errno(enum zbc_sk sk, enum zbc_asc_ascq asc_ascq) - /** - * Block device driver (requires kernel support). - */ --struct zbc_drv zbc_block_drv; -+extern struct zbc_drv zbc_block_drv; - - /** - * ZAC (ATA) device driver (uses SG_IO). - */ --struct zbc_drv zbc_ata_drv; -+extern struct zbc_drv zbc_ata_drv; - - /** - * ZBC (SCSI) device driver (uses SG_IO). - */ --struct zbc_drv zbc_scsi_drv; -+extern struct zbc_drv zbc_scsi_drv; - - /** - * ZBC emulation driver (file or block device). - */ --struct zbc_drv zbc_fake_drv; -+extern struct zbc_drv zbc_fake_drv; - - #define container_of(ptr, type, member) \ - ((type *)((char *)(ptr)-(unsigned long)(&((type *)0)->member))) -@@ -266,7 +266,7 @@ enum { - /** - * Library log level. - */ --int zbc_log_level; -+extern int zbc_log_level; - - #define zbc_print(stream,format,args...) \ - do { \ --- -2.25.1 - diff --git a/libzbc.changes b/libzbc.changes index 2424a13..646515f 100644 --- a/libzbc.changes +++ b/libzbc.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Thu Jul 30 15:53:24 UTC 2020 - Jan Engelhardt + +- Update to release 5.9.0 + * Compilation warning fixes +- Drop 0001-build-avoid-double-definition-of-zbc_log_drv-etc.patch + (merged) + ------------------------------------------------------------------- Mon Mar 16 07:20:10 UTC 2020 - Jan Engelhardt diff --git a/libzbc.spec b/libzbc.spec index dec953b..54dcb06 100644 --- a/libzbc.spec +++ b/libzbc.spec @@ -17,8 +17,8 @@ Name: libzbc -%define lname libzbc-5_8_5 -Version: 5.8.5 +%define lname libzbc-5_9_0 +Version: 5.9.0 Release: 0 Summary: Library for manipulating ZBC and ZAC disks License: BSD-2-Clause AND LGPL-3.0-or-later @@ -26,7 +26,6 @@ Group: Hardware/Other URL: https://github.com/hgst/libzbc Source: https://github.com/hgst/libzbc/archive/v%version.tar.gz -Patch1: 0001-build-avoid-double-definition-of-zbc_log_drv-etc.patch BuildRequires: autoconf-archive BuildRequires: libtool >= 2 BuildRequires: pkg-config diff --git a/v5.8.5.tar.gz b/v5.8.5.tar.gz deleted file mode 100644 index 04f0ab4..0000000 --- a/v5.8.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:82d2f5fdb3c831c7ff3af1b0d7142f1ba3124cc510d9ddee76d366d745696e8c -size 129980 diff --git a/v5.9.0.tar.gz b/v5.9.0.tar.gz new file mode 100644 index 0000000..069dbef --- /dev/null +++ b/v5.9.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:35424bcd8661314e654d18ad4b176ff1dbb473ae445d6c08d606c454dd64b500 +size 131517