Changeset 1028 in MondoRescue

Timestamp:

Jan 3, 2007, 1:00:58 PM (18 years ago)

Author:

Bruno Cornec

Message:

• Slackware 10.2 support added (from svn merge -r 1022:1027 $SVN_M/branches/2.2.1)
• mkanounce now adds the ANNOUNCE keyword to mails
• 2.2.1 announce in DB

Location:

branches/stable

Files:

• tools/build2pkg (modified) (2 diffs)
• tools/distro-env (modified) (2 diffs)
• tools/mkannounce (modified) (2 diffs)
• tools/pkg2ftp (modified) (1 diff)
• tools/svn2build (modified) (1 diff)
• website/announces3.sql (modified) ( previous)

branches/stable/tools/build2pkg

@@ -115 +115 @@
             status=-1
         fi
+        export pkg="$pkg $p-${PVER}.ebuild"
     elif [  _"$dtype" = _"deb" ]; then
         cd $TOPBUILDDIR
@@ -122 +123 @@
         ln -s distributions/${ddir}-$dver debian
         dpkg-buildpackage -us -uc -rfakeroot
+        export pkg="$pkg $p-${PVER}.deb"
         # Et voila !
+    elif [  _"$dfam" = _"slackware" ]; then
+        mkdir -p $TOPBUILDDIR/build-${p}/install
+        cd $TOPBUILDDIR
+        tar xfz $src
+        cd ${p}-${PVER}
+        mv distributions/${ddir}-$dver/slack-* $TOPBUILDDIR/build-${p}/install
+        if [ -e distributions/${ddir}-$dver/doinst.sh ]; then
+            mv distributions/${ddir}-$dver/doinst.sh $TOPBUILDDIR/build-${p}/install
+        fi
+        if [ _"$p" = _"mindi-busybox" ]; then
+            make oldconfig
+            make busybox
+            DESTDIR=$TOPBUILDDIR/build-${p}/usr/lib/mindi/rootfs
+            make PREFIX=$DESTDIR install
+        elif [ _"$p" = _"mindi" ]; then
+            export DONT_RELINK=1
+            export HEAD=$TOPBUILDDIR/build-${p}
+            export PREFIX=/usr
+            export CONFDIR=/etc
+            export MANDIR=/usr/man
+            export DOCDIR=/usr/doc
+            export LIBDIR=/usr/lib
+            export RPMBUILDMINDI="true"
+            ./install.sh
+        elif [ _"$p" = _"mondo" ]; then
+            ./configure --prefix=/usr
+            make VERSION=$PVER
+            make DESTDIR=$TOPBUILDDIR/build-${p} install
+        elif [ _"$p" = _"mondo-doc" ]; then
+            make -f Makefile.man VERSION=$PVER
+            make -f Makefile.howto VERSION=$PVER
+            make -f Makefile.man install INSTALLDIR=$TOPBUILDDIR/build-${p}/usr/doc/$p-${PVER}
+            make -f Makefile.howto install INSTALLDIR=$TOPBUILDDIR/build-${p}/usr/doc/$p-${PVER}
+        else
+            echo "Package $p not configured for $dfam"
+        fi
+        cd $TOPBUILDDIR/build-${p}
+        ar=`arch`
+        pkg1=$p-${PVER}-${ar}-${TAG}mr.tgz
+        echo "Running sudo /sbin/makepkg -p -l y -c y $pkg1"
+        sudo /sbin/makepkg -p -l y -c y $pkg1
+        export pkg="$pkg $pkg1"
     else
         echo "Unknown"

branches/stable/tools/distro-env

@@ -80 +80 @@
     suf=".${ddir}${dver1}"
 elif [ $ddir = "slackware" ]; then
-    dfam="slack"
+    dfam="slackware"
     dtype="tgz"
     suf=".${dfam}${dver}"
@@ -138 +138 @@
 elif [ _"$dtype" = _"deb" ]; then
     mkdir -p ${TOPBUILDDIR}
+elif [ _"$dfam" = _"slackware" ]; then
+    mkdir -p ${TOPBUILDDIR}
 elif [ _"$dtype" = _"ebuild" ]; then
     mkdir -p ${TOPBUILDDIR}/portage

branches/stable/tools/mkannounce

@@ -36 +36 @@
 MondoRescue $VER is now available</p>
 
-<p>I'm happy to announce the availability of a newest version of mondoescue $VER. Enjoy it as usual!</p>
+<p>I'm happy to announce the availability of a newest version of mondorescue $VER. Enjoy it as usual!</p>
 <p>
 Now available at <a href="ftp://ftp.mondorescue.org/">ftp://ftp.mondorescue.org/
@@ -88 +88 @@
 cat $MONDOTMP/announce.hdr $MONDOTMP/announce.tmp $MONDOTMP/announce.ftr | w3m -dump -T text/html > $MONDOTMP/mondo.ann.txt
 export EMAIL="bruno@mondorescue.org"
-cat $MONDOTMP/mondo.ann.txt | mutt -s "`head -1 $MONDOTMP/mondo.ann.txt`" mondo-devel@lists.sourceforge.net -c mondorescue-announce@lists.berlios.de
+cat $MONDOTMP/mondo.ann.txt | mutt -s "ANNOUNCE: `head -1 $MONDOTMP/mondo.ann.txt`" mondo-devel@lists.sourceforge.net -c mondorescue-announce@lists.berlios.de
 rm -rf $MONDOTMP

branches/stable/tools/pkg2ftp

@@ -68 +68 @@
         spkg="$spkg ${TOPBUILDDIR}/portage/sys-apps/$p/$pv.ebuild"
         pkg="$pkg /usr/portage/packages/All/$pv.tbz2"
+    elif [  _"$dfam" = _"slackware" ]; then
+        pkg="$pkg ${TOPBUILDDIR}/build-$p/$pv-*-${tag}mr.tgz"
     fi
 done

branches/stable/tools/svn2build

@@ -84 +84 @@
         elif [ "$dtype" = "ebuild" ]; then
             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/slack-desc
         elif [ "$dtype" = "deb" ]; then
             cp -a $dest/distributions/$ddir/* $dest/distributions/${ddir}-$dver