Changeset 596 in MondoRescue

Timestamp:

May 30, 2006, 10:50:31 PM (18 years ago)

Author:

bcornec

Message:

Build process fixes following first attempt to deliver 2.0.8

Location:

branches/stable

Files:

• mindi/distributions/rpm/mindi.spec (modified) (1 diff)
• mondo-doc/distributions/rpm/mondo-doc.spec (modified) (2 diffs)
• tools/build2pkg (modified) (2 diffs)
• tools/build2qemu (modified) (3 diffs)
• tools/distro-env (modified) (1 diff)
• tools/pkg2mdv (modified) (1 diff)
• tools/qemu-vm.txt (modified) (1 diff)
• tools/svn2build (modified) (3 diffs)

branches/stable/mindi/distributions/rpm/mindi.spec

@@ -52 +52 @@
 
 %files
-%config(noreplace) %{_sysconfdir}/mindi
 %config(noreplace) %{_sysconfdir}/mindi/deplist.txt 
 %doc ChangeLog INSTALL COPYING README TODO README.ia64 README.pxe README.busybox svn.log

branches/stable/mondo-doc/distributions/rpm/mondo-doc.spec

@@ -3 +3 @@
 #
 
-# if mandriva official build (rpm --with is_official)
-%{?is_official:%define rel %{mkrel} %{mrel}}%{!?is_official:%define rel %{mrel}}
-%define rel     RRR
+%define mrel    RRR
 %define tag     TTT
 
@@ -13 +11 @@
 Name:       mondo-doc
 Version:    VVV
-Release:    %{rel}
+Release:    %{mrel}
 License:    GPL
 Group:      GRP

branches/stable/tools/build2pkg

@@ -77 +77 @@
         echo "Generating $p RPMS"
         cd SPECS
-        tar xfz $src $pv/distributions/$ddir/$p.spec
-        mv $pv/distributions/$ddir/$p.spec .
+        tar xfz $src $pv/distributions/${ddir}-$dver/$p.spec
+        mv $pv/distributions/${ddir}-$dver/$p.spec .
         rm -rf $pv
+        rm -rf ${TOPBUILDDIR}/RPMS/${ar}/*
+        rm -rf ${TOPBUILDDIR}/SRPMS/*
 
         rpmbuild -ba $p.spec 2> $log 1> $log
+        egrep '^Wrote:' $log
         if [ $? != 0 ]; then 
             cat $log
             status=-1
         fi
+        rm -rf ${TOPBUILDDIR}/BUILD/*
         cd ..
     elif [  _"$dtype" = _"ebuild" ]; then
         log=/tmp/$p-gentoo.log
         ln -sf $src .
-        tar xfz $src $pv/distributions/$ddir/$p-${VER}-r$TAG.ebuild
+        tar xfz $src $pv/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild
         if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
             echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"
@@ -97 +101 @@
 
         mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
-        mv $pv/distributions/$ddir/$p-${VER}-r$TAG.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
+        mv $pv/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p
         rm -rf $pv
 

branches/stable/tools/build2qemu

@@ -39 +39 @@
 if [ _"$1" == _"" ]; then
     export VMS=`cat ${TOOLHOME}/DISTROS` 
+    single=0
 else
-    export VMS="$1"
+    export VMS="$*"
+    single=1
 fi
 
@@ -52 +54 @@
 export TOOLHOME=$TOOLHOME
 
-$TOOLHOME/build2pkg $LAST
-$TOOLHOME/pkg2ftp
+$TOOLHOME/build2pkg $LAST < /dev/null
+$TOOLHOME/pkg2ftp $LAST
 EOF
 chmod 755 $TMP/mkmondo
 
-$TOOLHOME/files2ftp
+if [ $single -eq 0 ]; then
+    $TOOLHOME/file2ftp
+fi
 cd $TOOLHOME/..
 tar cfz $TMP/mkmondo.tar.gz $TOOLHOME $TMP/mkmondo $TOPDIR/${VER}-$TAG
@@ -68 +72 @@
             exit -1
     fi
+    export sp=2222
     ps auxww | grep qemu | grep -v grep | grep -q /users/qemu/$m.qemu
-    export sp=2222
     if [ $? -ne 0 ]; then
         # Virtual machine alreday started

branches/stable/tools/distro-env

@@ -87 +87 @@
     dfam="redhat"
     dtype="rpm"
-    dver=`echo ${dver} | sed "s/\.//"`
+    dver1=`echo ${dver} | sed "s/\.//"`
     if [ $ddir = "fedora" ]; then
-        suf=".fc${dver}"
+        suf=".fc${dver1}"
     elif [ $ddir = "redhat" ]; then
-        suf=".rh${dver}"
+        suf=".rh${dver1}"
     else
-        suf=".rhel${dver}"
+        suf=".rhel${dver1}"
     fi
     BUILDDIR=${TOPDIR}/SPECS 

branches/stable/tools/pkg2mdv

@@ -70 +70 @@
 EOF
 chmod 755 /tmp/mkmondo
-#scp -p ${spkg} /tmp/mkmondo ${ACCOUNT}:
+scp -p ${spkg} /tmp/mkmondo ${ACCOUNT}:
 scp -p /tmp/mkmondo ${ACCOUNT}:
 echo "Packages rebuild on ${DSTNODE}"

branches/stable/tools/qemu-vm.txt

@@ -40 +40 @@
 
 Créer compte bruno avec répertoires nécéssaires + env necessaire
-useradd bruno
+mkdir /users
+useradd bruno -d /users/bruno
 passwd bruno
 

branches/stable/tools/svn2build

@@ -62 +62 @@
 EOF
 
-        mkdir -p $dest/distributions/$ddir
+        mkdir -p $dest/distributions/$ddir $dest/distributions/${ddir}-$dver
         if [ "$dtype" = "rpm" ]; then
             if [ -f $dest/distributions/$ddir/spec.m4 ]; then
@@ -73 +73 @@
             fi
             echo "Using $inc customization to build SPEC file"
-            m4 /tmp/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/$ddir/$p.spec
+            m4 /tmp/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
 
             if [ -f $dest/distributions/$ddir/changelog ]; then
@@ -86 +86 @@
             echo "Using $log customization to build changelog file"
             ddate=`LANG=C ; date "+%a %b %d %Y"`
-            cat > $dest/distributions/$ddir/$p.changelog.new << EOF
+            cat > $dest/distributions/${ddir}-$dver/$p.changelog.new << EOF
 * $ddate Bruno Cornec <bruno@mondorescue.org> VVV-RRR
 - Updated to VVV-r${REVISION}
 
 EOF
-            cat $log >> $dest/distributions/$ddir/$p.changelog.new
-            m4 /tmp/mondorescue.mc $dest/distributions/$ddir/$p.changelog.new >> $dest/distributions/$ddir/$p.spec
-            rm -f $dest/distributions/$ddir/$p.changelog.new
+            cat $log >> $dest/distributions/${ddir}-$dver/$p.changelog.new
+            m4 /tmp/mondorescue.mc $dest/distributions/${ddir}-$dver/$p.changelog.new >> $dest/distributions/${ddir}-${dver}/$p.spec
+            rm -f $dest/distributions/${ddir}-$dver/$p.changelog.new
 
         elif [ "$dtype" = "ebuild" ]; then
-            m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/$ddir/$p-$v-r$TAG.ebuild
+            m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v-r$TAG.ebuild
         elif [ "$dtype" = "deb" ]; then
             # To be developped