[Lunar-commits] <moonbase> sun-jdk: updated to 1.7.0

Zbigniew Luszpinski zbiggy at lunar-linux.org
Sat Sep 17 21:06:24 CEST 2011 

commit 90d124bdc7b160ed3e7be0147e9f9c2424e06f99
Author: Zbigniew Luszpinski <zbiggy at lunar-linux.org>
Date:   Sat Sep 17 21:06:24 2011 +0200

    sun-jdk: updated to 1.7.0
---
 compilers/sun-jdk/BUILD          |   16 +++++-----
 compilers/sun-jdk/BUILD.x86_64   |   54 --------------------------------------
 compilers/sun-jdk/DETAILS        |   16 ++++++-----
 compilers/sun-jdk/DETAILS.x86_64 |   16 ++++++-----
 compilers/sun-jdk/POST_REMOVE    |    2 +-
 compilers/sun-jdk/PRE_BUILD      |    4 ---
 6 files changed, 27 insertions(+), 81 deletions(-)

diff --git a/compilers/sun-jdk/BUILD b/compilers/sun-jdk/BUILD
index d9d3f5d..2d3b47e 100644
--- a/compilers/sun-jdk/BUILD
+++ b/compilers/sun-jdk/BUILD
@@ -1,8 +1,5 @@
 (
 
-  chmod +x $SOURCE &&
-  ./$SOURCE -noregister &&
-
   # Clean up old java 1.6.0 service packs
   rm -rf /usr/lib/j[rd][ek]1.6.0_* &&
   rm -rf /usr/java &&
@@ -13,7 +10,7 @@
   # Install java to right directory
   mkdir -p /usr/java &&
   # This is default and recommended installation place for Java
-  cp -r $SOURCE_DIRECTORY/jdk${FVERSION} /usr/java &&
+  cp -r $SOURCE_DIRECTORY /usr/java &&
   # Sun's recommended symlinks:
   # This one _always_ points on latest Java release
   ln -sf /usr/java/jdk${FVERSION} /usr/java/latest &&
@@ -42,10 +39,13 @@
   # Always use new plugin.
   # Firefox 3, Seamonkey 2, Google chrome/inium use it
   # KDE3/4 Konqueror and Opera always uses Java directly so do not use any plugin
-  ln -sf /usr/java/latest/jre/lib/i386/libnpjp2.so /opt/lunar/plugins/ &&
-
-  # This didn't get created, dead link. Do it this way.
-  ln -sf /usr/java/latest/jre/lib/i386/server/libjvm.so /usr/lib/libjvm.so &&
+  if [ -d /usr/java/latest/jre/lib/amd64 ]; then
+     ln -sf /usr/java/latest/jre/lib/amd64/server/libjvm.so /usr/lib/
+     ln -sf /usr/java/latest/jre/lib/amd64/libnpjp2.so /opt/lunar/plugins/
+  else
+     ln -sf /usr/java/latest/jre/lib/i386/server/libjvm.so /usr/lib/
+     ln -sf /usr/java/latest/jre/lib/i386/libnpjp2.so /opt/lunar/plugins/
+  fi &&
 
   echo export JAVA_HOME=\"/usr/java/latest\" >> $SOURCE_DIRECTORY/sun-jdk.rc &&
   echo export PATH=\"'$PATH':'$JAVA_HOME'/bin\" >> $SOURCE_DIRECTORY/sun-jdk.rc &&
diff --git a/compilers/sun-jdk/BUILD.x86_64 b/compilers/sun-jdk/BUILD.x86_64
deleted file mode 100644
index 0f73dcf..0000000
--- a/compilers/sun-jdk/BUILD.x86_64
+++ /dev/null
@@ -1,54 +0,0 @@
-(
-
-  chmod +x $SOURCE &&
-  ./$SOURCE -noregister &&
-
-  # Clean up old java 1.6.0 service packs
-  rm -rf /usr/lib/j[rd][ek]1.6.0_* &&
-  rm -rf /usr/java &&
-  rm -f /usr/lib/libjvm.so &&
-
-  prepare_install &&
-
-  # Install java to right directory
-  mkdir -p /usr/java &&
-  # This is default and recommended installation place for Java
-  cp -r $SOURCE_DIRECTORY/jdk${FVERSION} /usr/java &&
-  # Sun's recommended symlinks:
-  # This one _always_ points on latest Java release
-  ln -sf /usr/java/jdk${FVERSION} /usr/java/latest &&
-  # This one _always_ points on default Java.
-  # If not set manually by root it defaults to /usr/java/latest:
-  if [ ! -h /usr/java/default ]; then
-     ln -sf /usr/java/latest /usr/java/default
-  fi  &&
-
-  # Some dumb distros say java is only library so install it in /usr/lib
-  # We make symlink to help applications find java if they were developed in such ill environment
-  ln -sf /usr/java/jdk${FVERSION} /usr/lib/jdk${FVERSION} &&
-
-  # Some applications don't accept anything but /usr/bin
-  for file in /usr/java/latest/bin/*; do
-      bfile=`basename $file`
-      # Conflicting files with heimdal
-      if [[ "$bfile" != "klist" ]] && [[ "$bfile" != "kinit" ]]; then
-          ln -sf $file /usr/bin/
-      fi
-  done &&
-
-  mkdir -p /opt/lunar/plugins &&
-  rm -f /opt/lunar/plugins/{libjavaplugin_oji.so,libnpjp2.so} &&
-
-  # Always use new plugin.
-  # Firefox 3, Seamonkey 2, Google chrome/inium use it
-  # KDE3/4 Konqueror and Opera always uses Java directly so do not use any plugin
-  ln -sf /usr/java/latest/jre/lib/amd64/libnpjp2.so /opt/lunar/plugins/ &&
-
-  # This didn't get created, dead link. Do it this way.
-  ln -sf /usr/java/latest/jre/lib/amd64/server/libjvm.so /usr/lib/libjvm.so &&
-
-  echo export JAVA_HOME=\"/usr/java/latest\" >> $SOURCE_DIRECTORY/sun-jdk.rc &&
-  echo export PATH=\"'$PATH':'$JAVA_HOME'/bin\" >> $SOURCE_DIRECTORY/sun-jdk.rc &&
-  install -m644 $SOURCE_DIRECTORY/sun-jdk.rc /etc/profile.d/
-
-) > $C_FIFO 2>&1
diff --git a/compilers/sun-jdk/DETAILS b/compilers/sun-jdk/DETAILS
index 344c61a..d20c546 100644
--- a/compilers/sun-jdk/DETAILS
+++ b/compilers/sun-jdk/DETAILS
@@ -1,13 +1,15 @@
           MODULE=sun-jdk
-         VERSION=6u27
-        FVERSION=1.${VERSION/u/.0_}
-          SOURCE=jdk-$VERSION-linux-i586.bin
-      SOURCE_URL=http://download.oracle.com/otn-pub/java/jdk/6u27-b07
-      SOURCE_VFY=sha1:7a01bf274b265662acafacdd7b5740d1a3ab0539
-        WEB_SITE=https://jdk-distros.dev.java.net/developer.html
+         VERSION=7
+        FVERSION=1.7.0
+#        FVERSION=1.${VERSION/u/.0_}
+          SOURCE=jdk-$VERSION-linux-i586.tar.gz
+      SOURCE_URL=http://download.oracle.com/otn-pub/java/jdk/$VERSION
+      SOURCE_VFY=sha1:7b1a8c01885e0662018ee7829769f97499534b87
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/jdk$FVERSION
+        WEB_SITE=http://www.oracle.com/technetwork/java/javase/downloads/index.html
          LICENSE="proprietary"
          ENTERED=20070210
-         UPDATED=20110820
+         UPDATED=20110911
            FUZZY=off
        LDD_CHECK=off
          ARCHIVE=off
diff --git a/compilers/sun-jdk/DETAILS.x86_64 b/compilers/sun-jdk/DETAILS.x86_64
index dd246d7..1dae628 100644
--- a/compilers/sun-jdk/DETAILS.x86_64
+++ b/compilers/sun-jdk/DETAILS.x86_64
@@ -1,13 +1,15 @@
           MODULE=sun-jdk
-         VERSION=6u27
-        FVERSION=1.${VERSION/u/.0_}
-          SOURCE=jdk-$VERSION-linux-x64.bin
-      SOURCE_URL=http://download.oracle.com/otn-pub/java/jdk/6u27-b07
-      SOURCE_VFY=sha1:68bf4ece2f64dde2d3f07019df9ae3a3ec205999
-        WEB_SITE=https://jdk-distros.dev.java.net/developer.html
+         VERSION=7
+        FVERSION=1.7.0
+#        FVERSION=1.${VERSION/u/.0_}
+          SOURCE=jdk-$VERSION-linux-x64.tar.gz
+      SOURCE_URL=http://download.oracle.com/otn-pub/java/jdk/$VERSION
+      SOURCE_VFY=sha1:d58395c605a4050e482f7bf94eaab72b7325c3be
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/jdk$FVERSION
+        WEB_SITE=http://www.oracle.com/technetwork/java/javase/downloads/index.html
          LICENSE="proprietary"
          ENTERED=20070210
-         UPDATED=20110820
+         UPDATED=20110911
            FUZZY=off
        LDD_CHECK=off
          ARCHIVE=off
diff --git a/compilers/sun-jdk/POST_REMOVE b/compilers/sun-jdk/POST_REMOVE
index c81210a..1187205 100644
--- a/compilers/sun-jdk/POST_REMOVE
+++ b/compilers/sun-jdk/POST_REMOVE
@@ -1 +1 @@
-rm -rf /usr/lib/jdk1.6.0_*
+rm -rf /usr/java/jdk1.7.0
diff --git a/compilers/sun-jdk/PRE_BUILD b/compilers/sun-jdk/PRE_BUILD
deleted file mode 100644
index c6fd87a..0000000
--- a/compilers/sun-jdk/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-validate_source_dir $SOURCE_DIRECTORY &&
-mk_source_dir $SOURCE_DIRECTORY       &&
-cd $SOURCE_DIRECTORY                  &&
-cp $SOURCE_CACHE/$SOURCE $SOURCE_DIRECTORY/

More information about the Lunar-commits mailing list