pool/kmod
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copy back r108 because no time was given to react to the proposed change.

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/Base:System/kmod?expand=0&rev=110
This commit is contained in:
Jan Engelhardt 2016-07-21 09:52:34 +00:00 committed by Git OBS Bridge
parent 414e27ebe9
commit d5358f069e
4 changed files with 26 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
kmod-testsuite.changes
View File

@ -1,8 +1,3 @@
-------------------------------------------------------------------
Thu Jul 21 09:11:25 UTC 2016 - mmarek@suse.com
- Do link zlib and xz, as we are not building compressed modules.
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Mar 31 16:53:28 UTC 2016 - normand@linux.vnet.ibm.com Thu Mar 31 16:53:28 UTC 2016 - normand@linux.vnet.ibm.com

15
kmod-testsuite.spec
View File

@ -46,6 +46,13 @@ BuildRequires: kernel-default-devel
BuildRequires: libtool BuildRequires: libtool
BuildRequires: pkgconfig >= 0.21 BuildRequires: pkgconfig >= 0.21
BuildRequires: xz 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 Requires: suse-module-tools
%define kdir /usr/src/linux-obj/%_target_cpu/default %define kdir /usr/src/linux-obj/%_target_cpu/default
@ -60,11 +67,15 @@ buildloop with the kernel.
%build %build
autoreconf -fi autoreconf -fi
export LDFLAGS="-Wl,-z,relro,-z,now"
# The extra --includedir gives us the possibility to detect dependent # The extra --includedir gives us the possibility to detect dependent
# packages which fail to properly use pkgconfig. # packages which fail to properly use pkgconfig.
%configure \ %configure \
--without-xz \ %if 0%{?sles_version} == 11
--without-zlib \ zlib_CFLAGS=" " zlib_LIBS="-lz" \
%endif
--with-xz \
--with-zlib \
--includedir="%_includedir/kmod" \ --includedir="%_includedir/kmod" \
--with-rootlibdir="%_libdir" \ --with-rootlibdir="%_libdir" \
--bindir="%_bindir" --bindir="%_bindir"

5
kmod.changes
View File

@ -1,8 +1,3 @@
-------------------------------------------------------------------
Thu Jul 21 09:11:25 UTC 2016 - mmarek@suse.com
- Do link zlib and xz, as we are not building compressed modules.
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jun 17 15:18:29 UTC 2016 - mmarek@suse.cz Fri Jun 17 15:18:29 UTC 2016 - mmarek@suse.cz

15
kmod.spec
View File

@ -45,6 +45,13 @@ BuildRequires: libtool
BuildRequires: pkgconfig >= 0.21 BuildRequires: pkgconfig >= 0.21
BuildRequires: suse-module-tools BuildRequires: suse-module-tools
BuildRequires: xz 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 Requires: suse-module-tools
%description %description
@ -100,11 +107,15 @@ in %lname.
%build %build
autoreconf -fi autoreconf -fi
export LDFLAGS="-Wl,-z,relro,-z,now"
# The extra --includedir gives us the possibility to detect dependent # The extra --includedir gives us the possibility to detect dependent
# packages which fail to properly use pkgconfig. # packages which fail to properly use pkgconfig.
%configure \ %configure \
--without-xz \ %if 0%{?sles_version} == 11
--without-zlib \ zlib_CFLAGS=" " zlib_LIBS="-lz" \
%endif
--with-xz \
--with-zlib \
--includedir="%_includedir/kmod" \ --includedir="%_includedir/kmod" \
--with-rootlibdir="%_libdir" \ --with-rootlibdir="%_libdir" \
--bindir="%_bindir" --bindir="%_bindir"