jengelh/kmod
SHA256
1
0
Fork 0
forked from pool/kmod
Code Pull Requests Activity

Redo patch to use -version-number instead

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=16
This commit is contained in:
Jan Engelhardt 2012-02-08 02:47:37 +00:00 committed by Git OBS Bridge
parent 288d9ebf01
commit 97f0901b06
2 changed files with 28 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
kmod-so-version.diff
View File

@ -1,32 +1,38 @@
kmod broke versioning starting with kmod v5.
Change the kmod Makefile from using -version-info to -version-number
to make it clear that the kmod project is not trying to subvert the
libtool "interface" number concept, but in fact does not do
libtool-style counting.
References: <alpine.LNX.2.01.1202070049200.12889@frira.zrqbmnf.qr>
References: http://article.gmane.org/gmane.linux.kernel.modules/705
References: http://lists.gnu.org/archive/html/libtool/2012-02/msg00011.html
---
Makefile.am | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
Makefile.am | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
Index: kmod-5/Makefile.am
===================================================================
--- kmod-5.orig/Makefile.am
+++ kmod-5/Makefile.am
@@ -71,7 +71,7 @@ EXTRA_DIST += libkmod/libkmod.sym
@@ -39,9 +39,8 @@ SED_PROCESS = \
%.pc: %.pc.in Makefile
$(SED_PROCESS)
-LIBKMOD_CURRENT=2
-LIBKMOD_REVISION=0
-LIBKMOD_AGE=0
+LIBKMOD_SO_MAJOR=2
+LIBKMOD_SO_MINOR=0
noinst_LTLIBRARIES = libkmod/libkmod-util.la
libkmod_libkmod_util_la_SOURCES = libkmod/libkmod-hash.c \
@@ -71,7 +70,7 @@ EXTRA_DIST += libkmod/libkmod.sym
EXTRA_DIST += libkmod/COPYING libkmod/README
libkmod_libkmod_la_LDFLAGS = $(AM_LDFLAGS) \
- -version-info $(LIBKMOD_CURRENT):$(LIBKMOD_REVISION):$(LIBKMOD_AGE) \
+ -release ${PACKAGE_VERSION} \
+ -version-number ${LIBKMOD_SO_MAJOR}:${LIBKMOD_SO_MINOR} \
-Wl,--version-script=$(top_srcdir)/libkmod/libkmod.sym
libkmod_libkmod_la_DEPENDENCIES = libkmod/libkmod-util.la \
${top_srcdir}/libkmod/libkmod.sym
@@ -96,7 +96,7 @@ install-exec-hook:
so_img_name=$$(readlink $(DESTDIR)$(libdir)/libkmod.so) && \
so_img_rel_target_prefix=$$(echo $(libdir) | sed 's,\(^/\|\)[^/][^/]*,..,g') && \
ln -sf $$so_img_rel_target_prefix$(rootlibdir)/$$so_img_name $(DESTDIR)$(libdir)/libkmod.so && \
- mv $(DESTDIR)$(libdir)/libkmod.so.* $(DESTDIR)$(rootlibdir); \
+ mv $(DESTDIR)$(libdir)/libkmod-${PACKAGE_VERSION}.so $(DESTDIR)$(rootlibdir); \
fi
uninstall-hook:

11
kmod.spec
View File

@ -17,7 +17,7 @@
Name: kmod
%define lname libkmod-5
%define lname libkmod2
Summary: Utilities to load modules into the kernel
License: LGPL-2.1+ and GPL-2.0+
Group: System/Kernel
@ -27,7 +27,7 @@ Url: http://www.politreco.com/2011/12/announce-kmod-2/
#Git-Clone: git://git.profusion.mobi/kmod
Source: %name-%version.tar.xz
Source: %name-%version.tar.sign
Source2: %name-%version.tar.sign
Patch1: kmod-so-version.diff
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@ -80,6 +80,9 @@ Requires: %lname = %version
libkmod was created to allow programs to easily insert, remove and
list modules, also checking its properties, dependencies and aliases.
This package contains the development headers for the library found
in %lname.
%prep
%setup -q
%patch -P 1 -p1
@ -120,12 +123,12 @@ make check
%files -n %lname
%defattr(-,root,root)
/%_lib/libkmod-5.so
/%_lib/libkmod.so.2*
%files -n libkmod-devel
%defattr(-,root,root)
%_includedir/*
%_libdir/pkgconfig/*.pc
%_libdir/pkgconfig/libkmod.pc
%_libdir/libkmod.so
%files compat