Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22891/scripts
Modified Files:
patch-o-matic
Log Message:
correctly exclude patch we don't want
Index: patch-o-matic
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/patch-o-matic,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- patch-o-matic 23 Jul 2004 19:20:49 -0000 1.25
+++ patch-o-matic 25 Jul 2004 21:27:54 -0000 1.26
@@ -31,73 +31,50 @@
IPTABLES_DIR=$(find_src_dir iptables)
export IPTABLES_DIR
- PATCHES="";
- EXCLUDE_PATCHES="";
-
- # patchs to exclude, eg. because of creating troubles
- # (none at the moment)
- # eg. EXCLUDE_PATCHES="${EXCLUDE_PATCHES} dir/patchname.patch"
-
+ # update the patch-o-matic.exclude file to make sure we have everything listed in there
+ for PDIR in $(ls -d *); do
+ SUITE=$(grep "Repository:" $PDIR/info 2> /dev/null )
+ # remove whitespaces
+ SUITE=$(echo ${SUITE##*:} | tr -d "\t ")
+ if [ ! -z "$SUITE" ]; then
+ if [ -z "$(grep $PDIR $MYDIR/config/patch-o-matic.exclude)" ]; then
+ echo "$SUITE/$PDIR" >> $MYDIR/config/patch-o-matic.exclude
+ fi
+ fi
+ done
+ cat $MYDIR/config/patch-o-matic.exclude | sort -u > $WORKDIR/patch-o-matic.exclude || exit 1
+ mv $WORKDIR/patch-o-matic.exclude $MYDIR/config/patch-o-matic.exclude || exit 1
+
+ # reformat to fit as commandline option to runme
+ EXCLUDE=""
+ for P in $(grep -v "^#" $MYDIR/config/patch-o-matic.exclude ); do
+ #EXCLUDE="$EXCLUDE --exclude $P"
+ EXCLUDE="$EXCLUDE --exclude ${P##*/}"
+ done
+
[ "$CONFIG_NF_UPDATES" = "y" ] && \
- PATCHES="$PATCHES updates"
yes "" | ./runme --batch updates
[ "$CONFIG_NF_PENDING" = "y" ] && \
- PATCHES="$PATCHES pending"
- yes "" | ./runme --batch pending
+ yes "" | ./runme --batch pending $EXCLUDE
- #[ "$CONFIG_NF_OPTIMIZATION" = "y" ] && [ "$CONFIG_NF_SUBMITTED" = "y" ] && [ "$CONFIG_NF_PENDING" = "y" ] && \
- # PATCHES="$PATCHES optimizations"
-
- #[ "$CONFIG_NF_BASE" = "y" ] && [ "$CONFIG_NF_SUBMITTED" = "y" ] && [ "$CONFIG_NF_PENDING" = "y" ] && \
- # PATCHES="$PATCHES $(sed -e "/^$/d" -e "/^ \+$/d" -e "/^ \+$/d" -e "/^#/d" $MYDIR/config/config-netfilter-base)"
[ "$CONFIG_NF_BASE" = "y" ] && \
- yes "" | ./runme --batch base
-
-
- #[ "$CONFIG_NF_EXTRA" = "y" ] && [ "$CONFIG_NF_SUBMITTED" = "y" ] && [ "$CONFIG_NF_PENDING" = "y" ] && \
- # PATCHES="$PATCHES $(sed -e "/^$/d" -e "/^ \+$/d" -e "/^ \+$/d" -e "/^#/d" $MYDIR/config/config-netfilter-extra)"
-
- # reformat to fit as commandline option to runme
- #EXCLUDE=""; for P in $EXCLUDE_PATCHES; do
- # EXCLUDE="$EXCLUDE --exclude $P"; done
-
- ## create a temp file were we store the output of patch-o-matic
- ## [we do not have mktemp, so do it the simple unsecure way]
- #TMPFILE=$(mktemp -q /tmp/${0##*/}.XXXXXX)
- #if [ $? -ne 0 ]; then
- # echo "$0: Can't create temp file, exiting..."
- # exit 1
- #fi
- #TMPFILE=/tmp/${0##*/}.$$
-
- # now apply all patches at once and take care
- # to exclude troublesome patches
-
- #yes "" | ./runme --batch $EXCLUDE $PATCHES
-
- # >$TMPFILE 2>&1
-
- #if ! grep -q "Kernel is now ready for compilation." $TMPFILE; then
- # echo "Patch-O-Matic failed applying the patches." 1>&2
- # echo "See $TMPFILE for details" 1>&2
- # exit 1
- #fi
+ yes "" | ./runme --batch base $EXCLUDE
- #cat $TMPFILE; rm -f $TMPFILE
+ [ "$CONFIG_NF_EXTRA" = "y" ] && \
+ yes "" | ./runme --batch extra $EXCLUDE
set_all_kernel_options net/ipv4/netfilter
set_all_kernel_options net/ipv6/netfilter
# settings didn't get applied, so let's do it here
- set_kernel_option CONFIG_IP_NF_RAW m
- set_kernel_option CONFIG_IP_NF_SET_MAX 256
+ #set_kernel_option CONFIG_IP_NF_RAW m
+ #set_kernel_option CONFIG_IP_NF_SET_MAX 256
pushd $KERNEL_DIR > /dev/null
make oldconfig || exit 1
popd > /dev/null
fi
- cp $WORKDIR/netfilter.patches.lst $DL_DIR/docs
;;
install )
|
