From: Zdeněk Šustr Date: Wed, 5 Sep 2012 14:50:18 +0000 (+0000) Subject: Updating version, ChangeLog and copying the most recent configure from ./org.glite... X-Git-Tag: glite-lb-yaim_R_4_5_2_1~2 X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=792294e35c4a4f068651ccb02274070608bc0b40;p=jra1mw.git Updating version, ChangeLog and copying the most recent configure from ./org.glite.lb for v. 2.4.9-1 --- diff --git a/org.glite.lb.server/configure b/org.glite.lb.server/configure index 3d43cdb..89e41e1 100755 --- a/org.glite.lb.server/configure +++ b/org.glite.lb.server/configure @@ -33,6 +33,7 @@ my $root = $pwd.'/stage'; my $sysroot = ''; my $sysconfdir; my $localstatedir; +my $os_type; my $staged; my $module; my $thrflavour = 'gcc64dbgpthr'; @@ -234,6 +235,7 @@ my @opts = ( 'sysroot:s' => \$sysroot, 'sysconfdir=s' => \$sysconfdir, 'localstatedir=s' => \$localstatedir, + 'os-type=s' => \$os_type, 'lb-tag=s' => \$lb_tag, 'lbjp-common-tag=s' => \$lbjp_tag, 'jp-tag=s' => \$jp_tag, @@ -266,6 +268,7 @@ if (not $sysconfdir) { $sysconfdir = $prefix eq '/usr' ? '/etc' : "$prefix/etc"; if (not $localstatedir) { $localstatedir = $prefix eq '/usr' ? '/var' : "$prefix/var"; } $sysconfdir=~s/\/$//; $localstatedir=~s/\/$//; +if (not $os_type) { $os_type = os_type(); } $externs{'mysql-server'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-server'}{prefix} eq ''; $externs{'mysql-devel'}{prefix}=$externs{mysql}{prefix} if $externs{'mysql-devel'}{prefix} eq ''; @@ -1353,6 +1356,7 @@ stagedir = $stagedir sysroot = $sysroot sysconfdir = $sysconfdir localstatedir = $localstatedir +os_type = $os_type thrflavour = $thrflavour nothrflavour = $nothrflavour libdir = $libdir @@ -2084,6 +2088,24 @@ sub reshuffle_platforms($$) { } } +sub os_type { + my $ver; + + open FH, '<', '/etc/issue' or return "redhat"; + $_=; + close FH; + + if (/Debian|Ubuntu/i) { return "debian"; } + elsif (/Scientific|Redhat|Centos/i) { return "redhat"; } + elsif (/Fedora/i) { + $ver = `rpm -q --queryformat '%{version}' fedora-release 2>/dev/null`; + if ($ver and $ver >= 15) { return "fedora"; } + else { return "redhat"; } + } else { + return "redhat"; + } +} + sub usage { my @ext = keys %externs; my @myjars = keys %jar; @@ -2097,6 +2119,8 @@ General options (defaults in []): --root=DIR installation root (custom relocation root -> sysroot) [./stage] --sysroot=DIR system root (custom relocation root -> sysroot) [] --sysconfdir=DIR system configuration directory [PREFIX/etc] + --localstatedir=DIR system local status directory [PREFIX/var] + --os-type=DIST system type (debian/redhat/fedora) --staged=module,module,... what is already in PREFIX (specify without org.glite.) --thrflavour=flavour --nothrflavour=flavour threaded and non-treaded flavours [gcc64dbgpthr,gcc64dbg] diff --git a/org.glite.lb.server/project/ChangeLog b/org.glite.lb.server/project/ChangeLog index 7088c61..f135fea 100644 --- a/org.glite.lb.server/project/ChangeLog +++ b/org.glite.lb.server/project/ChangeLog @@ -481,3 +481,22 @@ - Added RSS feed runningVM - Bug Fix: malformed RSS when destination is unknown, more robust feed recognition +2.4.9-1 +- gLite L&B setup script: + - switch yaim to use the (sourced) setup script + - GLITE_USER, GLITE_HOST_CERT, GLITE_HOST_KEY not required + - GLITE_LB_LOCATION removed + - all defaults in the setup script now + - added Kerberos support (not launched by default) + - detect distribution and use that for the scripts + - configuration file in /etc/default or /etc/sysconfig + (replacement for the profile.d and site-info.def file) + - hide other startup scripts output + - more strict check for L&B database, migration for L&B 4 + - update msg-config script + - Notif-keeper cron record made more portable + - Related jobs list included also in text output +- Extended job status information over HTML +- Even partial results returned for job queries + - Avoid confusion by failure on last job + diff --git a/org.glite.lb.server/project/version.properties b/org.glite.lb.server/project/version.properties index fe6b426..013f89f 100644 --- a/org.glite.lb.server/project/version.properties +++ b/org.glite.lb.server/project/version.properties @@ -1,3 +1,3 @@ # : /cvs/jra1mw/org.glite.lb.server/project/version.properties,v 1.185 2008/06/25 13:12:58 akrenek Exp $ -module.version=2.4.8 +module.version=2.4.9 module.age=1