[ARVADOS] updated: 7384d5f1dd81d16646c163d032a10bb07ebbe6f0
Git user
git at public.curoverse.com
Fri Sep 23 17:38:41 EDT 2016
Summary of changes:
.../postinst | 11 ++++++++
.../prerm | 8 ++++++
build/package-build-dockerfiles/Makefile | 2 +-
build/package-build-dockerfiles/centos6/Dockerfile | 2 +-
build/package-build-dockerfiles/centos7/Dockerfile | 2 +-
build/package-build-dockerfiles/debian7/Dockerfile | 2 +-
build/package-build-dockerfiles/debian8/Dockerfile | 2 +-
.../ubuntu1204/Dockerfile | 2 +-
.../ubuntu1404/Dockerfile | 2 +-
build/python-package-scripts/postinst | 32 ----------------------
build/python-package-scripts/prerm | 20 --------------
build/run-library.sh | 8 +++---
12 files changed, 30 insertions(+), 63 deletions(-)
rename build/{go-package-scripts => go-python-package-scripts}/postinst (74%)
rename build/{go-package-scripts => go-python-package-scripts}/prerm (61%)
delete mode 100755 build/python-package-scripts/postinst
delete mode 100755 build/python-package-scripts/prerm
via 7384d5f1dd81d16646c163d032a10bb07ebbe6f0 (commit)
via 665be04c6964e5c0adbaf5c468596557fe3084fe (commit)
via 35dbe7ac8a4f18f24ea7afb0dcc537a669a5b0ea (commit)
from dbb3b8ddb414dadfc76d4e750be54cd2a70eaab6 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
commit 7384d5f1dd81d16646c163d032a10bb07ebbe6f0
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Sep 23 16:47:29 2016 -0400
9960: Install/remove systemd unit files wherever systemd exists, even if it is not running.
diff --git a/build/go-python-package-scripts/postinst b/build/go-python-package-scripts/postinst
index 1e10333..051c8bd 100755
--- a/build/go-python-package-scripts/postinst
+++ b/build/go-python-package-scripts/postinst
@@ -11,7 +11,8 @@ systemd_unit="${pkg}.service"
case "${1}" in
configure)
- if [ -e /run/systemd/system ]; then
+ if [ -d /lib/systemd/system ]
+ then
# Python packages put all data files in /usr, so we copy
# them to /lib at install time.
py_unit="/usr/share/doc/${pkg}/${pkg}.service"
@@ -19,7 +20,9 @@ case "${1}" in
then
cp "${py_unit}" /lib/systemd/system/
fi
+ fi
+ if [ -e /run/systemd/system ]; then
eval "$(systemctl -p UnitFileState show "${systemd_unit}")"
case "${UnitFileState}" in
disabled)
diff --git a/build/go-python-package-scripts/prerm b/build/go-python-package-scripts/prerm
index 7f4b843..c6ec18c 100755
--- a/build/go-python-package-scripts/prerm
+++ b/build/go-python-package-scripts/prerm
@@ -14,14 +14,14 @@ case "${1}" in
if [ -e /run/systemd/system ]; then
systemctl stop "${systemd_unit}" || true
systemctl disable "${systemd_unit}" || true
+ fi
- # Unit files from Python packages get installed by
- # postinst so we have to remove them explicitly here.
- py_unit="/usr/share/doc/${pkg}/${pkg}.service"
- if [ -e "${py_unit}" ]
- then
- rm "/lib/systemd/system/${pkg}.service" || true
- fi
+ # Unit files from Python packages get installed by postinst so
+ # we have to remove them explicitly here.
+ py_unit="/usr/share/doc/${pkg}/${pkg}.service"
+ if [ -e "${py_unit}" ]
+ then
+ rm "/lib/systemd/system/${pkg}.service" || true
fi
;;
esac
commit 665be04c6964e5c0adbaf5c468596557fe3084fe
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Sep 23 16:41:01 2016 -0400
9960: Update build scripts to Go 1.7.1.
diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile
index 2180b87..18694ed 100644
--- a/build/package-build-dockerfiles/Makefile
+++ b/build/package-build-dockerfiles/Makefile
@@ -24,7 +24,7 @@ ubuntu1404/generated: common-generated-all
test -d ubuntu1404/generated || mkdir ubuntu1404/generated
cp -rlt ubuntu1404/generated common-generated/*
-GOTARBALL=go1.6.2.linux-amd64.tar.gz
+GOTARBALL=go1.7.1.linux-amd64.tar.gz
common-generated-all: common-generated/$(GOTARBALL)
diff --git a/build/package-build-dockerfiles/centos6/Dockerfile b/build/package-build-dockerfiles/centos6/Dockerfile
index 8d969e6..8ea81f4 100644
--- a/build/package-build-dockerfiles/centos6/Dockerfile
+++ b/build/package-build-dockerfiles/centos6/Dockerfile
@@ -5,7 +5,7 @@ MAINTAINER Brett Smith <brett at curoverse.com>
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 unzip scl-utils centos-release-scl postgresql-devel
# Install golang binary
-ADD generated/go1.6.2.linux-amd64.tar.gz /usr/local/
+ADD generated/go1.7.1.linux-amd64.tar.gz /usr/local/
RUN ln -s /usr/local/go/bin/go /usr/local/bin/
# Install RVM
diff --git a/build/package-build-dockerfiles/centos7/Dockerfile b/build/package-build-dockerfiles/centos7/Dockerfile
index 311aaa2..4fcd640 100644
--- a/build/package-build-dockerfiles/centos7/Dockerfile
+++ b/build/package-build-dockerfiles/centos7/Dockerfile
@@ -5,7 +5,7 @@ MAINTAINER Brett Smith <brett at curoverse.com>
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 unzip scl-utils centos-release-scl postgresql-devel python-devel python-setuptools fuse-devel xz-libs git
# Install golang binary
-ADD generated/go1.6.2.linux-amd64.tar.gz /usr/local/
+ADD generated/go1.7.1.linux-amd64.tar.gz /usr/local/
RUN ln -s /usr/local/go/bin/go /usr/local/bin/
# Install RVM
diff --git a/build/package-build-dockerfiles/debian7/Dockerfile b/build/package-build-dockerfiles/debian7/Dockerfile
index ddad542..7632c94 100644
--- a/build/package-build-dockerfiles/debian7/Dockerfile
+++ b/build/package-build-dockerfiles/debian7/Dockerfile
@@ -13,7 +13,7 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
/usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
# Install golang binary
-ADD generated/go1.6.2.linux-amd64.tar.gz /usr/local/
+ADD generated/go1.7.1.linux-amd64.tar.gz /usr/local/
RUN ln -s /usr/local/go/bin/go /usr/local/bin/
ENV WORKSPACE /arvados
diff --git a/build/package-build-dockerfiles/debian8/Dockerfile b/build/package-build-dockerfiles/debian8/Dockerfile
index 80f06a2..977cd24 100644
--- a/build/package-build-dockerfiles/debian8/Dockerfile
+++ b/build/package-build-dockerfiles/debian8/Dockerfile
@@ -13,7 +13,7 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
/usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
# Install golang binary
-ADD generated/go1.6.2.linux-amd64.tar.gz /usr/local/
+ADD generated/go1.7.1.linux-amd64.tar.gz /usr/local/
RUN ln -s /usr/local/go/bin/go /usr/local/bin/
ENV WORKSPACE /arvados
diff --git a/build/package-build-dockerfiles/ubuntu1204/Dockerfile b/build/package-build-dockerfiles/ubuntu1204/Dockerfile
index 2f628b0..b0dd906 100644
--- a/build/package-build-dockerfiles/ubuntu1204/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu1204/Dockerfile
@@ -13,7 +13,7 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
/usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
# Install golang binary
-ADD generated/go1.6.2.linux-amd64.tar.gz /usr/local/
+ADD generated/go1.7.1.linux-amd64.tar.gz /usr/local/
RUN ln -s /usr/local/go/bin/go /usr/local/bin/
ENV WORKSPACE /arvados
diff --git a/build/package-build-dockerfiles/ubuntu1404/Dockerfile b/build/package-build-dockerfiles/ubuntu1404/Dockerfile
index b9c003a..91c5e5b 100644
--- a/build/package-build-dockerfiles/ubuntu1404/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu1404/Dockerfile
@@ -13,7 +13,7 @@ RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
/usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
# Install golang binary
-ADD generated/go1.6.2.linux-amd64.tar.gz /usr/local/
+ADD generated/go1.7.1.linux-amd64.tar.gz /usr/local/
RUN ln -s /usr/local/go/bin/go /usr/local/bin/
ENV WORKSPACE /arvados
commit 35dbe7ac8a4f18f24ea7afb0dcc537a669a5b0ea
Author: Tom Clegg <tom at curoverse.com>
Date: Fri Sep 23 16:40:37 2016 -0400
9960: De-duplicate Go and Python postinst/prerm scripts.
diff --git a/build/go-package-scripts/postinst b/build/go-python-package-scripts/postinst
similarity index 77%
rename from build/go-package-scripts/postinst
rename to build/go-python-package-scripts/postinst
index 0663465..1e10333 100755
--- a/build/go-package-scripts/postinst
+++ b/build/go-python-package-scripts/postinst
@@ -12,6 +12,14 @@ systemd_unit="${pkg}.service"
case "${1}" in
configure)
if [ -e /run/systemd/system ]; then
+ # Python packages put all data files in /usr, so we copy
+ # them to /lib at install time.
+ py_unit="/usr/share/doc/${pkg}/${pkg}.service"
+ if [ -e "${py_unit}" ]
+ then
+ cp "${py_unit}" /lib/systemd/system/
+ fi
+
eval "$(systemctl -p UnitFileState show "${systemd_unit}")"
case "${UnitFileState}" in
disabled)
diff --git a/build/go-package-scripts/prerm b/build/go-python-package-scripts/prerm
similarity index 59%
rename from build/go-package-scripts/prerm
rename to build/go-python-package-scripts/prerm
index 02772e4..7f4b843 100755
--- a/build/go-package-scripts/prerm
+++ b/build/go-python-package-scripts/prerm
@@ -14,6 +14,14 @@ case "${1}" in
if [ -e /run/systemd/system ]; then
systemctl stop "${systemd_unit}" || true
systemctl disable "${systemd_unit}" || true
+
+ # Unit files from Python packages get installed by
+ # postinst so we have to remove them explicitly here.
+ py_unit="/usr/share/doc/${pkg}/${pkg}.service"
+ if [ -e "${py_unit}" ]
+ then
+ rm "/lib/systemd/system/${pkg}.service" || true
+ fi
fi
;;
esac
diff --git a/build/python-package-scripts/postinst b/build/python-package-scripts/postinst
deleted file mode 100755
index 27e4601..0000000
--- a/build/python-package-scripts/postinst
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# NOTE: This package name detection will only work on Debian.
-# If this postinst script ever starts doing work on Red Hat,
-# we'll need to adapt this code accordingly.
-script="$(basename "${0}")"
-pkg="${script%.postinst}"
-systemd_unit="${pkg}.service"
-
-case "${1}" in
- configure)
- if [ -e /run/systemd/system ]; then
- cp "/usr/share/doc/${pkg}/${pkg}.service" /lib/systemd/system/
- eval "$(systemctl -p UnitFileState show "${systemd_unit}")"
- case "${UnitFileState}" in
- disabled)
- # Failing to enable or start the service is not a
- # package error, so don't let errors here
- # propagate up.
- systemctl enable "${systemd_unit}" || true
- systemctl start "${systemd_unit}" || true
- ;;
- enabled)
- systemctl daemon-reload || true
- systemctl reload-or-try-restart "${systemd_unit}" || true
- ;;
- esac
- fi
- ;;
-esac
diff --git a/build/python-package-scripts/prerm b/build/python-package-scripts/prerm
deleted file mode 100755
index 6d75f81..0000000
--- a/build/python-package-scripts/prerm
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# NOTE: This package name detection will only work on Debian.
-# If this prerm script ever starts doing work on Red Hat,
-# we'll need to adapt this code accordingly.
-script="$(basename "${0}")"
-pkg="${script%.prerm}"
-systemd_unit="${pkg}.service"
-
-case "${1}" in
- remove)
- if [ -e /run/systemd/system ]; then
- systemctl stop "${systemd_unit}" || true
- systemctl disable "${systemd_unit}" || true
- rm "/lib/systemd/system/${pkg}.service"
- fi
- ;;
-esac
diff --git a/build/run-library.sh b/build/run-library.sh
index e445541..73a99da 100755
--- a/build/run-library.sh
+++ b/build/run-library.sh
@@ -105,8 +105,8 @@ package_go_binary() {
systemd_unit="$WORKSPACE/${src_path}/${prog}.service"
if [[ -e "${systemd_unit}" ]]; then
switches+=(
- --after-install "${WORKSPACE}/build/go-package-scripts/postinst"
- --before-remove "${WORKSPACE}/build/go-package-scripts/prerm"
+ --after-install "${WORKSPACE}/build/go-python-package-scripts/postinst"
+ --before-remove "${WORKSPACE}/build/go-python-package-scripts/prerm"
"${systemd_unit}=/lib/systemd/system/${prog}.service")
fi
switches+=("$WORKSPACE/${license_file}=/usr/share/doc/$prog/${license_file}")
@@ -268,8 +268,8 @@ fpm_build () {
if [[ python = "$PACKAGE_TYPE" ]] && [[ -e "${PACKAGE}/${PACKAGE_NAME}.service" ]]
then
COMMAND_ARR+=(
- --after-install "${WORKSPACE}/build/python-package-scripts/postinst"
- --before-remove "${WORKSPACE}/build/python-package-scripts/prerm"
+ --after-install "${WORKSPACE}/build/go-python-package-scripts/postinst"
+ --before-remove "${WORKSPACE}/build/go-python-package-scripts/prerm"
)
fi
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list