commit kmod for openSUSE:Factory

29 Nov 2014

Hello community,

here is the log from the commit of package kmod for openSUSE:Factory checked in at 2014-11-29 08:39:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kmod (Old)
 and      /work/SRC/openSUSE:Factory/.kmod.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "kmod"

Changes:
--------

--- /work/SRC/openSUSE:Factory/kmod/kmod.changes	2014-11-18 22:56:01.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.kmod.new/kmod.changes	2014-11-29 08:39:52.000000000 +0100
@@ -1,0 +2,15 @@
+Sun Nov 16 20:54:36 UTC 2014 - jengelh@inai.de
+
+- Move include files out of pkg/ into a normal subdir of includedir.
+
+-------------------------------------------------------------------
+Sun Nov 16 18:22:37 UTC 2014 - crrodriguez@opensuse.org
+
+- Update to kmod 19
+* Fix missing CLOEXEC in library
+* Fix error message while opening kmod's index
+* static-nodes: when writing in tmpfiles format, indicate that
+  creation of static nodes should only happen at boot. This is used
+  and required by systemd-217+.
+
+-------------------------------------------------------------------

Old:
----
  kmod-18.tar.sign
  kmod-18.tar.xz

New:
----
  kmod-19.tar.sign
  kmod-19.tar.xz

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kmod.spec ++++++
--- /var/tmp/diff_new_pack.1Ohq2K/_old	2014-11-29 08:39:53.000000000 +0100
+++ /var/tmp/diff_new_pack.1Ohq2K/_new	2014-11-29 08:39:53.000000000 +0100
@@ -21,10 +21,10 @@
 Summary:        Utilities to load modules into the kernel
 License:        LGPL-2.1+ and GPL-2.0+
 Group:          System/Kernel
-Version:        18
+Version:        19
 Release:        0
 Url:            http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools...
-#Announce:	https://lwn.net/Articles/577962/
+#Announce:	https://lkml.org/lkml/2014/11/16/97
 
 #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
@@ -41,7 +41,7 @@
 BuildRequires:  libtool
 BuildRequires:  pkgconfig >= 0.21
 BuildRequires:  xz
-%if 0%{?sles_version}
+%if 0%{?sles_version} == 11
 BuildRequires:  xz-devel >= 4.99
 BuildRequires:  zlib-devel
 %else
@@ -107,12 +107,12 @@
 # The extra --includedir gives us the possibility to detect dependent
 # packages which fail to properly use pkgconfig.
 %configure \
-%if 0%{?sles_version}
+%if 0%{?sles_version} == 11
 	zlib_CFLAGS=" " zlib_LIBS="-lz" \
 %endif
 	--with-xz \
 	--with-zlib \
-	--includedir="%_includedir/pkg/%name" \
+	--includedir="%_includedir/%name" \
 	--with-rootlibdir="%_libdir" \
 	--bindir="%_bindir"
 make %{?_smp_mflags} V=1
@@ -150,7 +150,7 @@
 ln -s "%_bindir/kmod" "$b/bin/";
 %if "%_libdir" != "/%_lib"
 ln -s "%_libdir/libkmod.so.2" "$b/%_lib/";
-ln -s "%_libdir/libkmod.so.2.2.8" "$b/%_lib/";
+ln -s "%_libdir/libkmod.so.2.2.9" "$b/%_lib/";
 %endif
 
 %check
@@ -166,6 +166,7 @@
 %_libexecdir/%name
 /bin/kmod
 %_datadir/bash-completion/
+%_mandir/man8/kmod.8*
 
 %files -n %lname
 %defattr(-,root,root)

++++++ 0010-modprobe-Implement-allow-unsupported-modules.patch ++++++
--- /var/tmp/diff_new_pack.1Ohq2K/_old	2014-11-29 08:39:53.000000000 +0100
+++ /var/tmp/diff_new_pack.1Ohq2K/_new	2014-11-29 08:39:53.000000000 +0100
@@ -14,12 +14,10 @@
  create mode 100644 libkmod/libkmod-unsupported.c
  create mode 100644 libkmod/libkmod-unsupported.h
 
-diff --git a/Makefile.am b/Makefile.am
-index eb63073..1c3eee4 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -79,7 +79,9 @@ libkmod_libkmod_la_LIBADD = libkmod/libkmod-util.la \
- 			    ${liblzma_LIBS} ${zlib_LIBS}
+--- kmod-19.orig/Makefile.am
++++ kmod-19/Makefile.am
+@@ -86,7 +86,9 @@ libkmod_libkmod_la_LIBADD = \
+ 	${liblzma_LIBS} ${zlib_LIBS}
  
  noinst_LTLIBRARIES += libkmod/libkmod-internal.la
 -libkmod_libkmod_internal_la_SOURCES = $(libkmod_libkmod_la_SOURCES)
@@ -29,11 +27,8 @@
  libkmod_libkmod_internal_la_LDFLAGS = $(AM_LDFLAGS) \
  	-Wl,--version-script=$(top_srcdir)/libkmod/libkmod.sym
  libkmod_libkmod_internal_la_DEPENDENCIES  = $(libkmod_libkmod_la_DEPENDENCIES)
-diff --git a/libkmod/libkmod-unsupported.c b/libkmod/libkmod-unsupported.c
-new file mode 100644
-index 0000000..7ef9fc8
 --- /dev/null
-+++ b/libkmod/libkmod-unsupported.c
++++ kmod-19/libkmod/libkmod-unsupported.c
 @@ -0,0 +1,9 @@
 +#include "libkmod-internal.h"
 +#include "libkmod-unsupported.h"
@@ -44,11 +39,8 @@
 +
 +	config->block_unsupported = 0;
 +}
-diff --git a/libkmod/libkmod-unsupported.h b/libkmod/libkmod-unsupported.h
-new file mode 100644
-index 0000000..a95b4a2
 --- /dev/null
-+++ b/libkmod/libkmod-unsupported.h
++++ kmod-19/libkmod/libkmod-unsupported.h
 @@ -0,0 +1,8 @@
 +#pragma once
 +
@@ -58,19 +50,18 @@
 + * library
 + */
 +void kmod_internal_allow_unsupported(struct kmod_ctx *ctx);
-diff --git a/tools/modprobe.c b/tools/modprobe.c
-index 589cc07..7d0949d 100644
---- a/tools/modprobe.c
-+++ b/tools/modprobe.c
-@@ -33,6 +33,7 @@
- 
- #include "libkmod.h"
- #include "libkmod-array.h"
-+#include "libkmod-unsupported.h"
- #include "macro.h"
+--- kmod-19.orig/tools/modprobe.c
++++ kmod-19/tools/modprobe.c
+@@ -38,6 +38,8 @@
  
  #include "kmod.h"
-@@ -755,6 +756,7 @@ static int do_modprobe(int argc, char **orig_argv)
+ 
++#include "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 **
  	int do_remove = 0;
  	int do_show_config = 0;
  	int do_show_modversions = 0;
@@ -78,7 +69,7 @@
  	int err;
  
  	argv = prepend_options_from_env(&argc, orig_argv);
-@@ -838,7 +840,7 @@ static int do_modprobe(int argc, char **orig_argv)
+@@ -839,7 +842,7 @@ static int do_modprobe(int argc, char **
  			kversion = optarg;
  			break;
  		case 128:
@@ -87,7 +78,7 @@
  			break;
  		case 's':
  			env_modprobe_options_append("-s");
-@@ -910,6 +912,9 @@ static int do_modprobe(int argc, char **orig_argv)
+@@ -911,6 +914,9 @@ static int do_modprobe(int argc, char **
  
  	log_setup_kmod_log(ctx, verbose);
  
@@ -97,6 +88,3 @@
  	kmod_load_resources(ctx);
  
  	if (do_show_config)
--- 
-1.8.4.5
-

++++++ kmod-18.tar.xz -> kmod-19.tar.xz ++++++
++++ 16482 lines of diff (skipped)

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

root＠hilbert.suse.de

tags

participants (1)