[ARVADOS-DEV] created: 07c05348740cd932e54aecfa52bf2a1260b3948e
Git user
git at public.curoverse.com
Sat Feb 20 04:37:33 EST 2016
at 07c05348740cd932e54aecfa52bf2a1260b3948e (commit)
commit 07c05348740cd932e54aecfa52bf2a1260b3948e
Author: Tom Clegg <tom at curoverse.com>
Date: Sat Feb 20 03:04:50 2016 -0500
Fix dependencies after installing built package. refs #8345
diff --git a/jenkins/run-library.sh b/jenkins/run-library.sh
index 117e2d2..0534b3d 100755
--- a/jenkins/run-library.sh
+++ b/jenkins/run-library.sh
@@ -269,6 +269,7 @@ fpm_build () {
echo "Attemping to install build_dep $pkg using apt-get"
apt-get install -y "$pkg"
fi
+ apt-get -y -f install
else
pkg_rpm=$(ls "$WORKSPACE/packages/$TARGET/$pkg"-[0-9]*.rpm | sort -rg | awk 'NR==1')
if [[ -e $pkg_rpm ]]; then
commit 4640c72bbd678b70827a6d3ecaf13a8e502dfd2a
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Feb 19 22:46:34 2016 -0500
8345: Add libselinux-dev build-dep missed by awk script, skip "recommended" packages
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 82d8d70..d850cb2 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -366,7 +366,7 @@ if [[ $TARGET =~ ubuntu1204 ]]; then
file="fuse_2.9.2-4ubuntu4.14.04.1.dsc" && curl -L -o "${file}" "http://archive.ubuntu.com/ubuntu/pool/main/f/fuse/${file}"
# install dpkg-source and dpkg-buildpackage commands
- apt-get install -y dpkg-dev
+ apt-get install -y --no-install-recommends dpkg-dev
# extract source and apply patches
dpkg-source -x fuse_2.9.2-4ubuntu4.14.04.1.dsc
@@ -386,7 +386,7 @@ if [[ $TARGET =~ ubuntu1204 ]]; then
mv debian/changelog.new debian/changelog
# install build-deps and build
- apt-get install -y $(awk 'BEGIN {FS=":"} $1=="Build-Depends" {n=split($2,deps,","); for (i=0; i<n; i++) {split(deps[i],pkg," "); if (pkg[1]!="") {print pkg[1]}}}' debian/control)
+ apt-get install -y --no-install-recommends debhelper dh-autoreconf libselinux-dev
dpkg-buildpackage -rfakeroot -b
)
fpm_build "$LIBFUSE_DIR/fuse_2.9.2-5_amd64.deb" fuse "Ubuntu Developers" deb "2.9.2" --iteration 5
commit 8600760481ba1724cc18bd9b8be7b99bbca29dea
Author: Joshua C. Randall <jcrandall at alum.mit.edu>
Date: Fri Feb 19 14:26:35 2016 +0000
uses variable for curl output filename and makes curl foLlow redirects
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 7b0c8ec..82d8d70 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -361,9 +361,9 @@ if [[ $TARGET =~ ubuntu1204 ]]; then
(
cd $LIBFUSE_DIR
# download fuse 2.9.2 ubuntu 14.04 source package
- curl -o fuse_2.9.2.orig.tar.xz http://archive.ubuntu.com/ubuntu/pool/main/f/fuse/fuse_2.9.2.orig.tar.xz
- curl -o fuse_2.9.2-4ubuntu4.14.04.1.debian.tar.xz http://archive.ubuntu.com/ubuntu/pool/main/f/fuse/fuse_2.9.2-4ubuntu4.14.04.1.debian.tar.xz
- curl -o fuse_2.9.2-4ubuntu4.14.04.1.dsc http://archive.ubuntu.com/ubuntu/pool/main/f/fuse/fuse_2.9.2-4ubuntu4.14.04.1.dsc
+ file="fuse_2.9.2.orig.tar.xz" && curl -L -o "${file}" "http://archive.ubuntu.com/ubuntu/pool/main/f/fuse/${file}"
+ file="fuse_2.9.2-4ubuntu4.14.04.1.debian.tar.xz" && curl -L -o "${file}" "http://archive.ubuntu.com/ubuntu/pool/main/f/fuse/${file}"
+ file="fuse_2.9.2-4ubuntu4.14.04.1.dsc" && curl -L -o "${file}" "http://archive.ubuntu.com/ubuntu/pool/main/f/fuse/${file}"
# install dpkg-source and dpkg-buildpackage commands
apt-get install -y dpkg-dev
@@ -401,7 +401,7 @@ elif [[ $TARGET =~ centos6 ]]; then
(
cd "$LIBFUSE_DIR"
# download fuse 2.9.2 centos 7 source rpm
- curl -o fuse-2.9.2-6.el7.src.rpm "http://vault.centos.org/7.2.1511/os/Source/SPackages/fuse-2.9.2-6.el7.src.rpm"
+ file="fuse-2.9.2-6.el7.src.rpm" && curl -L -o "${file}" "http://vault.centos.org/7.2.1511/os/Source/SPackages/${file}"
(
# modify source rpm spec to remove conflict on filesystem version
mkdir -p /root/rpmbuild/SOURCES
commit b7e4507cfe19368f0f80dddfde111f2dd0a690fb
Author: Joshua C. Randall <jcrandall at alum.mit.edu>
Date: Fri Feb 19 14:18:06 2016 +0000
cleans up debian/changelog generation per tomclegg's comment
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 56a67f1..7b0c8ec 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -374,17 +374,18 @@ if [[ $TARGET =~ ubuntu1204 ]]; then
# add new version to changelog
cd fuse-2.9.2
- mv debian/changelog debian/changelog.old
- echo "fuse (2.9.2-5) precise; urgency=low" > debian/changelog
- echo "" >> debian/changelog
- echo " * Backported from trusty-security to precise" >> debian/changelog
- echo "" >> debian/changelog
- echo " -- Joshua Randall <jcrandall at alum.mit.edu> Thu, 4 Feb 2016 11:31:00 -0000" >> debian/changelog
- echo "" >> debian/changelog
- cat debian/changelog.old >> debian/changelog
- rm -f debian/changelog.old
-
- # install build-deps and build
+ (
+ echo "fuse (2.9.2-5) precise; urgency=low"
+ echo
+ echo " * Backported from trusty-security to precise"
+ echo
+ echo " -- Joshua Randall <jcrandall at alum.mit.edu> Thu, 4 Feb 2016 11:31:00 -0000"
+ echo
+ cat debian/changelog
+ ) > debian/changelog.new
+ mv debian/changelog.new debian/changelog
+
+ # install build-deps and build
apt-get install -y $(awk 'BEGIN {FS=":"} $1=="Build-Depends" {n=split($2,deps,","); for (i=0; i<n; i++) {split(deps[i],pkg," "); if (pkg[1]!="") {print pkg[1]}}}' debian/control)
dpkg-buildpackage -rfakeroot -b
)
commit abb1db4b4dcb4931c7fa2c03e21b994ddd911a3c
Author: Joshua C. Randall <jcrandall at alum.mit.edu>
Date: Fri Feb 19 14:11:47 2016 +0000
adds safety quotes and '-[0-9]' before wildcard as suggested in PR #6 comments
diff --git a/jenkins/run-library.sh b/jenkins/run-library.sh
index 7198345..117e2d2 100755
--- a/jenkins/run-library.sh
+++ b/jenkins/run-library.sh
@@ -270,7 +270,7 @@ fpm_build () {
apt-get install -y "$pkg"
fi
else
- pkg_rpm=$(ls $WORKSPACE/packages/$TARGET/$pkg*.rpm | sort -rg | awk 'NR==1')
+ pkg_rpm=$(ls "$WORKSPACE/packages/$TARGET/$pkg"-[0-9]*.rpm | sort -rg | awk 'NR==1')
if [[ -e $pkg_rpm ]]; then
echo "Installing build_dep $pkg from $pkg_rpm"
rpm -i "$pkg_rpm"
commit 99e1256022759020b0bba971ea5c4e252dab4611
Author: Joshua C. Randall <jcrandall at alum.mit.edu>
Date: Fri Feb 19 14:09:34 2016 +0000
adds safety quotes and '_' before wildcard as suggested in PR #6 comments
diff --git a/jenkins/run-library.sh b/jenkins/run-library.sh
index 3901882..7198345 100755
--- a/jenkins/run-library.sh
+++ b/jenkins/run-library.sh
@@ -261,7 +261,7 @@ fpm_build () {
fi
for pkg in "${build_depends[@]}"; do
if [[ $TARGET =~ debian|ubuntu ]]; then
- pkg_deb=$(ls $WORKSPACE/packages/$TARGET/$pkg*.deb | sort -rg | awk 'NR==1')
+ pkg_deb=$(ls "$WORKSPACE/packages/$TARGET/$pkg_"*.deb | sort -rg | awk 'NR==1')
if [[ -e $pkg_deb ]]; then
echo "Installing build_dep $pkg from $pkg_deb"
dpkg -i "$pkg_deb"
commit f46095f12c8470a4eac64997bef622e5f26cafb9
Author: Joshua Randall <joshua.randall at sanger.ac.uk>
Date: Fri Feb 5 15:16:37 2016 +0000
adds centos6 backport of fuse 2.9.2
diff --git a/jenkins/package-build-dockerfiles/centos6/Dockerfile b/jenkins/package-build-dockerfiles/centos6/Dockerfile
index 2bbec2e..64905b1 100644
--- a/jenkins/package-build-dockerfiles/centos6/Dockerfile
+++ b/jenkins/package-build-dockerfiles/centos6/Dockerfile
@@ -2,7 +2,7 @@ FROM centos:6
MAINTAINER Brett Smith <brett at curoverse.com>
# Install build dependencies provided in base distribution
-RUN yum -q -y install make automake gcc gcc-c++ libyaml-devel patch readline-devel zlib-devel libffi-devel openssl-devel bzip2 libtool bison sqlite-devel rpm-build git perl-ExtUtils-MakeMaker fuse-devel libattr-devel nss-devel libcurl-devel which tar scl-utils centos-release-SCL postgresql-devel
+RUN yum -q -y install make automake gcc gcc-c++ libyaml-devel patch readline-devel zlib-devel libffi-devel openssl-devel bzip2 libtool bison sqlite-devel rpm-build git perl-ExtUtils-MakeMaker libattr-devel nss-devel libcurl-devel which tar scl-utils centos-release-SCL postgresql-devel
# Install golang binary
ADD generated/golang-amd64.tar.gz /usr/local/
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 792325a..56a67f1 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -355,8 +355,8 @@ LIBCLOUD_DIR=$(mktemp -d)
fpm_build $LIBCLOUD_DIR "$PYTHON2_PKG_PREFIX"-apache-libcloud
rm -rf $LIBCLOUD_DIR
-# libfuse 2.9.2 on Ubuntu 12.04
if [[ $TARGET =~ ubuntu1204 ]]; then
+ # port libfuse 2.9.2 to Ubuntu 12.04
LIBFUSE_DIR=$(mktemp -d)
(
cd $LIBFUSE_DIR
@@ -365,11 +365,12 @@ if [[ $TARGET =~ ubuntu1204 ]]; then
curl -o fuse_2.9.2-4ubuntu4.14.04.1.debian.tar.xz http://archive.ubuntu.com/ubuntu/pool/main/f/fuse/fuse_2.9.2-4ubuntu4.14.04.1.debian.tar.xz
curl -o fuse_2.9.2-4ubuntu4.14.04.1.dsc http://archive.ubuntu.com/ubuntu/pool/main/f/fuse/fuse_2.9.2-4ubuntu4.14.04.1.dsc
- # install dpkg-dev for dpkg-source and dpkg-buildpackage commands
+ # install dpkg-source and dpkg-buildpackage commands
apt-get install -y dpkg-dev
# extract source and apply patches
dpkg-source -x fuse_2.9.2-4ubuntu4.14.04.1.dsc
+ rm -f fuse_2.9.2.orig.tar.xz fuse_2.9.2-4ubuntu4.14.04.1.debian.tar.xz fuse_2.9.2-4ubuntu4.14.04.1.dsc
# add new version to changelog
cd fuse-2.9.2
@@ -381,16 +382,44 @@ if [[ $TARGET =~ ubuntu1204 ]]; then
echo " -- Joshua Randall <jcrandall at alum.mit.edu> Thu, 4 Feb 2016 11:31:00 -0000" >> debian/changelog
echo "" >> debian/changelog
cat debian/changelog.old >> debian/changelog
- rm debian/changelog.old
+ rm -f debian/changelog.old
# install build-deps and build
apt-get install -y $(awk 'BEGIN {FS=":"} $1=="Build-Depends" {n=split($2,deps,","); for (i=0; i<n; i++) {split(deps[i],pkg," "); if (pkg[1]!="") {print pkg[1]}}}' debian/control)
dpkg-buildpackage -rfakeroot -b
)
- fpm_build $LIBFUSE_DIR/fuse_2.9.2-5_amd64.deb fuse "Ubuntu Developers" deb "2.9.2" --iteration 5
- fpm_build $LIBFUSE_DIR/libfuse2_2.9.2-5_amd64.deb libfuse2 "Ubuntu Developers" deb "2.9.2" --iteration 5
- fpm_build $LIBFUSE_DIR/libfuse-dev_2.9.2-5_amd64.deb libfuse-dev "Ubuntu Developers" deb "2.9.2" --iteration 5
+ fpm_build "$LIBFUSE_DIR/fuse_2.9.2-5_amd64.deb" fuse "Ubuntu Developers" deb "2.9.2" --iteration 5
+ fpm_build "$LIBFUSE_DIR/libfuse2_2.9.2-5_amd64.deb" libfuse2 "Ubuntu Developers" deb "2.9.2" --iteration 5
+ fpm_build "$LIBFUSE_DIR/libfuse-dev_2.9.2-5_amd64.deb" libfuse-dev "Ubuntu Developers" deb "2.9.2" --iteration 5
rm -rf $LIBFUSE_DIR
+elif [[ $TARGET =~ centos6 ]]; then
+ # port fuse 2.9.2 to centos 6
+ # install tools to build rpm from source
+ yum install -y rpm-build redhat-rpm-config
+ LIBFUSE_DIR=$(mktemp -d)
+ (
+ cd "$LIBFUSE_DIR"
+ # download fuse 2.9.2 centos 7 source rpm
+ curl -o fuse-2.9.2-6.el7.src.rpm "http://vault.centos.org/7.2.1511/os/Source/SPackages/fuse-2.9.2-6.el7.src.rpm"
+ (
+ # modify source rpm spec to remove conflict on filesystem version
+ mkdir -p /root/rpmbuild/SOURCES
+ cd /root/rpmbuild/SOURCES
+ rpm2cpio ${LIBFUSE_DIR}/fuse-2.9.2-6.el7.src.rpm | cpio -i
+ perl -pi -e 's/Conflicts:\s*filesystem.*//g' fuse.spec
+ )
+ # build rpms from source
+ rpmbuild -bb /root/rpmbuild/SOURCES/fuse.spec
+ rm -f fuse-2.9.2-6.el7.src.rpm
+ # move built RPMs to LIBFUSE_DIR
+ mv "/root/rpmbuild/RPMS/x86_64/fuse-2.9.2-6.el6.x86_64.rpm" ${LIBFUSE_DIR}/
+ mv "/root/rpmbuild/RPMS/x86_64/fuse-libs-2.9.2-6.el6.x86_64.rpm" ${LIBFUSE_DIR}/
+ mv "/root/rpmbuild/RPMS/x86_64/fuse-devel-2.9.2-6.el6.x86_64.rpm" ${LIBFUSE_DIR}/
+ rm -rf /root/rpmbuild
+ )
+ fpm_build "$LIBFUSE_DIR/fuse-libs-2.9.2-6.el6.x86_64.rpm" fuse-libs "Centos Developers" rpm "2.9.2" --iteration 5
+ fpm_build "$LIBFUSE_DIR/fuse-2.9.2-6.el6.x86_64.rpm" fuse "Centos Developers" rpm "2.9.2" --iteration 5 --no-auto-depends
+ fpm_build "$LIBFUSE_DIR/fuse-devel-2.9.2-6.el6.x86_64.rpm" fuse-devel "Centos Developers" rpm "2.9.2" --iteration 5 --no-auto-depends
fi
# Python 2 dependencies
commit 11280265c0ce229e5bd617583a06e630901a8617
Author: Joshua Randall <joshua.randall at sanger.ac.uk>
Date: Wed Feb 3 12:48:19 2016 +0000
Unpins llfuse version and adds fuse 2.9.2 backport
diff --git a/jenkins/run-build-packages.sh b/jenkins/run-build-packages.sh
index 97251c5..792325a 100755
--- a/jenkins/run-build-packages.sh
+++ b/jenkins/run-build-packages.sh
@@ -92,7 +92,7 @@ case "$TARGET" in
PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
- ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
+ ciso8601 pycrypto backports.ssl_match_hostname llfuse \
'pycurl<7.21.5')
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
;;
@@ -105,7 +105,7 @@ case "$TARGET" in
PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
- ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
+ ciso8601 pycrypto backports.ssl_match_hostname llfuse \
'pycurl<7.21.5')
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
;;
@@ -118,7 +118,8 @@ case "$TARGET" in
PYTHON_BACKPORTS=(python-gflags pyvcf google-api-python-client \
oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
- ciso8601 pycrypto backports.ssl_match_hostname llfuse==0.41.1 \
+ ciso8601 pycrypto backports.ssl_match_hostname llfuse \
+ contextlib2 \
'pycurl<7.21.5')
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
;;
@@ -128,7 +129,7 @@ case "$TARGET" in
PYTHON2_PKG_PREFIX=python
PYTHON3_PACKAGE=python$PYTHON3_VERSION
PYTHON3_PKG_PREFIX=python3
- PYTHON_BACKPORTS=(pyasn1==0.1.7 pyvcf pyasn1-modules==0.0.5 llfuse==0.41.1 ciso8601 \
+ PYTHON_BACKPORTS=(pyasn1==0.1.7 pyvcf pyasn1-modules==0.0.5 llfuse ciso8601 \
google-api-python-client six uritemplate oauth2client httplib2 \
rsa 'pycurl<7.21.5' backports.ssl_match_hostname)
PYTHON3_BACKPORTS=(docker-py requests websocket-client)
@@ -143,7 +144,7 @@ case "$TARGET" in
oauth2client pyasn1==0.1.7 pyasn1-modules==0.0.5 \
rsa uritemplate httplib2 ws4py pykka six pyexecjs jsonschema \
ciso8601 pycrypto backports.ssl_match_hostname 'pycurl<7.21.5' \
- python-daemon lockfile llfuse==0.41.1 'pbr<1.0')
+ python-daemon lockfile llfuse 'pbr<1.0')
PYTHON3_BACKPORTS=(docker-py six requests websocket-client)
export PYCURL_SSL_LIBRARY=nss
;;
@@ -354,6 +355,44 @@ LIBCLOUD_DIR=$(mktemp -d)
fpm_build $LIBCLOUD_DIR "$PYTHON2_PKG_PREFIX"-apache-libcloud
rm -rf $LIBCLOUD_DIR
+# libfuse 2.9.2 on Ubuntu 12.04
+if [[ $TARGET =~ ubuntu1204 ]]; then
+ LIBFUSE_DIR=$(mktemp -d)
+ (
+ cd $LIBFUSE_DIR
+ # download fuse 2.9.2 ubuntu 14.04 source package
+ curl -o fuse_2.9.2.orig.tar.xz http://archive.ubuntu.com/ubuntu/pool/main/f/fuse/fuse_2.9.2.orig.tar.xz
+ curl -o fuse_2.9.2-4ubuntu4.14.04.1.debian.tar.xz http://archive.ubuntu.com/ubuntu/pool/main/f/fuse/fuse_2.9.2-4ubuntu4.14.04.1.debian.tar.xz
+ curl -o fuse_2.9.2-4ubuntu4.14.04.1.dsc http://archive.ubuntu.com/ubuntu/pool/main/f/fuse/fuse_2.9.2-4ubuntu4.14.04.1.dsc
+
+ # install dpkg-dev for dpkg-source and dpkg-buildpackage commands
+ apt-get install -y dpkg-dev
+
+ # extract source and apply patches
+ dpkg-source -x fuse_2.9.2-4ubuntu4.14.04.1.dsc
+
+ # add new version to changelog
+ cd fuse-2.9.2
+ mv debian/changelog debian/changelog.old
+ echo "fuse (2.9.2-5) precise; urgency=low" > debian/changelog
+ echo "" >> debian/changelog
+ echo " * Backported from trusty-security to precise" >> debian/changelog
+ echo "" >> debian/changelog
+ echo " -- Joshua Randall <jcrandall at alum.mit.edu> Thu, 4 Feb 2016 11:31:00 -0000" >> debian/changelog
+ echo "" >> debian/changelog
+ cat debian/changelog.old >> debian/changelog
+ rm debian/changelog.old
+
+ # install build-deps and build
+ apt-get install -y $(awk 'BEGIN {FS=":"} $1=="Build-Depends" {n=split($2,deps,","); for (i=0; i<n; i++) {split(deps[i],pkg," "); if (pkg[1]!="") {print pkg[1]}}}' debian/control)
+ dpkg-buildpackage -rfakeroot -b
+ )
+ fpm_build $LIBFUSE_DIR/fuse_2.9.2-5_amd64.deb fuse "Ubuntu Developers" deb "2.9.2" --iteration 5
+ fpm_build $LIBFUSE_DIR/libfuse2_2.9.2-5_amd64.deb libfuse2 "Ubuntu Developers" deb "2.9.2" --iteration 5
+ fpm_build $LIBFUSE_DIR/libfuse-dev_2.9.2-5_amd64.deb libfuse-dev "Ubuntu Developers" deb "2.9.2" --iteration 5
+ rm -rf $LIBFUSE_DIR
+fi
+
# Python 2 dependencies
declare -a PIP_DOWNLOAD_SWITCHES=(--no-deps)
# Add --no-use-wheel if this pip knows it.
diff --git a/jenkins/run-library.sh b/jenkins/run-library.sh
index 83e0ea0..3901882 100755
--- a/jenkins/run-library.sh
+++ b/jenkins/run-library.sh
@@ -243,17 +243,43 @@ fpm_build () {
# the package source dir. These are added last so they can override
# the arguments added by this script.
declare -a fpm_args=()
+ 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"
- else
+ 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
+ for pkg in "${build_depends[@]}"; do
+ if [[ $TARGET =~ debian|ubuntu ]]; then
+ pkg_deb=$(ls $WORKSPACE/packages/$TARGET/$pkg*.deb | sort -rg | awk 'NR==1')
+ if [[ -e $pkg_deb ]]; then
+ echo "Installing build_dep $pkg from $pkg_deb"
+ dpkg -i "$pkg_deb"
+ else
+ echo "Attemping to install build_dep $pkg using apt-get"
+ apt-get install -y "$pkg"
+ fi
+ else
+ pkg_rpm=$(ls $WORKSPACE/packages/$TARGET/$pkg*.rpm | sort -rg | awk 'NR==1')
+ if [[ -e $pkg_rpm ]]; then
+ echo "Installing build_dep $pkg from $pkg_rpm"
+ rpm -i "$pkg_rpm"
+ else
+ echo "Attemping to install build_dep $pkg"
+ rpm -i "$pkg"
+ fi
+ fi
+ done
for i in "${fpm_depends[@]}"; do
COMMAND_ARR+=('--depends' "$i")
done
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list