diff options
| author |   Peter Volkov <pva@gentoo.org> | 2009-11-15 17:34:19 +0000 |
|---|---|---|
| committer | Peter Volkov <pva@gentoo.org> | 2009-11-15 17:34:19 +0000 |
| commit | b2c9d667a3036c6a409897f587bf48008feb19fc (patch) | |
| tree | ef52ae951c2d7ece6bc5e82aee78715ecdb8760d /net-firewall | |
| parent | Version bump. (diff) | |
| download | historical-b2c9d667a3036c6a409897f587bf48008feb19fc.tar.gz historical-b2c9d667a3036c6a409897f587bf48008feb19fc.tar.bz2 historical-b2c9d667a3036c6a409897f587bf48008feb19fc.zip | |
USE='modules' support.
Package-Manager: portage-2.1.7.4/cvs/Linux x86_64
Diffstat (limited to 'net-firewall')
| -rw-r--r-- | net-firewall/ipset/ChangeLog | 5 | ||||
| -rw-r--r-- | net-firewall/ipset/Manifest | 4 | ||||
| -rw-r--r-- | net-firewall/ipset/ipset-4.1.ebuild | 29 |
3 files changed, 21 insertions, 17 deletions
diff --git a/net-firewall/ipset/ChangeLog b/net-firewall/ipset/ChangeLog index ca392d426146..da458d9b8a41 100644 --- a/net-firewall/ipset/ChangeLog +++ b/net-firewall/ipset/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for net-firewall/ipset # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.32 2009/11/14 09:01:20 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.33 2009/11/15 17:34:19 pva Exp $ + + 15 Nov 2009; Peter Volkov <pva@gentoo.org> ipset-4.1.ebuild: + USE='modules' support. 14 Nov 2009; Peter Volkov <pva@gentoo.org> ipset-4.1.ebuild: Do not build modules in case kernel is patched and modules are built in, diff --git a/net-firewall/ipset/Manifest b/net-firewall/ipset/Manifest index 989de16dd6ca..0afa7912e760 100644 --- a/net-firewall/ipset/Manifest +++ b/net-firewall/ipset/Manifest @@ -9,6 +9,6 @@ DIST patch-o-matic-ng-20070401.tar.bz2 142585 RMD160 34e5c2ad672b7384867d2953bc8 EBUILD ipset-2.2.9.20070401.ebuild 1341 RMD160 8783afb65cd59b4dc037c24054ef14b7301a72b3 SHA1 10cf72ab7cdbbe77dc2f05f885fe868087212762 SHA256 9d533099035d27a789323db57b043533d68faf7a4dd184285760dc95db521680 EBUILD ipset-2.4.7.ebuild 2598 RMD160 d301a1f55b887ea8d911e2ae757473c1af08268b SHA1 b831f89ea9b811f14af30f97e05e99ccf22e30f7 SHA256 ba66819160a1638f49afeceffdc6fbb0f8e402eece8bf35382bebc0ec6236efd EBUILD ipset-3.0.ebuild 2569 RMD160 56551bb78735fadc171c3dd8f9e7b9825b78dabf SHA1 511a0e5cd241ad8b27616f5334081c7b643ec507 SHA256 2b0cc62478d1c0ae98336ca64ab128b58744cce22c50b79aa026f30c0bef4b75 -EBUILD ipset-4.1.ebuild 2705 RMD160 67d1e151876fba9b44bfc9cd7523a5f10b4792df SHA1 e8abf98e2887df6c17595f6673d8d6296dcf2541 SHA256 c530568c28854bae925a968ae4eb405368b97e86e6659a3c33079621c9df1e70 -MISC ChangeLog 6309 RMD160 a8f17356f61d8d4eb459605df4c59db3f4a7d327 SHA1 96f1f5fee86c146b2102078562c915109ee3618d SHA256 784e1933a9935ba32766618ecd875c7d00ce230dadaba9427fa090b83c800175 +EBUILD ipset-4.1.ebuild 2774 RMD160 97d8a2a48f1435970dc019b8c80996e2c8df7339 SHA1 ed520a260a86c1ed85be571685f7e25b0b9f17bf SHA256 2b50b330d0163131f74d8d3be7cd8ded4cfe7149f590fe23e7a11d8b2b3e53be +MISC ChangeLog 6398 RMD160 ff551539e472840785a86c8320649d4993592059 SHA1 587ff1a4c6ff0f4d4761621ffe2753ebcb7e0132 SHA256 4effd145c04ea9f9294fe07444058c5adcb433d6ce1488dcc74277578b8b9588 MISC metadata.xml 282 RMD160 aa8f4511de4ce6c391a019bfe77d4fbb42d0abb6 SHA1 721fca55a38262a0101e2e6680443986c27a681d SHA256 f4824882e12d63f3488e08077df95b12dca429a0275b82c541e4098527773fa5 diff --git a/net-firewall/ipset/ipset-4.1.ebuild b/net-firewall/ipset/ipset-4.1.ebuild index 3070633e292f..bc450b904c8b 100644 --- a/net-firewall/ipset/ipset-4.1.ebuild +++ b/net-firewall/ipset/ipset-4.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-4.1.ebuild,v 1.2 2009/11/14 09:01:20 pva Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-4.1.ebuild,v 1.3 2009/11/15 17:34:19 pva Exp $ EAPI="2" @@ -13,7 +13,7 @@ SRC_URI="http://ipset.netfilter.org/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" KEYWORDS="~amd64 ~ppc ~x86" -IUSE="" +IUSE="modules" RDEPEND=">=net-firewall/iptables-1.4.4" DEPEND="${RDEPEND}" @@ -37,20 +37,21 @@ ERROR_CFG="ipset requires netfilter support in your kernel." pkg_setup() { get_version - modules=0 - if linux_chkconfig_builtin "MODULES" ; then - if linux_chkconfig_builtin "IP_NF_SET"; then #274577 - einfo "Modular kernel detected but IP_NF_SET=y, will not build kernel modules" + build_modules=0 + if use modules; then + if linux_chkconfig_builtin "MODULES" ; then + if linux_chkconfig_builtin "IP_NF_SET"; then #274577 + einfo "Modular kernel detected but IP_NF_SET=y, will not build kernel modules" + else + build_modules=1 + einfo "Modular kernel detected, will build kernel modules" + fi else - modules=1 - einfo "Modular kernel detected, will build kernel modules" + einfo "Nonmodular kernel detected, will not build kernel modules" fi - else - einfo "Nonmodular kernel detected, will not build kernel modules" fi - [[ ${modules} -eq 1 ]] && \ - linux-mod_pkg_setup + [[ ${build_modules} -eq 1 ]] && linux-mod_pkg_setup myconf="${myconf} PREFIX=" myconf="${myconf} LIBDIR=/$(get_libdir)" myconf="${myconf} BINDIR=/sbin" @@ -74,7 +75,7 @@ src_compile() { einfo "Building userspace" emake CC="$(tc-getCC)" COPT_FLAGS="${CFLAGS}" ${myconf} binaries || die "failed to build" - if [[ ${modules} -eq 1 ]]; then + if [[ ${build_modules} -eq 1 ]]; then einfo "Building kernel modules" cd "${S}/kernel" export KERNELDIR="${KERNEL_DIR}" @@ -86,7 +87,7 @@ src_install() { einfo "Installing userspace" emake DESTDIR="${D}" ${myconf} binaries_install || die "failed to package" - if [[ ${modules} -eq 1 ]]; then + if [[ ${build_modules} -eq 1 ]]; then einfo "Installing kernel modules" cd "${S}/kernel" export KERNELDIR="${KERNEL_DIR}" |