forked from pool/ipset
Reenable KMP %install section I did not finish yesterday
OBS-URL: https://build.opensuse.org/package/show/security:netfilter/ipset?expand=0&rev=53
This commit is contained in:
parent
b8e44c76f5
commit
15df0cd4aa
31
ipset-destdir.diff
Normal file
31
ipset-destdir.diff
Normal file
@ -0,0 +1,31 @@
|
|||||||
|
From: Jan Engelhardt <jengelh@inai.de>
|
||||||
|
Date: 2016-03-17 01:13:03.340741300 +0100
|
||||||
|
|
||||||
|
Skip these two steps from Makefile.am altogether.
|
||||||
|
|
||||||
|
1. If $INSTALL_MOD_PATH/lib/modules/uname_r is missing, no depmod
|
||||||
|
files will be created at all (by depmod as invoked by the kernel's
|
||||||
|
modules_install target).
|
||||||
|
|
||||||
|
2. Therefore, modinfo -b will error out because it cannot find
|
||||||
|
$INSTALL_MOD_PATH/lib/modules/uname-r/modules.order.
|
||||||
|
|
||||||
|
3. lsmod fails because /proc and /sys are not mounted.
|
||||||
|
|
||||||
|
---
|
||||||
|
Makefile.am | 2 --
|
||||||
|
1 file changed, 2 deletions(-)
|
||||||
|
|
||||||
|
Index: ipset-6.29/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- ipset-6.29.orig/Makefile.am
|
||||||
|
+++ ipset-6.29/Makefile.am
|
||||||
|
@@ -72,8 +72,6 @@ modules_install:
|
||||||
|
if WITH_KMOD
|
||||||
|
${MAKE} -C $(KBUILD_OUTPUT) M=$$PWD/kernel/net \
|
||||||
|
KDIR=$$PWD/kernel modules_install
|
||||||
|
- @modinfo -b ${INSTALL_MOD_PATH} ip_set_hash_ip | ${GREP} /extra/ >/dev/null || echo "$$DEPMOD_WARNING"
|
||||||
|
- @lsmod | ${GREP} '^ip_set' >/dev/null && echo "$$MODULE_WARNING"
|
||||||
|
else
|
||||||
|
@echo Skipping kernel modules due to --with-kmod=no
|
||||||
|
endif
|
@ -13,6 +13,8 @@ Sat Mar 12 21:40:08 UTC 2016 - jengelh@inai.de
|
|||||||
* Check IPSET_ATTR_ETHER netlink attribute length
|
* Check IPSET_ATTR_ETHER netlink attribute length
|
||||||
* Fix set:list type crash when flush/dump set in parallel
|
* Fix set:list type crash when flush/dump set in parallel
|
||||||
* Allow a 0 netmask with hash_netiface type
|
* Allow a 0 netmask with hash_netiface type
|
||||||
|
- Restore unreviewed deletion of KMP production,
|
||||||
|
undo spec-cleaner refucktoring
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Mon Jan 18 15:42:54 UTC 2016 - kstreitova@suse.com
|
Mon Jan 18 15:42:54 UTC 2016 - kstreitova@suse.com
|
||||||
|
@ -28,6 +28,7 @@ Url: http://ipset.netfilter.org/
|
|||||||
#Git-Web: http://git.netfilter.org/
|
#Git-Web: http://git.netfilter.org/
|
||||||
Source: ftp://ftp.netfilter.org/pub/ipset/%name-%version.tar.bz2
|
Source: ftp://ftp.netfilter.org/pub/ipset/%name-%version.tar.bz2
|
||||||
Source3: %name-preamble
|
Source3: %name-preamble
|
||||||
|
Patch1: ipset-destdir.diff
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
@ -35,6 +36,11 @@ BuildRequires: libtool
|
|||||||
BuildRequires: linux-glibc-devel >= 2.6.24
|
BuildRequires: linux-glibc-devel >= 2.6.24
|
||||||
BuildRequires: pkg-config >= 0.21
|
BuildRequires: pkg-config >= 0.21
|
||||||
BuildRequires: pkgconfig(libmnl) >= 1
|
BuildRequires: pkgconfig(libmnl) >= 1
|
||||||
|
%if 0%{?suse_version} && 0%{?suse_version} < 1330
|
||||||
|
# Factory gets new kernels, old releases don't.
|
||||||
|
# Always build KMPs for all versions older than Factory.
|
||||||
|
%define ipset_build_kmp 1
|
||||||
|
%endif
|
||||||
%if 0%{?ipset_build_kmp}
|
%if 0%{?ipset_build_kmp}
|
||||||
BuildRequires: %kernel_module_package_buildreqs
|
BuildRequires: %kernel_module_package_buildreqs
|
||||||
%if 0%{?suse_version} >= 1320
|
%if 0%{?suse_version} >= 1320
|
||||||
@ -97,6 +103,7 @@ when matching an entry against a set.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch -P 1 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# build wants to call modinfo at some point
|
# build wants to call modinfo at some point
|
||||||
|
Loading…
Reference in New Issue
Block a user