Changeset 317 in MondoRescue

Timestamp:

Jan 13, 2006, 8:46:06 PM (18 years ago)

Author:

bcornec

Message:

merge -r309:316 $SVN_M/branches/2.06

Location:

trunk

Files:

• mindi/install.sh (modified) (2 diffs)
• mindi/mindi (modified) (3 diffs)
• mindi/mindi.spec (modified) (5 diffs)
• mondo/mondo.spec (modified) (6 diffs)
• tools/mkrpm (modified) (6 diffs)
• tools/rpm-env (modified) (3 diffs)

trunk/mindi/install.sh

@@ -47 +47 @@
 install -m 644 deplist.txt $conf
 
-cp -af rootfs aux-tools Mindi $locallib/mindi
+cp -af rootfs aux-tools $locallib/mindi
 chmod 755 $locallib/mindi/rootfs/bin/*
 chmod 755 $locallib/mindi/rootfs/sbin/*
@@ -61 +61 @@
 
 install -m 644 mindi.8 $MANDIR
-install -m 644 ChangeLog COPYING README README.busybox README.ia64 README.pxe TODO INSTALL $DOCDIR
+install -m 644 ChangeLog COPYING README README.busybox README.ia64 README.pxe TODO INSTALL svn.log $DOCDIR
 
 # Managing busybox

trunk/mindi/mindi

@@ -13 +13 @@
 #-----------------------------------------------------------------------------
 
+### Which arch are we on (useful for ia64 port)
+export ARCH=`/bin/arch`
 
 ADDITIONAL_BOOT_PARAMS="acpi=off apm=off devfs=nomount exec-shield=0"
@@ -33 +35 @@
 MINDI_CONF=YYY
 MINDI_SBIN=${MINDI_PREFIX}/sbin
-MINDI_LIB=${MINDI_PREFIX}/lib/mindi
+
+
+if [ "$ARCH" = "x86_64" ] ; then
+    MINDI_LIB=${MINDI_PREFIX}/lib64/mindi
+else
+    MINDI_LIB=${MINDI_PREFIX}/lib/mindi
+fi
 
 EXTRA_SPACE=24576         ; # increase if you run out of ramdisk space
@@ -2908 +2916 @@
 > $LOGFILE
 echo "mindi v$MINDI_VERSION" >> $LOGFILE
-### BCO
-### Which arch are we on (useful for ia64 port)
-export ARCH=`/bin/arch`
 echo "$ARCH architecture detected" >> $LOGFILE
 echo "mindi called with the following arguments:" >> $LOGFILE

trunk/mindi/mindi.spec

@@ -10 +10 @@
 %define name    mindi
 %define version VVV
-%define mrel    1
+%define mrel    RRR
+# if mandriva official build (rpm --with is_official)
+%{?is_official:%define rel %{mkrel} %{mrel}}%{!?is_official:%define rel %{mrel}}
 %define src     %{name}-%{version}.tgz
+%define grp     Archiving/Backup
+%define addreqb bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools, afio
 
 %if %is_redhat
-Group:          Applications/Archiving
+%define grp     Applications/Archiving
+%define addreq  %{addreqb}, which
 Autoreq:    0
 %endif
@@ -20 +25 @@
 %if %is_mandrake
 %define src     %{name}-%{version}.tar.bz2
-Group:          Archiving/Backup
+%define addreq  %{addreqb}, which
 Autoreqprov: no
 %endif
@@ -26 +31 @@
 %if %is_mandriva
 %define src     %{name}-%{version}.tar.bz2
-Group:          Archiving/Backup
+%define addreq  %{addreqb}, which
 Autoreqprov: no
 %endif
 
 %if %is_suse
-Group:          Archiving/Backup
+%define addreq  %{addreqb}
+%endif
+
+# define the mkrel macro if it is not already defined if mandriva offical build
+%if is_official
+%{?!mkrel:%define mkrel(c:) %{-c:0.%{-c*}.}%{!?_with_unstable:%(perl -e '$_="%{1}";m/(.\*)(\\d+)$/;$rel=${2}-1;re;print "$1$rel";').%{?subrel:%subrel}%{!?subrel:1}.%{?distversion:%distversion}%{?!distversion:%(echo $[%{mdkversion}/10])}}%{?_with_unstable:%{1}}%{?distsuffix:%distsuffix}%{?!distsuffix:mdk}}
 %endif
 
@@ -37 +47 @@
 Name:       %name
 Version:    %version
-Release:    %mrel
+Release:    %rel
 License:    GPL
-Group:      System/Kernel and hardware
+Group:      %{grp}
 Url:        http://mondorescue.berlios.de
 Source:     %{src}
 BuildRoot:  %{_tmppath}/%{name}-%{version}
-Requires:   bzip2 >= 0.9, mkisofs, ncurses, binutils, gawk, dosfstools, afio, which
+Requires:   %{addreq}
 # Not on all systems
 #Conflicts: bonnie++
@@ -93 +103 @@
 %defattr(644,root,root,755)
 %config(noreplace) %{_sysconfdir}/mindi/deplist.txt
-%doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox
+%doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox svn.log
 %{_mandir}
 %{_libdir}/mindi

trunk/mondo/mondo.spec

@@ -10 +10 @@
 %define name    mondo
 %define version VVV
-%define mrel    1
+%define mrel    RRR
+# if mandriva official build (rpm --with is_official)
+%{?is_official:%define rel %{mkrel} %{mrel}}%{!?is_official:%define rel %{mrel}}
 %define src     %{name}-%{version}.tgz
+%define grp     Archiving/Backup
+%define addreqb mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, newt >= 0.50, slang >= 1.4.1
 
 %if %is_redhat
-Group:          Applications/Archiving
+%define grp     Applications/Archiving
+%define addreq  %{addreqb}
 Autoreq:        0
 %endif
@@ -20 +25 @@
 %if %is_mandrake
 %define src     %{name}-%{version}.tar.bz2
-Group:          Archiving/Backup
+%define addreq  %{addreqb}
 Autoreqprov:    no
 %endif
@@ -26 +31 @@
 %if %is_mandriva
 %define src     %{name}-%{version}.tar.bz2
-Group:          Archiving/Backup
+%define addreq  %{addreqb}
 Autoreqprov:    no
 %endif
 
 %if %is_suse
-Group:          Archiving/Backup
+%define addreq  %{addreqb}
 %endif
 
@@ -43 +48 @@
 Release:    %{mrel}
 License:    GPL
+Group:      %{grp}
 Url:        http://mondorescue.berlios.de
 Source:     %{src}
@@ -48 +54 @@
 BuildRequires:  newt-devel >= 0.50, slang-devel >= 1.4.1, gcc
 %ifarch ia64
-Requires:   mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, elilo, newt >= 0.50, slang >= 1.4.1, buffer, parted
+Requires:   %{addreq}, elilo, parted
 %else
-Requires:   mindi >= 1.05, bzip2 >= 0.9, afio, mkisofs, binutils, syslinux >= 1.52, newt >= 0.50, slang >= 1.4.1, buffer
+Requires:   %{addreq}, syslinux >= 1.52
 %endif
 
@@ -116 +122 @@
 %files
 %defattr(644,root,root,755)
-%doc ChangeLog mondo/docs/en/1.6x-howto/*
+%doc ChangeLog svn.log mondo/docs/en/1.6x-howto/*
 %doc INSTALL COPYING README TODO AUTHORS NEWS
 

trunk/tools/mkrpm

@@ -17 +17 @@
 . $TOOLHOME/rpm-env
 
+# To be safe for SVN commands
+cd $TOOLHOME/..
 rev=`$TOOLHOME/mksvnversion`
+
+echo "Generating SVN log file ..."
+svn log -v > /tmp/mondorescue-svn.log
 
 if [ "$1" = "" ]; then
@@ -35 +40 @@
     tar cvfhz ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tgz mindi-kernel-${MINDI_VER}
     tar cvfhj ${TOPDIR}/SOURCES/mindi-kernel-${MINDI_VER}.tar.bz2 mindi-kernel-${MINDI_VER}
-    sed "s/^%define mrel..*/%define mrel    ${rev}.${suf}/" mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
+    sed "s/^%define mrel..*RRR/%define mrel ${rev}${suf}/" mindi-kernel-${MINDI_VER}/mindi-kernel.spec > ${TOPDIR}/SPECS/mindi-kernel.spec
     rm -f ${TMP}/mindi-kernel*-root
-    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${rev}.${suf}.${ARCH}.rpm"
+    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-kernel-${MINDI_VER}-${rev}${suf}.${ARCH}.rpm"
 fi
 if [ "`echo $c | grep -v kernel | grep mindi`" != "" ]; then
@@ -44 +49 @@
     rm -fr mindi-${MINDI_VER}
     cp -a ${VER}/mindi mindi-${MINDI_VER}
-    svn log -v > mindi-${MINDI_VER}/svn.log
+    cp -a /tmp/mondorescue-svn.log mindi-${MINDI_VER}/svn.log
     find mindi-${MINDI_VER} -type d -name .svn | xargs rm -rf
     find mindi-${MINDI_VER} -type f -name '.*.swp' | xargs rm -rf
@@ -52 +57 @@
     tar cvfhz ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tgz mindi-${MINDI_VER}
     tar cvfhj ${TOPDIR}/SOURCES/mindi-${MINDI_VER}.tar.bz2 mindi-${MINDI_VER}
-    sed -e "s/^%define mrel..*/%define mrel ${rev}.${suf}/" -e "s/VVV/${MINDI_VER}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
+    sed -e "s/^%define mrel..*RRR/%define mrel  ${rev}${suf}/" -e "s/VVV/${MINDI_VER}/" mindi-${MINDI_VER}/mindi.spec > ${TOPDIR}/SPECS/mindi.spec
     rm -f ${TMP}/mindi-*-root
-    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}.${suf}.${ARCH}.rpm"
+    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mindi-${MINDI_VER}-${rev}${suf}.${ARCH}.rpm"
     # ATTENTION: This could be dangerous for your setup
     opt="rm -rf /usr/lib/mindi ;"
@@ -63 +68 @@
     rm -rf mondo-${MONDO_VER}
     cp -a ${VER}/mondo mondo-${MONDO_VER}
-    svn log -v > mondo-${MONDO_VER}/svn.log
+    cp -a /tmp/mondorescue-svn.log mondo-${MONDO_VER}/svn.log
     cd mondo-${MONDO_VER}
     echo "Bootstraping mondo ... "
@@ -73 +78 @@
     tar cvfhz ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tgz mondo-${MONDO_VER}
     tar cvfhj ${TOPDIR}/SOURCES/mondo-${MONDO_VER}.tar.bz2 mondo-${MONDO_VER}
-    sed -e "s/^%define mrel..*/%define mrel ${rev}.${suf}/" -e "s/VVV/${MONDO_VER}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
+    sed -e "s/^%define mrel..*RRR/%define mrel  ${rev}${suf}/" -e "s/VVV/${MONDO_VER}/" mondo-${MONDO_VER}/mondo.spec > ${TOPDIR}/SPECS/mondo.spec
     rm -f ${TMP}/mondo-*-root
-    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}.${suf}.${ARCH}.rpm"
+    pkg="$pkg ${TOPDIR}/RPMS/${ARCH}/mondo-${MONDO_VER}-${rev}${suf}.${ARCH}.rpm"
 fi
 cd ${TOPDIR}/SPECS

trunk/tools/rpm-env

@@ -36 +36 @@
     export ddir="mandriva"
     export dver=`awk '{print $4}' /etc/mandriva-release`
-    export suf="${dver}mdk"
+    export suf=".`echo $dver | sed 's/\.//'`mdk"
 elif [ -e /etc/mandrake-release ]; then
     export ddir="mandrake"
     export dver=`awk '{print $3}' /etc/mandrake-release`
-    export suf="${dver}mdk"
+    export suf=".`echo $dver | sed 's/\.//'`mdk"
 elif [ -e /etc/redhat-release ]; then
     grep -q Enterprise /etc/redhat-release
@@ -49 +49 @@
         export ddir="fedora"
         export dver=`awk '{print $4}' /etc/redhat-release`
-        export suf="fc${dver}"
+        export suf=".fc${dver}"
     else
         export ddir="redhat"
         export dver=`awk '{print $5}' /etc/redhat-release | sed "s/\.//"`
-        export suf="rh${dver}"
+        export suf=".rh${dver}"
     fi
 elif [ -e /etc/SuSE-release ]; then
@@ -70 +70 @@
 
 if [ _"$suf" = _"" ]; then
-    export suf="${ddir}${dver}"
+    export suf=".${ddir}${dver}"
 fi