Changeset 3239 for branches/3.2


Ignore:
Timestamp:
Jan 5, 2014, 1:35:28 PM (6 years ago)
Author:
bruno
Message:
  • Fix build process for perl modules deps (creation of the perl-scripts file was incorrect with build dir in it, and overwritten)
  • Fix pod2man issue on mondorescue.conf by adding pod content in it which is then processed in the Makefile.PL
Location:
branches/3.2
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/3.2/MondoRescue/Makefile.PL

    r3226 r3239  
    107107        $text .= "\t".'@echo PBPKG PBVER-rPBREV will be installed under $(DESTDIR)'."\n";
    108108        $text .= "\t".'install -m 755 -d $(DESTDIR)'."$confdir/PBPROJ".' $(DESTDIR)'."$cachedir/PBPROJ".' $(DESTDIR)'."$sharedir/PBPROJ\n";
    109         $text .= "\t".'cp etc/PBPROJ.conf $(DESTDIR)'."$confdir/PBPROJ/PBPROJ.conf.dist ; install -m 755 -d ".' $(DESTDIR)'."$mandir/man5 ; pod2man etc/PBPROJ.conf > ".'$(DESTDIR)'."$mandir/man5/PBPROJ.conf.5\n";
     109        $text .= "\t".'cp etc/PBPROJ.conf $(DESTDIR)'."$confdir/PBPROJ/PBPROJ.conf.dist ; install -m 755 -d ".' $(DESTDIR)'."$mandir/man5 ; perl -p -e 's/^# //; s/^#//' etc/PBPROJ.conf | pod2man --name=PBPROJ.conf --release=PBVER-rPBREV --section=5 > ".'$(DESTDIR)'."$mandir/man5/PBPROJ.conf.5\n";
    110110        $text .= "\t".'md5sum $(DESTDIR)'."$confdir/PBPROJ/PBPROJ.conf.dist > ".'$(DESTDIR)'."$confdir/PBPROJ/PBPROJ.conf.dist.md5\n";
    111111        $text .= "\t".'if [ ! -f "'.'$(DESTDIR)'."$confdir/PBPROJ/PBPROJ.conf".'" ]; then echo "# Local configuration file for Mondorescue" > $(DESTDIR)'."$confdir/PBPROJ/PBPROJ.conf".'; echo "# Adapt content taken from the distribution conf file PBPROJ.conf.dist which should remain untouched" >> $(DESTDIR)'."$confdir/PBPROJ/PBPROJ.conf ; fi\n";
  • branches/3.2/MondoRescue/etc/mondorescue.conf

    r3219 r3239  
     1# $Id$
     2#
     3# =pod
     4#
     5# =head1 NAME
     6#
    17# MondoRescue configuration file
    28#
    3 # $Id$
     9# =head1 DESCRIPTION
    410#
    5 # We tried to give sensible defaults in this file.
    6 # It will always be loaded by the tools before your other configuration files.
     11# The mondorescue.conf contains the various parameters that can be adapted for MondoRescue usage
     12#
     13# =head1 SYNOPSIS
     14#
     15# We tried to give sensible defaults in this file (mondorescue.conf.dist).
     16# It will always be loaded by the tools before your own configuration files (mondorescue.conf).
     17#
    718# DO NOT CHANGE THAT FILE IN ANYWAY AS ITS MD5 SUM IS USED AS A CHECK !!
    819# Anyway changing some values in your own configuration file may render
    920# MondoRescue tools instable or cause failures. Use with care.
     21#
     22# =head1 CONFIGURATION PARAMETERS
     23#
    1024
     25# =over 4
     26
     27# =item B<mr_tmp_dir default>
     28#
    1129# Temporary directory
     30#
    1231# Under it a temporary directory will be created to host all
    13 # temporary files for mrmini. That subdirectory is erased at the end of mrmini
     32# temporary files for MondoRescue tools. That subdirectory is erased at the end of execution
    1433#
     34#  Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
     35#  Value: Full path of the temporary directory
     36#  Example:
    1537mr_tmp_dir default = /tmp
    1638
     39# =item B<mr_cmdline>
    1740#
    18 # Location of some configuration files
     41# Location of the file containing the boot command line for the OS
    1942#
    20 # depends on genre
     43#  Key: OS (could be from the most generic up to the most specific from ostype, osfamily, os, os-ver, os-ver-arch). The family name is generaly used here.
     44#  Value: comma separated list of URLs that point to repository files, or packages to install. The values may not include substitutions.
     45#  Example:
    2146mr_cmdline linux = /proc/cmdline
    2247mr_cmdline bsd = /tmp/cmdline
    2348# TBC
    2449mr_cmdline solaris = /proc/cmdline
     50#
     51
     52# =item B<TO BE DOCUMENTED LATER>
    2553#
    2654mr_etc_fstab default = /etc/fstab
     
    6492mr_cmd_lvm default = /usr/sbin/lvm
    6593mr_path_lvm default = /usr/sbin/
     94
     95# =back
     96
     97# =head1 COPYRIGHT
     98
     99# (c) B. Cornec 2007-2014
     100#
     101# Provided under the Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0) Creative Common License
     102
     103# =cut
  • branches/3.2/mindi/install.sh

    r3220 r3239  
    5555fi
    5656if [ _"$SBINDIR" = _"" ]; then
     57    subsbin=$local/sbin
    5758    SBINDIR=$local/sbin
    5859else
     60    subsbin=$SBINDIR
    5961    SBINDIR=${HEAD}$SBINDIR
    6062fi
     
    98100    install -m 644 $s.8 $MANDIR
    99101    # Generate the list of perl modules needed at restore time for mindi
    100     cat > $conf/perl-scripts << EOF
    101 $SBINDIR/$s
     102    cat >> $conf/perl-scripts << EOF
     103$subsbin/$s
    102104EOF
    103105done
  • branches/3.2/mindi/mindi

    r3231 r3239  
    26412641
    26422642    # Management of perl scripts delivered needed at restore time
    2643     mindi-get-perl-modules `cat $MINDI_CONF/perl-scripts` > $MINDI_TMP/perl.lis
     2643    mindi-get-perl-modules `cat $MINDI_CONF/perl-scripts` /usr/bin/mr-* > $MINDI_TMP/perl.lis
    26442644    tar cf - `cat $MINDI_TMP/perl.lis` 2>> $MINDI_TMP/$$.log | tar xf - || LogIt "ERROR: Problem in perl scripts analysis" $MINDI_TMP/$$.log
    26452645
Note: See TracChangeset for help on using the changeset viewer.