commit mhvtl for openSUSE:Factory
Hello community,
here is the log from the commit of package mhvtl for openSUSE:Factory checked
in at 2020-11-02 09:41:50
Comparing /work/SRC/openSUSE:Factory/mhvtl (Old)
and /work/SRC/openSUSE:Factory/.mhvtl.new.3463 (New)
Package is "mhvtl"
Mon Nov 2 09:41:50 2020 rev:11 rq:845055 version:1.62
Changes:
--- /work/SRC/openSUSE:Factory/mhvtl/mhvtl.changes 2020-06-23
21:05:57.934108003 +0200
+++ /work/SRC/openSUSE:Factory/.mhvtl.new.3463/mhvtl.changes2020-11-02
09:42:12.553714469 +0100
@@ -1,0 +2,5 @@
+Thu Oct 29 18:09:33 UTC 2020 - Lee Duncan
+
+- Added "-DHAVE_UNLOCKED_IOCTL" to kernel module build in SPEC file
+
+---
Other differences:
--
++ mhvtl.spec ++
--- /var/tmp/diff_new_pack.U4Vvn6/_old 2020-11-02 09:42:13.045714941 +0100
+++ /var/tmp/diff_new_pack.U4Vvn6/_new 2020-11-02 09:42:13.045714941 +0100
@@ -88,7 +88,7 @@
rm -rf obj/$flavor
mkdir -p obj/$flavor
cp -a kernel/* obj/$flavor
- make -C /usr/src/linux-obj/%_target_cpu/$flavor EXTRA_CFLAGS="-Iinclude
-DMHVTL_DEBUG" modules \
+ make -C /usr/src/linux-obj/%_target_cpu/$flavor EXTRA_CFLAGS="-Iinclude
-DMHVTL_DEBUG -DHAVE_UNLOCKED_IOCTL" modules \
M=$PWD/obj/$flavor
done
%endif
@@ -101,7 +101,7 @@
export INSTALL_MOD_PATH=%{buildroot}
export INSTALL_MOD_DIR=updates
for flavor in %flavors_to_build; do
- make -C /usr/src/linux-obj/%_target_cpu/$flavor EXTRA_CFLAGS="-Iinclude
-DMHVTL_DEBUG" modules_install \
+ make -C /usr/src/linux-obj/%_target_cpu/$flavor EXTRA_CFLAGS="-Iinclude
-DMHVTL_DEBUG -DHAVE_UNLOCKED_IOCTL" modules_install \
M=$PWD/obj/$flavor
done
%endif
commit mhvtl for openSUSE:Factory
Hello community,
here is the log from the commit of package mhvtl for openSUSE:Factory checked
in at 2020-06-23 21:05:39
Comparing /work/SRC/openSUSE:Factory/mhvtl (Old)
and /work/SRC/openSUSE:Factory/.mhvtl.new.2956 (New)
Package is "mhvtl"
Tue Jun 23 21:05:39 2020 rev:10 rq:816451 version:1.62
Changes:
--- /work/SRC/openSUSE:Factory/mhvtl/mhvtl.changes 2019-11-17
19:22:40.370878292 +0100
+++ /work/SRC/openSUSE:Factory/.mhvtl.new.2956/mhvtl.changes2020-06-23
21:05:57.934108003 +0200
@@ -1,0 +2,5 @@
+Mon Jun 22 17:02:05 UTC 2020 - Cristian RodrÃguez
+
+-Do not Require insserv or fillup which are no longer needed
+
+---
Other differences:
--
++ mhvtl.spec ++
--- /var/tmp/diff_new_pack.LeM37z/_old 2020-06-23 21:05:58.402109515 +0200
+++ /var/tmp/diff_new_pack.LeM37z/_new 2020-06-23 21:05:58.402109515 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mhvtl
#
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2020 SUSE LLC
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -25,14 +25,12 @@
%define mhvtl_home_dir /var/lib/mhvtl
Name: mhvtl
-Url:http://sites.google.com/site/linuxvtl2/
-PreReq: %insserv_prereq %fillup_prereq
+URL:http://sites.google.com/site/linuxvtl2/
Version:1.62
Release:0
Requires: mhvtl-kmp
Requires: module-init-tools
Requires: sg3_utils
-BuildRequires: insserv-compat
%if 0%{buildkmp} == 1
BuildRequires: kernel-syms
BuildRequires: module-init-tools
commit mhvtl for openSUSE:Factory
Hello community,
here is the log from the commit of package mhvtl for openSUSE:Factory checked
in at 2019-11-17 19:22:35
Comparing /work/SRC/openSUSE:Factory/mhvtl (Old)
and /work/SRC/openSUSE:Factory/.mhvtl.new.26869 (New)
Package is "mhvtl"
Sun Nov 17 19:22:35 2019 rev:9 rq:749013 version:1.62
Changes:
--- /work/SRC/openSUSE:Factory/mhvtl/mhvtl.changes 2019-11-09
23:47:31.721929971 +0100
+++ /work/SRC/openSUSE:Factory/.mhvtl.new.26869/mhvtl.changes 2019-11-17
19:22:40.370878292 +0100
@@ -1,0 +2,7 @@
+Fri Nov 15 17:16:03 UTC 2019 - Lee Duncan
+
+- Fix some builds of ppc and arm that were failing to compile
+ the dump_tape command. This adds the patch:
+ * mhvtl-fix-ppc-Makefile.patch
+
+---
New:
mhvtl-fix-ppc-Makefile.patch
Other differences:
--
++ mhvtl.spec ++
--- /var/tmp/diff_new_pack.mPfkqq/_old 2019-11-17 19:22:40.978878034 +0100
+++ /var/tmp/diff_new_pack.mPfkqq/_new 2019-11-17 19:22:40.982878032 +0100
@@ -47,9 +47,12 @@
Group: System/Daemons
Source: %{name}-%{version}_release.tar.xz
Source2:%{name}.preamble
+Patch1: %{name}-fix-ppc-Makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_ordering}
+%{?!_systemdgeneratordir:%define _systemdgeneratordir
/usr/lib/systemd/system-generators}
+
%if 0%{buildkmp} == 1
%suse_kernel_module_package -n %{name} -p %{S:2} kdump ec2 um
%endif
@@ -77,6 +80,7 @@
%prep
%setup -qn %{name}-%{version}_release
+%patch1 -p1
%build
make MHVTL_HOME_PATH=%{mhvtl_home_dir} VERSION=%{version}_release \
++ mhvtl-fix-ppc-Makefile.patch ++
From: Lee Duncan
Date: Fri Nov 15 09:13:32 PST 2019
Subject: [PATCH] mhvtl: fix ppc Makefile
Fix the Makefile in usr so that the dump_tape command can
compile on ppcle64. Otherwise, you get errors like:
> [ 74s] cc -Wall -Wshadow -g -O2 -D_LARGEFILE64_SOURCE -O2 -Wall
> -D_FORTIFY_SOURCE=2 -fstack-protector-strong -funwind-tables
> -fasynchronous-unwind-tables -fstack-clash-protection -Werror=return-type
> -flto=auto -g -I../kernel -DMHVTL_VERSION=\"1.62_release\" -D_GNU_SOURCE
> -DMHVTL_DEBUG -DMHVTL_HOME_PATH=\"/var/lib/mhvtl\"
> -DMHVTL_CONFIG_PATH=\"/etc/mhvtl\" -o dump_tape libcrc32c.o dump_tape.o
> minilzo.o -L. \
> [ 74s] -lz -L. -lvtlcart -lvtlscsi
> [ 75s]
> /usr/lib64/gcc/aarch64-suse-linux/9/../../../../aarch64-suse-linux/bin/ld:
> /tmp/dump_tape.H3eQFB.ltrans0.ltrans.o: relocation R_AARCH64_ADR_PREL_PG_HI21
> against symbol `c_pos' which may bind externally can not be used when making
> a shared object; recompile with -fPIC
> [ 75s]
> /usr/lib64/gcc/aarch64-suse-linux/9/../../../../aarch64-suse-linux/bin/ld:
> /tmp/dump_tape.H3eQFB.ltrans0.ltrans.o(.text.startup+0x590): unresolvable
> R_AARCH64_ADR_PREL_PG_HI21 relocation against symbol `c_pos'
> [ 75s]
> /usr/lib64/gcc/aarch64-suse-linux/9/../../../../aarch64-suse-linux/bin/ld:
> final link failed: bad value
> [ 75s] collect2: error: ld returned 1 exit status
> [ 75s] make[1]: *** [Makefile:96: dump_tape] Error 1
> [ 75s] make[1]: Leaving directory
> '/home/abuild/rpmbuild/BUILD/mhvtl-1.62_release/usr'
> [ 75s] make: *** [Makefile:56: usr] Error 2
---
diff -aurp mhvtl-1.62_release.orig/usr/Makefile mhvtl-1.62_release/usr/Makefile
--- mhvtl-1.62_release.orig/usr/Makefile2019-11-15 09:02:53.367425882
-0800
+++ mhvtl-1.62_release/usr/Makefile 2019-11-15 09:03:36.567320318 -0800
@@ -90,11 +90,14 @@ vtlcmd: vtlcmd.o
minilzo.o: minilzo.c lzoconf.h lzodefs.h
$(CC) $(CFLAGS) $(LZODEBUG) -o minilzo.o -c minilzo.c
+dump_tape.o: dump_tape.c
+ $(CC) $(CFLAGS) -c -fPIC $?
+
dump_tape: dump_tape.o vtlcart.o libvtlscsi.so vtltape.h scsi.h \
../kernel/vtl_common.h minilzo.c minilzo.h minilzo.o \
crc32c.h libcrc32c.o libcrc32c.c
$(CC) $(CFLAGS) -o dump_tape libcrc32c.o dump_tape.o minilzo.o -L. \
- -lz -L. -lvtlcart -lvtlscsi
+ -lz -L. -lvtlcart -lvtlscsi -fPIC
mktape:mktape.c mktape.o vtlcart.o libvtlscsi.so vtltape.h
vtllib.h \
../kernel/vtl_common.h
commit mhvtl for openSUSE:Factory
Hello community,
here is the log from the commit of package mhvtl for openSUSE:Factory checked
in at 2019-11-09 23:47:27
Comparing /work/SRC/openSUSE:Factory/mhvtl (Old)
and /work/SRC/openSUSE:Factory/.mhvtl.new.2990 (New)
Package is "mhvtl"
Sat Nov 9 23:47:27 2019 rev:8 rq:747020 version:1.62
Changes:
--- /work/SRC/openSUSE:Factory/mhvtl/mhvtl.changes 2019-11-06
14:04:47.848703855 +0100
+++ /work/SRC/openSUSE:Factory/.mhvtl.new.2990/mhvtl.changes2019-11-09
23:47:31.721929971 +0100
@@ -1,0 +2,5 @@
+Sat Nov 9 04:13:39 UTC 2019 - Neal Gompa
+
+- Use the correct macro for systemd generator directory
+
+---
Other differences:
--
++ mhvtl.spec ++
--- /var/tmp/diff_new_pack.XzjpQ2/_old 2019-11-09 23:47:33.213932155 +0100
+++ /var/tmp/diff_new_pack.XzjpQ2/_new 2019-11-09 23:47:33.221932167 +0100
@@ -80,7 +80,7 @@
%build
make MHVTL_HOME_PATH=%{mhvtl_home_dir} VERSION=%{version}_release \
- SYSTEMD_GENERATOR_DIR=/usr/lib/systemd/system-generators
+ SYSTEMD_GENERATOR_DIR=%{_systemdgeneratordir}
%if 0%{buildkmp} == 1
for flavor in %flavors_to_build; do
rm -rf obj/$flavor
@@ -94,7 +94,7 @@
%install
%make_install \
MHVTL_HOME_PATH=%{mhvtl_home_dir} VERSION=%{version}_release
LIBDIR=%{_libdir} \
- SYSTEMD_GENERATOR_DIR=/usr/lib/systemd/system-generators
+ SYSTEMD_GENERATOR_DIR=%{_systemdgeneratordir}
%if 0%{buildkmp} == 1
export INSTALL_MOD_PATH=%{buildroot}
export INSTALL_MOD_DIR=updates
@@ -142,7 +142,7 @@
%config %{_sysconfdir}/mhvtl/device.conf
%config %{_sysconfdir}/mhvtl/library_contents.10
%config %{_sysconfdir}/mhvtl/library_contents.30
-%{_libexecdir}/systemd/system-generators/
+%{_systemdgeneratordir}/
%{_unitdir}/mhvtl-load-modules.service
%{_unitdir}/mhvtl.target
%{_unitdir}/vtltape@.service
commit mhvtl for openSUSE:Factory
Hello community,
here is the log from the commit of package mhvtl for openSUSE:Factory checked
in at 2019-11-06 14:04:43
Comparing /work/SRC/openSUSE:Factory/mhvtl (Old)
and /work/SRC/openSUSE:Factory/.mhvtl.new.2990 (New)
Package is "mhvtl"
Wed Nov 6 14:04:43 2019 rev:7 rq:745288 version:1.62
Changes:
--- /work/SRC/openSUSE:Factory/mhvtl/mhvtl.changes 2019-10-08
19:58:33.372085025 +0200
+++ /work/SRC/openSUSE:Factory/.mhvtl.new.2990/mhvtl.changes2019-11-06
14:04:47.848703855 +0100
@@ -1,0 +2,7 @@
+Mon Nov 4 23:43:56 UTC 2019 - Lee Duncan
+
+- Change install of systemd generatos to /usr/lib/systemd/...
+ instead of /usr/libexec/systemd/..., which does not yet exist,
+ to fix build issue
+
+---
Other differences:
--
++ mhvtl.spec ++
--- /var/tmp/diff_new_pack.g64tsA/_old 2019-11-06 14:04:48.928704986 +0100
+++ /var/tmp/diff_new_pack.g64tsA/_new 2019-11-06 14:04:48.932704989 +0100
@@ -80,7 +80,7 @@
%build
make MHVTL_HOME_PATH=%{mhvtl_home_dir} VERSION=%{version}_release \
- SYSTEMD_GENERATOR_DIR=%{_libexecdir}/systemd/system-generators
+ SYSTEMD_GENERATOR_DIR=/usr/lib/systemd/system-generators
%if 0%{buildkmp} == 1
for flavor in %flavors_to_build; do
rm -rf obj/$flavor
@@ -94,7 +94,7 @@
%install
%make_install \
MHVTL_HOME_PATH=%{mhvtl_home_dir} VERSION=%{version}_release
LIBDIR=%{_libdir} \
- SYSTEMD_GENERATOR_DIR=%{_libexecdir}/systemd/system-generators
+ SYSTEMD_GENERATOR_DIR=/usr/lib/systemd/system-generators
%if 0%{buildkmp} == 1
export INSTALL_MOD_PATH=%{buildroot}
export INSTALL_MOD_DIR=updates
commit mhvtl for openSUSE:Factory
Hello community,
here is the log from the commit of package mhvtl for openSUSE:Factory checked
in at 2019-10-08 19:58:30
Comparing /work/SRC/openSUSE:Factory/mhvtl (Old)
and /work/SRC/openSUSE:Factory/.mhvtl.new.2352 (New)
Package is "mhvtl"
Tue Oct 8 19:58:30 2019 rev:6 rq:735901 version:1.62
Changes:
--- /work/SRC/openSUSE:Factory/mhvtl/mhvtl.changes 2019-04-02
09:23:25.180754772 +0200
+++ /work/SRC/openSUSE:Factory/.mhvtl.new.2352/mhvtl.changes2019-10-08
19:58:33.372085025 +0200
@@ -1,0 +2,62 @@
+Sun Oct 06 14:42:22 UTC 2019 - ldun...@suse.com
+
+- Update to version 1.62_release:
+ * Update the 1.6.2 tarball name
+ * Update spec file for 1.6-2 release
+ * mhvtl.ko: Bump module version to reflect white-listed buffer work
+ * mhvtl.ko: Use white-listed buffer to copy data to/from kernel space
+ * Bump kernel module version
+ * mhvtl.ko: scsi_host_template changed block .ioctl
+ * mhvtl.ko: Remove useless printk("\n")
+ * Reformat KERNEL_VERSION() to make checkpatch.pl happier
+ * Bump kernel module version
+ * Fix kernel build SUBDIR going away post 5.3
+ * mhvtl.ko: Fix compile on 5.0+ kernels
+ * mhvtl.ko: Bump version number due to serial_number change
+ * mhvtl.ko: Remove dependency on scsi mid layer serial_number
+ * Remove dead code
+ * Only build symlink paths for tape devices
+ * Silence another gcc error regarding snprintf
+ * Silence another gcc error regarding snprintf
+ * Make sure target buffer is large enough
+ * Use systemd-path to query mhvtl-device-conf-generator path
+ * Change Vagrantbox for Centos to one that is publicly available.
+ * Remove lzo from the install script and added -g to lsscsi
+ * Add Vagrant file with install script for testing
+ * Revert "Correct yet another /usr -> / path - this time for systemd etc
stuff"
+ * Correct yet another /usr -> / path - this time for systemd etc stuff
+ * Correct systemd-generator default path
+ * Fix path to modprobe
+ * Ubuntu/Debian need the systemd-generators install in /lib not /usr/lib
+ * Sample script to build /dev/tape/by-path/ entries
+ * Add test for root user on install
+ * Update Change log and spec file for 1.6-1_release
+ * Add CRC check on read path
+ * Update dump_tape to understand CRC32
+ * Add CRC32 to each block write
+ * Add libcrc32c routines
+ * Add additional field to reflect if tape in drive
+ * Move true/false values into single bit field
+ * Allow to override build date with SOURCE_DATE_EPOCH
+ * dump_tape: Fix off-by-one reading argv[]
+ * Improve SCSI cdb logging format from kernel module
+ * Fix typo for mktape in make_vtl_media
+ * Simplify building of mktape
+ * Clean up white space formatting in source
+ * A very basic script to show how to setup LIO iSCSI via pscsi driver
+ * Fix a media unload race condition
+ * Force shared library and systemd refresh on install
+ * bump kernel module version string.
+ * Remove use of "use_clustering" in our kernel driver.
+ * Correct mhvtl-load-modules.service dependencies.
+
+ This results in replacing mhvtl-1.60_release.tar.xz with
+ mhvtl-1.62_release.tar.xz, and removing two patches, no
+ longer needed. Removed:
+ * mhvtl-systemd-load-modules-cleanup.patch
+ * mhvtl-remove-use-of-use_clustering.patch
+
+ Also, updated SPEC-file %build and %install make commands to pass
+ in systemd generator directory.
+
+---
Old:
mhvtl-1.60_release.tar.xz
mhvtl-remove-use-of-use_clustering.patch
mhvtl-systemd-load-modules-cleanup.patch
New:
mhvtl-1.62_release.tar.xz
Other differences:
--
++ mhvtl.spec ++
--- /var/tmp/diff_new_pack.c0gkta/_old 2019-10-08 19:58:34.156082677 +0200
+++ /var/tmp/diff_new_pack.c0gkta/_new 2019-10-08 19:58:34.160082665 +0200
@@ -27,7 +27,7 @@
Name: mhvtl
Url:http://sites.google.com/site/linuxvtl2/
PreReq: %insserv_prereq %fillup_prereq
-Version:1.60
+Version:1.62
Release:0
Requires: mhvtl-kmp
Requires: module-init-tools
@@ -47,8 +47,6 @@
Group: System/Daemons
Source: %{name}-%{version}_release.tar.xz
Source2:%{name}.preamble
-Patch1: %{name}-remove-use-of-use_clustering.patch
-Patch2: %{name}-systemd-load-modules-cleanup.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%{?systemd_ordering}
@@ -79,11 +77,10 @@
%prep
%setup -qn %{name}-%{version}_release
-%patch1 -p1
-%patch2 -p1
%build
-make MHVTL_HOME_PATH=%{mhvtl_home_dir} VERSION=%{version}_release
+make MHVTL_HOME_PATH=%{mhvtl_home_dir} VERSION=%{version}_release \
+ SYSTEMD_GENERATOR_DIR=%{_libexecdir}/systemd/system-generators
%if 0%{buildkmp} ==
commit mhvtl for openSUSE:Factory
Hello community,
here is the log from the commit of package mhvtl for openSUSE:Factory checked
in at 2019-04-02 09:23:23
Comparing /work/SRC/openSUSE:Factory/mhvtl (Old)
and /work/SRC/openSUSE:Factory/.mhvtl.new.25356 (New)
Package is "mhvtl"
Tue Apr 2 09:23:23 2019 rev:5 rq:690408 version:1.60
Changes:
--- /work/SRC/openSUSE:Factory/mhvtl/mhvtl.changes 2019-04-01
12:38:33.069920081 +0200
+++ /work/SRC/openSUSE:Factory/.mhvtl.new.25356/mhvtl.changes 2019-04-02
09:23:25.180754772 +0200
@@ -1,0 +2,4 @@
+Sat Mar 30 12:08:09 UTC 2019 - Jan Engelhardt
+
+- Reduce dependency on systemd. Make use of %make_install.
+
Other differences:
--
++ mhvtl.spec ++
--- /var/tmp/diff_new_pack.4TOSck/_old 2019-04-02 09:23:25.700755120 +0200
+++ /var/tmp/diff_new_pack.4TOSck/_new 2019-04-02 09:23:25.700755120 +0200
@@ -12,7 +12,7 @@
# 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/
#
@@ -40,8 +40,7 @@
BuildRequires: lzo-devel
BuildRequires: modutils
BuildRequires: openssl-devel
-BuildRequires: systemd
-BuildRequires: systemd-devel
+BuildRequires: systemd-rpm-macros
BuildRequires: zlib-devel
Summary:Virtual Tape Library system
License:GPL-2.0-only
@@ -51,7 +50,7 @@
Patch1: %{name}-remove-use-of-use_clustering.patch
Patch2: %{name}-systemd-load-modules-cleanup.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%{?systemd_requires}
+%{?systemd_ordering}
%if 0%{buildkmp} == 1
%suse_kernel_module_package -n %{name} -p %{S:2} kdump ec2 um
@@ -96,8 +95,8 @@
%endif
%install
-make DESTDIR=%{buildroot} \
- MHVTL_HOME_PATH=%{mhvtl_home_dir} VERSION=%{version}_release
LIBDIR=%{_libdir} install
+%make_install \
+ MHVTL_HOME_PATH=%{mhvtl_home_dir} VERSION=%{version}_release
LIBDIR=%{_libdir}
%if 0%{buildkmp} == 1
export INSTALL_MOD_PATH=%{buildroot}
export INSTALL_MOD_DIR=updates
@@ -145,7 +144,7 @@
%config %{_sysconfdir}/mhvtl/device.conf
%config %{_sysconfdir}/mhvtl/library_contents.10
%config %{_sysconfdir}/mhvtl/library_contents.30
-%{_libexecdir}/systemd/system-generators/mhvtl-device-conf-generator
+%{_libexecdir}/systemd/system-generators/
%{_unitdir}/mhvtl-load-modules.service
%{_unitdir}/mhvtl.target
%{_unitdir}/vtltape@.service
commit mhvtl for openSUSE:Factory
Hello community,
here is the log from the commit of package mhvtl for openSUSE:Factory checked
in at 2019-04-01 12:38:30
Comparing /work/SRC/openSUSE:Factory/mhvtl (Old)
and /work/SRC/openSUSE:Factory/.mhvtl.new.25356 (New)
Package is "mhvtl"
Mon Apr 1 12:38:30 2019 rev:4 rq:689910 version:1.60
Changes:
--- /work/SRC/openSUSE:Factory/mhvtl/mhvtl.changes 2018-07-31
15:58:38.815469859 +0200
+++ /work/SRC/openSUSE:Factory/.mhvtl.new.25356/mhvtl.changes 2019-04-01
12:38:33.069920081 +0200
@@ -1,0 +2,26 @@
+---
+Thu Mar 28 17:35:06 UTC 2019 - Lee Duncan
+
+- Update to upstream version 1.60_release from 1.55_release
+ * Switch to systemd from init scripts (see bsc#1116023)
+ * Create virtual media on post install
+ * Update version to 1.6 with introduction of systemd support
+ * Don't overwrite config files by default
+ * Replace SuSE rpm macros with systemctl command for RPM install/uninstall
+ * Update systemd-generators dir based on variable
+ * Include ChangeLog in tar ball as time/date string in man pages depend on it
+ * Corrected time/date stamp in spec change log
+ * Set correct shared lib path
+ * Remove empty double quotes in service tmeplates
+ This replaces mhvtl-1.53_release.tar.xz with mhvtl-1.60_release.tar.gz,
+ This change updates the SPEC file, and itremoves both patches,
+ no longer needed:
+ * mhvtl-set-lib64-correctly.patch
+ * mhvtl-suse-patches.diff.gz
+ For kernels 5.0 and newer, this patch was added to patch the KMP:
+ * mhvtl-remove-use-of-use_clustering.patch
+ And to cleanup systemd dependencies, added:
+ * mhvtl-systemd-load-modules-cleanup.patch
+ Both of these patches will be submitted upstream, as well.
+
+---
Old:
mhvtl-1.53_release.tar.xz
mhvtl-set-lib64-correctly.patch
mhvtl-suse-patches.diff.gz
New:
mhvtl-1.60_release.tar.xz
mhvtl-remove-use-of-use_clustering.patch
mhvtl-systemd-load-modules-cleanup.patch
Other differences:
--
++ mhvtl.spec ++
--- /var/tmp/diff_new_pack.IlPuu6/_old 2019-04-01 12:38:34.137920595 +0200
+++ /var/tmp/diff_new_pack.IlPuu6/_new 2019-04-01 12:38:34.141920597 +0200
@@ -1,7 +1,7 @@
#
# spec file for package mhvtl
#
-# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2019 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
@@ -22,10 +22,12 @@
%define buildkmp 0
%endif
+%define mhvtl_home_dir /var/lib/mhvtl
+
Name: mhvtl
-Url:https://github.com/markh794/mhvtl.git
+Url:http://sites.google.com/site/linuxvtl2/
PreReq: %insserv_prereq %fillup_prereq
-Version:1.53_release
+Version:1.60
Release:0
Requires: mhvtl-kmp
Requires: module-init-tools
@@ -38,15 +40,18 @@
BuildRequires: lzo-devel
BuildRequires: modutils
BuildRequires: openssl-devel
+BuildRequires: systemd
+BuildRequires: systemd-devel
BuildRequires: zlib-devel
Summary:Virtual Tape Library system
License:GPL-2.0-only
Group: System/Daemons
-Source: %{name}-%{version}.tar.xz
+Source: %{name}-%{version}_release.tar.xz
Source2:%{name}.preamble
-Patch1: %{name}-suse-patches.diff.gz
-Patch2: %{name}-set-lib64-correctly.patch
+Patch1: %{name}-remove-use-of-use_clustering.patch
+Patch2: %{name}-systemd-load-modules-cleanup.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%{?systemd_requires}
%if 0%{buildkmp} == 1
%suse_kernel_module_package -n %{name} -p %{S:2} kdump ec2 um
@@ -60,7 +65,7 @@
%package KMP
Summary:Virtual Tape Library kernel module
License:LGPL-2.1-or-later
-Group: System/Daemons
+Group: System/Kernel
%description KMP
This is the kernel module package for the mhvtl Virtual Tape &
@@ -74,12 +79,12 @@
through to user-space daemons.
%prep
-%setup -qn %{name}-%{version}
+%setup -qn %{name}-%{version}_release
%patch1 -p1
%patch2 -p1
%build
-make MHVTL_HOME_PATH=/var/lib/mhvtl VERSION=%{version}
+make MHVTL_HOME_PATH=%{mhvtl_home_dir} VERSION=%{version}_release
%if 0%{buildkmp} == 1
for flavor in %flavors_to_build; do
rm -rf obj/$flavor
@@ -91,8 +96,8 @@
%endif
%install
-make BINGROUP=bin USR=bin GRP=bin DESTDIR=%{buildroot} \
- MHVTL_HOME_PATH=/var/lib/%{name} VERSION=%{version} LIBDIR=%{_libdir}
install
+make DESTDIR=%{buildroot} \
+ MHVTL_HOME_PATH=%{mhvtl_home_dir} VERSION=%{version}_release
LIBDIR=%{_libdir} install
%if
commit mhvtl for openSUSE:Factory
Hello community,
here is the log from the commit of package mhvtl for openSUSE:Factory checked
in at 2018-07-31 15:58:33
Comparing /work/SRC/openSUSE:Factory/mhvtl (Old)
and /work/SRC/openSUSE:Factory/.mhvtl.new (New)
Package is "mhvtl"
Tue Jul 31 15:58:33 2018 rev:3 rq:625945 version:1.53_release
Changes:
--- /work/SRC/openSUSE:Factory/mhvtl/mhvtl.changes 2018-07-28
12:40:04.308387648 +0200
+++ /work/SRC/openSUSE:Factory/.mhvtl.new/mhvtl.changes 2018-07-31
15:58:38.815469859 +0200
@@ -1,0 +2,7 @@
+Fri Jul 27 07:23:04 UTC 2018 - jeng...@inai.de
+
+- Remove redundant %clean section. Replace unnecessary %__ macro
+ indirections. Fix erroneous description (was copy-pasted from
+ open-iscsi?)
+
+---
Other differences:
--
++ mhvtl.spec ++
--- /var/tmp/diff_new_pack.uen0hk/_old 2018-07-31 15:58:39.587471168 +0200
+++ /var/tmp/diff_new_pack.uen0hk/_new 2018-07-31 15:58:39.591471175 +0200
@@ -39,7 +39,7 @@
BuildRequires: modutils
BuildRequires: openssl-devel
BuildRequires: zlib-devel
-Summary:Open Source iSCSI Target with Professional Features
+Summary:Virtual Tape Library system
License:GPL-2.0-only
Group: System/Daemons
Source: %{name}-%{version}.tar.xz
@@ -55,14 +55,10 @@
%description
A Virtual Tape & Library system.
-This package is composed of a KMP (mhvtl), which is also a psuedo-HBA.
-
-The vtl is basically a stripped-down scsi_debug kernel module plus a
-character device "back end" to pass the SCSI commands through to user-
-space daemons.
+This package is composed of a KMP (mhvtl), which is also a psuedo HBA.
%package KMP
-Summary:Open Source iSCSI Target with Professional Features
+Summary:Virtual Tape Library kernel module
License:LGPL-2.1-or-later
Group: System/Daemons
@@ -73,13 +69,17 @@
This works in conjunction with the user-land commands and libraries
to enable tape emulation.
+The vtl module is a stripped-down derivative of the scsi_debug kernel
+module, plus a character device "back end" to pass the SCSI commands
+through to user-space daemons.
+
%prep
%setup -qn %{name}-%{version}
%patch1 -p1
%patch2 -p1
%build
-%{__make} MHVTL_HOME_PATH=/var/lib/mhvtl VERSION=%{version}
+make MHVTL_HOME_PATH=/var/lib/mhvtl VERSION=%{version}
%if 0%{buildkmp} == 1
for flavor in %flavors_to_build; do
rm -rf obj/$flavor
@@ -91,7 +91,7 @@
%endif
%install
-%{__make} BINGROUP=bin USR=bin GRP=bin DESTDIR=%{buildroot} \
+make BINGROUP=bin USR=bin GRP=bin DESTDIR=%{buildroot} \
MHVTL_HOME_PATH=/var/lib/%{name} VERSION=%{version} LIBDIR=%{_libdir}
install
%if 0%{buildkmp} == 1
export INSTALL_MOD_PATH=%{buildroot}
@@ -105,9 +105,6 @@
ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}
install -d -m 755 %{buildroot}/var/lib/%{name}
-%clean
-%{__rm} -rf %{buildroot}
-
%post
%{fillup_and_insserv -f mhvtl}
/sbin/chkconfig --add mhvtl
commit mhvtl for openSUSE:Factory
Hello community,
here is the log from the commit of package mhvtl for openSUSE:Factory checked
in at 2018-07-28 12:40:01
Comparing /work/SRC/openSUSE:Factory/mhvtl (Old)
and /work/SRC/openSUSE:Factory/.mhvtl.new (New)
Package is "mhvtl"
Sat Jul 28 12:40:01 2018 rev:2 rq:623922 version:1.53_release
Changes:
--- /work/SRC/openSUSE:Factory/mhvtl/mhvtl.changes 2018-06-29
22:29:21.178349334 +0200
+++ /work/SRC/openSUSE:Factory/.mhvtl.new/mhvtl.changes 2018-07-28
12:40:04.308387648 +0200
@@ -1,0 +2,5 @@
+Mon Jul 16 18:41:00 UTC 2018 - ldun...@suse.com
+
+- Update SPEC file to correctly handle lib64 vs lib for ppc
+
+---
Other differences:
--
++ mhvtl.spec ++
--- /var/tmp/diff_new_pack.pois6r/_old 2018-07-28 12:40:05.200389362 +0200
+++ /var/tmp/diff_new_pack.pois6r/_new 2018-07-28 12:40:05.232389423 +0200
@@ -16,6 +16,12 @@
#
+%ifnarch ppc
+%define buildkmp 1
+%else
+%define buildkmp 0
+%endif
+
Name: mhvtl
Url:https://github.com/markh794/mhvtl.git
PreReq: %insserv_prereq %fillup_prereq
@@ -25,14 +31,16 @@
Requires: module-init-tools
Requires: sg3_utils
BuildRequires: insserv-compat
+%if 0%{buildkmp} == 1
BuildRequires: kernel-syms
-BuildRequires: lzo-devel
BuildRequires: module-init-tools
+%endif
+BuildRequires: lzo-devel
BuildRequires: modutils
BuildRequires: openssl-devel
BuildRequires: zlib-devel
Summary:Open Source iSCSI Target with Professional Features
-License:GPL-2.0
+License:GPL-2.0-only
Group: System/Daemons
Source: %{name}-%{version}.tar.xz
Source2:%{name}.preamble
@@ -40,7 +48,9 @@
Patch2: %{name}-set-lib64-correctly.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%if 0%{buildkmp} == 1
%suse_kernel_module_package -n %{name} -p %{S:2} kdump ec2 um
+%endif
%description
A Virtual Tape & Library system.
@@ -53,7 +63,7 @@
%package KMP
Summary:Open Source iSCSI Target with Professional Features
-License:LGPL-2.1+
+License:LGPL-2.1-or-later
Group: System/Daemons
%description KMP
@@ -70,6 +80,7 @@
%build
%{__make} MHVTL_HOME_PATH=/var/lib/mhvtl VERSION=%{version}
+%if 0%{buildkmp} == 1
for flavor in %flavors_to_build; do
rm -rf obj/$flavor
mkdir -p obj/$flavor
@@ -77,16 +88,19 @@
make -C /usr/src/linux-obj/%_target_cpu/$flavor EXTRA_CFLAGS="-Iinclude
-DMHVTL_DEBUG" modules \
M=$PWD/obj/$flavor
done
+%endif
%install
%{__make} BINGROUP=bin USR=bin GRP=bin DESTDIR=%{buildroot} \
- MHVTL_HOME_PATH=/var/lib/%{name} VERSION=%{version} install
+ MHVTL_HOME_PATH=/var/lib/%{name} VERSION=%{version} LIBDIR=%{_libdir}
install
+%if 0%{buildkmp} == 1
export INSTALL_MOD_PATH=%{buildroot}
export INSTALL_MOD_DIR=updates
for flavor in %flavors_to_build; do
make -C /usr/src/linux-obj/%_target_cpu/$flavor EXTRA_CFLAGS="-Iinclude
-DMHVTL_DEBUG" modules_install \
M=$PWD/obj/$flavor
done
+%endif
install -d -m 755 %{buildroot}%{_sbindir}
ln -s %{_sbindir}/service %{buildroot}/%{_sbindir}/rc%{name}
install -d -m 755 %{buildroot}/var/lib/%{name}
