Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10400/scripts
Modified Files:
net-tools openh323gk postfix unarj watchdog
Log Message:
build fixes for rebuild / make openh323gk compile with 2.6 (Oliver)
Index: net-tools
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/net-tools,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- net-tools 11 Jan 2004 14:43:04 -0000 1.13
+++ net-tools 4 Feb 2004 20:40:59 -0000 1.14
@@ -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.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- openh323gk 1 Feb 2004 15:04:23 -0000 1.9
+++ openh323gk 4 Feb 2004 20:40:59 -0000 1.10
@@ -30,6 +30,7 @@
case $1 in
build )
if [ "$CONFIG_OPENH323GK" = "y" ]; then
+ old_kernel_includes
test "$CONFIG_LINUX_VERSION" = "2.6" && old_kernel_includes
pushd .. > /dev/null
export PWLIBDIR=$PWD/pwlib
Index: postfix
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/postfix,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- postfix 11 Jan 2004 14:43:05 -0000 1.23
+++ postfix 4 Feb 2004 20:40:59 -0000 1.24
@@ -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
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- unarj 11 Jan 2004 14:43:05 -0000 1.4
+++ unarj 4 Feb 2004 20:40:59 -0000 1.5
@@ -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
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- watchdog 16 Jan 2004 01:47:55 -0000 1.14
+++ watchdog 4 Feb 2004 20:40:59 -0000 1.15
@@ -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
|
