[gentoo-commits] gentoo-x86 commit in net-firewall/ipset: ipset-2.3.3a.ebuild ChangeLog

[gentoo-commits] gentoo-x86 commit in net-firewall/ipset: ipset-2.3.3a.ebuild ChangeLog

[Robin H. Johnson (robbat2)]

robbat2     08/10/14 07:21:01

  Modified:             ipset-2.3.3a.ebuild ChangeLog
  Log:
  Bug #236138, allow building with non-modular kernels.
  (Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64)

Revision  Changes    Path
1.2                  net-firewall/ipset/ipset-2.3.3a.ebuild

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ipset-2.3.3a.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ipset-2.3.3a.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ipset-2.3.3a.ebuild?r1=1.1&r2=1.2

Index: ipset-2.3.3a.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.3.3a.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -p -w -b -B -u -u -r1.1 -r1.2
--- ipset-2.3.3a.ebuild	14 Aug 2008 00:06:25 -0000	1.1
+++ ipset-2.3.3a.ebuild	14 Oct 2008 07:21:01 -0000	1.2
@@ -1,8 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.3.3a.ebuild,v 1.1 2008/08/14 00:06:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.3.3a.ebuild,v 1.2 2008/10/14 07:21:01 robbat2 Exp $
 
-inherit eutils versionator toolchain-funcs linux-mod
+inherit eutils versionator toolchain-funcs linux-mod linux-info
 
 DESCRIPTION="IPset tool for iptables, successor to ippool."
 HOMEPAGE="http://ipset.netfilter.org/"
@@ -45,7 +45,19 @@ src_unpack() {
 }
 
 pkg_setup() {
-	#use modules && \
+	get_version
+
+	modules=0
+	msg=''
+	if linux_chkconfig_builtin "MODULES" ; then
+		modules=1
+		msg="Modular kernel detected, will build kernel modules"
+	else
+		msg="Nonmodular kernel detected, will not build kernel modules"
+	fi
+	einfo "${msg}"
+
+	[[ $modules -eq 1 ]] && \
 		linux-mod_pkg_setup
 	myconf="${myconf} PREFIX="
 	myconf="${myconf} LIBDIR=/$(get_libdir)"
@@ -59,22 +71,22 @@ src_compile() {
 	einfo "Building userspace"
 	emake CC="$(tc-getCC)" COPT_FLAGS="${CFLAGS}" ${myconf} binaries || die "failed to build"
 
-	#if use modules; then
+	if [[ $modules -eq 1 ]]; then
 		einfo "Building kernel modules"
 		cd "${S}/kernel"
 		export KERNELDIR="${KERNEL_DIR}"
 		linux-mod_src_compile || die "failed to build modules"
-	#fi
+	fi
 }
 
 src_install() {
 	einfo "Installing userspace"
 	emake DESTDIR="${D}" ${myconf} binaries_install || die "failed to package"
 
-	#if use modules; then
+	if [[ $modules -eq 1 ]]; then
 		einfo "Installing kernel modules"
 		cd "${S}/kernel"
 		export KERNELDIR="${KERNEL_DIR}"
 		linux-mod_src_install
-	#fi
+	fi
 }



1.18                 net-firewall/ipset/ChangeLog

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ChangeLog?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ChangeLog?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ChangeLog?r1=1.17&r2=1.18

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v
retrieving revision 1.17
retrieving revision 1.18
diff -p -w -b -B -u -u -r1.17 -r1.18
--- ChangeLog	14 Aug 2008 00:06:25 -0000	1.17
+++ ChangeLog	14 Oct 2008 07:21:01 -0000	1.18
@@ -1,6 +1,9 @@
 # ChangeLog for net-firewall/ipset
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.17 2008/08/14 00:06:25 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.18 2008/10/14 07:21:01 robbat2 Exp $
+
+  14 Oct 2008; Robin H. Johnson <robbat2@gentoo.org> ipset-2.3.3a.ebuild:
+  Bug #236138, allow building with non-modular kernels.
 
 *ipset-2.3.3a (14 Aug 2008)