Changeset 916


Ignore:
Timestamp:
Nov 2, 2006, 7:47:32 PM (13 years ago)
Author:
bruno
Message:

Fixes to support CentOS build
Fixes for build errors reporetd by Andy Wright (mondo_at_eltofts.homelinux.com)

Location:
branches/stable
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mindi-busybox/distributions/rpm/mindi-busybox.spec

    r894 r916  
    1313REQ
    1414ExcludeArch:    ppc
    15 OBS
    1615
    1716%description
  • branches/stable/mindi/install.sh

    r911 r916  
    11#!/bin/bash
     2#
     3# $Id$
     4#
    25
    36if [ ! -f "mindi" ] ; then
     
    4851
    4952cp -af rootfs aux-tools $locallib/mindi
    50 chmod 755 $locallib/mindi/rootfs/bin/*
    5153chmod 755 $locallib/mindi/rootfs/sbin/*
    5254chmod 755 $locallib/mindi/aux-tools/sbin/*
  • branches/stable/mondo-doc/mondorescue-howto.sgml

    r915 r916  
    27582758<qandaentry>
    27592759<question>
    2760 <para>Q: How do i copy boot+data
    2761         disk images to physical floppy disks ?</para>
     2760<para id="copybootdatadisk">Q: How do i copy boot+data disk images to physical floppy disks ?</para>
    27622761</question>
    27632762<answer>
  • branches/stable/mondo/src/restore-scripts/Makefile.am

    r899 r916  
    1 SUBDIRS = src usr
     1SUBDIRS = mondo usr
    22
    33restoreetcdir       = $(pkgdatadir)/restore-scripts/etc
  • branches/stable/tools/distro-env

    r882 r916  
    2626        elif grep -q Fedora /etc/redhat-release ; then
    2727            export ddir="fedora"
     28            export dver=`awk '{print $4}' /etc/redhat-release`
     29        elif grep -q CentOS /etc/redhat-release ; then
     30            export ddir="centos"
    2831            export dver=`awk '{print $4}' /etc/redhat-release`
    2932        else
     
    8184    dtype="rpm"
    8285    suf=".${ddir}${dver}"
    83 elif [ $ddir = "fedora" -o $ddir = "redhat" -o $ddir = "rhel" ]; then
     86elif [ $ddir = "fedora" -o $ddir = "redhat" -o $ddir = "rhel" -o $ddir = "centos" ]; then
    8487    dfam="redhat"
    8588    dtype="rpm"
     
    8790    if [ $ddir = "fedora" ]; then
    8891        suf=".fc${dver1}"
     92    elif [ $ddir = "centos" ]; then
     93        suf=".centos${dver1}"
    8994    elif [ $ddir = "redhat" ]; then
    9095        suf=".rh${dver1}"
  • branches/stable/tools/livwww

    r874 r916  
    4848if [ $force -eq 1 ]; then
    4949    echo "Purging $LOCALDIR"
    50     rm -rf $LOCALDIR
     50    rm -rf $LOCALDIR/* $LOCALDIR/.??*
    5151fi
    5252
     
    5555if [ $force -eq 1 ]; then
    5656    echo "Purging $LOCALDOC"
    57     rm -rf $LOCALDOC
     57    rm -rf $LOCALDOC/* $LOCALDOC/.??*
    5858fi
    5959
     
    6969    make -f Makefile.howto
    7070    make -f Makefile.man
    71     mv $LOCALDOC $LOCALDIR/docs
     71    mkdir -p $LOCALDIR/docs
     72    mv $LOCALDOC/* $LOCALDIR/docs
    7273    #
    7374    # Man pages corrections
Note: See TracChangeset for help on using the changeset viewer.