[Devil-linux-develop] PATCH --- FIXED as suggested by Bruce

[Oliver J. <oli...@mo...>]

Index: logrotate
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/logrotate,v
retrieving revision 1.17
diff -u -r1.17 logrotate
--- logrotate   11 Jan 2004 14:43:04 -0000      1.17
+++ logrotate   30 Jan 2004 13:54:23 -0000
@@ -28,10 +28,13 @@
 case $1 in
        build )
                if [ "$CONFIG_LOGROTATE" = "y" ]; then
-                       bzcat
$DL_DIR/src/logrotate-3.6.6-moveout.dif.bz2 | patch -p0 || exit 1
-                       bzcat
$DL_DIR/src/logrotate-3.6.6-dateext.dif.bz2 | patch -p0 || exit 1
-                       bzcat $DL_DIR/src/logrotate-3.6.6-maxage.dif.bz2
| patch -p0 || exit 1
-                       bzcat $DL_DIR/src/logrotate-3.6.6-conf.dif.bz2 |
patch -p0 || exit 1
+                       if [ ! -f logrotate_patch_done ]; then
+                               bzcat
$DL_DIR/src/logrotate-3.6.6-moveout.dif.bz2 | patch -p0 || exit 1
+                               bzcat
$DL_DIR/src/logrotate-3.6.6-dateext.dif.bz2 | patch -p0 || exit 1
+                               bzcat
$DL_DIR/src/logrotate-3.6.6-maxage.dif.bz2 | patch -p0 || exit 1
+                               bzcat
$DL_DIR/src/logrotate-3.6.6-conf.dif.bz2 | patch -p0 || exit 1
+                               touch logrotate_patch_done
+                       fi
                        make $PMAKE all || exit 1
                        strip_debug
                fi
Index: lha
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/lha,v
retrieving revision 1.4
diff -u -r1.4 lha
--- lha 11 Jan 2004 14:43:04 -0000      1.4
+++ lha 30 Jan 2004 13:54:23 -0000
@@ -25,7 +25,10 @@
 case $1 in
        build )
                if [ "$CONFIG_LHA" = "y" ]; then
-                       zcat $DL_DIR/src/lha*.diff.gz | patch -p1 ||
exit 1
+                       if [ ! -f lha_patches_done  ]; then
+                               zcat $DL_DIR/src/lha*.diff.gz | patch
-p1 || exit 1
+                               touch lha_patches_done
+                       fi
                        make $PMAKE || exit 1
                        strip_debug
                fi
Index: compartment
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/compartment,v
retrieving revision 1.14
diff -u -r1.14 compartment
--- compartment 11 Jan 2004 14:43:04 -0000      1.14
+++ compartment 30 Jan 2004 13:54:23 -0000
@@ -25,10 +25,14 @@

 case $1 in
        build )
-               bzcat $DL_DIR/src/compartment-1.2-suse-patches.diff.bz2
| patch -p1 || exit 1
-               bzcat $DL_DIR/src/compartment-env.diff.bz2 | patch -p1
|| exit 1
-               bzcat $DL_DIR/src/compartment-no-close-fd.diff.bz2 |
patch -p1 || exit 1
-               bzcat $DL_DIR/src/compartment-gcc33.diff.bz2 | patch -p1
|| exit 1
+
+               if [ ! -f compartment_patch_done ]; then
+                       bzcat
$DL_DIR/src/compartment-1.2-suse-patches.diff.bz2 | patch -p1 || exit 1
+                       bzcat $DL_DIR/src/compartment-env.diff.bz2 |
patch -p1 || exit 1
+                       bzcat
$DL_DIR/src/compartment-no-close-fd.diff.bz2 | patch -p1 || exit 1
+                       bzcat $DL_DIR/src/compartment-gcc33.diff.bz2 |
patch -p1 || exit 1
+                       touch compartment_patch_done
+               fi

                make $PMAKE clean all  || exit 1
                strip_debug