Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package mhvtl for openSUSE:Factory checked in at 2022-07-07 12:57:24 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/mhvtl (Old) and /work/SRC/openSUSE:Factory/.mhvtl.new.1523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "mhvtl" Thu Jul 7 12:57:24 2022 rev:18 rq:987284 version:1.70_release+865.af13081a1ae5 Changes: -------- --- /work/SRC/openSUSE:Factory/mhvtl/mhvtl.changes 2022-06-04 23:27:19.068772912 +0200 +++ /work/SRC/openSUSE:Factory/.mhvtl.new.1523/mhvtl.changes 2022-07-07 12:57:43.971356197 +0200 @@ -1,0 +2,12 @@ +Wed Jun 08 22:12:53 UTC 2022 - ldun...@suse.com + +- Update to version 1.70_release+865.af13081a1ae5: + * Fix possible double define of HAVE_UNLOCKED_IOCTL + (fixing a build issue on some architectures) + * kernel: Handle removal of genhd.h from linux includes. + * Clean up the kernel Makefile. + This removed the patch (no longer needed): + mhvtl-fix-removal-of-genhd-h.patch + Also, updated SPEC file to avoid building s390x + +------------------------------------------------------------------- Old: ---- mhvtl-1.70_release+862.561d4d5b473f.tar.xz mhvtl-fix-removal-of-genhd-h.patch New: ---- mhvtl-1.70_release+865.af13081a1ae5.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mhvtl.spec ++++++ --- /var/tmp/diff_new_pack.pyiom5/_old 2022-07-07 12:57:44.287356668 +0200 +++ /var/tmp/diff_new_pack.pyiom5/_new 2022-07-07 12:57:44.291356674 +0200 @@ -16,7 +16,7 @@ # -%ifnarch ppc +%ifnarch ppc s390x %define buildkmp 1 %else %define buildkmp 0 @@ -26,12 +26,13 @@ Name: mhvtl URL: http://sites.google.com/site/linuxvtl2/ -Version: 1.70_release+862.561d4d5b473f +Version: 1.70_release+865.af13081a1ae5 Release: 0 Requires: mhvtl-kmp Requires: module-init-tools Requires: sg3_utils %if 0%{buildkmp} == 1 +BuildRequires: %kernel_module_package_buildreqs BuildRequires: kernel-syms BuildRequires: module-init-tools %endif @@ -45,7 +46,6 @@ Group: System/Daemons Source: %{name}-%{version}.tar.xz Source2: %{name}.preamble -Patch1: %{name}-fix-removal-of-genhd-h.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %{?systemd_ordering} @@ -78,7 +78,6 @@ %prep %setup -qn %{name}-%{version} -%patch1 -p1 %build make MHVTL_HOME_PATH=%{mhvtl_home_dir} VERSION=%{version} \ ++++++ _service ++++++ --- /var/tmp/diff_new_pack.pyiom5/_old 2022-07-07 12:57:44.315356709 +0200 +++ /var/tmp/diff_new_pack.pyiom5/_new 2022-07-07 12:57:44.315356709 +0200 @@ -4,7 +4,7 @@ <param name="url">https://github.com/markh794/mhvtl.git</param> <param name="subdir"></param> <param name="filename">mhvtl</param> - <param name="revision">HEAD</param> + <param name="revision">af13081a1ae5</param> <param name="versionformat">1.7-0_release+@TAG_OFFSET@.%h</param> <param name="match-tag">1.[0-0]-[0-0]_release</param> <param name="changesgenerate">enable</param> ++++++ _servicedata ++++++ --- /var/tmp/diff_new_pack.pyiom5/_old 2022-07-07 12:57:44.331356733 +0200 +++ /var/tmp/diff_new_pack.pyiom5/_new 2022-07-07 12:57:44.335356740 +0200 @@ -1,6 +1,6 @@ <servicedata> <service name="tar_scm"> <param name="url">https://github.com/markh794/mhvtl.git</param> - <param name="changesrevision">561d4d5b473f29c44961cd4a64c2ff3e0c02ed2c</param></service></servicedata> + <param name="changesrevision">af13081a1ae5179c0b050d988e2eb2b1a17f5f97</param></service></servicedata> (No newline at EOF) ++++++ mhvtl-1.70_release+862.561d4d5b473f.tar.xz -> mhvtl-1.70_release+865.af13081a1ae5.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mhvtl-1.70_release+862.561d4d5b473f/kernel/Makefile new/mhvtl-1.70_release+865.af13081a1ae5/kernel/Makefile --- old/mhvtl-1.70_release+862.561d4d5b473f/kernel/Makefile 2022-06-01 03:40:51.000000000 +0200 +++ new/mhvtl-1.70_release+865.af13081a1ae5/kernel/Makefile 2022-06-08 00:47:47.000000000 +0200 @@ -29,36 +29,34 @@ default: config.h $(MAKE) -C $(KDIR) M=$(PWD) modules -config.h: +config.h: config.sh ./config.sh clean: - rm -f mhvtl.ko + $(RM) mhvtl.ko + $(RM) *.o $(RM) TAGS -distclean: - rm -f mhvtl.o mhvtl.ko \ - *.o \ - .*.o.d \ - mhvtl.mod.c \ - Modules.symvers \ - Module.symvers \ - .mhvtl.ko.cmd \ - .mhvtl.o.cmd \ - .mhvtl.mod.o.cmd \ - .event.o.cmd \ - .event.o.d \ - .Module.symvers.cmd \ - .mhvtl.mod.cmd \ - .modules.order.cmd \ - mhvtl.mod \ - Module.markers \ - modules.order \ - mhvtl.ko.unsigned \ - .mhvtl.ko.unsigned.cmd \ - TAGS \ - config.h - rm -rf .tmp_versions +distclean: clean + $(RM) .*.o.d \ + mhvtl.mod.c \ + Modules.symvers \ + Module.symvers \ + .mhvtl.ko.cmd \ + .mhvtl.o.cmd \ + .mhvtl.mod.o.cmd \ + .event.o.cmd \ + .event.o.d \ + .Module.symvers.cmd \ + .mhvtl.mod.cmd \ + .modules.order.cmd \ + mhvtl.mod \ + Module.markers \ + modules.order \ + mhvtl.ko.unsigned \ + .mhvtl.ko.unsigned.cmd \ + config.h + $(RM) -r .tmp_versions install: install -o root -g root -m 644 mhvtl.ko /lib/modules/$(V)/kernel/drivers/scsi/; \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mhvtl-1.70_release+862.561d4d5b473f/kernel/backport.h new/mhvtl-1.70_release+865.af13081a1ae5/kernel/backport.h --- old/mhvtl-1.70_release+862.561d4d5b473f/kernel/backport.h 2022-06-01 03:40:51.000000000 +0200 +++ new/mhvtl-1.70_release+865.af13081a1ae5/kernel/backport.h 2022-06-08 00:47:47.000000000 +0200 @@ -48,11 +48,6 @@ } #endif -/* HAVE_UNLOCKED_IOCTL removed in linux/fs.h for kernels 5.9+ */ -#if LINUX_VERSION_CODE > KERNEL_VERSION(5, 8, 0) -#define HAVE_UNLOCKED_IOCTL 1 -#endif - #if !defined(HAVE_SYSFS_EMIT) /* https://patches.linaro.org/project/stable/patch/20210305120853.392925...@linuxfoundation.org/ */ /** diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mhvtl-1.70_release+862.561d4d5b473f/kernel/config.sh new/mhvtl-1.70_release+865.af13081a1ae5/kernel/config.sh --- old/mhvtl-1.70_release+862.561d4d5b473f/kernel/config.sh 2022-06-01 03:40:51.000000000 +0200 +++ new/mhvtl-1.70_release+865.af13081a1ae5/kernel/config.sh 2022-06-08 00:47:47.000000000 +0200 @@ -1,6 +1,19 @@ #!/usr/bin/env bash # vim: tabstop=4 shiftwidth=4 expandtab colorcolumn=80 foldmethod=marker : +# make sure we have the kernel directory defined +if [ -z "${KDIR}" ] ; then + echo "error: you must supply environment variable KDIR" 1>&2 + exit 1 +fi + +# +# "syms" is an associative array, where the "key" +# is a symbol that we try to find (using grep) in +# the "value", i.e. we try to find the string +# "sysfs_emit" in the include file sysfs.h. Based +# on that, we create a cpp #define or #undef. +# declare -A syms syms[kmem_cache_create_usercopy]='slab.h' syms[file_inode]='fs.h' @@ -9,6 +22,7 @@ output='config.h' kparent="${KDIR%/*}" +# use the "fs.h" to determine where the kernel headers are located if [ -e "${KDIR}/include/linux/fs.h" ] then hdrs="${KDIR}" @@ -16,7 +30,7 @@ then hdrs="${kparent}/source" else - echo "Cannot infer kernel headers location" + echo "Cannot infer kernel headers location" 1>&2 exit 1 fi @@ -43,4 +57,22 @@ fi done +# do we have a "genhd.h" present? +if [ -e "${hdrs}/include/linux/genhd.h" ]; then + echo "#define HAVE_GENHD" +else + echo "#undef HAVE_GENHD" +fi >> "${output}" + +# see if "struct file_operations" has member "unlocked_ioctl" +# (otherwise, just "ioctl") +syms[file_operations]='fs.h' +if grep -q unlocked_ioctl "${hdrs}/include/linux/fs.h"; then + echo "#ifndef HAVE_UNLOCKED_IOCTL" + echo "#define HAVE_UNLOCKED_IOCTL" + echo "#endif" +else + echo "#undef HAVE_UNLOCKED_IOCTL" +fi >> "${output}" + printf '\n\n#endif /* _MHVTL_KERNEL_CONFIG_H */\n' >> "${output}" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/mhvtl-1.70_release+862.561d4d5b473f/kernel/mhvtl.c new/mhvtl-1.70_release+865.af13081a1ae5/kernel/mhvtl.c --- old/mhvtl-1.70_release+862.561d4d5b473f/kernel/mhvtl.c 2022-06-01 03:40:51.000000000 +0200 +++ new/mhvtl-1.70_release+865.af13081a1ae5/kernel/mhvtl.c 2022-06-08 00:47:47.000000000 +0200 @@ -50,7 +50,6 @@ #include <linux/timer.h> #include <linux/types.h> #include <linux/string.h> -#include <linux/genhd.h> #include <linux/fs.h> #include <linux/init.h> #include <linux/moduleparam.h> @@ -94,6 +93,10 @@ #include "vtl_common.h" #include "backport.h" +#if defined(HAVE_GENHD) +#include <linux/genhd.h> +#endif + #include <scsi/scsi_driver.h> #include <scsi/scsi_ioctl.h>
