Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Loading…

Fix 7u51 build #125

Closed
wants to merge 2 commits into from
@ladios

This should fix #123

ladios added some commits
@ladios ladios Update condition on downloading binary file(s)
Since upstream v7.45-2, it requires binary files for both architectures
again. This patch updates the condition on detecting whether we need
both files or just one for the version we are building against.
51ee7c6
@ladios ladios Run upstream's preparing script if it exists
Upstream v7.45-2 introduced a preparing script to download and inflate
archives. If the version we are building against contains that script,
then run it to inflate archives in order to build packages.
70408f4
@ladios

Some commands in the upstream's preparing script might fail silently (in my case curl exited with error when resuming the already download completed JCE package), but doesn't affect the build.

@ykulbak

Thanks, this fixed 7u51 for me

@nifgraup

Works.

@tfnico

Thanks! Works for me on Ubuntu 12.04 :thumbsup:

@shinji257

Yup. Confirmed it fixes it for me as well. Great job!

@verveguy verveguy referenced this pull request in toffer/minecloud-ami
Closed

Stuck at "restoring game data" #12

@verveguy verveguy referenced this pull request from a commit in verveguy/minecloud-ami
Brett Adam Let's try patched OAB from ladios/oab-java6 to resolve upstream chang…
…es to Oracle's java download site (see flexiondotorg/oab-java6#125)
82135b7
@toffer toffer referenced this pull request from a commit in toffer/minecloud-ami
Brett Adam Handle upstream changes to Oracle's download site.
Use patched OAB from ladios/oab-java6 to resolve upstream changes
to Oracle's java download site.

See flexiondotorg/oab-java6#125

Fixes #16.
62b74cb
@wlk

working for me as well

@tuxinaut

Thanks! Also works for me on Ubuntu 12.04 :thumbsup:

@rmorgans

Cheers - works for me on 13.10 saucy for version 7 (the -7 flag) -> however the version 6 I have the
Unmet build dependencies: lib32asound2 ia32-libs issue (which is unrelated to this I think)

@ladios

@rmorgans That should be #122 which can be fixed by #124
I merged that in my fork's master branch ladios@218eddf

@timmc

Confirmed on Ubuntu 12.10 Quantal Quetzal. :+1: (For -7, at least.)

@dpursehouse

:+1: Works for me on Ubuntu 12.04 LTS with -7

@dol

Thx, working with '-7' on Ubuntu 12.10.

@ladios ladios referenced this pull request
Open

Java8 #130

@ladios

Replaced by #130

@ladios ladios closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 16, 2014
  1. @ladios

    Update condition on downloading binary file(s)

    ladios authored
    Since upstream v7.45-2, it requires binary files for both architectures
    again. This patch updates the condition on detecting whether we need
    both files or just one for the version we are building against.
  2. @ladios

    Run upstream's preparing script if it exists

    ladios authored
    Upstream v7.45-2 introduced a preparing script to download and inflate
    archives. If the version we are building against contains that script,
    then run it to inflate archives in order to build packages.
This page is out of date. Refresh to see the latest.
Showing with 10 additions and 3 deletions.
  1. +10 −3 oab-java.sh
View
13 oab-java.sh
@@ -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
@@ -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 &
Something went wrong with that request. Please try again.