From a81bbc6d4d76336c2a986299bfb2997895837f3d Mon Sep 17 00:00:00 2001 From: Swann Croiset Date: Tue, 22 Mar 2016 14:11:04 +0100 Subject: [PATCH] Change dependency of tzdata-java at build time Partial-bug: #1560436 Change-Id: I4d9ec4bd639dfe2b422534ae6fe7318905d359f9 (cherry picked from commit 475228797247c8507ce05f833e7dbf23da827521) --- pre_build_hook | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/pre_build_hook b/pre_build_hook index 6d27099..edefce8 100755 --- a/pre_build_hook +++ b/pre_build_hook @@ -13,11 +13,13 @@ ELASTICSEARCH_TARBALL_URL="https://forgeapi.puppetlabs.com/v3/files/elasticsearc # Kibana 3 sources KIBANA_TARBALL_URL="https://download.elasticsearch.org/kibana/kibana/kibana-3.1.2.tar.gz" +TZ_VERSION="2016b-0ubuntu0.14.04_all" + # Packages needed to install JRE headless download_package http://mirrors.kernel.org/ubuntu/pool/main/p/pcsc-lite/libpcsclite1_1.8.10-1ubuntu1_amd64.deb \ http://mirrors.kernel.org/ubuntu/pool/main/j/java-common/java-common_0.51_all.deb \ - http://security.ubuntu.com/ubuntu/pool/main/t/tzdata/tzdata-java_2016b-0ubuntu0.14.04_all.deb \ - http://security.ubuntu.com/ubuntu/pool/main/t/tzdata/tzdata_2016b-0ubuntu0.14.04_all.deb \ + "http://security.ubuntu.com/ubuntu/pool/main/t/tzdata/tzdata-java_${TZ_VERSION}.deb" \ + "http://security.ubuntu.com/ubuntu/pool/main/t/tzdata/tzdata_${TZ_VERSION}.deb" \ http://security.ubuntu.com/ubuntu/pool/main/c/ca-certificates/ca-certificates_20160104ubuntu0.14.04.1_all.deb \ http://mirrors.kernel.org/ubuntu/pool/main/c/ca-certificates-java/ca-certificates-java_20130815ubuntu1_all.deb \ http://security.ubuntu.com/ubuntu/pool/main/o/openjdk-7/openjdk-7-jre-headless_7u95-2.6.4-0ubuntu0.14.04.1_amd64.deb \ @@ -41,3 +43,18 @@ download_puppet_module "elasticsearch" "$ELASTICSEARCH_TARBALL_URL" KIBANA_FOLDER="${MODULES_DIR}/lma_logging_analytics/files/kibana/src" mkdir -p "${KIBANA_FOLDER}" wget -qO- "${KIBANA_TARBALL_URL}" | tar -C "${KIBANA_FOLDER}" --strip-components=1 -xz + +# Update tzdata-java package to remove strict dependency on tzdata (see LP bug #1560436) +ROOT="$(dirname "$(readlink -f "$0")")" +DEB_REPO="${ROOT}"/repositories/ubuntu/ +TMP_DIR=$(mktemp -d || exit 1) +cp "${DEB_REPO}/tzdata-java_${TZ_VERSION}.deb" "${TMP_DIR}" +cd "${TMP_DIR}" || exit 1 +ar x "tzdata-java_${TZ_VERSION}.deb" || exit 1 +tar xzvf control.tar.gz || exit 1 +sed -i 's/Depends: tzdata (=/Depends: tzdata (>=/' control || exit 1 +tar czvf control.tar.gz md5sums control || exit 1 +ar r "tzdata-java_${TZ_VERSION}.deb" control.tar.gz data.tar.xz || exit 1 +mv "tzdata-java_${TZ_VERSION}.deb" "${DEB_REPO}/" || exit 1 +cd /tmp || exit 1 +rm -rf "${TMP_DIR}" || exit 1