Changeset 51 for trunk


Ignore:
Timestamp:
Oct 8, 2005, 12:50:41 AM (14 years ago)
Author:
bcornec
Message:

Merge patches from branch 2.04_berlios (r46-r50)

Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • trunk/mindi/mindi.spec

    r35 r51  
    22# $Id$
    33#
    4 %define _prefix /usr
     4%define is_mandriva %(test -e /etc/mandriva-release && echo 1 || echo 0)
     5%define is_mandrake %(test -e /etc/mandrake-release && echo 1 || echo 0)
     6%define is_suse %(test -e /etc/SuSE-release && echo 1 || echo 0)
     7%define is_fedora %(test -e /etc/fedora-release && echo 1 || echo 0)
     8%define is_redhat %(test -e /etc/redhat-release && echo 1 || echo 0)
     9
     10%define name    mindi
     11%define version 1.04_berlios
     12%define mrel    1
     13
     14%if %is_redhat
     15%define release %{mrel}
     16%define src     %{name}-%{version}.tgz
     17Autoreq:    0
     18%endif
     19
     20%if %is_mandrake
     21%define release %{mrel}mdk
     22%define src     %{name}-%{version}.tar.bz2
     23Autoreqprov: no
     24%endif
     25
     26%if %is_mandriva
     27%define release %{mrel}mdk
     28%define src     %{name}-%{version}.tar.bz2
     29Autoreqprov: no
     30%endif
     31
    532Summary:    Mindi creates emergency boot disks/CDs using your kernel, tools and modules
    6 Name:       mindi
    7 Version:    1.04_berlios
    8 Release:    1
     33Name:       %name
     34Version:    %version
     35Release:    %release
    936License:    GPL
    1037Group:      System/Kernel and hardware
    11 Url:        http://www.mondorescue.org
    12 Source:     %{name}-%{version}.tgz
     38Url:        http://mondorescue.berlios.de
     39Source:     %{src}
    1340BuildRoot:  %{_tmppath}/%{name}-%{version}
    14 Requires:   bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools
     41Requires:   bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools,afio
    1542# Not on all systems
    1643#Conflicts: bonnie++
    17 Prefix:     %{_prefix}
    18 Autoreq:    0
    1944
    2045%description
     
    2550
    2651%prep
    27 %setup
     52%{__rm}  -rf $RPM_BUILD_ROOT
     53%setup -n %name-%{version}
    2854
    2955%build
    3056%ifarch ia64
    31 make -f Makefile.parted2fdisk clean
    32 make -f Makefile.parted2fdisk
     57%{__make} -f Makefile.parted2fdisk clean
     58%{__make} -f Makefile.parted2fdisk
    3359%endif
    3460
    3561%install
    36 %{__rm} -Rf /usr/local/share/mindi
     62export DONT_RELINK=1
     63
    3764%{__rm} -rf $RPM_BUILD_ROOT
    3865MINDIDIR=$RPM_BUILD_ROOT%{_datadir}/mindi
    39 %{__mkdir_p} $MINDIDIR $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_sysconfdir}/mindi
     66
     67%{__mkdir_p} $MINDIDIR $RPM_BUILD_ROOT%{_bindir} $RPM_BUILD_ROOT%{_sysconfdir}/mindi $RPM_BUILD_ROOT%{_sbindir}
    4068%{__mv} deplist.txt $RPM_BUILD_ROOT%{_sysconfdir}/mindi/
    4169%{__cp} -af * $MINDIDIR
    42 %ifarch ia64
    43     make -f Makefile.parted2fdisk DEST=${MINDIDIR}/ install
     70
     71%ifarch ia64
     72    %{__make} -f Makefile.parted2fdisk DEST=${MINDIDIR}/ install
    4473    %{__mv} $MINDIDIR/rootfs/bin/busybox-ia64 $MINDIDIR/rootfs/bin/busybox
    4574    %{__mv} $MINDIDIR/rootfs/sbin/parted2fdisk-ia64 $MINDIDIR/rootfs/sbin/parted2fdisk
     
    5079%endif
    5180%{__rm} -f $MINDIDIR/rootfs/bin/busybox-ia64 $MINDIDIR/rootfs/sbin/parted2fdisk-ia64 $MINDIDIR/rootfs/bin/busybox-i386 $MINDIDIR/rootfs/bin/busybox-i386.net
     81
    5282#
    5383# These are installed twice if not removed here
     84#
    5485( cd $MINDIDIR
    5586%{__rm} -f CHANGES INSTALL COPYING README TODO README.ia64 README.pxe
    5687)
    57 cd $RPM_BUILD_ROOT%{_bindir}
    58 %{__ln_s} -f %{_datadir}/mindi/mindi .
    59 %{__ln_s} -f %{_datadir}/mindi/parted2fdisk.pl .
    60 %{__ln_s} -f %{_datadir}/mindi/analyze-my-lvm .
    61 chmod +x $MINDIDIR/mindi
     88
     89# Symlinks
     90
     91cd $RPM_BUILD_ROOT%{_sbindir}
     92%{__ln_s} -f ${_sbindir}/mindi/mindi .
     93%{__ln_s} -f ${_sbindir}/mindi/analyze-my-lvm .
     94%ifarch ia64
     95%{__ln_s} -f ${_sbindir}/mindi/parted2fdisk.pl .
     96%endif
    6297
    6398%clean
     
    76111
    77112%files
    78 %defattr(-,root,root,-)
     113%defattr(644,root,root,755)
    79114%config(noreplace) %{_sysconfdir}/mindi/deplist.txt
    80115%doc CHANGES INSTALL COPYING README TODO README.ia64 README.pxe
    81 #%attr(755,root,root) %{_datadir}/mindi/mindi
    82 
     116%attr(755,-,-) %{_sbindir}/mindi
     117%attr(755,-,-) %{_sbindir}/analyze-my-lvm
    83118%{_datadir}/mindi
    84 %{_bindir}/analyze-my-lvm
    85 %{_bindir}/mindi
    86 %{_bindir}/parted2fdisk.pl
     119%attr(755,-,-) %{_datadir}/mindi/analyze-my-lvm
     120%attr(755,-,-) %{_datadir}/mindi/mindi
     121%ifarch ia64
     122%attr(755,-,-) %{_datadir}/mindi/parted2fdisk.pl
     123%endif
     124%attr(755,-,-) %{_datadir}/mindi/aux-tools/sbin/*
     125%attr(755,-,-) %{_datadir}/mindi/rootfs/bin/*
     126%attr(755,-,-) %{_datadir}/mindi/rootfs/sbin/*
    87127
    88128%changelog
    89129* Tue Sep 06 2005 Bruno Cornec <bcornec@users.berlios.de> 1.04_berlios
    90130- Merge of patches mentionned on mondo ML + ia64 updates
     131- Fix bugs when called alone
    91132
    92133* Tue May 03 2005 Hugo Rabson <hugorabson@msn.com> 1.04_cvs_20050503
  • trunk/mindi/rootfs/sbin/init

    r30 r51  
    629629        imgname="mondorescue"
    630630        if [ "`cat /proc/cmdline | grep -i prefix`" ] ; then
    631             for i in "`cat /proc/cmdline`" do
     631            for i in "`cat /proc/cmdline`" ; do
    632632                if [ "`echo $i | grep -i prefix`" ] ; then
    633633                    imgname=`echo $i | cut -d'=' -f2`
  • trunk/tools/mkdeliv

    r34 r51  
    2828if [ "`echo $c | grep mindi`" != "" ]; then
    2929    cp -a ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tgz
    30     tgz="$tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tgz"
     30    tgz="$tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tgz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}-r${rev}.tar.bz2"
    3131    rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}.${ARCH}.rpm"
    3232    srpms="$srpms ${TOPDIR}/SRPMS/mindi-${MINDI_VER}-${rev}.src.rpm"
     
    3434if [ "`echo $c | grep  mondo`" != "" ]; then
    3535    cp -a ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz
    36     tgz="$tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz"
     36    tgz="$tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tgz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}-r${rev}.tar.bz2"
    3737    rpms="$rpms ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}.${ARCH}.rpm"
    3838    srpms="$srpms ${TOPDIR}/SRPMS/mondo-${MONDO_VER}-${rev}.src.rpm"
  • trunk/tools/mkrpm

    r36 r51  
    3434    mkdir -p ${TOPDIR}/SOURCES
    3535    tar cvfhz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz mindi-${MINDI_VER}
    36     sed "s/^Release:..*/Release:    ${rev}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
     36    tar cvfhj ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tar.bz2 mindi-${MINDI_VER}
     37    sed "s/^%define mrel..*/%define mrel    ${rev}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
    3738    rm -f ${TMP}/mindi-*-root
    3839    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}.${ARCH}.rpm"
     
    5354    cd ..
    5455    tar cvfhz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz mondo-${MONDO_VER}
    55     sed "s/^Release:..*/Release:    ${rev}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
     56    tar cvfhj ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 mondo-${MONDO_VER}
     57    sed "s/^%define mrel..*/%define mrel    ${rev}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
    5658    rm -f ${TMP}/mondo-*-root
    5759    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}.${ARCH}.rpm"
  • trunk/tools/rpm-env

    r34 r51  
    2222mkdir -p ${TMP}
    2323if [ -f ${HOME}/.rpmmacros ]; then
    24     export TOPDIR=`grep _topdir ${HOME}/.rpmmacros | awk '{print $2}'`
     24    export TOPDIR=`egrep '^%_topdir' ${HOME}/.rpmmacros | awk '{print $2}'`
    2525else
    2626    export TOPDIR=${BASE}/RPMS
     
    2929mkdir -p RPMS SRPMS SPECS SOURCES BUILD
    3030
    31 export MINDI_VER=`cat ${BASE}/svn/${VER}/mindi/mindi.spec | egrep '^Version:' | cut -d: -f2 | sed "s/[  ]*//"`
    32 export MONDO_VER=`cat ${BASE}/svn/${VER}/mondo/mondo.spec | egrep '^Version:' | cut -d: -f2 | sed "s/[  ]*//"`
     31export MINDI_VER=`cat ${BASE}/svn/${VER}/mindi/mindi.spec | egrep '^%define version' | awk '{print $3}' | sed "s/[  ]*//"`
     32export MONDO_VER=`cat ${BASE}/svn/${VER}/mondo/mondo.spec | egrep '^%define version' | awk '{print $3}' | sed "s/[  ]*//"`
Note: See TracChangeset for help on using the changeset viewer.