changeset in /hg/icedtea6: 2008-03-12 Matthias Klose <doko at ubu...

[doko at ubuntu.com]

changeset e724bd705658 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=e724bd705658
description:
	2008-03-12  Matthias Klose  <doko at ubuntu.com>

	        * patches/icedtea-print-lsb-release.patch: New.
	        * Makefile.am (ICEDTEA_PATCHES): Add new patch.
	        * Makefile.in: Regenerated.

diffstat:

4 files changed, 60 insertions(+)
ChangeLog                               |   10 ++++++
Makefile.am                             |    1 
Makefile.in                             |    1 
patches/icedtea-print-lsb-release.patch |   48 +++++++++++++++++++++++++++++++

diffs (91 lines):

diff -r fb82a5744082 -r e724bd705658 ChangeLog
--- a/ChangeLog	Wed Mar 12 18:38:40 2008 +0100
+++ b/ChangeLog	Wed Mar 12 20:41:56 2008 +0100
@@ -1,3 +1,13 @@ 2008-03-12  Matthias Klose  <doko at ubuntu
+2008-03-12  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/icedtea-print-lsb-release.patch: New.
+	* Makefile.am (ICEDTEA_PATCHES): Add new patch.
+	* Makefile.in: Regenerated.
+
+2008-03-12  Matthias Klose  <doko at ubuntu.com>
+
+	* patches/icedtea-ecj.patch (openjdk/corba/make/common/Defs-linux.gmk):
+
 2008-03-12  Matthias Klose  <doko at ubuntu.com>
 
 	* patches/icedtea-ecj.patch (openjdk/corba/make/common/Defs-linux.gmk):
diff -r fb82a5744082 -r e724bd705658 Makefile.am
--- a/Makefile.am	Wed Mar 12 18:38:40 2008 +0100
+++ b/Makefile.am	Wed Mar 12 20:41:56 2008 +0100
@@ -253,6 +253,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-generated.patch \
 	patches/icedtea-lib64.patch \
 	patches/icedtea-zero.patch \
+	patches/icedtea-print-lsb-release.patch \
 	$(GCC_PATCH) \
 	$(FAST_BUILD_PATCH) \
 	$(ZERO_BUILD_PATCH) \
diff -r fb82a5744082 -r e724bd705658 Makefile.in
--- a/Makefile.in	Wed Mar 12 18:38:40 2008 +0100
+++ b/Makefile.in	Wed Mar 12 20:41:56 2008 +0100
@@ -382,6 +382,7 @@ ICEDTEA_PATCHES = \
 	patches/icedtea-generated.patch \
 	patches/icedtea-lib64.patch \
 	patches/icedtea-zero.patch \
+	patches/icedtea-print-lsb-release.patch \
 	$(GCC_PATCH) \
 	$(FAST_BUILD_PATCH) \
 	$(ZERO_BUILD_PATCH) \
diff -r fb82a5744082 -r e724bd705658 patches/icedtea-print-lsb-release.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/icedtea-print-lsb-release.patch	Wed Mar 12 20:41:56 2008 +0100
@@ -0,0 +1,48 @@
+--- openjdk/hotspot/src/os/linux/vm/os_linux.cpp~	2007-12-14 08:57:02.000000000 +0100
++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp	2008-01-19 16:20:24.206979233 +0100
+@@ -1757,6 +1757,37 @@
+   return true;
+ }
+ 
++bool _print_debian_lsb_file(const char* filename, outputStream* st) {
++  int fd = open(filename, O_RDONLY);
++  if (fd == -1) {
++     return false;
++  }
++
++  char buf[512], *d_i, *d_r, *d_c;
++  int bytes;
++
++  if ((bytes = read(fd, buf, sizeof(buf)-1)) == sizeof(buf)-1) {
++     close(fd);
++     return false;
++  }
++  close(fd);
++
++  buf[bytes] = '\n';
++  buf[bytes+1] = '\0';
++  d_i = strstr(buf, "DISTRIB_ID=");
++  d_r = strstr(buf, "DISTRIB_RELEASE=");
++  d_c = strstr(buf, "DISTRIB_CODENAME=");
++  if (!d_i || !d_r || !d_c) {
++     return false;
++  }
++  d_i = strchr(d_i, '=') + 1;  *strchrnul(d_i, '\n') = '\0';
++  d_r = strchr(d_r, '=') + 1;  *strchrnul(d_r, '\n') = '\0';
++  d_c = strchr(d_c, '=') + 1;  *strchrnul(d_c, '\n') = '\0';
++  st->print("%s %s (%s)", d_i, d_r, d_c);
++
++  return true;
++}
++
+ void os::print_dll_info(outputStream *st) {
+    st->print_cr("Dynamic libraries:");
+ 
+@@ -1785,6 +1816,7 @@
+       !_print_ascii_file("/etc/SuSE-release", st) &&
+       !_print_ascii_file("/etc/turbolinux-release", st) &&
+       !_print_ascii_file("/etc/gentoo-release", st) &&
++      !_print_debian_lsb_file("/etc/lsb-release", st) &&
+       !_print_ascii_file("/etc/debian_version", st)) {
+       st->print("Linux");
+   }