From 215b8ba8ffd61cd6ef571ce0ac2b706080450311 Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Mon, 19 Mar 2007 21:33:32 +0000 Subject: [PATCH] * fixed iptables (1.3.7) to build when DO_MULTI=1 - used on static builds git-svn-id: svn://svn.opensde.net/opensde/package/trunk@20510 10447126-35f2-4685-b0cf-6dd780d3921f --- network/iptables/iptables.conf | 22 +++++++++++++++++++--- network/iptables/iptables.desc | 2 +- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/network/iptables/iptables.conf b/network/iptables/iptables.conf index 4854a334f..90de9dd66 100644 --- a/network/iptables/iptables.conf +++ b/network/iptables/iptables.conf @@ -1,7 +1,8 @@ -# --- T2-COPYRIGHT-NOTE-BEGIN --- +# --- SDE-COPYRIGHT-NOTE-BEGIN --- # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # -# T2 SDE: package/.../iptables/iptables.conf +# Filename: package/.../iptables/iptables.conf +# Copyright (C) 2007 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # Copyright (C) 1998 - 2003 Clifford Wolf # @@ -11,7 +12,11 @@ # it under the terms of the GNU General Public License as published by # the Free Software Foundation; version 2 of the License. A copy of the # GNU General Public License can be found in the file COPYING. -# --- T2-COPYRIGHT-NOTE-END --- +# --- SDE-COPYRIGHT-NOTE-END --- + +for x in $( match_source_file -p patch ); do + var_append patchfiles ' ' "$x" +done # never ever use the kernel source - always use the installed headers var_append makeopt ' ' "PREFIX=$root/$prefix" @@ -22,4 +27,15 @@ var_append makeopt ' ' "KERNEL_DIR=$root/usr" makeinstopt="$makeopt install" +#hook_add postmake 5 'iptables_install_devel' +iptables_install_devel() { + $MAKE $makeopt install-devel + + cp -vf iptables.o "$root$libdir" + cp -vf include/{iptables,iptables_common}.h "$root$includedir/" + + mkdir -vp "$root$includedir/libiptc" + cp -vf include/libiptc/{libiptc,ipt_kernel_headers}.h "$root$includedir/libiptc/" +} + runconf=0 diff --git a/network/iptables/iptables.desc b/network/iptables/iptables.desc index 04b8cb5a7..716d716c1 100644 --- a/network/iptables/iptables.desc +++ b/network/iptables/iptables.desc @@ -36,4 +36,4 @@ [P] X -----5---9 189.900 [D] 126301267 iptables-1.3.7.tar.bz2 http://www.iptables.org/projects/iptables/files/ - +[D] 419764073 iptables-1.3.7-do_multi-1.patch http://svn.cross-lfs.org/svn/repos/cross-lfs/branches/clfs-embedded/patches/