Fix backports dir search for PACKAGE="llfuse==0.41.1".

Also, drop "-v 0.41.1" args from fpm-info.sh: cannot specify version
both here and in run-build-packages.sh.

refs #8345

diff --git a/backports/python-llfuse/fpm-info.sh b/backports/python-llfuse/fpm-info.sh
index 327bc5e50f5793c6cb8a81a2f73117fac424e3be..a7d9398701b7bc4c405027c26f5133fe7b23d383 100644 (file)
--- a/backports/python-llfuse/fpm-info.sh
+++ b/backports/python-llfuse/fpm-info.sh
@@ -11,6 +11,3 @@ esac
 
 # FIXME: Remove this line after #6885 is done.
 fpm_args+=(--iteration 2)
-
-# FIXME: Remove once support for llfuse 0.42+ is in place
-fpm_args+=(-v 0.41.1)

diff --git a/build/run-library.sh b/build/run-library.sh
index c2e9b404764b92b2c653bab63cc99f7ba6fba771..bc76dd6ff30d513138e79483a79aedba0bf8b61e 100755 (executable)
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -244,10 +244,6 @@ fpm_build () {
   # that will take precedence, as desired.
   COMMAND_ARR+=(--iteration "$(default_iteration "$PACKAGE" "$VERSION")")
 
-  # 'dir' type packages are provided in the form /path/to/source=/path/to/dest
-  # so strip off the 2nd part to check for fpm-info below.
-  PACKAGE_DIR=$(echo $PACKAGE | sed 's/\/=.*//')
-
   # Append --depends X and other arguments specified by fpm-info.sh in
   # the package source dir. These are added last so they can override
   # the arguments added by this script.
@@ -255,19 +251,19 @@ fpm_build () {
   declare -a build_depends=()
   declare -a fpm_depends=()
   declare -a fpm_exclude=()
-  FPM_INFO=""
-  if [[ -d "$PACKAGE_DIR" ]]; then
-      FPM_INFO="$PACKAGE_DIR/fpm-info.sh"
-  elif [[ -e "${WORKSPACE}/backports/${PACKAGE_TYPE}-${PACKAGE}/fpm-info.sh" ]]; then
-      FPM_INFO="${WORKSPACE}/backports/${PACKAGE_TYPE}-${PACKAGE}/fpm-info.sh"
-      debug_echo "Found fpm-info.sh in backports: $FPM_INFO"
-  elif [[ -e "${WORKSPACE}/backports/${PACKAGE_TYPE}-${PACKAGE_NAME}/fpm-info.sh" ]]; then
-      FPM_INFO="${WORKSPACE}/backports/${PACKAGE_TYPE}-${PACKAGE_NAME}/fpm-info.sh"
-  fi
-  if [[ -e "$FPM_INFO" ]]; then
-      debug_echo "Loading fpm overrides from $FPM_INFO"
-      source "$FPM_INFO"
-  fi
+  declare -a fpm_dirs=(
+      # source dir part of 'dir' package ("/source=/dest" => "/source"):
+      "${PACKAGE%%=/*}"
+      # backports ("llfuse==0.41.1" => "backports/python-llfuse")
+      "${WORKSPACE}/backports/${PACKAGE_TYPE}-${PACKAGE%%[<=>]*}")
+  for pkgdir in "${fpm_dirs[@]}"; do
+      fpminfo="$pkgdir/fpm-info.sh"
+      if [[ -e "$fpminfo" ]]; then
+          debug_echo "Loading fpm overrides from $fpminfo"
+          source "$fpminfo"
+          break
+      fi
+  done
   for pkg in "${build_depends[@]}"; do
       if [[ $TARGET =~ debian|ubuntu ]]; then
           pkg_deb=$(ls "$WORKSPACE/packages/$TARGET/$pkg_"*.deb | sort -rg | awk 'NR==1')