Magellan Linux

Diff of /trunk/extras/java7-sun/java7-sun-1.7.0.10-r1.smage2

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 15500 by niro, Wed Jan 2 22:36:12 2013 UTC revision 15501 by niro, Wed Jan 2 22:42:32 2013 UTC
# Line 23  JAVA_BUILD="b04" Line 23  JAVA_BUILD="b04"
23  # both files must be fetch or our md5-logic breaks  # both files must be fetch or our md5-logic breaks
24  SRCFILE_x86="jdk-${PVER:2:1}u$(echo ${PVER:6} | sed 's/0\([0-9]\)/\1/')-linux-i586.tar.gz"  SRCFILE_x86="jdk-${PVER:2:1}u$(echo ${PVER:6} | sed 's/0\([0-9]\)/\1/')-linux-i586.tar.gz"
25  SRCFILE_x86_64="jdk-${PVER:2:1}u$(echo ${PVER:6} | sed 's/0\([0-9]\)/\1/')-linux-x64.tar.gz"  SRCFILE_x86_64="jdk-${PVER:2:1}u$(echo ${PVER:6} | sed 's/0\([0-9]\)/\1/')-linux-x64.tar.gz"
26    DEMOS_SRCFILE_x86="jdk-${PVER:2:1}u$(echo ${PVER:6} | sed 's/0\([0-9]\)/\1/')-linux-i586-demos.tar.gz"
27    DEMOS_SRCFILE_x86_64="jdk-${PVER:2:1}u$(echo ${PVER:6} | sed 's/0\([0-9]\)/\1/')-linux-x64-demos.tar.gz"
28  # decide between x86 and x86_64 arch  # decide between x86 and x86_64 arch
29  SRCFILE="$(marchsrcfile)"  SRCFILE="$(marchsrcfile)"
30  SRCDIR="${BUILDDIR}/jdk${PVER%.*}_0${PVER##*.}"  DEMOS_SRCFILE="$(marchsrcfile DEMOS_SRCFILE)"
31    SRCDIR="${BUILDDIR}/jdk${PVER%.*}_${PVER##*.}"
32    
33  sminclude mtools  sminclude mtools
34    
# Line 68  split_info_java7-demos-sun() Line 71  split_info_java7-demos-sun()
71  src_prepare()  src_prepare()
72  {  {
73   munpack ${SRCFILE} || die   munpack ${SRCFILE} || die
74     munpack ${DEMOS_SRCFILE} || die
  # satisfy split-packes, as no demos and sample are provided by upstream  
  install -d ${SRCDIR}/demo || die  
  install -d ${SRCDIR}/sample || die  
75  }  }
76    
77  src_install_java7-jre-sun()  src_install_java7-jre-sun()

Legend:
Removed from v.15500  
changed lines
  Added in v.15501