| 1 |
robbat2 08/10/14 07:21:01 |
| 2 |
|
| 3 |
Modified: ipset-2.3.3a.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Bug #236138, allow building with non-modular kernels. |
| 6 |
(Portage version: 2.2_rc11/cvs/Linux 2.6.27-rc1-10246-gca5de40 x86_64) |
| 7 |
|
| 8 |
Revision Changes Path |
| 9 |
1.2 net-firewall/ipset/ipset-2.3.3a.ebuild |
| 10 |
|
| 11 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ipset-2.3.3a.ebuild?rev=1.2&view=markup |
| 12 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ipset-2.3.3a.ebuild?rev=1.2&content-type=text/plain |
| 13 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ipset-2.3.3a.ebuild?r1=1.1&r2=1.2 |
| 14 |
|
| 15 |
Index: ipset-2.3.3a.ebuild |
| 16 |
=================================================================== |
| 17 |
RCS file: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.3.3a.ebuild,v |
| 18 |
retrieving revision 1.1 |
| 19 |
retrieving revision 1.2 |
| 20 |
diff -p -w -b -B -u -u -r1.1 -r1.2 |
| 21 |
--- ipset-2.3.3a.ebuild 14 Aug 2008 00:06:25 -0000 1.1 |
| 22 |
+++ ipset-2.3.3a.ebuild 14 Oct 2008 07:21:01 -0000 1.2 |
| 23 |
@@ -1,8 +1,8 @@ |
| 24 |
# Copyright 1999-2008 Gentoo Foundation |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.3.3a.ebuild,v 1.1 2008/08/14 00:06:25 robbat2 Exp $ |
| 27 |
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ipset-2.3.3a.ebuild,v 1.2 2008/10/14 07:21:01 robbat2 Exp $ |
| 28 |
|
| 29 |
-inherit eutils versionator toolchain-funcs linux-mod |
| 30 |
+inherit eutils versionator toolchain-funcs linux-mod linux-info |
| 31 |
|
| 32 |
DESCRIPTION="IPset tool for iptables, successor to ippool." |
| 33 |
HOMEPAGE="http://ipset.netfilter.org/" |
| 34 |
@@ -45,7 +45,19 @@ src_unpack() { |
| 35 |
} |
| 36 |
|
| 37 |
pkg_setup() { |
| 38 |
- #use modules && \ |
| 39 |
+ get_version |
| 40 |
+ |
| 41 |
+ modules=0 |
| 42 |
+ msg='' |
| 43 |
+ if linux_chkconfig_builtin "MODULES" ; then |
| 44 |
+ modules=1 |
| 45 |
+ msg="Modular kernel detected, will build kernel modules" |
| 46 |
+ else |
| 47 |
+ msg="Nonmodular kernel detected, will not build kernel modules" |
| 48 |
+ fi |
| 49 |
+ einfo "${msg}" |
| 50 |
+ |
| 51 |
+ [[ $modules -eq 1 ]] && \ |
| 52 |
linux-mod_pkg_setup |
| 53 |
myconf="${myconf} PREFIX=" |
| 54 |
myconf="${myconf} LIBDIR=/$(get_libdir)" |
| 55 |
@@ -59,22 +71,22 @@ src_compile() { |
| 56 |
einfo "Building userspace" |
| 57 |
emake CC="$(tc-getCC)" COPT_FLAGS="${CFLAGS}" ${myconf} binaries || die "failed to build" |
| 58 |
|
| 59 |
- #if use modules; then |
| 60 |
+ if [[ $modules -eq 1 ]]; then |
| 61 |
einfo "Building kernel modules" |
| 62 |
cd "${S}/kernel" |
| 63 |
export KERNELDIR="${KERNEL_DIR}" |
| 64 |
linux-mod_src_compile || die "failed to build modules" |
| 65 |
- #fi |
| 66 |
+ fi |
| 67 |
} |
| 68 |
|
| 69 |
src_install() { |
| 70 |
einfo "Installing userspace" |
| 71 |
emake DESTDIR="${D}" ${myconf} binaries_install || die "failed to package" |
| 72 |
|
| 73 |
- #if use modules; then |
| 74 |
+ if [[ $modules -eq 1 ]]; then |
| 75 |
einfo "Installing kernel modules" |
| 76 |
cd "${S}/kernel" |
| 77 |
export KERNELDIR="${KERNEL_DIR}" |
| 78 |
linux-mod_src_install |
| 79 |
- #fi |
| 80 |
+ fi |
| 81 |
} |
| 82 |
|
| 83 |
|
| 84 |
|
| 85 |
1.18 net-firewall/ipset/ChangeLog |
| 86 |
|
| 87 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ChangeLog?rev=1.18&view=markup |
| 88 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ChangeLog?rev=1.18&content-type=text/plain |
| 89 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-firewall/ipset/ChangeLog?r1=1.17&r2=1.18 |
| 90 |
|
| 91 |
Index: ChangeLog |
| 92 |
=================================================================== |
| 93 |
RCS file: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v |
| 94 |
retrieving revision 1.17 |
| 95 |
retrieving revision 1.18 |
| 96 |
diff -p -w -b -B -u -u -r1.17 -r1.18 |
| 97 |
--- ChangeLog 14 Aug 2008 00:06:25 -0000 1.17 |
| 98 |
+++ ChangeLog 14 Oct 2008 07:21:01 -0000 1.18 |
| 99 |
@@ -1,6 +1,9 @@ |
| 100 |
# ChangeLog for net-firewall/ipset |
| 101 |
# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 |
| 102 |
-# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.17 2008/08/14 00:06:25 robbat2 Exp $ |
| 103 |
+# $Header: /var/cvsroot/gentoo-x86/net-firewall/ipset/ChangeLog,v 1.18 2008/10/14 07:21:01 robbat2 Exp $ |
| 104 |
+ |
| 105 |
+ 14 Oct 2008; Robin H. Johnson <robbat2@g.o> ipset-2.3.3a.ebuild: |
| 106 |
+ Bug #236138, allow building with non-modular kernels. |
| 107 |
|
| 108 |
*ipset-2.3.3a (14 Aug 2008) |
Archives