Skip to content
This repository has been archived by the owner on Apr 9, 2019. It is now read-only.

Fix 7u51 build #125

Closed
wants to merge 2 commits into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions oab-java.sh
Original file line number Diff line number Diff line change
Expand Up @@ -482,11 +482,11 @@ if [ "${JAVA_UPSTREAM}" == "sun-java6" ]; then
else
JAVA_EXT=.tar.gz
fi
if grep -q ia32 ${WORK_PATH}/src/debian/rules; then
# Upstream still builds ia32 package, download both architectures
if grep -q 'srcdir.*:=.*$(arch)' ${WORK_PATH}/src/debian/rules; then
# Upstream requires binary files for both architectures
JAVA_BINS="jdk-${JAVA_VER}u${JAVA_UPD}-linux-i586${JAVA_EXT} jdk-${JAVA_VER}u${JAVA_UPD}-linux-x64${JAVA_EXT}"
else
# Upstream has removed ia32 package, just download the appropriate one
# Upstream requires binary file of the machine's architecture only
if [ "${LSB_ARCH}" == "amd64" ]; then
JAVA_BINS="jdk-${JAVA_VER}u${JAVA_UPD}-linux-x64${JAVA_EXT}"
else
Expand Down Expand Up @@ -562,6 +562,13 @@ BUILD_MESSAGE="Automated build for ${LSB_REL} using https://github.com/rraptorr/
# Change directory to the build directory
cd ${WORK_PATH}/src

# Run upstream's preparing script if it exists
if [ -f prepare.sh ]; then
ncecho " [x] Inflating archives "
./prepare.sh >> "$log" 2>&1 &
pid=$!;progress $pid
fi

# Update the changelog
ncecho " [x] Updating the changelog "
dch --distribution ${LSB_CODE} --force-distribution --newversion ${NEW_VERSION} --force-bad-version --urgency=${DEB_URGENCY} "${BUILD_MESSAGE}" >> "$log" 2>&1 &
Expand Down