diff options
| author | Bart De Schuymer <bdschuym@pandora.be> | 2002-09-10 20:28:37 +0000 |
|---|---|---|
| committer | Bart De Schuymer <bdschuym@pandora.be> | 2002-09-10 20:28:37 +0000 |
| commit | 4ac2d8698251d0fc8528e5620592bbbe59e6f850 (patch) | |
| tree | 40ee1c3f1bb75f9d05f6b6bf135d9202a5954ebe /kernel/scripts | |
| parent | 8853618a904800e68fc33b5285249ed8bbac7819 (diff) | |
*** empty log message ***
Diffstat (limited to 'kernel/scripts')
| -rwxr-xr-x | kernel/scripts/Makediff | 6 | ||||
| -rwxr-xr-x | kernel/scripts/Makediff2.5 | 7 | ||||
| -rwxr-xr-x | kernel/scripts/Makeincrdiff | 2 |
3 files changed, 15 insertions, 0 deletions
diff --git a/kernel/scripts/Makediff b/kernel/scripts/Makediff index 857f3fc..f452575 100755 --- a/kernel/scripts/Makediff +++ b/kernel/scripts/Makediff @@ -7,6 +7,7 @@ # 31 July 2002: added mark match/target, bridge/br.c, bridge/Makefile; # deleted netsyms # 20 August 2002: deleted br_db +# 10 September 2002: added br_forward.c export FROM=linux export TO=ebt2.0-rc2 @@ -14,6 +15,11 @@ export FILE=ebtables-v2.0-rc2_vs_2.4.20-pre4.diff echo "ebtables-v2.0-rc2-dev - 21 August 2002" >$FILE echo >>$FILE +echo "*** deal with NETFILTER_DEBUG ***" >>$FILE +echo >>$FILE + +diff -urNp --exclude TAGS $FROM/net/bridge/br_forward.c $TO/net/bridge/br_forward.c >> $FILE + echo "*** modifications for brouter support ***" >>$FILE echo >>$FILE diff --git a/kernel/scripts/Makediff2.5 b/kernel/scripts/Makediff2.5 index 5065c27..b88a4b6 100755 --- a/kernel/scripts/Makediff2.5 +++ b/kernel/scripts/Makediff2.5 @@ -8,6 +8,7 @@ # deleted netsyms # 20 August 2002: deleted br_db # 23 August 2002: made this file for patches vs 2.5, added Config.help +# 10 September 2002: added br_forward.c export FROM=linux export TO=ebt2.0-rc2-dev @@ -15,6 +16,12 @@ export FILE=ebtables-v2.0-rc2-dev_vs_2.5.31.diff echo "ebtables-v2.0-rc2-dev - 23 August 2002" >$FILE echo >>$FILE +echo "*** deal with NETFILTER_DEBUG ***" >>$FILE +echo >>$FILE + +diff -urNp --exclude TAGS $FROM/net/bridge/br_forward.c $TO/net/bridge/br_forward.c >> $FILE + +echo >>$FILE echo "*** modifications for brouter support ***" >>$FILE echo >>$FILE diff --git a/kernel/scripts/Makeincrdiff b/kernel/scripts/Makeincrdiff index 0b36755..580df07 100755 --- a/kernel/scripts/Makeincrdiff +++ b/kernel/scripts/Makeincrdiff @@ -2,6 +2,7 @@ # used for making the incremental kernel diffs # 31 July 2002: added mark match/target, bridge/br.c, bridge/Makefile; # deleted netsyms +# 10 September 2002: added br_forward.c export FROM=linux export TO=ebt2.0-rc1 @@ -13,6 +14,7 @@ diff -urN $FROM/net/bridge/br_private.h $TO/net/bridge/br_private.h > $FILE diff -urN $FROM/include/linux/if_bridge.h $TO/include/linux/if_bridge.h >> $FILE diff -urN $FROM/net/core/dev.c $TO/net/core/dev.c >> $FILE diff -urN $FROM/net/bridge/br_input.c $TO/net/bridge/br_input.c >> $FILE +diff -urN $FROM/net/bridge/br_forward.c $TO/net/bridge/br_forward.c >> $FILE diff -urN $FROM/net/bridge/br.c $TO/net/bridge/br.c >> $FILE diff -urN $FROM/net/bridge/Makefile $TO/net/bridge/Makefile >> $FILE diff -urN $FROM/include/linux/netfilter_bridge.h $TO/include/linux/netfilter_bridge.h >> $FILE |