Changeset 1356 in MondoRescue

Timestamp:

Apr 28, 2007, 8:30:52 PM (18 years ago)

Author:

Bruno Cornec

Message:

Try to improve Fedora delivery

File:

• branches/2.2.2/tools/pkg2fc (modified) (2 diffs)

branches/2.2.2/tools/pkg2fc

@@ -40 +40 @@
 fi
 
-export pkg=""
-echo "Working under $TOPBUILDDIR"
 cd $TOPBUILDDIR
 
 ppkg=""
 spkg=""
+lastfc=`cat $TOOLHOME/DISTROS | grep fedora | tail -1 | cut -d_ -f2`
 
 for p in $c; do
@@ -51 +50 @@
     src=${TOPDIR}/${VER}-$TAG/$p-[1-9st]*.tar.gz
     pv=`basename $src .tar.gz`
-    tag=`echo $pv | sed "s/-\([0-9]*.*\)/\2/"` 
-    spkg="$spkg ${TOPBUILDDIR}/SRPMS/$pv-${tag}${suf}.src.rpm"
-    ppkg="$ppkg $pv-${tag}${suf}.src.rpm"
+    tar -xz -C $MONDOTMP -f $src $pv/TAG
+    tag=`cat $MONDOTMP/$pv/TAG`
+    spkg="$spkg ${DSTDIR}/../fedora/${lastfc}/$pv-${tag}.fc${lastfc}.src.rpm"
 done
 
 echo "Packages delivery to ${ACCOUNT}"
 cat > /tmp/mkmondo << EOF
+set -x
+TOPBUILDDIR=\`rpmquery --eval '%{_topdir}' 2> /dev/null\`
+echo "Working under $TOPBUILDDIR"
 rm -f /tmp/mondorescue.log
-for p in $ppkg ; do
-    rpm -ivh \$p
-    src=\`rpm -qlp \$p | grep -E '\.spec'\`
-    spec=\`tar tvf rpm/SOURCES/\$src | grep -E "\$p-fc.spec"\`
-    tar xf rpm/SOURCES/\$src \$spec
-    s=\`rpm -qlp \$p | egrep '\.spec'\`
-    mv \$p-fc.spec rpm/SPECS/\$s
-    # Use dist for fc
-    perl -pi -e "s/define Release:[ \t]+([0-9]+)..*/define Release: \$1%{?dist}/" rpm/SPECS/\$s
-    perl -pi -e 's/ Bruno Cornec <bruno@mondorescue.org>..*/ Bruno Cornec <bruno@mondorescue.org> %{version}-%{release}/' rpm/SPECS/\$s
-    rm -rf rpm/BUILD/*
-    rpmbuild -ba rpm/SPECS/\$s 2>&1 | tee -a /tmp/mondorescue.log
+for p in $spkg ; do
+    pkg=\`basename \$p\`
+    rpm -ivh \$pkg
+    sp=\`rpm -qlp \$pkg | grep -E '\.spec'\`
+    src=\`rpm -qlp \$pkg | grep -E '\.tar\.'\`
+    fcsp=\`echo \$sp | sed 's/\.spec/-fc.spec/'\`
+    spec=\`tar tfz \$TOPBUILDDIR/SOURCES/\$src | grep -E "\$fcsp"\`
+    tar xzf \$TOPBUILDDIR/SOURCES/\$src \$spec
+    for s in \$spec ; do
+        file \$s | grep -q ISO-8859
+        if [ \$? -eq 0 ]; then
+            cat \$s | recode latin1..utf-8 > \$TOPBUILDDIR/SPECS/\$sp
+        else
+            mv \$s \$TOPBUILDDIR/SPECS/\$sp
+        fi
+        # Use dist for fc
+        perl -pi -e "s/define Release:[ \t]+([0-9]+)..*/define Release: \$1%{?dist}/" \$TOPBUILDDIR/SPECS/\$sp
+        perl -pi -e 's/ Bruno Cornec <bruno@mondorescue.org>..*/ Bruno Cornec <bruno@mondorescue.org> %{version}-%{release}/' \$TOPBUILDDIR/SPECS/\$sp
+        rm -rf \$TOPBUILDDIR/BUILD/*
+        rpmbuild -ba \$TOPBUILDDIR/SPECS/\$sp 2>&1 | tee -a /tmp/mondorescue.log
+    done
 done
 apkg=\`egrep "^Wrote:" /tmp/mondorescue.log | grep -v debug | cut -d: -f2\`
 aspkg=\`echo \$apkg | egrep "\.src.rpm"\`
-mkdir -p \$DSTDIR
-mv \$aspkg \$DSTDIR
+mkdir -p $DSTDIR
+mv \$aspkg $DSTDIR
 rm -f \$ppkg
+cd /tmp
 EOF
 chmod 755 /tmp/mkmondo
-scp -p ${spkg} /tmp/mkmondo ${ACCOUNT}:
+echo "Packages rebuild on ${ACCOUNT}"
 scp -p /tmp/mkmondo ${ACCOUNT}:
-echo "Packages rebuild on ${DSTNODE}"
-ssh -q ${ACCOUNT} ${DSTNODE} "./mkmondo"
+ssh -q ${ACCOUNT} "cp -v ${spkg} . ; ./mkmondo"
 ) 2>&1 | tee /tmp/pk2fc.log