Changeset 753 in MondoRescue for branches/stable/tools/build2pkg

Timestamp:

Aug 6, 2006, 1:43:13 PM (18 years ago)

Author:

Bruno Cornec

Message:

• Qemu doc updated for SLES 10
• creation of tar file with -p to preserve directory modes
• mindi's version now handled correctly in svn2build

File:

• branches/stable/tools/build2pkg (modified) (5 diffs)

branches/stable/tools/build2pkg

@@ -55 +55 @@
     src=${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz
     pv=`basename $src .tar.gz`
+    PVER=`echo $pv | sed "s|^$p-||" | cut -d- -f1`
 
     if [  _"$dtype" = _"rpm" ]; then
@@ -77 +78 @@
         echo "Generating $p RPMS"
         cd SPECS
-        tar xfz $src $p-${VER}/distributions/${ddir}-$dver/$p.spec
-        mv $p-${VER}/distributions/${ddir}-$dver/$p.spec .
-        rm -rf $p-${VER}
+        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p.spec
+        mv $p-${PVER}/distributions/${ddir}-$dver/$p.spec .
+        rm -rf $p-${PVER}
 
         rpmbuild -ba $p.spec 2> $log 1> $log
@@ -97 +98 @@
     elif [  _"$dtype" = _"ebuild" ]; then
         log=$TMP/$p-gentoo.log
-        tar xfz $src $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild
+        tar xfz $src $p-${PVER}/distributions/${ddir}-$dver/$p-${VER}.ebuild
         if [ _"`grep $TOPBUILDDIR/portage /etc/make.conf`" = _"" ]; then
             echo "Adding $TOPBUILDDIR/portage to /etc/make.conf"
@@ -104 +105 @@
 
         mkdir -p ${TOPBUILDDIR}/portage/sys-apps/$p
-        mv $p-${VER}/distributions/${ddir}-$dver/$p-${VER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p/$p-${VER}.ebuild
-        rm -rf $p-${VER}
+        mv $p-${PVER}/distributions/${ddir}-$dver/$p-${PVER}.ebuild ${TOPBUILDDIR}/portage/sys-apps/$p/$p-${PVER}.ebuild
+        rm -rf $p-${PVER}
 
         cd ${TOPBUILDDIR}/portage/sys-apps/$p
-        ebuild $p-${VER}.ebuild digest 2> $log 1> $log
+        ebuild $p-${PVER}.ebuild digest 2> $log 1> $log
         if [ $? != 0 ]; then 
             cat $log
             status=-1
         fi
-        ebuild $p-${VER}.ebuild install 2>> $log 1>> $log
+        ebuild $p-${PVER}.ebuild install 2>> $log 1>> $log
         if [ $? != 0 ]; then 
             cat $log
@@ -123 +124 @@
         cd $TOPBUILDDIR
         tar xfz $src
-        cd ${p}-${VER}
+        cd ${p}-${PVER}
         # point to the right debian conf
         ln -s distributions/${ddir}-$dver debian