Hello community,
here is the log from the commit of package obs-server for openSUSE:Factory
checked in at Wed Feb 4 00:15:02 CET 2009.
--------
--- obs-server/obs-server.changes 2008-12-15 10:19:34.000000000 +0100
+++ obs-server/obs-server.changes 2009-01-27 15:55:56.000000000 +0100
@@ -1,0 +2,8 @@
+Tue Jan 127 13:06:47 CET 2009 - adrian@novell.com
+
+- Update to 1.5.rc2
+- init script fixes
+- various kiwi image handling fixes
+- relsync fixes
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
obs-server-1.5.rc1.5898.tar.bz2
New:
----
obs-server-1.5.rc2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ obs-server.spec ++++++
--- /var/tmp/diff_new_pack.F25700/_old 2009-02-04 00:14:25.000000000 +0100
+++ /var/tmp/diff_new_pack.F25700/_new 2009-02-04 00:14:25.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package obs-server (Version MACRO)
#
-# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,9 +19,9 @@
Name: obs-server
Summary: The openSUSE Build Service -- Server Component
-%define svnversion 1.5.rc1.5898
+%define svnversion 1.5.rc2
Version: %{svnversion}
-Release: 2
+Release: 4
License: GPL v2 only
Group: Productivity/Networking/Web/Utilities
Url: http://en.opensuse.org/Build_Service
@@ -43,6 +43,7 @@
AutoReqProv: on
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: python-devel rubygem-activesupport
+Requires: build >= 2009.01.27
%if 0%{?suse_version} >= 1030
BuildRequires: fdupes
%endif
@@ -175,7 +176,7 @@
The openSUSE Team
%prep
-%setup -q -n buildservice/1.5
+%setup -q -n buildservice-1.5
#-------------------------------------------------------------------------------
%build
@@ -393,6 +394,7 @@
/usr/lib/obs/server/Meta.pm
/usr/lib/obs/server/Meta/Debmd.pm
/usr/lib/obs/server/Meta/Rpmmd.pm
+/usr/lib/obs/server/Meta/Susetagsmd.pm
/usr/lib/obs/server/COPYING
/usr/lib/obs/server/DESIGN
/usr/lib/obs/server/License
@@ -524,6 +526,11 @@
#-------------------------------------------------------------------------------
%changelog
+* Tue Feb 03 2009 adrian@novell.com
+- Update to 1.5.rc2
+- init script fixes
+- various kiwi image handling fixes
+- relsync fixes
* Fri Dec 12 2008 froh@novell.com
- branch to 1.5.rc1
- include bs_productconvert search path fix (bnc#458309)
++++++ obsdispatcher ++++++
--- /var/tmp/diff_new_pack.F25700/_old 2009-02-04 00:14:25.000000000 +0100
+++ /var/tmp/diff_new_pack.F25700/_new 2009-02-04 00:14:25.000000000 +0100
@@ -11,31 +11,43 @@
#
### BEGIN INIT INFO
# Provides: obsdispatcher
-# Required-Start: $time $syslog $remote_fs obssrcserver obsrepserver
+# Required-Start: $time $syslog obssrcserver obsrepserver
# Should-Start: obsscheduler
-# Required-Stop: $time $syslog $remote_fs obssrcserver obsrepserver
+# Required-Stop: $null
# Default-Start: 3 5
# Default-Stop: 0 1 2 4 6
-# Description: openSUSE build service dispatcher
+# Description: openSUSE build service
### END INIT INFO
. /etc/rc.status
+
. /etc/sysconfig/obs-server
# Determine the base and follow a runlevel link name.
base=${0##*/}
link=${base#*[SK][0-9][0-9]}
+if [ -z "$OBS_RUN_DIR" ]; then
+ OBS_RUN_DIR="/srv/obs/run"
+fi
+
+if [ -z "$OBS_LOG_DIR" ]; then
+ OBS_LOG_DIR="/srv/obs/log"
+fi
+
obsdir=/usr/lib/obs/server/
+rundir="$OBS_RUN_DIR"
+logdir="$OBS_LOG_DIR"
rc_reset
case "$1" in
start)
echo -n "Initializing obsdispatcher"
+ mkdir -p "$rundir" "$logdir"
+ chown obsrun:obsrun "$logdir" "$rundir"
# FIXME: not nice, this should receive a proper daemon handling,
# including real logging, pid file and startproc
- startproc -l /srv/obs/log/dispatcher.log \
- "$obsdir"/bs_dispatch
+ startproc -l "$logdir"/dispatcher.log "$obsdir"/bs_dispatch
rc_status -v
;;
stop)
++++++ obspublisher ++++++
--- /var/tmp/diff_new_pack.F25700/_old 2009-02-04 00:14:25.000000000 +0100
+++ /var/tmp/diff_new_pack.F25700/_new 2009-02-04 00:14:25.000000000 +0100
@@ -11,30 +11,43 @@
#
### BEGIN INIT INFO
# Provides: obspublisher
-# Required-Start: $time $syslog $remote_fs obssrcserver obsrepserver
+# Required-Start: $time $syslog obssrcserver obsrepserver
# Should-Start: obsscheduler
-# Required-Stop: $time $syslog $remote_fs obssrcserver obsrepserver
+# Required-Stop: $null
# Default-Start: 3 5
# Default-Stop: 0 1 2 4 6
# Description: openSUSE build service publisher
### END INIT INFO
. /etc/rc.status
+
. /etc/sysconfig/obs-server
# Determine the base and follow a runlevel link name.
base=${0##*/}
link=${base#*[SK][0-9][0-9]}
+if [ -z "$OBS_RUN_DIR" ]; then
+ OBS_RUN_DIR="/srv/obs/run"
+fi
+
+if [ -z "$OBS_LOG_DIR" ]; then
+ OBS_LOG_DIR="/srv/obs/log"
+fi
+
obsdir=/usr/lib/obs/server/
+rundir="$OBS_RUN_DIR"
+logdir="$OBS_LOG_DIR"
rc_reset
case "$1" in
start)
echo -n "Initializing obspublisher"
+ mkdir -p "$rundir" "$logdir"
+ chown obsrun:obsrun "$logdir" "$rundir"
# FIXME: not nice, this should receive a proper daemon handling,
# including real logging, pid file and startproc
- startproc -l /srv/obs/log/publisher.log \
+ startproc -l "$logdir"/publisher.log \
"$obsdir"/bs_publish
rc_status -v
;;
++++++ obsrepserver ++++++
--- /var/tmp/diff_new_pack.F25700/_old 2009-02-04 00:14:25.000000000 +0100
+++ /var/tmp/diff_new_pack.F25700/_new 2009-02-04 00:14:25.000000000 +0100
@@ -9,8 +9,8 @@
#
### BEGIN INIT INFO
# Provides: obsrepserver
-# Required-Start: $time $remote_fs $syslog
-# Required-Stop: $time $remote_fs $syslog
+# Required-Start: $time $syslog
+# Required-Stop: $null
# Default-Start: 3 5
# Default-Stop: 0 1 2 4 6
# Description: openSUSE build service repository server
@@ -18,19 +18,33 @@
. /etc/rc.status
+. /etc/sysconfig/obs-server
+
# Determine the base and follow a runlevel link name.
base=${0##*/}
link=${base#*[SK][0-9][0-9]}
+if [ -z "$OBS_RUN_DIR" ]; then
+ OBS_RUN_DIR="/srv/obs/run"
+fi
+
+if [ -z "$OBS_LOG_DIR" ]; then
+ OBS_LOG_DIR="/srv/obs/log"
+fi
+
obsdir=/usr/lib/obs/server/
+rundir="$OBS_RUN_DIR"
+logdir="$OBS_LOG_DIR"
rc_reset
case "$1" in
start)
echo -n "Initializing obsrepserver"
+ mkdir -p "$rundir" "$logdir"
+ chown obsrun:obsrun "$logdir" "$rundir"
# FIXME: not nice, this should receive a proper daemon handling,
# including real logging, pid file and startproc
- startproc -l /srv/obs/log/rep_server.log "$obsdir"/bs_repserver
+ startproc -l "$logdir"/rep_server.log "$obsdir"/bs_repserver
rc_status -v
;;
stop)
@@ -41,7 +55,12 @@
restart)
## If first returns OK call the second, if first or
## second command fails, set echo return value.
- $0 stop && $0 start
+ $0 status
+ if test $? = 0; then
+ touch "$rundir"/bs_repserver.restart
+ else
+ $0 stop && $0 start
+ fi
rc_status
;;
try-restart)
@@ -55,6 +74,11 @@
rc_status
;;
reload)
+ $0 status
+ if test $? = 0; then
+ touch "$rundir"/bs_repserver.restart
+ fi
+ rc_status
;;
status)
echo -n "Checking for obsrepserver: "
++++++ obsscheduler ++++++
--- /var/tmp/diff_new_pack.F25700/_old 2009-02-04 00:14:25.000000000 +0100
+++ /var/tmp/diff_new_pack.F25700/_new 2009-02-04 00:14:25.000000000 +0100
@@ -9,32 +9,46 @@
#
### BEGIN INIT INFO
# Provides: obsscheduler
-# Required-Start: $time $remote_fs $syslog obssrcserver obsrepserver
-# Required-Stop: $time $remote_fs $syslog obssrcserver obsrepserver
+# Required-Start: $time $syslog obssrcserver obsrepserver
+# Should-Start: obssrcserver obsrepserver
+# Required-Stop: $null
# Default-Start: 3 5
# Default-Stop: 0 1 2 4 6
# Description: openSUSE build service scheduler
### END INIT INFO
. /etc/rc.status
+
. /etc/sysconfig/obs-server
# Determine the base and follow a runlevel link name.
base=${0##*/}
link=${base#*[SK][0-9][0-9]}
+if [ -z "$OBS_RUN_DIR" ]; then
+ OBS_RUN_DIR="/srv/obs/run"
+fi
+
+if [ -z "$OBS_LOG_DIR" ]; then
+ OBS_LOG_DIR="/srv/obs/log"
+fi
+
obsdir=/usr/lib/obs/server/
+rundir="$OBS_RUN_DIR"
+logdir="$OBS_LOG_DIR"
rc_reset
case "$1" in
start)
echo -n "Initializing obsscheduler"
+ mkdir -p "$rundir" "$logdir"
+ chown obsrun:obsrun "$logdir" "$rundir"
cd "$obsdir"
# FIXME: not nice, this should receive a proper daemon handling,
# including real logging, pid file and startproc
test -z "$OBS_SCHEDULER_ARCHITECTURES" && OBS_SCHEDULER_ARCHITECTURES=i586
for i in $OBS_SCHEDULER_ARCHITECTURES; do
- ./bs_sched $i >& /srv/obs/log/scheduler_$i.log &
+ ./bs_sched $i >> "$logdir"/scheduler_$i.log 2>&1 &
done
rc_status -v
;;
++++++ obs-server-1.5.rc1.5898.tar.bz2 -> obs-server-1.5.rc2.tar.bz2 ++++++
++++ 599316 lines of diff (skipped)
++++++ obssignd ++++++
--- /var/tmp/diff_new_pack.F25700/_old 2009-02-04 00:14:34.000000000 +0100
+++ /var/tmp/diff_new_pack.F25700/_new 2009-02-04 00:14:34.000000000 +0100
@@ -8,10 +8,10 @@
#
### BEGIN INIT INFO
# Provides: signd
-# Required-Start: $network $remote_fs $named $syslog $time
-# Should-Start:
-# Required-Stop: $network $remote_fs $named $syslog $time
-# Should-Stop:
+# Required-Start: $network $named $syslog $time
+# Should-Start: $null
+# Required-Stop: $null
+# Should-Stop: $null
# Default-Start: 3 5
# Default-Stop:
# Description: start the gpg sign daemon
@@ -102,9 +102,9 @@
rc_status -v
;;
reload)
- # not implemented in signd.
- rc_failed 3
- rc_status -v
+ # not implemented in signd.
+ rc_failed 3
+ rc_status -v
;;
info)
++++++ obssrcserver ++++++
--- /var/tmp/diff_new_pack.F25700/_old 2009-02-04 00:14:34.000000000 +0100
+++ /var/tmp/diff_new_pack.F25700/_new 2009-02-04 00:14:34.000000000 +0100
@@ -9,8 +9,8 @@
#
### BEGIN INIT INFO
# Provides: obssrcserver
-# Required-Start: $time $syslog $remote_fs
-# Required-Stop: $time $syslog $remote_fs
+# Required-Start: $time $syslog
+# Required-Stop: $null
# Default-Start: 3 5
# Default-Stop: 0 1 2 4 6
# Description: openSUSE build service source repository server
@@ -18,19 +18,33 @@
. /etc/rc.status
+. /etc/sysconfig/obs-server
+
# Determine the base and follow a runlevel link name.
base=${0##*/}
link=${base#*[SK][0-9][0-9]}
+if [ -z "$OBS_RUN_DIR" ]; then
+ OBS_RUN_DIR="/srv/obs/run"
+fi
+
+if [ -z "$OBS_LOG_DIR" ]; then
+ OBS_LOG_DIR="/srv/obs/log"
+fi
+
obsdir=/usr/lib/obs/server/
+rundir="$OBS_RUN_DIR"
+logdir="$OBS_LOG_DIR"
rc_reset
case "$1" in
start)
echo -n "Initializing obssrcserver"
+ mkdir -p "$rundir" "$logdir"
+ chown obsrun:obsrun "$logdir" "$rundir"
# FIXME: not nice, this should receive a proper daemon handling,
# including real logging, pid file and startproc
- startproc -l /srv/obs/log/src_server.log "$obsdir"/bs_srcserver
+ startproc -l "$logdir"/src_server.log "$obsdir"/bs_srcserver
[ "$?" -ne 0 ] && rc_status -v
# FIXME:
@@ -53,7 +67,13 @@
restart)
## If first returns OK call the second, if first or
## second command fails, set echo return value.
- $0 stop && $0 start
+# $0 stop && $0 start
+ $0 status
+ if test $? = 0; then
+ touch "$rundir"/bs_srcserver.restart
+ else
+ $0 stop && $0 start
+ fi
rc_status
;;
try-restart)
@@ -67,6 +87,11 @@
rc_status
;;
reload)
+ $0 status
+ if test $? = 0; then
+ touch "$rundir"/bs_srcserver.restart
+ fi
+ rc_status
;;
status)
echo -n "Checking for obssrcserver: "
++++++ obsworker ++++++
--- /var/tmp/diff_new_pack.F25700/_old 2009-02-04 00:14:34.000000000 +0100
+++ /var/tmp/diff_new_pack.F25700/_new 2009-02-04 00:14:34.000000000 +0100
@@ -9,8 +9,8 @@
#
### BEGIN INIT INFO
# Provides: obsworker
-# Required-Start: $time $network $remote_fs $syslog
-# Required-Stop: $time $network $remote_fs $syslog
+# Required-Start: $time $network $syslog
+# Required-Stop: $time $network $syslog
# Default-Start: 3 5
# Default-Stop: 0 1 2 4 6
# Description: openSUSE build service worker
@@ -23,10 +23,17 @@
# Determine the base and follow a runlevel link name.
base=${0##*/}
link=${base#*[SK][0-9][0-9]}
-workerdir=/var/run/obsworker
-workerbootdir="$workerdir"/boot
-screenrc=/var/run/obsworker/boot/screenrc
-obsopt=""
+
+if [ -z "$OBS_RUN_DIR" ]; then
+ OBS_RUN_DIR="/var/run/obs"
+fi
+if [ -z "$OBS_REPO_SERVER" ]; then
+ OBS_REPO_SERVER="localhost:6262"
+fi
+
+if [ -z "$OBS_LOG_DIR" ]; then
+ OBS_LOG_DIR="/var/log/obs"
+fi
if [ -z "$OBS_SRC_SERVER" ]; then
OBS_SRC_SERVER="localhost:6362"
@@ -40,10 +47,18 @@
obsopt=--xen
fi
+obsrundir="$OBS_RUN_DIR"
+workerdir="$obsrundir"/worker
+workerbootdir="$workerdir"/boot
+screenrc="$workerdir"/boot/screenrc
+obsopt=""
+
rc_reset
case "$1" in
start)
# reset screenrc
+ mkdir -p "$obsrundir"
+ chown obsrun:obsrun "$obsrundir"
rm -rf "$workerdir"
mkdir -p "$workerbootdir"
echo "zombie on" > $screenrc
++++++ sysconfig.obs-server ++++++
--- /var/tmp/diff_new_pack.F25700/_old 2009-02-04 00:14:34.000000000 +0100
+++ /var/tmp/diff_new_pack.F25700/_new 2009-02-04 00:14:34.000000000 +0100
@@ -16,14 +16,28 @@
# If you also have workers on this host, each worker can also need 1
# GB RAM in some known cases (e.g. compiling gcc)
#
-#OBS_SCHEDULER_ARCHITECTURES="i586 x86_64 ppc ppc64 s390 s390x ia64 sparc sparc64 mips mips64 armv4l armv5el sh4"
-#OBS_SCHEDULER_ARCHITECTURES="armv4l"
-#OBS_SCHEDULER_ARCHITECTURES="armv5el"
-#OBS_SCHEDULER_ARCHITECTURES="ppc"
-#OBS_SCHEDULER_ARCHITECTURES="ppc64"
+#OBS_SCHEDULER_ARCHITECTURES="i586 x86_64 ppc ppc64 s390 s390x ia64 sparc sparc64 mips mips64 armv4l armv5el armv7el sh4"
+
#OBS_SCHEDULER_ARCHITECTURES="i586"
#OBS_SCHEDULER_ARCHITECTURES="x86_64"
-#OBS_SCHEDULER_ARCHITECTURES="i586 x86_64 ppc"
-#OBS_SCHEDULER_ARCHITECTURES="i586 x86_64 ppc ppc64"
-#OBS_SCHEDULER_ARCHITECTURES="i586 x86_64 ppc ppc64 armv4l armv5el"
-OBS_SCHEDULER_ARCHITECTURES="i586 x86_64"
+#OBS_SCHEDULER_ARCHITECTURES="i586 x86_64"
+
+#OBS_SCHEDULER_ARCHITECTURES="armv4l armv5el armv7el"
+#OBS_SCHEDULER_ARCHITECTURES="ppc ppc64"
+
+#OBS_SCHEDULER_ARCHITECTURES="x86_64 ppc ppc64"
+#OBS_SCHEDULER_ARCHITECTURES="i586 armv4l armv5el armv7el"
+
+## Path: Applications/OBS
+## Description: The base for OBS communucation directory
+## Type: string
+## Default: "/srv/obs/run"
+## Config: OBS
+OBS_RUN_DIR="/srv/obs/run"
+
+## Path: Applications/OBS
+## Description: The base for OBS logging directory
+## Type: string
+## Default: "/srv/obs/log"
+## Config: OBS
+OBS_LOG_DIR="/srv/obs/log"
++++++ sysconfig.obs-worker ++++++
--- /var/tmp/diff_new_pack.F25700/_old 2009-02-04 00:14:34.000000000 +0100
+++ /var/tmp/diff_new_pack.F25700/_new 2009-02-04 00:14:34.000000000 +0100
@@ -41,3 +41,17 @@
# 0 means let the operating system assign a port number
#
OBS_WORKER_PORTBASE="0"
+
+## Path: Applications/OBS
+## Description: The base for OBS communucation directory
+## Type: string
+## Default: "/var/run/obs"
+## Config: OBS
+OBS_RUN_DIR="/var/run/obs"
+
+## Path: Applications/OBS
+## Description: The base for OBS logging directory
+## Type: string
+## Default: "/var/log/obs"
+## Config: OBS
+OBS_LOG_DIR="/var/log/obs"
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
