Menu
▾
▴
[Devil-linux-commit] build/scripts libevent, NONE, 1.1 libnfsidmap, NONE, 1.1 prepare, 1.66, 1.67 nfs-utils, 1.3, 1.4 squid, 1.26, 1.27 ucarp, 1.2, 1.3 unzip, 1.7, 1.8 quota-tools, 1.6, 1.7
|
From: Serge L. <sma...@us...> - 2007-08-31 08:28:38
|
Update of /cvsroot/devil-linux/build/scripts In directory sc8-pr-cvs12.sourceforge.net:/tmp/cvs-serv30490/d Modified Files: prepare nfs-utils squid ucarp unzip quota-tools Added Files: libevent libnfsidmap Log Message: - added nfsv4 - updated ucarp to 1.3 - removed duplicate from quota-tools Index: unzip =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/unzip,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- unzip 1 Apr 2007 20:20:29 -0000 1.7 +++ unzip 31 Aug 2007 08:28:24 -0000 1.8 @@ -32,7 +32,7 @@ install ) if [ "$CONFIG_UNZIP" = "y" ]; then - make -f unix/Makefile install prefix=$CDDIR/usr MANDIR=$CDDIR/usr/share/man || exit 1 + make -f unix/Makefile install prefix=$CDDIR/usr MANDIR=$CDDIR/usr/share/man/man1 || exit 1 fi ;; Index: prepare =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/prepare,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- prepare 6 Jul 2007 05:22:18 -0000 1.66 +++ prepare 31 Aug 2007 08:28:24 -0000 1.67 @@ -67,10 +67,14 @@ if [ "$CONFIG_NFS" == "y" ]; then cat $KERNEL_CONFIG_DIR/config_linux.nfs >> $KERNELDIR/.config || exit 1 + else + echo "CONFIG_NFS=n" >> $KERNELDIR/.config || exit 1 fi if [ "$CONFIG_NFSD" == "y" ]; then cat $KERNEL_CONFIG_DIR/config_linux.nfsd >> $KERNELDIR/.config || exit 1 + else + echo "CONFIG_NFSD=n" >> $KERNELDIR/.config || exit 1 fi if [ "$CONFIG_LINUX_SYSRQ" == "y" ]; then @@ -97,6 +101,15 @@ echo applying patch: $PATCH patch -p1 -i $PATCH || exit 1 done + set_kernel_option CONFIG_IP_NF_TARGET_IMQ m + set_kernel_option CONFIG_IP6_NF_TARGET_IMQ m + set_kernel_option CONFIG_IMQ m + set_kernel_option CONFIG_IMQ_BEHAVIOR_AA n + set_kernel_option CONFIG_IMQ_BEHAVIOR_AB n + set_kernel_option CONFIG_IMQ_BEHAVIOR_BA y + set_kernel_option CONFIG_IMQ_BEHAVIOR_BB n + set_kernel_option CONFIG_IMQ_NUM_DEVS 2 + fi if [ "$CONFIG_PAX" == "y" ]; then @@ -137,6 +150,8 @@ set_all_kernel_options drivers/i2c make oldconfig || exit 1 +# ( yes "" | make oldconfig ) || exit 1 + popd > /dev/null Index: squid =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/squid,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- squid 23 Jul 2007 11:03:08 -0000 1.26 +++ squid 31 Aug 2007 08:28:24 -0000 1.27 @@ -63,8 +63,10 @@ make install DESTDIR=$TMPDIR || exit 1 copy_docs $TMPDIR rm $TMPDIR/etc/*.default || exit 1 - # We use ntlm authenticator (ntlm_auth) from Samba-3.X - rm $TMPDIR/usr/sbin/ntlm_auth || exit 1 + if [ "$CONFIG_SAMBA" = "y" ]; then + # We use ntlm authenticator (ntlm_auth) from Samba-3.X + rm $TMPDIR/usr/sbin/ntlm_auth || exit 1 + fi cp $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 rm -rf $TMPDIR/etc || exit 1 cp -dpR $TMPDIR/* $CDDIR/ || exit 1 --- NEW FILE: libnfsidmap --- #!/bin/bash # $Source: /cvsroot/devil-linux/build/scripts/libnfsidmap,v $ # $Revision: 1.1 $ # $Date: 2007/08/31 08:28:24 $ # # http://www.devil-linux.org # you need the next line, otherwise script won't be executed !!! # DL-build-system v3 ### BEGIN INIT INFO # Provides: libnfsidmap # Required-Start: $basebuildtools glibc # Required-Stop: # Default-Start: 1 # Default-Stop: # Description: description ### END INIT INFO # get the directoryname of the script MYDIR=${0%/*} # source functions and config source $MYDIR/settings case $1 in build ) ./configure --prefix=/usr || exit 1 make $PMAKE all || exit 1 strip_debug # install it in local system, because other programs could need it make install ;; * ) echo "ERROR ($0)" echo "please add parameter so I know what to do" exit 1 ;; esac Index: nfs-utils =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/nfs-utils,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- nfs-utils 13 Dec 2005 10:12:15 -0000 1.3 +++ nfs-utils 31 Aug 2007 08:28:24 -0000 1.4 @@ -26,43 +26,32 @@ case $1 in build ) if [ "$CONFIG_NFSD" = "y" ]; then - ./configure --prefix=$WORKDIR/tmp/usr --disable-nfsv4 --disable-gss || exit 1 + ./configure --prefix=/usr --disable-gss || exit 1 make || exit 1 fi ;; install ) if [ "$CONFIG_NFSD" = "y" ]; then - rm -rf $WORKDIR/tmp || exit 1 - mkdir -p $WORKDIR/tmp || exit 1 - make install || exit 1 - if [ ! -d $CDDIR/var/lib/nfs ]; then mkdir -p $CDDIR/var/lib/nfs || exit 1 ; fi - touch $CDDIR/var/lib/nfs/xtab; chmod 644 $CDDIR/var/lib/nfs/xtab - touch $CDDIR/var/lib/nfs/etab; chmod 644 $CDDIR/var/lib/nfs/etab - touch $CDDIR/var/lib/nfs/rmtab; chmod 644 $CDDIR/var/lib/nfs/rmtab - mkdir -p $CDDIR/var/lib/nfs/sm $CDDIR/var/lib/nfs/sm.bak - touch $CDDIR/var/lib/nfs/state - chmod go-rwx $CDDIR/var/lib/nfs/sm $CDDIR/var/lib/nfs/sm.bak $CDDIR/var/lib/nfs/state - chown nobody $CDDIR/var/lib/nfs/sm $CDDIR/var/lib/nfs/sm.bak $CDDIR/var/lib/nfs/state - - copy_docs $WORKDIR/tmp - cp -dpR $WORKDIR/tmp/* $CDDIR || exit 1 - rm -rf $WORKDIR/tmp || exit 1 - cp -p /etc/rpc $ETCDIR/etc/ || exit 1 - cat > $ETCDIR/etc/sysconfig/nfs-server <<-EOF + rm -rf $TMPDIR || exit 1 + mkdir -p $TMPDIR || exit 1 + make install DESTDIR=$CDDIR || exit 1 + rm -rf $TMPDIR || exit 1 + cp -p /etc/rpc $ETCDIR/etc/ || exit 1 + cat > $ETCDIR/etc/sysconfig/nfs-server <<-EOF PORT="2049" PROCESSES="8" QUOTAS="no" KILLDELAY="10" -EOF - touch $ETCDIR/etc/exports || exit 1 + EOF + touch $ETCDIR/etc/exports || exit 1 - cp $MYDIR/scripts/nfsd $ETCDIR/etc/init.d || exit 1 + cp $MYDIR/scripts/nfsd $ETCDIR/etc/init.d || exit 1 - echo "# Start NFS server?" >> $CONFIGFILE - echo "START_NFSD=no" >> $CONFIGFILE - echo >> $CONFIGFILE - echo "HELP_NFSD=\"NFSD is Network File System v3 Server" + echo "# Start NFS server?" >> $CONFIGFILE + echo "START_NFSD=no" >> $CONFIGFILE + echo >> $CONFIGFILE + echo "HELP_NFSD=\"NFSD is Network File System v4(3,2) Server" fi ;; Index: quota-tools =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/quota-tools,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- quota-tools 22 Dec 2005 08:23:55 -0000 1.6 +++ quota-tools 31 Aug 2007 08:28:24 -0000 1.7 @@ -40,6 +40,8 @@ make install ROOTDIR=$TMPDIR || exit 1 rm -rf $TMPDIR/share || exit 1 rm -rf $TMPDIR/include || exit 1 + #we will use rpc.rquotad from nfs-utils + rm -f $TMPDIR/sbin/rpc.rquotad || exit 1 copy_docs $TMPDIR cp -dpR $TMPDIR/etc/* $ETCDIR/etc/ || exit 1 rm -rf $TMPDIR/etc || exit 1 Index: ucarp =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/ucarp,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- ucarp 3 Oct 2005 13:25:42 -0000 1.2 +++ ucarp 31 Aug 2007 08:28:24 -0000 1.3 @@ -26,14 +26,15 @@ case $1 in build ) if [ "$CONFIG_UCARP" = "y" ]; then - ./configure || exit 1 + ./configure --prefix=/usr --disable-nls || exit 1 make || exit 1 fi ;; install ) if [ "$CONFIG_UCARP" = "y" ]; then - cp src/ucarp $CDDIR/usr/bin/ || exit 1 + make install all DESTDIR=$CDDIR/ || exit 1 + mkdir $ETCDIR/etc/ucarp && cp examples/linux/*.sh $ETCDIR/etc/ucarp/ || exit 1 fi ;; * ) --- NEW FILE: libevent --- #!/bin/bash # $Source: /cvsroot/devil-linux/build/scripts/libevent,v $ # $Revision: 1.1 $ # $Date: 2007/08/31 08:28:24 $ # # http://www.devil-linux.org # you need the next line, otherwise script won't be executed !!! # DL-build-system v3 ### BEGIN INIT INFO # Provides: libevent # Required-Start: $basebuildtools glibc # Required-Stop: # Default-Start: 1 # Default-Stop: # Description: description ### END INIT INFO # get the directoryname of the script MYDIR=${0%/*} # source functions and config source $MYDIR/settings case $1 in build ) ./configure --prefix=/usr || exit 1 make $PMAKE all || exit 1 strip_debug # install it in local system, because other programs could need it make install ;; * ) echo "ERROR ($0)" echo "please add parameter so I know what to do" exit 1 ;; esac |
