Hello community, here is the log from the commit of package kmod for openSUSE:Factory checked in at 2015-04-27 22:07:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kmod (Old) and /work/SRC/openSUSE:Factory/.kmod.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmod" Changes: -------- New Changes file: --- /dev/null 2015-03-12 01:14:30.992027505 +0100 +++ /work/SRC/openSUSE:Factory/.kmod.new/kmod-testsuite.changes 2015-04-27 22:07:48.000000000 +0200 @@ -0,0 +1,6 @@ +------------------------------------------------------------------- +Tue Apr 21 12:43:39 UTC 2015 - mma...@suse.cz + +- Run the kmod testsuite in a separate build, to avoid a buildloop + with the kernel. + --- /work/SRC/openSUSE:Factory/kmod/kmod.changes 2015-04-06 00:25:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes 2015-04-27 22:07:48.000000000 +0200 @@ -1,0 +2,14 @@ +Tue Apr 21 14:38:55 UTC 2015 - mma...@suse.cz + +- Update to kmod 20 +* More robust ELF parsing +* To fix a race, modprobe only looks at modules.builtin to + determine a builtin module, so e.g. 'modprobe vt' will no longer + work. +* Other fixes +* Testsuite moved to a separate package, since it is now building + the test modules from sources, which requires the kernel package. +* dropped kmod-blacklist-fixtest.patch (merged upstream) + + +------------------------------------------------------------------- Old: ---- kmod-19.tar.sign kmod-19.tar.xz kmod-blacklist-fixtest.patch New: ---- kmod-20.tar.sign kmod-20.tar.xz kmod-testsuite.changes kmod-testsuite.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kmod-testsuite.spec ++++++ # # spec file for package kmod-testsuite # # Copyright (c) 2015 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 # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # 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/ # Name: kmod-testsuite %define lname libkmod2 Version: 20 Release: 0 Summary: Testsuite of the kmod package License: LGPL-2.1+ and GPL-2.0+ Group: System/Kernel Url: http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools/ #Announce: https://lkml.org/lkml/2015/3/1/152 #Git-Web: http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary #Git-Clone: git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.xz Source2: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.sign Patch1: 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch Patch2: 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch Patch7: 0001-use-correct-sort-method-in-test-array.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake BuildRequires: git-core BuildRequires: kernel-default-devel BuildRequires: libtool BuildRequires: pkgconfig >= 0.21 BuildRequires: xz %if 0%{?sles_version} == 11 BuildRequires: xz-devel >= 4.99 BuildRequires: zlib-devel %else BuildRequires: pkgconfig(liblzma) >= 4.99 BuildRequires: pkgconfig(zlib) %endif Requires: suse-module-tools %description This spec file does not produce any binary RPMs. It just builds kmod and runs its testsuite. It has been split off the kmod package to avoid a buildloop with the kernel. %prep %setup -q -n kmod-%version %patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -p1 %build autoreconf -fi export LDFLAGS="-Wl,-z,relro,-z,now" # The extra --includedir gives us the possibility to detect dependent # packages which fail to properly use pkgconfig. %configure \ %if 0%{?sles_version} == 11 zlib_CFLAGS=" " zlib_LIBS="-lz" \ %endif --with-xz \ --with-zlib \ --includedir="%_includedir/kmod" \ --with-rootlibdir="%_libdir" \ --bindir="%_bindir" make %{?_smp_mflags} V=1 %install # empty %check make check V=1 %changelog ++++++ kmod.spec ++++++ --- /var/tmp/diff_new_pack.Q2PSNP/_old 2015-04-27 22:07:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Q2PSNP/_new 2015-04-27 22:07:49.000000000 +0200 @@ -18,24 +18,23 @@ Name: kmod %define lname libkmod2 +Version: 20 +Release: 0 Summary: Utilities to load modules into the kernel License: LGPL-2.1+ and GPL-2.0+ Group: System/Kernel -Version: 19 -Release: 0 Url: http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools/ -#Announce: https://lkml.org/lkml/2014/11/16/97 +#Announce: https://lkml.org/lkml/2015/3/1/152 #Git-Web: http://git.kernel.org/?p=utils/kernel/kmod/kmod.git;a=summary #Git-Clone: git://git.kernel.org/pub/scm/utils/kernel/kmod/kmod -Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.xz -Source2: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/%name-%version.tar.sign +Source: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.xz +Source2: ftp://ftp.kernel.org/pub/linux/utils/kernel/kmod/kmod-%version.tar.sign Patch1: 0002-modprobe-Recognize-allow-unsupported-modules-on-comm.patch Patch2: 0003-libkmod-config-Recognize-allow_unsupported_modules-i.patch Patch3: 0009-libkmod-Implement-filtering-of-unsupported-modules-o.patch Patch4: 0010-modprobe-Implement-allow-unsupported-modules.patch Patch5: 0011-Do-not-filter-unsupported-modules-when-running-a-van.patch -Patch6: kmod-blacklist-fixtest.patch Patch7: 0001-use-correct-sort-method-in-test-array.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf @@ -101,8 +100,8 @@ in %lname. %prep -%setup -q -%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 6 -P 7 -p1 +%setup -q -n kmod-%version +%patch -P 1 -P 2 -P 3 -P 4 -P 5 -P 7 -p1 %build autoreconf -fi @@ -115,7 +114,7 @@ %endif --with-xz \ --with-zlib \ - --includedir="%_includedir/%name" \ + --includedir="%_includedir/kmod" \ --with-rootlibdir="%_libdir" \ --bindir="%_bindir" make %{?_smp_mflags} V=1 @@ -125,7 +124,7 @@ make install DESTDIR="$b"; rm -f "$b/%_libdir"/*.la -mkdir -p "$b/%_libexecdir/%name" "$b/%_sbindir" "$b/sbin"; +mkdir -p "$b/%_libexecdir/kmod" "$b/%_sbindir" "$b/sbin"; for i in depmod insmod lsmod modinfo modprobe rmmod; do # # kmod-compat and kmod-compat(usrmerge) @@ -137,7 +136,7 @@ # Make symlinks also available in normal fashion, # so one can actually run it. # - ln -s "%_bindir/kmod" "$b/%_libexecdir/%name/$i"; + ln -s "%_bindir/kmod" "$b/%_libexecdir/kmod/$i"; done; mkdir -p "$b/%_bindir" "$b/bin"; for i in lsmod; do @@ -153,12 +152,9 @@ ln -s "%_bindir/kmod" "$b/bin/"; %if "%_libdir" != "/%_lib" ln -s "%_libdir/libkmod.so.2" "$b/%_lib/"; -ln -s "%_libdir/libkmod.so.2.2.9" "$b/%_lib/"; +ln -s "%_libdir/libkmod.so.2.2.10" "$b/%_lib/"; %endif -%check -make check V=1 - %post %{?regenerate_initrd_post} @@ -172,7 +168,7 @@ %files %defattr(-,root,root) %_bindir/kmod -%_libexecdir/%name +%_libexecdir/kmod /bin/kmod %_datadir/bash-completion/ %_mandir/man8/kmod.8* ++++++ 0010-modprobe-Implement-allow-unsupported-modules.patch ++++++ --- /var/tmp/diff_new_pack.Q2PSNP/_old 2015-04-27 22:07:49.000000000 +0200 +++ /var/tmp/diff_new_pack.Q2PSNP/_new 2015-04-27 22:07:49.000000000 +0200 @@ -6,17 +6,17 @@ References: fate#316971 Patch-mainline: never --- - Makefile.am | 4 +++- - libkmod/libkmod-unsupported.c | 9 +++++++++ - libkmod/libkmod-unsupported.h | 8 ++++++++ - tools/modprobe.c | 7 ++++++- - 4 files changed, 26 insertions(+), 2 deletions(-) + Makefile.am | 4 +++- + libkmod/libkmod-unsupported.c | 9 +++++++++ + libkmod/libkmod-unsupported.h | 8 ++++++++ + tools/modprobe.c | 8 +++++++- + 4 files changed, 27 insertions(+), 2 deletions(-) create mode 100644 libkmod/libkmod-unsupported.c create mode 100644 libkmod/libkmod-unsupported.h ---- kmod-19.orig/Makefile.am -+++ kmod-19/Makefile.am -@@ -86,7 +86,9 @@ libkmod_libkmod_la_LIBADD = \ +--- kmod-20.orig/Makefile.am ++++ kmod-20/Makefile.am +@@ -87,7 +87,9 @@ libkmod_libkmod_la_LIBADD = \ ${liblzma_LIBS} ${zlib_LIBS} noinst_LTLIBRARIES += libkmod/libkmod-internal.la @@ -28,7 +28,7 @@ -Wl,--version-script=$(top_srcdir)/libkmod/libkmod.sym libkmod_libkmod_internal_la_DEPENDENCIES = $(libkmod_libkmod_la_DEPENDENCIES) --- /dev/null -+++ kmod-19/libkmod/libkmod-unsupported.c ++++ kmod-20/libkmod/libkmod-unsupported.c @@ -0,0 +1,9 @@ +#include "libkmod-internal.h" +#include "libkmod-unsupported.h" @@ -40,7 +40,7 @@ + config->block_unsupported = 0; +} --- /dev/null -+++ kmod-19/libkmod/libkmod-unsupported.h ++++ kmod-20/libkmod/libkmod-unsupported.h @@ -0,0 +1,8 @@ +#pragma once + @@ -50,18 +50,18 @@ + * library + */ +void kmod_internal_allow_unsupported(struct kmod_ctx *ctx); ---- kmod-19.orig/tools/modprobe.c -+++ kmod-19/tools/modprobe.c +--- kmod-20.orig/tools/modprobe.c ++++ kmod-20/tools/modprobe.c @@ -38,6 +38,8 @@ #include "kmod.h" -+#include "libkmod-unsupported.h" ++#include "libkmod/libkmod-unsupported.h" + static int log_priority = LOG_CRIT; static int use_syslog = 0; #define LOG(...) log_printf(log_priority, __VA_ARGS__) -@@ -756,6 +758,7 @@ static int do_modprobe(int argc, char ** +@@ -730,6 +732,7 @@ static int do_modprobe(int argc, char ** int do_remove = 0; int do_show_config = 0; int do_show_modversions = 0; @@ -69,7 +69,7 @@ int err; argv = prepend_options_from_env(&argc, orig_argv); -@@ -839,7 +842,7 @@ static int do_modprobe(int argc, char ** +@@ -813,7 +816,7 @@ static int do_modprobe(int argc, char ** kversion = optarg; break; case 128: @@ -78,7 +78,7 @@ break; case 's': env_modprobe_options_append("-s"); -@@ -911,6 +914,9 @@ static int do_modprobe(int argc, char ** +@@ -885,6 +888,9 @@ static int do_modprobe(int argc, char ** log_setup_kmod_log(ctx, verbose); ++++++ kmod-19.tar.xz -> kmod-20.tar.xz ++++++ ++++ 36426 lines of diff (skipped)
