Changeset 862 for rpmbuild-bot

Timestamp:

Oct 18, 2016, 10:14:43 PM (9 years ago)

Author:

dmik

Message:

rpmbuild-bot: Run rpmbuild only once for noarch-only specs.

It makes no sense to build noarch packages several times for different
architectures if there are no architecture specific pakgages. Unfortunately,
we cannot avoud duplicate noarch builds for specs with architecture
specific packages because rpmbuild doesn't seem to allow to exclude noarch
from the build.

Note that this revision also fixes a regression of building noarch-only
specs with rpmbuild-bot introduced somewhere in the past.

File:

• rpmbuild-bot/rpmbuild-bot.sh (modified) (2 diffs)

rpmbuild-bot/rpmbuild-bot.sh

@@ -366 +366 @@
   fi
 
+  local noarch_only=
   local start_time=
 
-  # Generate RPMs.
-  for arch in $arch_list ; do
+  # Generate RPMs (note that base_arch always goes first).
+  for arch in $base_arch ${arch_list%${base_arch}} ; do
     echo "Creating RPMs for '$arch' target (logging to $log_base.$arch.log)..."
     start_time=$(date +%s)
     log_run "$log_base.$arch.log" rpmbuild.exe --target=$arch -bb "$spec_full"
     print_elapsed start_time "Completed in \$e."
+    if ! grep -q "^Wrote: \+.*\.$arch\.rpm$" "$log_base.$arch.log" ; then
+      if ! grep -q "^Wrote: \+.*\.noarch\.rpm$" "$log_base.$arch.log" ; then
+        die "Target '$arch' did not produce any RPMs."
+      fi
+      noarch_only=1
+      echo "Skipping other targets because '$arch' produced only 'noarch' RPMs."
+      break
+    fi
   done
 
@@ -432 +441 @@
     echo `stat -c '%Y' "$f"`"|$f" >> "$ver_list"
   done
-  # Save other arch RPMs.
-  for arch in ${arch_list%${base_arch}} ; do
-    rpms="`grep "^Wrote: \+.*\.$arch\.rpm$" "$log_base.$arch.log" | sed -e "s#^Wrote: \+##g"`"
-    [ -n "$rpms" ] || die "Cannot find .$arch.rpm file names in '$log_base.arch.log'."
-    for f in $rpms ; do
-      echo `stat -c '%Y' "$f"`"|$f" >> "$ver_list"
+  # Save other arch RPMs (only if there is anything but noarch).
+  if [ -z "$noarch_only" ] ; then
+    for arch in ${arch_list%${base_arch}} ; do
+      rpms="`grep "^Wrote: \+.*\.$arch\.rpm$" "$log_base.$arch.log" | sed -e "s#^Wrote: \+##g"`"
+      [ -n "$rpms" ] || die "Cannot find .$arch.rpm file names in '$log_base.arch.log'."
+      for f in $rpms ; do
+        echo `stat -c '%Y' "$f"`"|$f" >> "$ver_list"
+      done
     done
-  done
+  fi
 
   # Everything succeeded. Symlink the list file so that "upload" can find it.