Jan Engelhardt 2013-09-02 21:39:27 +00:00 committed by Git OBS Bridge
parent fcc28fe86c
commit ed2768dc8a
7 changed files with 61 additions and 22 deletions

View File

@ -1,17 +0,0 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.20 (GNU/Linux)
iQIcBAABAgAGBQJR1EaKAAoJEJuipaYwy+pTQukP/iHFfTl7lcLLQYnPlxeYytgp
a+sXwwEUjHMOsQgffJ7j4S1Qg8yVLjxYs6h7hyUMR1PixwOT7WsOA1z5zFDMJwVc
zL9+9lWkOyyj5G3o15NUl5x7J80Ic+UGuCDGWBIRKP7tZHAqjPBpEgvZvxsfH+ud
2vHJoq1ClKCYtylbuDDpccoo59T496Ry/54QLCjNMRHfHxe4n2vNbkRfQfN3mzNo
tBrZ4GAal6n71D3GrtxIsUiPvLDTyOn6oTZYxSBednblvOpIsaLqUqj3YdOguCRw
WkHZC7crxgpuMcYPwcocjaBPeTWZ0h2KhznfmssncBmF6ERKRL31ebNcGLOUNxcY
NdfF8K4RuMjJPQU1WTXqiTCYWN2y6bqh5RUUXYs7ZFSnssuqW0puNyat9PgJtr8P
KC9NLFz6AN8nYU6W+1l60IODhJ1iN5L8p1id3xsyGboFyGqzKuxGhBnt4to549pY
4T+oKDmXt7gvd/8h18xNA0gpQELN10AnUBy1ua1coO5woAdGd72W2hMYnSLkIHN4
20bmFr6N3BDN34ilR4ZWYuDWyaolqxF0/jq+rwVfRsFwzqAumP/A7wAWGvLgEGHD
LKvsR9IWkef77pGSz5o/tBl+bFp9VKbVpBR1VqbZoFrhk6Wfr4g0RS69/BjkuwCu
ydxTTgGKuavrwvGepdaJ
=wtEK
-----END PGP SIGNATURE-----

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:1f54abb63ba3642277ae1af3626c0896b102a915c4d8b9eb5005ae0afe6e7174
size 1436872

17
kmod-15.tar.sign Normal file
View File

@ -0,0 +1,17 @@
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.21 (GNU/Linux)
iQIcBAABAgAGBQJSFhpaAAoJEJuipaYwy+pT55AP/jZK04iAzoyrGYXlFWo+ngBP
f34CueSb3OJs+JQ6CJZNS5qg83XmOWhTSt2r41nH+N5kWmrF2NsDJ58zzqWy/Rwq
VW4AmSImeJSAi4jtV5T3gjp25htqO1pW57dPwugX4F13PkxqD+l8lJ28X0FcY32k
POR0uiYc0qLOssUASVdFJeRgrYA9V3/Se+fOr118GYWji5S+NlwYSCKb3Khu/j2U
cUHeVrEhbRbYGZ5sQ2ylC0RoM+9G/fJz9cSCxeZh1F6KuCfgJDOzfzLwTQzcRjSA
sBflTMWcw6KcLa5AvNYIrQHIDXHrVn0kR1yQb4glgYygPfU2LhAA20VGPyYsp4JS
6C55VrkXmhX6IlwA0LTdVGkNBOWmuPxzxtMInPoOVapCRHl1KnLMa68T38VSDwS8
8g6fKM7gUEM5wu3w1ica9yXy9panaom7HBrMFouOjk9YU1DqkIV+ItbBfE9HdW1X
x5LqoOktiuVtJCNbj8Ll6OsjMfKROa+pnRxMT95wA5l2e5rZljR6Ie0deTaRDFX/
IOMHQn/oK3CIfYcjM5SOn3AaFNHE9KleYSewV/XC/m4YOnaKmUoCrhMJSJQxPUue
9qLh3fqqSQSD3cZmRPfBFaT2cGnehbmx5oPh8uZIxqV8z21y6oNF3CbKSij9ZaeO
sigBwb3OIcf7K5jCrdJl
=qu/t
-----END PGP SIGNATURE-----

3
kmod-15.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:e8ef0ea7e1929b46aa681fe6ce58c5e62d0026289026ebfc63abae3b8fd5ca9e
size 1453996

23
kmod-no-static.diff Normal file
View File

@ -0,0 +1,23 @@
From: Jan Engelhardt <jengelh@inai.de>
Date: 2013-09-02 23:35:26.194874106 +0200
Well, we are not interested in just kmod (cf. NEWS),
so undo static linkage.
---
Makefile.am | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: kmod/Makefile.am
===================================================================
--- kmod.orig/Makefile.am
+++ kmod/Makefile.am
@@ -117,7 +117,7 @@ tools_kmod_SOURCES = tools/kmod.c tools/
tools/depmod.c tools/log.h tools/log.c \
tools/static-nodes.c
tools_kmod_LDADD = libkmod/libkmod-util.la \
- libkmod/libkmod-internal.la
+ libkmod/libkmod.la
${noinst_SCRIPTS}: tools/kmod
$(AM_V_GEN) ($(RM) $@; \

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Mon Sep 2 21:36:22 UTC 2013 - jengelh@inai.de
- Update to new upstream release 15
* kmod static-nodes no longer fails if modules.devname does not exist
* Fix getting boolean parameter from kernel cmdline in case the
value is omitted
* kmod static-nodes creates parent directories if given a -o option
-------------------------------------------------------------------
Wed Jul 3 22:18:38 UTC 2013 - jengelh@inai.de

View File

@ -21,7 +21,7 @@ Name: kmod
Summary: Utilities to load modules into the kernel
License: LGPL-2.1+ and GPL-2.0+
Group: System/Kernel
Version: 14
Version: 15
Release: 0
Url: http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-module-init-tools/
#Announce: https://lwn.net/Articles/502622/
@ -30,7 +30,11 @@ Url: http://www.jonmasters.org/blog/2011/12/20/libkmod-replaces-modul
#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
Patch1: kmod-no-static.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: libtool
%if 0%{?suse_version} >= 1220
BuildRequires: libxslt-tools
%else
@ -96,8 +100,10 @@ in %lname.
%prep
%{?gpg_verify: xz -dk "%{S:0}"; %gpg_verify %{S:2}}
%setup -q
%patch -P 1 -p1
%build
autoreconf -fi
# The extra --includedir gives us the possibility to detect dependent
# packages which fail to properly use pkgconfig.
%configure \
@ -144,7 +150,7 @@ mkdir -p "$b"/{bin,sbin,%_lib};
ln -s "%_bindir/kmod" "$b/bin/";
%if "%_libdir" != "/%_lib"
ln -s "%_libdir/libkmod.so.2" "$b/%_lib/";
ln -s "%_libdir/libkmod.so.2.2.4" "$b/%_lib/";
ln -s "%_libdir/libkmod.so.2.2.5" "$b/%_lib/";
%endif
%check
@ -159,6 +165,7 @@ make check V=1 || :;
%_bindir/kmod
%_libexecdir/%name
/bin/kmod
%_datadir/bash-completion/
%files -n %lname
%defattr(-,root,root)