Changeset 1682


Ignore:
Timestamp:
Oct 17, 2007, 1:40:52 PM (12 years ago)
Author:
bruno
Message:

Remove DOCDIR usage in mindi + various build fixes

Location:
branches/2.2.5
Files:
5 edited
1 copied

Legend:

Unmodified
Added
Removed
  • branches/2.2.5/mindi/install.sh

    r1620 r1682  
    6969
    7070echo "Creating target directories ..."
    71 install -m 755 -d $conf $locallib/mindi $MANDIR $local/sbin $DOCDIR $CACHEDIR
     71install -m 755 -d $conf $locallib/mindi $MANDIR $local/sbin $CACHEDIR # $DOCDIR
    7272
    7373echo "Copying files ..."
     
    8989
    9090install -m 644 mindi.8 $MANDIR
    91 install -m 644 ChangeLog COPYING README README.busybox README.ia64 README.pxe TODO INSTALL svn.log $DOCDIR
     91#install -m 644 ChangeLog COPYING README README.busybox README.ia64 README.pxe TODO INSTALL svn.log $DOCDIR
    9292
    9393if [ "_$PREFIX" = "_" ] && [ ! -f $locallib/mindi/rootfs/bin/busybox ]; then
     
    116116
    117117if [ "$PKGBUILDMINDI" != "true" ]; then
    118     chown -R root:root $locallib/mindi $conf $DOCDIR
     118    chown -R root:root $locallib/mindi $conf # $DOCDIR
    119119    chown root:root $local/sbin/mindi $MANDIR/mindi.8 $locallib/mindi/analyze-my-lvm $local/sbin/parted2fdisk.pl
    120120    if [ "$ARCH" = "ia64" ] ; then
     
    124124
    125125# Special case for SuSE family where doc is put elsewhere in the RPM
    126 if [ -e /etc/SuSE-release ]; then
    127     rm -rf $DOCDIR
    128 fi
     126# if [ -e /etc/SuSE-release ]; then
     127    # rm -rf $DOCDIR
     128# fi
    129129
    130130# Special case for Debian family where doc is put elsewhere in the DEB
    131 if [ -e /etc/debian_version ]; then
    132     rm -rf $DOCDIR
    133 fi
     131# if [ -e /etc/debian_version ]; then
     132    # rm -rf $DOCDIR
     133# fi
    134134
    135135exit 0
  • branches/2.2.5/pbconf/mindi/rpm/mindi.spec

    r1677 r1682  
    3737export CONFDIR=%{_sysconfdir}
    3838export MANDIR=%{_mandir}
    39 export DOCDIR=%{_docdir}
     39#export DOCDIR=%{_docdir}
    4040export LIBDIR=%{_libdir}
    4141export CACHEDIR=%{_var}/cache/%{name}
  • branches/2.2.5/pbconf/mondo/du/rules

    r1674 r1682  
    9191    mkdir -p debian/doc-temp
    9292    mkdir -p $(CURDIR)/debian/$(PACKAGE_NAME)/var/cache/mondo
    93     cp -a docs/en/mondorescue-howto debian/doc-temp/html
     93    #cp -a docs/en/mondorescue-howto debian/doc-temp/html
    9494
    9595    dh_install -s
  • branches/2.2.5/tools/qemu-vm.txt

    r1631 r1682  
    22qemu-img create -f qcow image.qemu 3G
    33qemu -cdrom /dev/hdc -m 256 -boot d image.qemu
     4
     5# use lilo on recent x86_86 distros as grub doesn't work.
     6# on suse make yast2 use the right repositories (Sw/SWrepositories/ remove DVD)
     7# # verify root alogin on sshd conf
     8grep Root /etc/ssh/sshd_config
     9
     10# On Ubuntu install openssh-server
     11apt-get install openssh-server
     12
     13# At install on 64 distro use lilo
     14# on Ubuntu change tty, kill grub install
     15# chroot /target remount cdrom
     16# install lilo instead
    417
    518# Recent SUSE acpi=off
     
    720# RPM based : urpmi, yum install, yast2
    821# Mandriva
    9 urpmi neon newt-devel slang-devel glibc-static-devel autoconf automake libtool gcc rpm-build wget gcc-c++ docbook-utils-pdf ImageMagick man patch mindi mondo mkisofs cdrecord pb
    10 
    11 #Fedora
    12 yum install neon newt-devel slang-devel autoconf automake libtool gcc rpm-build wget vim gcc-c++ docbook-utils-pdf ImageMagick man patch cdrecord mkisofs pb
    13 
    1422
    1523# gentoo
     
    2331apt-get install autoconf automake libtool g++ wget patch mondo groff imagemagick docbook-utils docbook2x docbook-to-man openssh-server dpkg-dev debian-builder dh-make fakeroot libnewt-dev libncurses5-dev pb
    2432
    25 # Apply AppConfig path
    26 patch -p0 < pb-doc/App*
    27 
    2833#Changing CD during install:
    2934Ctrl-Alt-2
     
    3540
    3641#Clé SSH:
     42mkdir .ssh
     43chmod 700 .ssh
    3744scp bruno@10.0.2.2:.ssh/id_dsa.pub /root/.ssh/authorized_keys
    3845chmod 600 /root/.ssh/authorized_keys
    39 
    40 #Créer compte pb
    41 useradd pb
    42 
    43 # No passwd for pb
    44 perl -pi -e 's/^pb:\!\!:/pb:*:/' /etc/shadow
    45 # Adapt sudoers
    46 echo "pb   ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers
    47 # poweroff only
    48 
    49 su - pb
    50 mkdir ~/.ssh
    51 chmod 700 ~/.ssh
    52 scp -p victoria2.home.musique-ancienne.org:.ssh/id_dsa.pub ~/.ssh/authorized_keys
    53 # Passwd asked above
    54 chmod 600 ~/.ssh/authorized_keys
    5546
    5647#rebuild paquets necessaires mondo:
     
    6354chmod 644 build/RPMS/i386/*
    6455scp -p build/RPMS/i?86/afio-[0-9]* build/RPMS/i?86/buffer-[0-9]* www.mondorescue.org:/mondo/ftp/rhel/3/
    65 
    66 # Exchange host keys with www.mondorescue.org
    67 ssh www.mondorescue.org ls
    68 
    6956
    7057root:
  • branches/2.2.5/tools/setupqemu

    r1679 r1682  
    33(
    44if [ _"$1" == _"" ]; then
    5     echo "Syntax: setupqemu VM"
     5    echo "Syntax: setupqemu VM|all"
    66    exit -1
    77fi
    88cat /users/bruno/pb/svn/devel/pb/contrib/pbsetupqemu /users/bruno/pb/svn/devel/pb/lib/ProjectBuilder/Distribution.pm > /tmp/pbscript
    9 for m in $*; do
    10     pb -r `pwd` -p mondorescue -m $m -a root -s /tmp/pbscript script2vm ; pb -p mondorescue -m $m build2vm
     9if [ _"$1" == "all" ]; then
     10    pb -r `pwd` -p mondorescue -a root -s /tmp/pbscript script2vm
    1111    ssh -p 2222 root@localhost halt
    1212    sleep 120
    13     ps auhxww | grep qemu | grep -Ev 'grep|setupqemu' | awk '{print $2}' | xargs kill -9
    14 done
     13    ps auhxww | grep qemu | grep -Ev 'grep|setupqemu' | awk '{print $2}' | xargs kill
     14else
     15    for m in $*; do
     16        pb -r `pwd` -p mondorescue -m $m -a root -s /tmp/pbscript script2vm ; pb -p mondorescue -m $m build2vm
     17        #ssh -p 2222 root@localhost halt
     18        #sleep 120
     19        #ps auhxww | grep qemu | grep -Ev 'grep|setupqemu' | awk '{print $2}' | xargs kill -9
     20    done
     21fi
    1522) 2>&1 | tee /tmp/setupqemu.log
  • branches/2.2.5/tools/updateqemu

    r1681 r1682  
    33(
    44if [ _"$1" == _"" ]; then
    5     echo "Syntax: setupqemu VM"
     5    echo "Syntax: updateqemu VM|all"
    66    exit -1
    77fi
    8 cat /users/bruno/pb/svn/devel/pb/contrib/pbsetupqemu /users/bruno/pb/svn/devel/pb/lib/ProjectBuilder/Distribution.pm > /tmp/pbscript
    9 for m in $*; do
    10     pb -r `pwd` -p mondorescue -m $m -a root -s /tmp/pbscript script2vm ; pb -p mondorescue -m $m build2vm
    11     ssh -p 2222 root@localhost halt
     8if [ _"$1" == _"all" ]; then
     9    opt="`grep vmlist  ~/.pbrc | grep mondorescue | cut -d= -f2 | sed 's/,/ /g'`"
     10    opt64="`echo $opt | sed 's/ /_64 /g'`"
     11    #opt="$opt $opt64"
     12    opt="$opt64"
     13else
     14    opt="`echo $* | sed 's/,/ /g'`"
     15fi
     16
     17export PBPROJ=pb
     18export PBROOT=/users/bruno/pb/svn/0.8.5
     19
     20for m in $opt; do
     21    cat /users/bruno/pb/svn/devel/pb/contrib/pbsetupqemu /users/bruno/pb/svn/devel/pb/lib/ProjectBuilder/Distribution.pm > /tmp/pbscript
     22    echo "Launching script on $m"
     23    pb -m $m -a root -s /tmp/pbscript script2vm
     24    pb -m $m build2vm
     25    echo "Halting $m"
     26    echo "/sbin/halt -p" > /tmp/pbscript
     27    pb -m $m -a root -s /tmp/pbscript script2vm
    1228    sleep 120
    13     ps auhxww | grep qemu | grep -Ev 'grep|setupqemu' | awk '{print $2}' | xargs kill -9
     29    job=`ps auhxww | grep qemu | grep -Ev 'grep|updateqemu' | awk '{print $2}'`
     30    if [ _"$job" != _"" ]; then
     31        echo "Really halting $m"
     32        kill $job
     33    fi
    1434done
    15 ) 2>&1 | tee /tmp/setupqemu.log
     35) 2>&1 | tee /tmp/updateqemu.log
Note: See TracChangeset for help on using the changeset viewer.