Changeset 1024 in MondoRescue

Timestamp:

Jan 2, 2007, 8:20:29 PM (17 years ago)

Author:

Bruno Cornec

Message:

Still some Slackware improvements

Location:

branches/2.2.1/tools

Files:

• build2pkg (modified) (2 diffs)
• distro-env (modified) (1 diff)
• svn2build (modified) (1 diff)

branches/2.2.1/tools/build2pkg

@@ -126 +126 @@
         # Et voila !
     elif [  _"$dfam" = _"slackware" ]; then
-        mkdir $TOPBUILDDIR/src
-        cd $TOPBUILDDIR/src
+        mkdir $TOPBUILDDIR/install
+        cd $TOPBUILDDIR
         tar xfz $src
-        mv install ..
+        cd ${p}-${PVER}
+        mv distributions/${ddir}-$dver/slack-* $TOPBUILDDIR/install
+        mv distributions/${ddir}-$dver/doinst.sh $TOPBUILDDIR/install
         if [ _"$p" = _"mindi-busybox" ]; then
             make oldconfig
@@ -160 +162 @@
         ar=`arch`
         pkg1=$p-${PVER}-${ar}-${TAG}mr.tgz
-        sudo makepkg $pkg1
+        sudo "makepkg $pkg1"
         export pkg="$pkg $pkg1"
     else

branches/2.2.1/tools/distro-env

@@ -141 +141 @@
 elif [ _"$dtype" = _"deb" ]; then
     mkdir -p ${TOPBUILDDIR}
-elif [ _"$dfam" = _"slack" ]; then
+elif [ _"$dfam" = _"slackware" ]; then
     mkdir -p ${TOPBUILDDIR}/install
 elif [ _"$dtype" = _"ebuild" ]; then

branches/2.2.1/tools/svn2build

@@ -85 +85 @@
             m4 $MONDOTMP/mondorescue.mc $dest/distributions/$dfam/$p.ebuild > $dest/distributions/${ddir}-$dver/$p-$v.ebuild
         elif [ "$dtype" = "tgz" ]; then
-            m4 $MONDOTMP/mondorescue.mc $dest/distributions/$dfam/slack-desc > $dest/distributions/${ddir}-$dver/install/slack-dest
+            m4 $MONDOTMP/mondorescue.mc $dest/distributions/$dfam/slack-desc > $dest/distributions/${ddir}-$dver/slack-desc
         elif [ "$dtype" = "deb" ]; then
             cp -a $dest/distributions/$ddir/* $dest/distributions/${ddir}-$dver