Menu
▾
▴
[Devil-linux-commit] build/scripts cluster-glue, NONE, 1.1 libnftnl, NONE, 1.1 heartbeat, 1.27, 1.28 iptables, 1.43, 1.44 kmod, 1.7, 1.8
|
From: Heiko Z. <smi...@us...> - 2015-12-12 21:52:02
|
Update of /cvsroot/devil-linux/build/scripts In directory sfp-cvs-1.v30.ch3.sourceforge.com:/tmp/cvs-serv15444/scripts Modified Files: heartbeat iptables kmod Added Files: cluster-glue libnftnl Log Message: iptables needs kmod binaries in /sbin updating heartbeat to the latest version and adding required dependencies Index: iptables =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/iptables,v retrieving revision 1.43 retrieving revision 1.44 diff -u -d -r1.43 -r1.44 --- iptables 12 Dec 2015 14:48:13 -0000 1.43 +++ iptables 12 Dec 2015 21:52:00 -0000 1.44 @@ -19,7 +19,8 @@ build ) FLAGS="-O2" - ./configure --prefix=/usr --with-ksource=$KERNELDIR --enable-devel || exit 1 + ./configure --prefix=/usr --with-ksource=$KERNELDIR --enable-devel --enable-libipq --enable-nfsynproxy \ + --localstatedir=/var --sysconfdir=/etc || exit 1 #replace_str Makefile "/usr/local" "/usr" # seems like iptables comple is unhappy in some circumstances, let's see if that makes it better make clean @@ -36,10 +37,11 @@ ln -sf $KERNELDIR /lib/modules/$KERNELVERSION/source rm -rf $TMPDIR || exit 1 - mkdir -p $TMPDIR/sbin || exit 1 + mkdir -p $TMPDIR/etc || exit 1 mkdir -p $TMPDIR/usr/share/man/man{1,2,5,8} || exit 1 make install KERNEL_DIR=$KERNELDIR DESTDIR=$TMPDIR || exit 1 copy_docs $TMPDIR + copy_files $TMPDIR/etc $ETCDIR/etc || exit 1 copy_files $TMPDIR/usr/bin $CDDIR/usr || exit 1 copy_files $TMPDIR/usr/sbin $CDDIR/usr || exit 1 copy_files $TMPDIR/usr/lib $CDDIR/usr || exit 1 --- NEW FILE: libnftnl --- #!/bin/bash # $Source: /cvsroot/devil-linux/build/scripts/libnftnl,v $ # $Revision: 1.1 $ # $Date: 2015/12/12 21:52:00 $ # # http://www.devil-linux.org # you need the next line, otherwise script won't be executed !!! # DL-build-system v3 # 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 # 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: heartbeat =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/heartbeat,v retrieving revision 1.27 retrieving revision 1.28 diff -u -d -r1.27 -r1.28 --- heartbeat 6 Oct 2015 00:59:16 -0000 1.27 +++ heartbeat 12 Dec 2015 21:52:00 -0000 1.28 @@ -20,23 +20,23 @@ build ) if [ "$CONFIG_HEARTBEAT" = "y" ]; then cd $(find_src_dir Heartbeat) || exit 1 - replace_str "include/clplumbing/cl_uuid.h" "glib/gtypes.h" "glib.h" - patch_from_file 1 $DL_DIR/src/heartbeat-poderror_ldirectord.patch.xz || exit 1 if [ "$CONFIG_PYTHON" = "y" ]; then if [ "$CONFIG_NET_SNMP" != "y" ]; then SNMP="--disable-snmp" fi - patch_from_file 1 $DL_DIR/src/heartbeat-2.1.4_install_fix.patch.xz || exit 1 - - #CFLAGS="-D_FORTIFY_SOURCE=0" - #CC="gcc -nopie -fno-stack-protector" - #CFLAGS="$CFLAGS -fno-stack-protector -D_FORTIFY_SOURCE=0" ./ConfigureMe configure --prefix=/usr --disable-quorumd \ + --disable-doc --with-group-id=50 --with-ccmuser-id=50 \ --localstatedir=/var --sysconfdir=/etc ${SNMP} --enable-fatal-warnings=no || exit 1 - #CFLAGS="$CFLAGS -fno-stack-protector -D_FORTIFY_SOURCE=0" ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc ${SNMP} || exit 1 - make $PMAKE all || exit 1 + # disable the building of the documentation, since we don't have internet access + #replace_str doc/Makefile /usr/bin/xsltproc /bin/true + rm doc/Makefile + echo "all:" > doc/Makefile + echo "install:" >> doc/Makefile + echo "clean:" >> doc/Makefile + + make $PMAKE all || exit 1 fi fi @@ -53,36 +53,23 @@ copy_docs $TMPDIR rm -rf $TMPDIR/usr/include || exit 1 + rm -rf $TMPDIR/etc/init.d || exit 1 find $TMPDIR/usr/lib/ -name \*a | xargs rm || exit 1 copy_files $TMPDIR/usr $CDDIR/ || exit 1 copy_files $TMPDIR/var $CDDIR/ || exit 1 copy_files $TMPDIR/etc $ETCDIR/ || exit 1 - cp -dpv ldirectord/ldirectord.cf $ETCDIR/etc/ha.d/ || exit 1 - - useradd -s /bin/false -u 50 hacluster - groupadd -f -g 50 haclient rm -rf $TMPDIR || exit 1 cp -dp $MYDIR/scripts/heartbeat $ETCDIR/etc/init.d/ || exit 1 - cp -dp $MYDIR/scripts/ldirectord $ETCDIR/etc/init.d/ || exit 1 echo "# Start $MYNAME?" >> $CONFIGFILE echo "START_$MYNAME=no" >> $CONFIGFILE echo >> $CONFIGFILE echo "HELP_$MYNAME=\"$MYNAME is to control failover servers\"" >> $SOFTWAREHELP - - MYNAME=LDIRECTORD - echo "# Start $MYNAME?" >> $CONFIGFILE - echo "START_$MYNAME=no" >> $CONFIGFILE - echo >> $CONFIGFILE - echo "HELP_$MYNAME=\"$MYNAME is to monitor remote servers (works with heartbeat)\"" >> $SOFTWAREHELP - echo "/var/lib/heartbeat/crm hacluster.haclient 700" >> $ETCDIR/etc/sysconfig/permissions.base - echo "/var/lib/heartbeat/pengine hacluster.haclient 770" >> $ETCDIR/etc/sysconfig/permissions.base - echo "/var/lib/heartbeat/cores/hacluster hacluster.haclient 700" >> $ETCDIR/etc/sysconfig/permissions.base - echo "/var/run/heartbeat/crm hacluster.haclient 700" >> $ETCDIR/etc/sysconfig/permissions.base - echo "/var/run/heartbeat/ccm hacluster.haclient 700" >> $ETCDIR/etc/sysconfig/permissions.base + echo "/var/lib/heartbeat hacluster.hacluster 700" >> $ETCDIR/etc/sysconfig/permissions.base + echo "/var/run/heartbeat hacluster.hacluster 700" >> $ETCDIR/etc/sysconfig/permissions.base fi --- NEW FILE: cluster-glue --- #!/bin/bash # $Source: /cvsroot/devil-linux/build/scripts/cluster-glue,v $ # $Revision: 1.1 $ # $Date: 2015/12/12 21:51:57 $ # # http://www.devil-linux.org # you need the next line, otherwise script won't be executed !!! # DL-build-system v3 # get the directoryname of the script MYDIR=${0%/*} # source functions and config source $MYDIR/settings MYNAME=HEARTBEAT case $1 in build ) if [ "$CONFIG_HEARTBEAT" = "y" ]; then cd $(find_src_dir Reusable-Cluster-Components-glue) || exit 1 ./autogen.sh || exit 1 ./configure --prefix=/usr --localstatedir=/var --sysconfdir=/etc --enable-libnet --disable-doc || exit 1 make $PMAKE all || exit 1 make install || exit 1 fi ;; install ) if [ "$CONFIG_HEARTBEAT" = "y" ]; then cd $(find_src_dir Reusable-Cluster-Components-glue) || exit 1 rm -rf $TMPDIR || exit 1 mkdir -p $TMPDIR || exit 1 groupadd -f -g 50 hacluster useradd -s /bin/false -u 50 -g hacluster hacluster make install DESTDIR=$TMPDIR || exit 1 rm -rf $TMPDIR/usr/share/doc || exit 1 rm -rf $TMPDIR/usr/share/cluster-glue/lrmtest || exit 1 rm -rf $TMPDIR/usr/include || exit 1 copy_docs $TMPDIR find $TMPDIR/usr -name \*a | xargs rm || exit 1 copy_files $TMPDIR/usr $CDDIR/usr || exit 1 copy_files $TMPDIR/var $CDDIR/var || exit 1 cp -v logd/logd.cf $ETCDIR/etc/ || exit 1 rm -rf $TMPDIR || exit 1 cp -dp $MYDIR/scripts/logd $ETCDIR/etc/init.d/ || exit 1 echo "# Start LOGD?" >> $CONFIGFILE echo "START_LOGD=no" >> $CONFIGFILE echo >> $CONFIGFILE fi ;; * ) echo "ERROR ($0)" echo "please add parameter so I know what to do" exit 1 ;; esac Index: kmod =================================================================== RCS file: /cvsroot/devil-linux/build/scripts/kmod,v retrieving revision 1.7 retrieving revision 1.8 diff -u -d -r1.7 -r1.8 --- kmod 4 Dec 2015 01:13:35 -0000 1.7 +++ kmod 12 Dec 2015 21:52:00 -0000 1.8 @@ -16,7 +16,7 @@ case $1 in build ) - ./configure --prefix=/usr -bindir=/bin --sysconfdir=/etc --with-rootlibdir=/lib --with-xz --with-zlib || exit 1 + ./configure --prefix=/usr -bindir=/sbin --sysconfdir=/etc --with-rootlibdir=/lib --with-xz --with-zlib || exit 1 replace_str Makefile "sed -E" "sed -e" # don't do parallel builds make all || exit 1 @@ -27,7 +27,7 @@ do test -f /sbin/${FILE} && rm -fv /sbin/${FILE} test -f /bin/${FILE} && rm -fv /bin/${FILE} - ln -sf kmod /bin/${FILE} || exit 1 + ln -sf kmod /sbin/${FILE} || exit 1 done #fix the symlink @@ -40,14 +40,14 @@ make install DESTDIR=$TMPDIR || exit 1 for FILE in depmod insmod lsmod modinfo modprobe rmmod do - ln -sf kmod $TMPDIR/bin/${FILE} || exit 1 + ln -sf kmod $TMPDIR/sbin/${FILE} || exit 1 done rm -rf $TMPDIR/usr/include || exit 1 rm -rf $TMPDIR/usr/lib/*a || exit 1 copy_docs $TMPDIR - copy_files $TMPDIR/bin $CDDIR || exit 1 + copy_files $TMPDIR/sbin $CDDIR || exit 1 copy_files $TMPDIR/usr $CDDIR || exit 1 rm -rf $TMPDIR || exit 1 ;; |
