[Devil-linux-develop] some more build fixes for rebuild / make openh323gk compile with 2.6

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

Index: net-tools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/net-tools,v
retrieving revision 1.13
diff -u -r1.13 net-tools
--- net-tools   11 Jan 2004 14:43:04 -0000      1.13
+++ net-tools   30 Jan 2004 14:53:32 -0000
@@ -25,7 +25,10 @@

  case $1 in
         build )
-               zcat $DL_DIR/src/net-tools*.diff.gz | patch -p1 || exit 1
+               if [ ! -f net_tools_patch ]; then
+                   zcat $DL_DIR/src/net-tools*.diff.gz | patch -p1 || exit 1
+                   touch net_tools_patch
+               fi
                 cp $MYDIR/config/config_net-tools.h ./config.h
                 cp $MYDIR/config/config_net-tools.make ./config.make
                 # parallel build fails - do not use $PMAKE
Index: openh323gk
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/openh323gk,v
retrieving revision 1.8
diff -u -r1.8 openh323gk
--- openh323gk  11 Jan 2004 14:43:04 -0000      1.8
+++ openh323gk  30 Jan 2004 14:53:32 -0000
@@ -30,6 +30,7 @@
  case $1 in
         build )
             if [ "$CONFIG_OPENH323GK" = "y" ]; then
+               old_kernel_includes
                 pushd .. > /dev/null
                 export PWLIBDIR=$PWD/pwlib
                 export OPENH323DIR=$PWD/openh323
Index: postfix
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/postfix,v
retrieving revision 1.23
diff -u -r1.23 postfix
--- postfix     11 Jan 2004 14:43:05 -0000      1.23
+++ postfix     30 Jan 2004 14:53:32 -0000
@@ -28,9 +28,13 @@
  case $1 in
         build )
                 if [ "$CONFIG_POSTFIX" = "y" ]; then
+                       make tidy
                         if [ "$CONFIG_POSTFIX_TLS" = "y" ]; then
-                               PFIXTLSPATCH=$(ls $WORKDIR/pfixtls*/pfixtls.diff)
-                               patch -p1 < $PFIXTLSPATCH || exit 1
+                               if [ ! -f postfix_tls_patch ]; then
+                                       PFIXTLSPATCH=$(ls $WORKDIR/pfixtls*/pfixtls.diff)
+                                       patch -p1 < $PFIXTLSPATCH || exit 1
+                                       touch postfix_tls_patch
+                               fi
                                 make makefiles CCARGS="-DHAS_SSL" -I/usr/include/openssl AUXLIBS="-lssl -lcrypto" || exit 1
                         fi
                         make $PMAKE || exit 1
Index: unarj
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/unarj,v
retrieving revision 1.4
diff -u -r1.4 unarj
--- unarj       11 Jan 2004 14:43:05 -0000      1.4
+++ unarj       30 Jan 2004 14:53:32 -0000
@@ -25,7 +25,10 @@
  case $1 in
         build )
                 if [ "$CONFIG_UNARJ" = "y" ]; then
-                       zcat $DL_DIR/src/unarj*.diff.gz | patch -p1 || exit 1
+                       if [ ! -f unarj_patch_done ]; then
+                               zcat $DL_DIR/src/unarj*.diff.gz | patch -p1 || exit 1
+                               touch unarj_patch_done
+                       fi
                         make $PMAKE || exit 1
                         strip_debug
                 fi
Index: watchdog
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/watchdog,v
retrieving revision 1.14
diff -u -r1.14 watchdog
--- watchdog    16 Jan 2004 01:47:55 -0000      1.14
+++ watchdog    30 Jan 2004 14:53:32 -0000
@@ -28,7 +28,10 @@
         build )
                 if [ "$CONFIG_WATCHDOG" = "y" ]; then
                     disable_et_dyn
-                       bzcat $DL_DIR/src/watchdog-errno.patch.bz2 | patch -p1 || exit 1
+                       if [ ! -f watchdog_patch_done ]; then
+                               bzcat $DL_DIR/src/watchdog-errno.patch.bz2 | patch -p1 || exit 1
+                               touch watchdog_patch_done
+                       fi
                         add_kernel_config $MYDIR/config/config_watchdog
                         ./configure --prefix=/usr --localstatedir=/var --disable-nfs --with-linelength=256|| exit 1
                         make $PMAKE all || exit 1