x
/
fuel-plugin-elasticsearch-kibana
Code Issues Proposed changes

Change dependency of tzdata-java at build time 

Partial-bug: #1560436

(cherry picked from commit 4752287972)

Conflicts:
	pre_build_hook

Change-Id: I4d9ec4bd639dfe2b422534ae6fe7318905d359f9
This commit is contained in:
Swann Croiset 2016-03-22 14:11:04 +01:00
parent 6491d81b14
commit dd69ca50c7
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
pre_build_hook
View File

@ -17,11 +17,13 @@ FUEL_LIB_TARBALL_URL="https://github.com/openstack/fuel-library/archive/${FUEL_L
# Kibana 3 sources
KIBANA_TARBALL_URL="https://download.elasticsearch.org/kibana/kibana/kibana-3.1.3.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 \
@ -55,3 +57,18 @@ wget -qO- "${FUEL_LIB_TARBALL_URL}" | \
# Remove the dead link : osnailyfacter/modular/master -> ../nailgun/examples
rm -rf ${MODULES_DIR}/osnailyfacter/modular/master
# 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