X-Git-Url: https://git.jankratochvil.net/?a=blobdiff_plain;ds=inline;f=runone;h=70746e9d030212d8144889ac0834fed103162f64;hb=656a3e93403f216dd634d2ba81c8af8601650022;hp=28d2c23ec9b4425e0dbb9242c8ce2631ac6f1802;hpb=3d5f8a1b10fd96f8d800be7b400cbe19a4517a03;p=massrebuild.git

diff --git a/runone b/runone
index 28d2c23..70746e9 100755
--- a/runone
+++ b/runone
@@ -3,6 +3,8 @@ set -ex
 repos=$1
 shift
 mock="mock -v -r fedora-rawhide-x86_64 --uniqueext=mass$$ --no-bootstrap-chroot --disable-plugin=yum_cache"
+# https://bugzilla.redhat.com/show_bug.cgi?id=1869030 glibc 2.32.9000-1 snapshot build in rawhide breaks systemd-nspawn based chroots
+mock="$mock --isolation=simple"
 mkdir -p build
 cd build
 for pkg in "$@";do
@@ -31,7 +33,8 @@ for pkg in "$@";do
      continue
    fi
    (echo '%global _find_debuginfo_dwz_opts %{nil}'
-    echo '%global optflags %(echo %{optflags}|sed "s/ -g / -g -fdebug-types-section /")'
+# It removes -fcommon, use redhat-rpm-config.patch instead.
+#    echo '%global optflags %(echo %{optflags}|sed "s/ -g / -g -fdebug-types-section /")'
     sed 's/^%\(\(define\|global\) *_find_debuginfo_dwz_opts\)/\1/'
    ) <$name.spec >$name.spec.new
    cp -p $name.spec     ../$srcrpm.spec
@@ -47,33 +50,37 @@ for pkg in "$@";do
      continue
    fi
    # if not pkg.endswith('.rpm'): log.error("%s doesn't appear to be an rpm - skipping", pkg)
-   mv -f resultdir/*.src.rpm ../$srcrpm.dt.rpm
+   mv -f resultdir/*.src.rpm ../$srcrpm.nc.rpm
    cd ..
-  test -e $srcrpm.dt.rpm
+  test -e $srcrpm.nc.rpm
   rm -rf $srcrpm.d
-  for ext in "" ".dt.rpm";do
+  for ext in "" ".nc.rpm";do
     resultdir=$PWD/$srcrpm$ext.resultdir
     test ! -e $resultdir
     set +e
     # --chain instead of --rebuild as otherwise -a does not work
-    $mock --resultdir=$resultdir --nocheck $(: -a https://people.redhat.com/jkratoch/dwzrepo/ ) --chain $srcrpm$ext &>$srcrpm$ext.mocklog
-    rc=$?
+    $mock --resultdir=$resultdir --nocheck $(
+      if [ "$ext" = ".nc.rpm"  ];then echo -a https://www.jankratochvil.net/t/nocommon/;fi
+      if [ "$ext" = ".dt.rpm"  ];then echo -a https://www.jankratochvil.net/t/rpmdts/  ;fi
+      if [ "$ext" = ".dt5.rpm" ];then echo -a https://www.jankratochvil.net/t/rpmdts5/ ;fi
+      ) --chain $srcrpm$ext &>$srcrpm$ext.mocklog
+    mockrc=$?
     set -e
     test -e $resultdir
     #rm -f $srcrpm$ext
-    if [ $rc -ne 0 ];then
-      touch $srcrpm$ext.mockfail
-      break
-    fi
     # --chain ignores --resultdir
     resultdirsrc="$(sed -n 's/^INFO: Results out to: //p' $srcrpm$ext.mocklog)"
     if [ ! -e $resultdirsrc/*/root.log ];then
-      touch $srcrpm$ext.mockrfail
+      touch $srcrpm$ext.mockfail
       break
     fi
     # With --chain $resultdir contains just some small *.log files.
     rm -rf $resultdir
     mv `dirname $resultdirsrc/*/root.log` $resultdir
+    if [ $mockrc -ne 0 ];then
+      touch $srcrpm$ext.mockfail
+      break
+    fi
     echo >$srcrpm$ext.rpmsize $(du -sbc /dev/null $resultdir/*-debuginfo*.rpm|tail -n1|awk '{print $1}')
     size=0
     for i in $resultdir/*-debuginfo*.rpm;do