X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/2d3726dd11046146731f7f7391659a5eaf44702b..10a5441e60ef81e9f875e4b49f987dba14622bf2:/build/run-build-packages.sh diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh index c56b74088f..e8cd721ae2 100755 --- a/build/run-build-packages.sh +++ b/build/run-build-packages.sh @@ -110,9 +110,6 @@ case "$TARGET" in debian9) FORMAT=deb ;; - ubuntu1204) - FORMAT=deb - ;; ubuntu1404) FORMAT=deb ;; @@ -288,55 +285,6 @@ handle_python_package fi ) -# On older platforms we need to publish a backport of libfuse >=2.9.2, -# and we need to build and install it here in order to even build an -# llfuse package. -cd $WORKSPACE/packages/$TARGET -if [[ $TARGET =~ ubuntu1204 ]]; then - # port libfuse 2.9.2 to Ubuntu 12.04 - LIBFUSE_DIR=$(mktemp -d) - ( - cd $LIBFUSE_DIR - # download fuse 2.9.2 ubuntu 14.04 source package - 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 --no-install-recommends 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 - ( - echo "fuse (2.9.2-5) precise; urgency=low" - echo - echo " * Backported from trusty-security to precise" - echo - echo " -- Joshua Randall 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 --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 - 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 - dpkg -i \ - "$WORKSPACE/packages/$TARGET/fuse_2.9.2-5_amd64.deb" \ - "$WORKSPACE/packages/$TARGET/libfuse2_2.9.2-5_amd64.deb" \ - "$WORKSPACE/packages/$TARGET/libfuse-dev_2.9.2-5_amd64.deb" - apt-get -y --no-install-recommends -f install - rm -rf $LIBFUSE_DIR -fi - # Go binaries cd $WORKSPACE/packages/$TARGET export GOPATH=$(mktemp -d) @@ -486,23 +434,8 @@ if [[ "$?" == "0" ]]; then fpm_build $WORKSPACE/tools/crunchstat-summary ${PYTHON2_PKG_PREFIX}-crunchstat-summary 'Curoverse, Inc.' 'python' "$crunchstat_summary_version" "--url=https://arvados.org" "--description=Crunchstat-summary reads Arvados Crunch log files and summarize resource usage" --iteration "$iteration" fi -# Forked libcloud -if test_package_presence "$PYTHON2_PKG_PREFIX"-apache-libcloud "$LIBCLOUD_PIN" python 2 -then - LIBCLOUD_DIR=$(mktemp -d) - ( - cd $LIBCLOUD_DIR - git clone $DASHQ_UNLESS_DEBUG https://github.com/curoverse/libcloud.git . - git checkout $DASHQ_UNLESS_DEBUG apache-libcloud-$LIBCLOUD_PIN - # libcloud is absurdly noisy without -q, so force -q here - OLD_DASHQ_UNLESS_DEBUG=$DASHQ_UNLESS_DEBUG - DASHQ_UNLESS_DEBUG=-q - handle_python_package - DASHQ_UNLESS_DEBUG=$OLD_DASHQ_UNLESS_DEBUG - ) - fpm_build $LIBCLOUD_DIR "$PYTHON2_PKG_PREFIX"-apache-libcloud "" python "" --iteration 2 - rm -rf $LIBCLOUD_DIR -fi +## if libcloud becomes our own fork see +## https://dev.arvados.org/issues/12268#note-27 # Python 2 dependencies declare -a PIP_DOWNLOAD_SWITCHES=(--no-deps)