From f46095f12c8470a4eac64997bef622e5f26cafb9 Mon Sep 17 00:00:00 2001 From: Joshua Randall Date: Fri, 5 Feb 2016 15:16:37 +0000 Subject: [PATCH] adds centos6 backport of fuse 2.9.2 --- .../centos6/Dockerfile | 2 +- jenkins/run-build-packages.sh | 41 ++++++++++++++++--- 2 files changed, 36 insertions(+), 7 deletions(-) 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 # 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 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