[Devil-linux-commit] build/scripts loop-AES,NONE,1.1 alsa-lib,1.4,1.5 alsa-utils,1.2,1.3 cd_cleanup,1.5,1.6 lm_sensors,1.7,1.8 util-linux,1.13,1.14

[<rap...@us...>]

Update of /cvsroot/devil-linux/build/scripts
In directory sc8-pr-cvs1:/tmp/cvs-serv15440/scripts

Modified Files:
	alsa-lib alsa-utils cd_cleanup lm_sensors util-linux 
Added Files:
	loop-AES 
Log Message:
loop-aes and bugfixes

--- NEW FILE: loop-AES ---
#!/bin/bash
# LOOP-AES by Diego Torres <rap...@co...>

# you need the next line, otherwise script won't be executed !!!
# DL-build-system v3

### BEGIN INIT INFO
# Provides:       loop-AES
# Required-Start: $basebuildtools $libs linux
# Required-Stop:
# Default-Start:  1 2
# Default-Stop:
# Description:    description
### END INIT INFO

# get the directoryname of the script
MYDIR=${0%/*}

# source functions and config
source $MYDIR/settings
source $MYDIR/functions

MYNAME=LOOP-AES

case $1 in
    build )
        ;;

    install )
	make LINUX_SOURCE=$KERNELDIR INSTALL_MOD_PATH=$CDDIR
	cp -dpR $CDDIR/lib/modules/$KERNELVERSION/block $WORKDIR/modules.initrd/lib/modules/$KERNELVERSION/kernel/drivers/ || exit 1
    	;;

    * )
        echo "ERROR ($0)"
        echo "please add parameter so I know what to do"
        exit 1
        ;;
esac

Index: alsa-lib
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/alsa-lib,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- alsa-lib	29 Nov 2003 15:36:06 -0000	1.4
+++ alsa-lib	2 Dec 2003 16:13:41 -0000	1.5
@@ -32,13 +32,9 @@
 	    strip_debug
             rm -rf $WORKDIR/tmp || exit 1
 	    make install DESTDIR=$WORKDIR/tmp || exit 1
-	    mkdir -p $CDDIR/
-	    copy_files $WORKDIR/tmp/usr/ $CDDIR/ || exit 1
-	    #rm -r $CDDIR/usr/share/alsa 
-	    copy_files $WORKDIR/tmp/usr/include $CDDIR/ || exit 1
+	    copy_files $WORKDIR/tmp/usr/ / || exit 1
 	fi
         ;;
-	
     install )
     	;;
 

Index: alsa-utils
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/alsa-utils,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- alsa-utils	24 Nov 2003 14:11:37 -0000	1.2
+++ alsa-utils	2 Dec 2003 16:13:41 -0000	1.3
@@ -27,7 +27,7 @@
 case $1 in
     build )
 	if [ "$CONFIG_ALSA" = "y" ]; then
-	    ./configure --prefix=/usr --with-alsa-prefix=$CDDIR/usr/lib/ --with-alsa-inc-prefix=$CDDIR/usr/include || exit 1
+	    ./configure --prefix=/usr --with-alsa-prefix=/usr/lib/ --with-alsa-inc-prefix=/usr/include || exit 1
 	    make $PMAKE all || exit 1
 	    strip_debug
 	fi
@@ -36,12 +36,14 @@
     install )
 	if [ "$CONFIG_ALSA" = "y" ]; then
             rm -rf $WORKDIR/tmp || exit 1
+	    mkdir $WORKDIR/tmp || exit 1
 	    make install DESTDIR=$WORKDIR/tmp || exit 1
 	    copy_files $WORKDIR/tmp/usr/sbin/ $CDDIR/ || exit 1
 	    copy_files $WORKDIR/tmp/usr/bin/ $CDDIR/ || exit 1
+	    copy_files /usr/share/alsa/ $CDDIR/usr/share/ || exit 1
 	    rm -rf $WORKDIR/tmp || exit 1
-	    rm -rf $CDDIR/usr/include/alsa
-	    rm -rf $CDDIR/usr/include/sys
+	    rm -rf /usr/include/alsa
+	    rm -rf /usr/share/alsa
 	fi
     	;;
 

Index: cd_cleanup
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/cd_cleanup,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- cd_cleanup	7 Nov 2003 00:13:45 -0000	1.5
+++ cd_cleanup	2 Dec 2003 16:13:41 -0000	1.6
@@ -27,7 +27,7 @@
 case $1 in
 	install )
 		rm $CDDIR/usr/lib/*a
-		rm -rf $CDDIR/usr/include/*
+#		rm -rf $CDDIR/usr/include/*
 		pushd $CDDIR/usr/bin > /dev/null; strip_debug ; popd > /dev/null
 		pushd $CDDIR/bin > /dev/null; strip_debug ; popd > /dev/null
 		pushd $CDDIR/sbin > /dev/null; strip_debug ; popd > /dev/null
@@ -40,6 +40,7 @@
                     rm -rf $CDDIR/usr/share/man/* || exit 1
                     rm -rf $CDDIR/usr/share/doc/* || exit 1
             	    rm -rf $CDDIR/usr/share/info/* || exit 1
+		    rm -rf $CDDIR/usr/share/samba/swat/* || exit 1
                 fi
 		;;
 

Index: lm_sensors
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/lm_sensors,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- lm_sensors	28 Nov 2003 00:02:46 -0000	1.7
+++ lm_sensors	2 Dec 2003 16:13:41 -0000	1.8
@@ -24,6 +24,8 @@
 source $MYDIR/settings
 source $MYDIR/functions
 
+MYNAME=LM_SENSORS
+
 KERNELDIR=$(find_src_dir linux)
 
 case $1 in

Index: util-linux
===================================================================
RCS file: /cvsroot/devil-linux/build/scripts/util-linux,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- util-linux	8 Nov 2003 21:04:23 -0000	1.13
+++ util-linux	2 Dec 2003 16:13:41 -0000	1.14
@@ -10,7 +10,7 @@
 
 ### BEGIN INIT INFO
 # Provides:       util-linux
-# Required-Start: $basebuildtools $libs
+# Required-Start: $basebuildtools $libs loop-AES
 # Required-Stop:
 # Default-Start:  1 2
 # Default-Stop:
@@ -26,6 +26,8 @@
 
 case $1 in
     build )
+		bzip2 -d $SRCDIR/util-linux-2.12.diff.bz2 2> /dev/null
+		patch -p1 < $SRCDIR/util-linux-2.12.diff
 		./configure || exit 1
 		replace_str defines.h "#define ENABLE_NLS" ""
 		#make $PMAKE HAVE_SLN=yes ADD_RAW=yes DISABLE_NLS=yes -C lib || exit 1