Changeset 657 in MondoRescue

Timestamp:

Jun 9, 2006, 1:06:23 AM (18 years ago)

Author:

bcornec

Message:

Debian more and more !

Location:

branches/2.0.8/tools

Files:

• build2pkg (modified) (3 diffs)
• svn2build (modified) (4 diffs)

branches/2.0.8/tools/build2pkg

@@ -67 +67 @@
         pkg="$pkg $pkg1"
 
-        log=/tmp/$p-rpm.log
+        log=$TMP/$p-rpm.log
 
         if [ "$dfam" = "mandriva" ]; then
@@ -90 +90 @@
         cd ..
     elif [  _"$dtype" = _"ebuild" ]; then
-        log=/tmp/$p-gentoo.log
+        log=$TMP/$p-gentoo.log
         ln -sf $src .
         tar xfz $src $pv/distributions/${ddir}-$dver/$p-${VER}-r$TAG.ebuild
@@ -124 +124 @@
         fi
     elif [  _"$dtype" = _"deb" ]; then
-        log=/tmp/$p-deb.log
+        log=$TMP/$p-deb.log
         cd $TOPBUILDDIR
         tar xfz $src
         cd ${pv}*
-        ln -s distributions/debian debian
-        # update debian/changelog
+        # point to the right debian conf
+        ln -s distributions/${ddir}-$dver debian
         dpkg-buildpackage -us -uc -rfakeroot
         # Et voila !

branches/2.0.8/tools/svn2build

@@ -54 +54 @@
 
         ddd=`LANG=C ; date '+%Y-%m-%d'`
-        cat > /tmp/mondorescue.mc << EOF
+        cat > $TMP/mondorescue.mc << EOF
 define(\`TTT', ${TAG})dnl
 define(\`RRR', ${TAG}${suf})dnl
@@ -72 +72 @@
             fi
             echo "Using $inc customization to build SPEC file"
-            m4 /tmp/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
+            m4 $TMP/mondorescue.mc $inc $dest/distributions/rpm/$p.spec > $dest/distributions/${ddir}-$dver/$p.spec
 
-            $TOOLHOME/mkchangelog.pl $dtype $p /tmp/$p.spec
+            $TOOLHOME/mkchangelog.pl $dtype $p $TMP/$p.spec
             if [ $? -ne 0 ]; then
                 echo "Unable to create changelog for ${ddir}-$dver/$p.spec"
                 exit -1
             fi
-            cat /tmp/$p.spec >> $dest/distributions/${ddir}-$dver/$p.spec
-            rm -f /tmp/$p.spec
+            cat $TMP/$p.spec >> $dest/distributions/${ddir}-$dver/$p.spec
+            rm -f $TMP/$p.spec
         elif [ "$dtype" = "ebuild" ]; then
-            m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$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
-            m4 /tmp/mondorescue.mc $dest/distributions/$dfam/$p > /dev/null
+            #m4 $TMP/mondorescue.mc $dest/distributions/$dfam/$p > /dev/null
+            $TOOLHOME/mkchangelog.pl $dtype $p $TMP/$p.chg
+            if [ $? -ne 0 ]; then
+                echo "Unable to create changelog for ${ddir}-$dver/$p.chg"
+                exit -1
+            fi
+            mv $TMP/$p.chg $dest/distributions/${ddir}-$dver/changelog
         else
             echo "Unknown Build"
@@ -94 +100 @@
         cd $dest
         for f in mondorescue-howto.sgml *8; do
-            m4 /tmp/mondorescue.mc $f > ${f}.new
+            m4 $TMP/mondorescue.mc $f > ${f}.new
             mv ${f}.new $f
         done
@@ -134 +140 @@
 done
 
-rm -f /tmp/mondorescue.mc
+rm -f $TMP/mondorescue.mc
 
 echo "Version delivered :"