Changeset 949 for rpmbuild-bot

Timestamp:

Feb 3, 2017, 8:12:15 PM (9 years ago)

Author:

dmik

Message:

rpmbuild-bot: Add support for automatic generation of legacy runtime sub-packages.

Location:

rpmbuild-bot

Files:

• rpmbuild-bot-env.sh (modified) (2 diffs)
• rpmbuild-bot.sh (modified) (4 diffs)

rpmbuild-bot/rpmbuild-bot-env.sh

@@ -66 +66 @@
 RPMBUILD_BOT_ARCH_LIST_kLIBCum="i686" # Binary build -> no other archs.
 
+# Legacy DLLs for specific packages. Each RPM from the list (format is
+# "ABI|NAME|VERSION-RELEASE|[FILEMASK]|[ARCH]") for each target platform is
+# downloaded from a repository specified in RPMBUILD_BOT_UPLOAD_REPO_STABLE
+# and scanned for FILEMASK files (*.dll by default). These files are then
+# extracted to a directory called RPM_SOURCE_DIR/PACKAGE-legacy (preserving the
+# original directory tree) and, if PACKAGE.spec contains a macro named
+# %legacy_runtime_packages, they are later placed to a sub-package called
+# `legacy-ABI` when rpmbuild is run. If ARCH is specified, this platform's
+# legacy package will be used for all target platforms.
+RPMBUILD_BOT_LEGACY_libvpx="2|libvpx|1.4.0-2"
+
 # Basic RPM repository layout for this distribution channel.
 RPMBUILD_BOT_UPLOAD_REPO_LAYOUT_rpm="\$base/i386/\$arch"
@@ -74 +85 @@
 RPMBUILD_BOT_UPLOAD_REPO_LIST="exp rel"
 
+# Name of the stable repository (must be present in the above list).
+RPMBUILD_BOT_UPLOAD_REPO_STABLE="rel"
+
 # Sanity checks.
 check_dir_var "RPM_NETLABS_ORG_DIR"

rpmbuild-bot/rpmbuild-bot.sh

@@ -342 +342 @@
 }
 
-build_cmd()
-{
+get_legacy_runtime()
+{
+  [ -n "$src_dir" ] || die "src_dir is empty."
+  [ -n "$RPMBUILD_BOT_UPLOAD_REPO_STABLE" ] || die "RPMBUILD_BOT_UPLOAD_REPO_STABLE is empty."
+
   local spec_name_=`echo "${spec_name}" | tr - _`
   eval local arch_list="\${RPMBUILD_BOT_ARCH_LIST_${spec_name_}}"
   [ -z "$arch_list" ] && arch_list="${RPMBUILD_BOT_ARCH_LIST}"
 
+  eval local rpm_list="\${RPMBUILD_BOT_LEGACY_${spec_name_}}"
+  [ -z "$rpm_list" ] && return # nothing to do
+
+  eval local base="\$RPMBUILD_BOT_UPLOAD_${RPMBUILD_BOT_UPLOAD_REPO_STABLE}_DIR"
+
+  local abi_list=
+
+  for rpm_spec in "$rpm_list" ; do
+    local abi name ver mask legacy_arch
+    IFS='|' read abi name ver mask legacy_arch <<EOF
+${rpm_spec}
+EOF
+    [ -z "$abi" -o -z "$name" -o -z "$ver" ] && die "Value '${rpm_spec}' in RPMBUILD_BOT_LEGACY_${spec_name_} is invalid."
+    [ -z "$mask" ] && mask="*.dll"
+
+    abi_list="$abi_list${abi_list:+ }$abi"
+
+    # Enumerate RPMs for all archs and extract them
+    echo "Getting legacy runtime ($mask) for ABI '$abi'..."
+    for arch in ${legacy_arch:-${arch_list}} ; do
+      eval local rpm="$RPMBUILD_BOT_UPLOAD_REPO_LAYOUT_rpm/$name-$ver$dist_mark.$arch.rpm"
+      local tgt_dir="$src_dir/$spec_name-legacy/$abi/$arch"
+      # Check filenames and timestamps
+      echo "Checking package $rpm..."
+      [ -f "$rpm" ] || die "File '$rpm' is not found."
+      local old_ts old_rpm old_name old_ver
+      [ -f "$tgt_dir.list" ] && IFS='|' read old_ts old_rpm old_name old_ver < "$tgt_dir.list"
+      local ts=`stat -c '%Y' "$rpm"`
+      # Drop fractional part of seconds reported by older coreutils
+      ts="${ts%%.*}"
+      old_ts="${old_ts%%.*}"
+      if [ "$old_rpm" != "$rpm" -o "$ts" != "$old_ts" -o "$name" != "$old_name" -o "$ver" != "$old_ver" ] ; then
+        echo "Extracting to $tgt_dir..."
+        run rm -f "$tgt_dir.list" && rm -rf "$tgt_dir"
+        (run mkdir -p "$tgt_dir" && cd "$tgt_dir"; run rpm2cpio "$rpm" | eval cpio -idm $mask)
+        # save the list for later use
+        find "$tgt_dir" -type f -printf '/%P\n' > "$tgt_dir.files.list"
+        # now try to locate the debuginfo package and extract *.dbg from it
+        eval local debug_rpm="$RPMBUILD_BOT_UPLOAD_REPO_LAYOUT_rpm/$name-debuginfo-$ver$dist_mark.$arch.rpm"
+        [ ! -f "$debug_rpm" ] && eval debug_rpm="$RPMBUILD_BOT_UPLOAD_REPO_LAYOUT_rpm/$name-debug-$ver$dist_mark.$arch.rpm"
+        if [ -f "$debug_rpm" ] ; then
+          echo "Found debug info package $debug_rpm, extracting..."
+          local dbgfilelist="$tgt_dir.debugfiles.list"
+          run rm -rf "$dbgfilelist"
+          local masks=
+          local f
+          while read -r f ; do
+            f="${f%.*}.dbg"
+            masks="$masks${masks:+ }'*$f'"
+            # Save the file for later inclusion into debugfiles.list (%debug_package magic in brp-strip.os2)
+            run echo "$f" >> "$dbgfilelist"
+          done < "$tgt_dir.files.list"
+          (run cd "$tgt_dir"; run rpm2cpio "$debug_rpm" | eval cpio -idm $masks)
+        fi
+        # put the 'done' mark
+        run echo "$ts|$rpm|$name|$ver" > "$tgt_dir.list"
+      fi
+    done
+  done
+
+  run echo "$abi_list" > "$src_dir/$spec_name-legacy/abi.list"
+}
+
+build_prepare()
+{
+  sync_aux_src
+  get_legacy_runtime
+}
+
+build_cmd()
+{
+  local spec_name_=`echo "${spec_name}" | tr - _`
+  eval local arch_list="\${RPMBUILD_BOT_ARCH_LIST_${spec_name_}}"
+  [ -z "$arch_list" ] && arch_list="${RPMBUILD_BOT_ARCH_LIST}"
+
   local base_arch="${arch_list##* }"
 
@@ -353 +431 @@
   echo "Targets:   $arch_list + SRPM + ZIP ($base_arch)"
 
-  sync_aux_src
+  build_prepare
 
   if [ -f "$spec_list" ] ; then
@@ -471 +549 @@
   echo "Spec file: $spec_full"
 
-  sync_aux_src
-
   local base_arch="${RPMBUILD_BOT_ARCH_LIST##* }"
   local cmds=
@@ -480 +556 @@
   case "$command_arg" in
     all)
+      build_prepare
       cmds="$cmds -bb"
       ;;