Changeset 833 for rpmbuild-bot

Timestamp:

Aug 8, 2016, 3:57:12 PM (9 years ago)

Author:

dmik

Message:

rpmbuild-bot: Support per-package ARCH specification in -env.sh.

This is to be used to restrict (or enhance) the package list for
specific package needs. One use case is to limit the number of
architectures to one for packages composed from pre-built
binaries (often available for only a single architecture).

Location:

rpmbuild-bot

Files:

• rpmbuild-bot-env.sh (modified) (1 diff)
• rpmbuild-bot.sh (modified) (3 diffs)

rpmbuild-bot/rpmbuild-bot-env.sh

@@ -59 +59 @@
 RPMBUILD_BOT_ARCH_LIST="pentium4 i686"
 
+# Overrides of RPM arch list for specific packages.
+RPMBUILD_BOT_ARCH_LIST_libc="i686" # Binary build -> no other archs.
+
 # Basic RPM repository layout for this distribution channel.
 RPMBUILD_BOT_UPLOAD_REPO_LAYOUT_rpm="\$base/i386/\$arch"

rpmbuild-bot/rpmbuild-bot.sh

@@ -333 +333 @@
 build_cmd()
 {
-  local base_arch="${RPMBUILD_BOT_ARCH_LIST##* }"
+  eval local arch_list="\${RPMBUILD_BOT_ARCH_LIST_${spec_name}}"
+  [ -z "$arch_list" ] && arch_list="${RPMBUILD_BOT_ARCH_LIST}"
+
+  local base_arch="${arch_list##* }"
 
   echo "Spec file: $spec_full"
-  echo "Targets:   $RPMBUILD_BOT_ARCH_LIST + SRPM + ZIP ($base_arch)"
+  echo "Targets:   $arch_list + SRPM + ZIP ($base_arch)"
 
   sync_aux_src
@@ -365 +368 @@
 
   # Generate RPMs.
-  for arch in $RPMBUILD_BOT_ARCH_LIST ; do
+  for arch in $arch_list ; do
     echo "Creating RPMs for '$arch' target (logging to $log_base.$arch.log)..."
     start_time=$(date +%s)
@@ -429 +432 @@
   done
   # Save other arch RPMs.
-  for arch in ${RPMBUILD_BOT_ARCH_LIST%${base_arch}} ; do
+  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'."