[pkg-boinc-commits] r522 - in /branches/experimental/boinc/debian:
./ conffiles/ extra/ patches/
fst-guest at users.alioth.debian.org
fst-guest at users.alioth.debian.org
Thu Aug 31 08:19:02 UTC 2006
Author: fst-guest
Date: Thu Aug 31 08:19:01 2006
New Revision: 522
URL: http://svn.debian.org/wsvn/pkg-boinc/?sc=1&rev=522
Log:
Merged with tags/boinc/5.4.11-1.
Added:
branches/experimental/boinc/debian/boinc-client.examples
branches/experimental/boinc/debian/conffiles/
branches/experimental/boinc/debian/conffiles/cc_config.xml
- copied unchanged from r520, branches/experimental/boinc/debian/extra/cc_config.xml
branches/experimental/boinc/debian/conffiles/global_prefs_override.xml
- copied unchanged from r518, branches/experimental/boinc/debian/extra/global_prefs_override.xml
branches/experimental/boinc/debian/conffiles/gui_rpc_auth.cfg
- copied unchanged from r518, branches/experimental/boinc/debian/extra/gui_rpc_auth.cfg
branches/experimental/boinc/debian/conffiles/remote_hosts.cfg
- copied, changed from r518, branches/experimental/boinc/debian/extra/remote_hosts.cfg
branches/experimental/boinc/debian/extra/move-boinc-dir.sh (with props)
branches/experimental/boinc/debian/extra/use-32bit-on-amd64.sh (with props)
branches/experimental/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch (with props)
Removed:
branches/experimental/boinc/debian/extra/cc_config.xml
branches/experimental/boinc/debian/extra/global_prefs_override.xml
branches/experimental/boinc/debian/extra/gui_rpc_auth.cfg
branches/experimental/boinc/debian/extra/remote_hosts.cfg
Modified:
branches/experimental/boinc/debian/boinc-client.README.Debian
branches/experimental/boinc/debian/boinc-client.install
branches/experimental/boinc/debian/boinc-dev.install
branches/experimental/boinc/debian/boinc-dev.links
branches/experimental/boinc/debian/boinc-manager.install
branches/experimental/boinc/debian/changelog
branches/experimental/boinc/debian/patches/00list
branches/experimental/boinc/debian/rules
Modified: branches/experimental/boinc/debian/boinc-client.README.Debian
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/boinc-client.README.Debian?rev=522&op=diff
==============================================================================
--- branches/experimental/boinc/debian/boinc-client.README.Debian (original)
+++ branches/experimental/boinc/debian/boinc-client.README.Debian Thu Aug 31 08:19:01 2006
@@ -11,6 +11,7 @@
1. Configuring the BOINC core client
2. Installing and configuring BOINC application packages
3. Moving a BOINC data directory to /var/lib/boinc-client
+ 4. Making the BOINC core client usable on AMD64
1. Configuring the BOINC core client
@@ -75,14 +76,50 @@
boinc:
% chown -R boinc:boinc /var/lib/boinc-client
- 4. Move configuration files to /etc/boinc-client/ and create symlinks
+ 4. Move configuration files to '/etc/boinc-client/' and create symlinks
for the core client:
% mv -f /var/lib/boinc-client/gui_rpc_auth.cfg /etc/boinc-client/
% ln -s /etc/boinc-client/gui_rpc_auth.cfg /var/lib/boinc-client/gui_rpc_auth.cfg
- Repeat the last step for the following configuration files if they exist in
- your old BOINC data directory: 'global_prefs_override.xml', 'cc_config.xml',
- and 'remote_hosts.cfg'
+ Repeat the last step for the following configuration files if they
+ exist in your old BOINC data directory: 'global_prefs_override.xml',
+ 'log_flags.xml', and 'remote_hosts.cfg'
5. Start the BOINC core client again:
% /etc/init.d/boinc-client start
+
+
+4. Making the BOINC core client usable on AMD64
+-----------------------------------------------
+
+Most BOINC projects do not support AMD64 and do not provide
+applications for it. You know that a project does not support AMD64
+when your client receives a message from the BOINC server which looks
+like this:
+
+ "Message from server: platform 'x86_64-pc-linux-gnu' not found"
+
+If you still want to use the AMD64 BOINC core client you can now
+install 'boinc-app-*' packages (see paragraph 2.) which use the
+anonymous platform mechanism or additionally modify the core client to
+donwload 32bit applications which are available for almost all
+projects. The following instructions explains the latter option:
+
+ 1. Install the libc6-i386 package (the 32bit GNU C library for AMD64)
+ since the BOINC core client will download and run 32bit
+ applications:
+ % apt-get install libc6-i386
+
+ 2. Stop the BOINC core client:
+ % /etc/init.d/boinc-client stop
+
+ 3. Replace the string 'x86_64-pc-linux-gnu' with 'i686-pc-linux-gnu'
+ in the XML element <platform_name> in your client state file
+ '/var/lib/boinc-client/client_state.xml'. You can use this sed
+ snippet to do this for you:
+ % sed -i -e \
+ 's/<platform_name>x86_64-pc-linux-gnu<\/platform_name>/<platform_name>i686-pc-linux-gnu<\/platform_name>/' \
+ /var/lib/boinc-client/client_state.xml
+
+ 4. Start the BOINC core client again:
+ % /etc/init.d/boinc-client start
Added: branches/experimental/boinc/debian/boinc-client.examples
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/boinc-client.examples?rev=522&op=file
==============================================================================
--- branches/experimental/boinc/debian/boinc-client.examples (added)
+++ branches/experimental/boinc/debian/boinc-client.examples Thu Aug 31 08:19:01 2006
@@ -1,0 +1,2 @@
+debian/extra/move-boinc-dir.sh
+debian/extra/use-32bit-on-amd64.sh
Modified: branches/experimental/boinc/debian/boinc-client.install
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/boinc-client.install?rev=522&op=diff
==============================================================================
--- branches/experimental/boinc/debian/boinc-client.install (original)
+++ branches/experimental/boinc/debian/boinc-client.install Thu Aug 31 08:19:01 2006
@@ -1,7 +1,7 @@
-debian/extra/cc_config.xml etc/boinc-client
-debian/extra/global_prefs_override.xml etc/boinc-client
-debian/extra/gui_rpc_auth.cfg etc/boinc-client
-debian/extra/remote_hosts.cfg etc/boinc-client
-debian/extra/update-boinc-applinks usr/bin
-debian/tmp/usr/bin/boinc_cmd usr/bin
-debian/overrides/boinc-client usr/share/lintian/overrides
+debian/conffiles/cc_config.xml etc/boinc-client
+debian/conffiles/global_prefs_override.xml etc/boinc-client
+debian/conffiles/gui_rpc_auth.cfg etc/boinc-client
+debian/conffiles/remote_hosts.cfg etc/boinc-client
+debian/extra/update-boinc-applinks usr/bin
+debian/overrides/boinc-client usr/share/lintian/overrides
+lib/boinc_cmd usr/bin
Modified: branches/experimental/boinc/debian/boinc-dev.install
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/boinc-dev.install?rev=522&op=diff
==============================================================================
--- branches/experimental/boinc/debian/boinc-dev.install (original)
+++ branches/experimental/boinc/debian/boinc-dev.install Thu Aug 31 08:19:01 2006
@@ -6,6 +6,7 @@
api/boinc_gl.h usr/include/BOINC/api
api/txf_util.h usr/include/BOINC/api
lib/error_numbers.h usr/include/BOINC/lib
+lib/gui_rpc_client.h usr/include/BOINC/lib
lib/std_fixes.h usr/include/BOINC/lib
Makefile.am usr/share/boinc-dev
config.h usr/share/boinc-dev
Modified: branches/experimental/boinc/debian/boinc-dev.links
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/boinc-dev.links?rev=522&op=diff
==============================================================================
--- branches/experimental/boinc/debian/boinc-dev.links (original)
+++ branches/experimental/boinc/debian/boinc-dev.links Thu Aug 31 08:19:01 2006
@@ -22,6 +22,7 @@
usr/include/BOINC/api/graphics_data.h usr/share/boinc-dev/api/graphics_data.h
usr/include/BOINC/api/reduce.h usr/share/boinc-dev/api/reduce.h
usr/include/BOINC/lib/error_numbers.h usr/share/boinc-dev/lib/error_numbers.h
+usr/include/BOINC/lib/gui_rpc_client.h usr/share/boinc-dev/lib/gui_rpc_client.h
usr/include/BOINC/lib/std_fixes.h usr/share/boinc-dev/lib/std_fixes.h
usr/lib/libboinc.a usr/share/boinc-dev/lib/libboinc.a
Modified: branches/experimental/boinc/debian/boinc-manager.install
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/boinc-manager.install?rev=522&op=diff
==============================================================================
--- branches/experimental/boinc/debian/boinc-manager.install (original)
+++ branches/experimental/boinc/debian/boinc-manager.install Thu Aug 31 08:19:01 2006
@@ -1,2 +1,3 @@
+clientgui/boincmgr usr/bin
debian/icons/boincmgr-*.xpm usr/share/pixmaps
debian/boinc-manager.desktop usr/share/applications
Modified: branches/experimental/boinc/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/changelog?rev=522&op=diff
==============================================================================
--- branches/experimental/boinc/debian/changelog (original)
+++ branches/experimental/boinc/debian/changelog Thu Aug 31 08:19:01 2006
@@ -1,9 +1,9 @@
-boinc (5.5.16-1) experimental; urgency=low
+boinc (5.6.0-1) experimental; urgency=low
* NOT RELEASED YET
[ Frank S. Thomas ]
- * New experimental upstream release.
+ * New upstream release.
* Use debconf to ask whether the BOINC data directory should be removed
while purging the boinc-client package.
* Updates for the new Python policy:
@@ -12,7 +12,37 @@
* debian/patches/:
- Updated 07_use-sensible-browser.dpatch for the new release.
- -- Frank S. Thomas <frank at thomas-alfeld.de> Tue, 29 Aug 2006 22:40:47 +0200
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Thu, 31 Aug 2006 09:51:57 +0200
+
+boinc (5.4.11-1) unstable; urgency=low
+
+ [ Frank S. Thomas ]
+ * New upstream release.
+ * Added the header file lib/gui_rpc_client.h to the boinc-dev package as
+ requested by Folkert van Heusden.
+ * debian/control:
+ - Removed Greg Norris <adric at debian.org> from the Uploaders field.
+ * debian/rules:
+ - Applied patch from Robert Millan <rmh at aybabtu.com> which simplifies the
+ platform override for i386. We are now using --target instead of the
+ --build and --host switches. This also needed some changes in
+ boinc-client.install and boinc-manager.install. Thanks Robert for the
+ patch. (closes: #383871)
+ * debian/patches/:
+ - Added 01_amd64-disable-platform-reset.dpatch from Robert Millan
+ <rmh at aybabtu.com>. This patch prevents that projects are reset when the
+ platform name in client_state.xml does not match the platform name the
+ client was compiled for and it also sets the platform name from
+ client_state.xml as the valid platform name which will be used for
+ scheduler requests. This patch only affects AMD64. (related to: #366741)
+ * Explain in boinc-client's README.Debian how to modify the BOINC core
+ client so that it downloads 32bit applications on AMD64. The
+ 01_amd64-disable-platform-reset.dpatch patch is mandatory for this
+ procedure to work correctly. (also related to: #366741, LP#51948)
+ * Added two helper scripts (move-boinc-dir.sh and use-32bit-on-amd64.sh)
+ as examples in the boinc-client package.
+
+ -- Frank S. Thomas <frank at thomas-alfeld.de> Sun, 27 Aug 2006 14:50:00 +0200
boinc (5.4.10-2) unstable; urgency=medium
Copied: branches/experimental/boinc/debian/conffiles/remote_hosts.cfg (from r518, branches/experimental/boinc/debian/extra/remote_hosts.cfg)
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/conffiles/remote_hosts.cfg?rev=522&op=diff
==============================================================================
--- branches/experimental/boinc/debian/extra/remote_hosts.cfg (original)
+++ branches/experimental/boinc/debian/conffiles/remote_hosts.cfg Thu Aug 31 08:19:01 2006
@@ -1,7 +1,8 @@
# This file contains a list of hostnames or IP addresses (one per line)
# of remote hosts, that are allowed to connect and to control the local
# BOINC core client via GUI RPCs.
-# Lines beginning with a # or a ; will be ignored.
+# Lines beginning with a # or a ; are treated like comments and will be
+# ignored.
#
#host.example.com
#192.168.0.180
Added: branches/experimental/boinc/debian/extra/move-boinc-dir.sh
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/extra/move-boinc-dir.sh?rev=522&op=file
==============================================================================
--- branches/experimental/boinc/debian/extra/move-boinc-dir.sh (added)
+++ branches/experimental/boinc/debian/extra/move-boinc-dir.sh Thu Aug 31 08:19:01 2006
@@ -1,0 +1,57 @@
+#!/bin/sh
+#
+# This script can be used to move an BOINC data directory to Debian's
+# default location of the BOINC data directory /var/lib/boinc-client.
+# Invoke it with the old data directory as it's only argument,
+# for example:
+# % move-boinc-dir.sh /home/john/BOINC
+#
+# Copyright © 2006 Debian BOINC Maintainers
+# <pkg-boinc-devel at lists.alioth.debian.org>
+#
+# This file is licensed under the terms of the GNU General Public License,
+# Version 2 or any later version published by the Free Software Foundation.
+
+set -e
+
+OLD_DIR="$1"
+if [ -z "$OLD_DIR" ]; then
+ echo "Error: Old BOINC directory not specified."
+ exit 1
+elif [ ! -d "$OLD_DIR" ]; then
+ echo "Error: $OLD_DIR does not exists or is not a directory."
+ exit 1
+fi
+
+BOINC_DIR=/var/lib/boinc-client
+CONF_DIR=/etc/boinc-client
+
+move_configfile_and_symlink()
+{
+ if [ ! -L $BOINC_DIR/$1 -a -f $BOINC_DIR/$1 ]; then
+ mv -f $BOINC_DIR/$1 $CONF_DIR/$1
+ fi
+ ln -sf $CONF_DIR/$1 $BOINC_DIR/$1
+ chown boinc:boinc $BOINC_DIR/$1 || true
+}
+
+# Stop the BOINC core client.
+invoke-rc.d boinc-client stop
+
+# Copy the old BOINC directory to the new location.
+mkdir -p $BOINC_DIR || true
+cp -R -T "$OLD_DIR" $BOINC_DIR
+
+# Set the user boinc as the owner for
+# all files in /var/lib/boinc-client.
+chown -R boinc:boinc $BOINC_DIR || true
+
+# Move old configuration files to /etc/boinc-client/ and
+# create symlinks for the BOINC core client.
+move_configfile_and_symlink global_prefs_override.xml
+move_configfile_and_symlink gui_rpc_auth.cfg
+move_configfile_and_symlink log_flags.xml
+move_configfile_and_symlink remote_hosts.cfg
+
+# Start the BOINC core client again.
+invoke-rc.d boinc-client start
Propchange: branches/experimental/boinc/debian/extra/move-boinc-dir.sh
------------------------------------------------------------------------------
svn:executable = *
Added: branches/experimental/boinc/debian/extra/use-32bit-on-amd64.sh
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/extra/use-32bit-on-amd64.sh?rev=522&op=file
==============================================================================
--- branches/experimental/boinc/debian/extra/use-32bit-on-amd64.sh (added)
+++ branches/experimental/boinc/debian/extra/use-32bit-on-amd64.sh Thu Aug 31 08:19:01 2006
@@ -1,0 +1,34 @@
+#!/bin/sh
+#
+# This script modifies the default BOINC installation on AMD64 to
+# download and use 32bit applications. See paragraph 4. in
+# /usr/share/doc/boinc-client/README.Debian for more information.
+#
+# Copyright © 2006 Debian BOINC Maintainers
+# <pkg-boinc-devel at lists.alioth.debian.org>
+#
+# This file is licensed under the terms of the GNU General Public License,
+# Version 2 or any later version published by the Free Software Foundation.
+
+BOINC_DIR=/var/lib/boinc-client
+
+ARCH=`dpkg --print-architecture`
+if [ "$ARCH" != "amd64" ]; then
+ echo "Error: dpkg architecture ($ARCH) is not amd64."
+ exit 1
+fi
+
+LIBC6_STATUS=`dpkg-query -f '${Status}' -W libc6-i386 | grep not-installed`
+if [ -n "$LIBC6_STATUS" ]; then
+ apt-get install libc6-i386
+fi
+
+invoke-rc.d boinc-client stop
+
+PLATFORM_AMD64="<platform_name>x86_64-pc-linux-gnu<\/platform_name>"
+PLATFORM_I386="<platform_name>i686-pc-linux-gnu<\/platform_name>"
+
+echo "Trying to substitute platform name in client state file..."
+sed -i -e "s/$PLATFORM_AMD64/$PLATFORM_I386/" "$BOINC_DIR/client_state.xml"
+
+invoke-rc.d boinc-client start
Propchange: branches/experimental/boinc/debian/extra/use-32bit-on-amd64.sh
------------------------------------------------------------------------------
svn:executable = *
Modified: branches/experimental/boinc/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/patches/00list?rev=522&op=diff
==============================================================================
--- branches/experimental/boinc/debian/patches/00list (original)
+++ branches/experimental/boinc/debian/patches/00list Thu Aug 31 08:19:01 2006
@@ -1,3 +1,4 @@
+01_amd64-disable-platform-reset.dpatch
04_sched-makefile.am.dpatch
07_use-sensible-browser.dpatch
08_boinc-path-config.dpatch
Added: branches/experimental/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch?rev=522&op=file
==============================================================================
--- branches/experimental/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch (added)
+++ branches/experimental/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch Thu Aug 31 08:19:01 2006
@@ -1,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01_amd64-disable-platform-reset.dpatch by Robert Millan <rmh at aybabtu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: See these mailing lists post for a description of this patch:
+## DP: http://lists.alioth.debian.org/pipermail/pkg-boinc-devel/2006-August/000352.html
+## DP: http://lists.alioth.debian.org/pipermail/pkg-boinc-devel/2006-August/000350.html
+
+ at DPATCH@
+diff -urNad boinc-5.4.11~/client/client_state.C boinc-5.4.11/client/client_state.C
+--- boinc-5.4.11~/client/client_state.C 2006-08-03 10:31:03.000000000 +0200
++++ boinc-5.4.11/client/client_state.C 2006-08-26 14:01:36.000000000 +0200
+@@ -331,6 +331,9 @@
+ // This could happen e.g. if user copies files from PPC to Intel Mac
+ //
+ if (strcmp(platform_name, statefile_platform_name.c_str())) {
++#ifdef __x86_64__
++ platform_name = strdup(statefile_platform_name.c_str());
++#else
+ msg_printf(NULL, MSG_INFO,
+ "Platform changed from %s to %s - resetting projects",
+ statefile_platform_name.c_str(), platform_name
+@@ -339,6 +342,7 @@
+ p = projects[i];
+ reset_project(p);
+ }
++#endif
+ }
+
+ return 0;
Propchange: branches/experimental/boinc/debian/patches/01_amd64-disable-platform-reset.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: branches/experimental/boinc/debian/rules
URL: http://svn.debian.org/wsvn/pkg-boinc/branches/experimental/boinc/debian/rules?rev=522&op=diff
==============================================================================
--- branches/experimental/boinc/debian/rules (original)
+++ branches/experimental/boinc/debian/rules Thu Aug 31 08:19:01 2006
@@ -16,22 +16,16 @@
# Most BOINC projects only provide their applications for i686-pc-linux-gnu.
# If the core client reports that it was built for i486-pc-linux-gnu it won't
-# download any application or work units, so we use i686-linux-gnu as argument
-# for configure's --build and --host switches on i386 hosts.
+# download any application or work units, so we use --target i686-linux-gnu
+# to override it on i386 hosts.
ifeq ($(DEB_HOST_GNU_TYPE), i486-linux-gnu)
- DEB_HOST_GNU_TYPE = i686-linux-gnu
-endif
-ifeq ($(DEB_BUILD_GNU_TYPE), i486-linux-gnu)
- DEB_BUILD_GNU_TYPE = i686-linux-gnu
+ TYPE_FLAGS += --target i686-linux-gnu
endif
# This is the same as above, but only for compatibility with sarge's version
# of dpkg-architecture.
ifeq ($(DEB_HOST_GNU_TYPE), i386-linux)
- DEB_HOST_GNU_TYPE = i686-linux-gnu
-endif
-ifeq ($(DEB_BUILD_GNU_TYPE), i386-linux)
- DEB_BUILD_GNU_TYPE = i686-linux-gnu
+ TYPE_FLAGS += --target i686-linux-gnu
endif
CFLAGS += -g -Wall
@@ -172,9 +166,6 @@
#
# boinc-manager
#
- install -D debian/tmp/usr/bin/boinc_gui \
- debian/boinc-manager/usr/bin/boincmgr
-
for i in `ls locale/client`; do \
if [ -f "locale/client/$$i/BOINC Manager.mo" ]; then \
install -D -m644 "locale/client/$$i/BOINC Manager.mo" \
@@ -231,6 +222,7 @@
dh_installchangelogs -a
dh_installdocs -a
dh_installdebconf -a
+ dh_installexamples -a
dh_installmenu -a
dh_desktop -a
dh_installinit -a
More information about the pkg-boinc-commits
mailing list