From 10a5441e60ef81e9f875e4b49f987dba14622bf2 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Tue, 24 Apr 2018 23:21:16 -0400 Subject: [PATCH] Remove remaining build script references to ubuntu1204, which we do not build packages for anymore. No issue # Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- build/build.list | 68 +++++++++---------- .../test-packages-ubuntu1204.sh | 1 - build/run-build-packages.sh | 52 -------------- 3 files changed, 34 insertions(+), 87 deletions(-) delete mode 120000 build/package-testing/test-packages-ubuntu1204.sh diff --git a/build/build.list b/build/build.list index dfbfb4a257..846e68e344 100644 --- a/build/build.list +++ b/build/build.list @@ -3,44 +3,44 @@ # SPDX-License-Identifier: AGPL-3.0 #distribution(s)|name|version|iteration|type|architecture|extra fpm arguments -debian8,debian9,ubuntu1204,centos7|python-gflags|2.0|2|python|all -debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|google-api-python-client|1.6.2|2|python|all -debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|apache-libcloud|2.3.0|2|python|all -debian8,debian9,ubuntu1204,ubuntu1404,centos7|oauth2client|1.5.2|2|python|all -debian8,debian9,ubuntu1204,ubuntu1404,centos7|pyasn1|0.1.7|2|python|all -debian8,debian9,ubuntu1204,ubuntu1404,centos7|pyasn1-modules|0.0.5|2|python|all -debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|rsa|3.4.2|2|python|all -debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|uritemplate|3.0.0|2|python|all -debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|httplib2|0.9.2|3|python|all -debian8,debian9,ubuntu1204,centos7|ws4py|0.3.5|2|python|all -debian8,debian9,ubuntu1204,centos7|pykka|1.2.1|2|python|all -debian8,debian9,ubuntu1204,ubuntu1404,centos7|six|1.10.0|2|python|all -debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|ciso8601|1.0.3|3|python|amd64 -debian8,debian9,ubuntu1204,centos7|pycrypto|2.6.1|3|python|amd64 -debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604|backports.ssl_match_hostname|3.5.0.1|2|python|all -debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|llfuse|1.2|3|python|amd64 -debian8,debian9,ubuntu1204,ubuntu1404,centos7|pycurl|7.19.5.3|3|python|amd64 -debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|pyyaml|3.12|2|python|amd64 -debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|rdflib|4.2.2|2|python|all -debian8,debian9,ubuntu1204,ubuntu1404,centos7|shellescape|3.4.1|2|python|all -debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|mistune|0.7.3|2|python|all -debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|typing|3.5.3.0|2|python|all -debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|avro|1.8.1|2|python|all -debian8,debian9,ubuntu1204,ubuntu1404,centos7|ruamel.ordereddict|0.4.9|2|python|amd64 -debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|cachecontrol|0.11.7|2|python|all -debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|pathlib2|2.1.0|2|python|all -debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|docker-py|1.7.2|2|python3|all -debian8,debian9,ubuntu1204,centos7|six|1.10.0|2|python3|all -debian8,debian9,ubuntu1204,ubuntu1404,centos7|requests|2.12.4|2|python3|all -debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|websocket-client|0.37.0|2|python3|all -ubuntu1204,ubuntu1404|requests|2.4.3|2|python|all -ubuntu1204,centos7|contextlib2|0.5.4|2|python|all -ubuntu1204,centos7|isodate|0.5.4|2|python|all +debian8,debian9,centos7|python-gflags|2.0|2|python|all +debian8,debian9,ubuntu1404,ubuntu1604,centos7|google-api-python-client|1.6.2|2|python|all +debian8,debian9,ubuntu1404,ubuntu1604,centos7|apache-libcloud|2.3.0|3|python|all +debian8,debian9,ubuntu1404,centos7|oauth2client|1.5.2|2|python|all +debian8,debian9,ubuntu1404,centos7|pyasn1|0.1.7|2|python|all +debian8,debian9,ubuntu1404,centos7|pyasn1-modules|0.0.5|2|python|all +debian8,debian9,ubuntu1404,ubuntu1604,centos7|rsa|3.4.2|2|python|all +debian8,debian9,ubuntu1404,ubuntu1604,centos7|uritemplate|3.0.0|2|python|all +debian8,debian9,ubuntu1404,ubuntu1604,centos7|httplib2|0.9.2|3|python|all +debian8,debian9,centos7|ws4py|0.3.5|2|python|all +debian8,debian9,centos7|pykka|1.2.1|2|python|all +debian8,debian9,ubuntu1404,centos7|six|1.10.0|2|python|all +debian8,debian9,ubuntu1404,ubuntu1604,centos7|ciso8601|1.0.3|3|python|amd64 +debian8,debian9,centos7|pycrypto|2.6.1|3|python|amd64 +debian8,debian9,ubuntu1404,ubuntu1604|backports.ssl_match_hostname|3.5.0.1|2|python|all +debian8,debian9,ubuntu1404,ubuntu1604,centos7|llfuse|1.2|3|python|amd64 +debian8,debian9,ubuntu1404,centos7|pycurl|7.19.5.3|3|python|amd64 +debian8,debian9,ubuntu1404,ubuntu1604,centos7|pyyaml|3.12|2|python|amd64 +debian8,debian9,ubuntu1404,ubuntu1604,centos7|rdflib|4.2.2|2|python|all +debian8,debian9,ubuntu1404,centos7|shellescape|3.4.1|2|python|all +debian8,debian9,ubuntu1404,ubuntu1604,centos7|mistune|0.7.3|2|python|all +debian8,debian9,ubuntu1404,ubuntu1604,centos7|typing|3.5.3.0|2|python|all +debian8,debian9,ubuntu1404,ubuntu1604,centos7|avro|1.8.1|2|python|all +debian8,debian9,ubuntu1404,centos7|ruamel.ordereddict|0.4.9|2|python|amd64 +debian8,debian9,ubuntu1404,ubuntu1604,centos7|cachecontrol|0.11.7|2|python|all +debian8,debian9,ubuntu1404,ubuntu1604,centos7|pathlib2|2.1.0|2|python|all +debian8,debian9,ubuntu1404,ubuntu1604,centos7|docker-py|1.7.2|2|python3|all +debian8,debian9,centos7|six|1.10.0|2|python3|all +debian8,debian9,ubuntu1404,centos7|requests|2.12.4|2|python3|all +debian8,debian9,ubuntu1404,ubuntu1604,centos7|websocket-client|0.37.0|2|python3|all +ubuntu1404|requests|2.4.3|2|python|all +centos7|contextlib2|0.5.4|2|python|all +centos7|isodate|0.5.4|2|python|all centos7|python-daemon|2.1.2|1|python|all centos7|pbr|0.11.1|2|python|all centos7|pyparsing|2.1.10|2|python|all centos7|keepalive|0.5|2|python|all -debian8,debian9,ubuntu1204,ubuntu1404,ubuntu1604,centos7|lockfile|0.12.2|2|python|all|--epoch 1 +debian8,debian9,ubuntu1404,ubuntu1604,centos7|lockfile|0.12.2|2|python|all|--epoch 1 debian8,ubuntu1404,centos7|subprocess32|3.2.7|2|python|all all|ruamel.yaml|0.13.7|2|python|amd64|--python-setup-py-arguments --single-version-externally-managed all|cwltest|1.0.20180416154033|4|python|all|--depends 'python-futures >= 3.0.5' --depends 'python-subprocess32' diff --git a/build/package-testing/test-packages-ubuntu1204.sh b/build/package-testing/test-packages-ubuntu1204.sh deleted file mode 120000 index 54ce94c357..0000000000 --- a/build/package-testing/test-packages-ubuntu1204.sh +++ /dev/null @@ -1 +0,0 @@ -deb-common-test-packages.sh \ No newline at end of file diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh index 497545dfac..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) -- 2.30.2