SHA256
1
0
forked from pool/kmod

* libkmod-util: add missing stdbool.h include

- Don't assert mkdir_p, it fails on 32bit systems.
  add: dont-assert-mkdir_p.patch

OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=31
This commit is contained in:
Robert Milasan 2012-06-20 13:11:38 +00:00 committed by Git OBS Bridge
parent 2aef4e0d72
commit 87a9c849bd
3 changed files with 23 additions and 3 deletions

15
dont-assert-mkdir_p.patch Normal file
View File

@ -0,0 +1,15 @@
Index: kmod-9/testsuite/init_module.c
===================================================================
--- kmod-9.orig/testsuite/init_module.c
+++ kmod-9/testsuite/init_module.c
@@ -147,7 +147,9 @@ static int create_sysfs_files(const char
strcpy(buf + len, modname);
len += strlen(modname);
- assert(mkdir_p(buf, 0755) >= 0);
+ // This fails on 32bit systems, we can't use assert
+ // assert(mkdir_p(buf, 0755) >= 0);
+ mkdir_p(buf, 0755);
strcpy(buf + len, "/initstate");
return write_one_line_file(buf, "live\n", strlen("live\n"));

View File

@ -10,8 +10,9 @@ Wed Jun 20 08:41:03 UTC 2012 - rmilasan@suse.com
* depmod: fail if any index could not be created * depmod: fail if any index could not be created
* depmod: don't return error if modules.builtin don't exist * depmod: don't return error if modules.builtin don't exist
* libkmod-util: split function for usec conversion * libkmod-util: split function for usec conversion
* libkmod-util: add missing stdbool.h include * libkmod-util: add missing stdbool.h include
- Don't assert mkdir_p, it fails on 32bit systems.
add: dont-assert-mkdir_p.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Apr 21 01:55:30 UTC 2012 - jengelh@medozas.de Sat Apr 21 01:55:30 UTC 2012 - jengelh@medozas.de

View File

@ -30,6 +30,7 @@ Url: http://www.politreco.com/2011/12/announce-kmod-2/
Source: %name-%version.tar.xz Source: %name-%version.tar.xz
Source2: %name-%version.tar.sign Source2: %name-%version.tar.sign
Patch1: kmod-so-version.diff Patch1: kmod-so-version.diff
Patch2: dont-assert-mkdir_p.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: autoconf BuildRequires: autoconf
@ -87,6 +88,7 @@ in %lname.
%prep %prep
%setup -q %setup -q
%patch1 -p1 %patch1 -p1
%patch2 -p1
%build %build
autoreconf -fi autoreconf -fi
@ -97,7 +99,7 @@ autoreconf -fi
--with-zlib \ --with-zlib \
--includedir=%_includedir/%{name}-%{version} \ --includedir=%_includedir/%{name}-%{version} \
--with-rootlibdir=%{_libdir} \ --with-rootlibdir=%{_libdir} \
--bindir=%{_bindir} --bindir=%{_bindir}
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
@ -130,6 +132,8 @@ make check
%postun -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig
%clean
%files %files
%defattr(-,root,root) %defattr(-,root,root)
%{_bindir}/kmod %{_bindir}/kmod