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 <[email protected]> + +- 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 0%{buildkmp} == 1 export INSTALL_MOD_PATH=%{buildroot} export INSTALL_MOD_DIR=updates @@ -106,45 +111,59 @@ install -d -m 755 %{buildroot}/var/lib/%{name} %post -%{fillup_and_insserv -f mhvtl} -/sbin/chkconfig --add mhvtl +%{service_add_post mhvtl-load-modules.service mhvtl.target [email protected] [email protected]} %preun -%stop_on_removal mhvtl +%{service_del_preun mhvtl-load-modules.service mhvtl.target [email protected] [email protected]} %postun -%{insserv_cleanup} +%{service_del_postun mhvtl-load-modules.service mhvtl.target [email protected] [email protected]} + +%pre +%{service_add_pre mhvtl-load-modules.service mhvtl.target [email protected] [email protected]} %files %defattr(-,root,root) %doc README etc/library_contents.sample -%{_initddir}/mhvtl +%license COPYING %{_sbindir}/rcmhvtl %{_bindir}/mktape %{_bindir}/edit_tape %{_bindir}/dump_tape %{_bindir}/tapeexerciser -%{_bindir}/build_library_config %{_bindir}/make_vtl_media %{_bindir}/update_device.conf %{_bindir}/vtlcmd %{_bindir}/vtllibrary %{_bindir}/vtltape +%{_bindir}/generate_device_conf +%{_bindir}/generate_library_contents %{_libdir}/libvtlscsi.so %{_libdir}/libvtlcart.so -%dir /var/lib/mhvtl +%dir %{_sysconfdir}/mhvtl +%config %{_sysconfdir}/mhvtl/mhvtl.conf +%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 +%{_unitdir}/mhvtl-load-modules.service +%{_unitdir}/mhvtl.target +%{_unitdir}/[email protected] +%{_unitdir}/[email protected] +%dir %{mhvtl_home_dir} +%{mhvtl_home_dir}/* %defattr(644,root,root) %{_mandir}/man1/vtlcmd.1%{ext_man} %{_mandir}/man1/vtllibrary.1%{ext_man} %{_mandir}/man1/vtltape.1%{ext_man} %{_mandir}/man1/mktape.1%{ext_man} -%{_mandir}/man1/mhvtl.1%{ext_man} %{_mandir}/man1/make_vtl_media.1%{ext_man} %{_mandir}/man1/edit_tape.1%{ext_man} -%{_mandir}/man1/build_library_config.1%{ext_man} %{_mandir}/man1/dump_tape.1%{ext_man} %{_mandir}/man1/tapeexerciser.1%{ext_man} %{_mandir}/man1/update_device.conf.1%{ext_man} +%{_mandir}/man1/generate_device_conf.1%{ext_man} +%{_mandir}/man1/generate_library_contents.1%{ext_man} %{_mandir}/man5/device.conf.5%{ext_man} %{_mandir}/man5/library_contents.5%{ext_man} %{_mandir}/man5/mhvtl.conf.5%{ext_man} ++++++ _service ++++++ --- /var/tmp/diff_new_pack.IlPuu6/_old 2019-04-01 12:38:34.169920611 +0200 +++ /var/tmp/diff_new_pack.IlPuu6/_new 2019-04-01 12:38:34.169920611 +0200 @@ -4,9 +4,10 @@ <param name="url">https://github.com/markh794/mhvtl.git</param> <param name="subdir"></param> <param name="filename">mhvtl</param> - <param name="versionformat">1.5-3_release</param> - <param name="revision">1.5-3_release</param> + <param name="versionformat">1.6-0_release</param> + <param name="revision">1.6-0_release</param> <param name="changesgenerate">enable</param> + <param name="changesauthor">[email protected]</param> </service> <service name="recompress" mode="disabled"> <param name="file">*mhvtl*.tar</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.IlPuu6/_old 2019-04-01 12:38:34.185920618 +0200 +++ /var/tmp/diff_new_pack.IlPuu6/_new 2019-04-01 12:38:34.185920618 +0200 @@ -1,4 +1,4 @@ <servicedata> <service name="tar_scm"> - <param name="url">https://github.com/markh794/mhvtl.git</param> - <param name="changesrevision">f993138c7fc64304684d94def69a7714c3c283bf</param></service></servicedata> + <param name="url">https://github.com/markh794/mhvtl.git</param> + <param name="changesrevision">d324c2d4132c9675f96ad9d5cbbf03babdabda3b</param></service></servicedata> \ No newline at end of file ++++++ mhvtl-1.53_release.tar.xz -> mhvtl-1.60_release.tar.xz ++++++ ++++ 19597 lines of diff (skipped) ++++++ mhvtl-remove-use-of-use_clustering.patch ++++++ diff -aurp mhvtl-1.60_release.orig/kernel/mhvtl.c mhvtl-1.60_release/kernel/mhvtl.c --- mhvtl-1.60_release.orig/kernel/mhvtl.c 2019-03-27 20:37:28.000000000 -0700 +++ mhvtl-1.60_release/kernel/mhvtl.c 2019-03-28 11:19:34.908351926 -0700 @@ -320,7 +320,11 @@ static struct scsi_host_template vtl_dri .cmd_per_lun = 32, .max_sectors = 4096, .unchecked_isa_dma = 0, +#if LINUX_VERSION_CODE < KERNEL_VERSION(5,0,0) .use_clustering = ENABLE_CLUSTERING, +#else + .dma_boundary = PAGE_SIZE - 1, +#endif .module = THIS_MODULE, }; ++++++ mhvtl-systemd-load-modules-cleanup.patch ++++++ diff -aurrp mhvtl-1.60_release.orig/etc/mhvtl-load-modules.service.in mhvtl-1.60_release/etc/mhvtl-load-modules.service.in --- mhvtl-1.60_release.orig/etc/mhvtl-load-modules.service.in 2019-03-27 20:37:28.000000000 -0700 +++ mhvtl-1.60_release/etc/mhvtl-load-modules.service.in 2019-03-29 09:19:09.550779912 -0700 @@ -1,7 +1,7 @@ [Unit] Description=Load mhvtl modules Documentation=man:man:vtltape(1) man:man:vtllibrary(1) -Before=multi-user.target +Before=mhvtl.target PartOf=mhvtl.target Conflicts=shutdown.target Before=shutdown.target @@ -15,4 +15,4 @@ ExecStart=/usr/sbin/modprobe mhvtl opts= ExecStart=/usr/sbin/modprobe sg [Install] -WantedBy=multi-user.target mhvtl.target +WantedBy=mhvtl.target
