Accepting request 32611 from Base:System

Copy from Base:System/sysvinit based on submit request 32611 from user coolo

OBS-URL: https://build.opensuse.org/request/show/32611
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sysvinit?expand=0&rev=62
This commit is contained in:
OBS User autobuild 2010-02-15 17:11:18 +00:00 committed by Git OBS Bridge
commit b341b3649d
2 changed files with 58 additions and 46 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Feb 11 13:36:19 UTC 2010 - coolo@novell.com
- Split out tools not specific to System V into a tool subpackage
to support alternative init implementations (fate#305690)
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Feb 8 15:58:56 CET 2010 - werner@suse.de Mon Feb 8 15:58:56 CET 2010 - werner@suse.de

View File

@ -30,7 +30,7 @@ Group: System/Base
PreReq: coreutils PreReq: coreutils
AutoReqProv: on AutoReqProv: on
Version: 2.86 Version: 2.86
Release: 220 Release: 221
Summary: SysV-Style init Summary: SysV-Style init
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: libselinux-devel libsepol-devel BuildRequires: libselinux-devel libsepol-devel
@ -64,6 +64,7 @@ Patch17: sysvinit-2.86-hddown.patch
Patch18: sysvinit-2.86-selinux.patch Patch18: sysvinit-2.86-selinux.patch
Patch19: sysvinit-2.86-fuse-no-kill.patch Patch19: sysvinit-2.86-fuse-no-kill.patch
Patch20: sysvinit-2.86-mdmon-no-kill.patch Patch20: sysvinit-2.86-mdmon-no-kill.patch
Requires: sysvinit-tools
%description %description
System V style init programs by Miquel van Smoorenburg that control the System V style init programs by Miquel van Smoorenburg that control the
@ -72,16 +73,18 @@ runlevels, each one associated with a specific set of utilities. For
example, the normal system runlevel is 3, which starts a getty on example, the normal system runlevel is 3, which starts a getty on
virtual consoles tty1-tty6. Runlevel 5 starts xdm. Runlevel 0 shuts virtual consoles tty1-tty6. Runlevel 5 starts xdm. Runlevel 0 shuts
down the system. See the individual man pages for inittab, initscript, down the system. See the individual man pages for inittab, initscript,
halt, init, killproc, killall5, powerd, reboot, runlevel, shutdown, and halt, init, powerd, reboot, runlevel, shutdown, and telinit for
telinit for more information. more information.
%package tools
License: GPLv2+
Summary: Tools for basic booting
Group: System/Base
%description tools
Authors: Helper tools from sysvinit that support booting, including but not exclusive
-------- to startpar, killproc and pidof. System V init specific programs are in the
Miquel van Smoorenburg <miquels@drinkel.ow.nl> sysvinit package.
Florian La Roche <florian@suse.de>
Werner Fink <werner@suse.de>
%prep %prep
%setup -q -b 2 -b 3 -b 4 -b 5 %setup -q -b 2 -b 3 -b 4 -b 5
@ -124,21 +127,21 @@ popd
CC=gcc CC=gcc
make %{?jobs:-j%jobs} -C src CFLAGS="$CFLAGS" CC="$CC" make %{?jobs:-j%jobs} -C src CFLAGS="$CFLAGS" CC="$CC"
pushd ../showconsole-%{SCVER} pushd ../showconsole-%{SCVER}
make %{?jobs:-j%jobs}; make %{?_smp_mflags}
popd popd
pushd ../killproc-%{KPVER} pushd ../killproc-%{KPVER}
make %{?jobs:-j%jobs} INC="-I../showconsole-%{SCVER} -L../showconsole-%{SCVER}" make %{?_smp_mflags} INC="-I../showconsole-%{SCVER} -L../showconsole-%{SCVER}"
popd popd
pushd ../powerd-%{PDVER} pushd ../powerd-%{PDVER}
%ifnarch s390 s390x %ifnarch s390 s390x
./configure --prefix= --bindir='$(DESTDIR)/sbin' \ ./configure --prefix= --bindir='$(DESTDIR)/sbin' \
--mandir='$(DESTDIR)%{_mandir}' \ --mandir='$(DESTDIR)%{_mandir}' \
--sbindir='$(DESTDIR)/sbin' --sbindir='$(DESTDIR)/sbin'
make %{?jobs:-j%jobs} CFLAGS="-I../sysvinit-%{version}/src $CFLAGS" make %{?_smp_mflags} CFLAGS="-I../sysvinit-%{version}/src $CFLAGS"
%endif %endif
popd popd
pushd ../startpar-%{START} pushd ../startpar-%{START}
make %{?jobs:-j%jobs} INC="-I../showconsole-%{SCVER} -L../showconsole-%{SCVER}" make %{?_smp_mflags} INC="-I../showconsole-%{SCVER} -L../showconsole-%{SCVER}"
popd popd
%install %install
@ -204,10 +207,10 @@ popd
%endif %endif
chmod 444 ${RPM_BUILD_ROOT}%{_mandir}/man?/* chmod 444 ${RPM_BUILD_ROOT}%{_mandir}/man?/*
%preun %preun tools
%stop_on_removal powered %stop_on_removal powered
%post %post tools
if test -x /sbin/telinit -a -p /dev/initctl -a -f /proc/1/exe -a -d /proc/1/root -a ! -d /.build ; then if test -x /sbin/telinit -a -p /dev/initctl -a -f /proc/1/exe -a -d /proc/1/root -a ! -d /.build ; then
if test $(stat -Lc '%%D-%%i' /) = $(stat -Lc '%%D-%%i' /proc/1/root) ; then if test $(stat -Lc '%%D-%%i' /) = $(stat -Lc '%%D-%%i' /proc/1/root) ; then
/sbin/telinit u /sbin/telinit u
@ -217,7 +220,7 @@ if test -x /sbin/mkinitrd_setup; then
mkinitrd_setup mkinitrd_setup
fi fi
%postun %postun tools
%insserv_cleanup %insserv_cleanup
if test -x /sbin/mkinitrd_setup; then if test -x /sbin/mkinitrd_setup; then
mkinitrd_setup mkinitrd_setup
@ -228,6 +231,25 @@ rm -rf ${RPM_BUILD_ROOT}
%files %files
%defattr (-,root,root,755) %defattr (-,root,root,755)
/sbin/halt
/sbin/init
/sbin/poweroff
/sbin/reboot
/sbin/runlevel
/sbin/shutdown
/sbin/telinit
%doc %{_mandir}/man8/halt.8.gz
%doc %{_mandir}/man5/initscript.5.gz
%doc %{_mandir}/man5/inittab.5.gz
%doc %{_mandir}/man8/init.8.gz
%doc %{_mandir}/man8/poweroff.8.gz
%doc %{_mandir}/man8/reboot.8.gz
%doc %{_mandir}/man8/runlevel.8.gz
%doc %{_mandir}/man8/shutdown.8.gz
%doc %{_mandir}/man8/telinit.8.gz
%files tools
%defattr (-,root,root,755)
%ifnarch s390 s390x %ifnarch s390 s390x
%config /etc/powerd.conf %config /etc/powerd.conf
%config /etc/init.d/powerd %config /etc/init.d/powerd
@ -247,7 +269,11 @@ rm -rf ${RPM_BUILD_ROOT}
/bin/pidof /bin/pidof
/bin/usleep /bin/usleep
/bin/fsync /bin/fsync
/usr/bin/last
/usr/bin/lastb
/usr/bin/utmpdump
# /sbin/bootlogd # /sbin/bootlogd
# /sbin/intr
/sbin/blogger /sbin/blogger
/sbin/blogd /sbin/blogd
/sbin/showconsole /sbin/showconsole
@ -255,9 +281,6 @@ rm -rf ${RPM_BUILD_ROOT}
/sbin/isserial /sbin/isserial
/sbin/checkproc /sbin/checkproc
/sbin/pidofproc /sbin/pidofproc
/sbin/halt
/sbin/init
# /sbin/intr
/sbin/killproc /sbin/killproc
/sbin/killall5 /sbin/killall5
/sbin/pidof /sbin/pidof
@ -265,26 +288,22 @@ rm -rf ${RPM_BUILD_ROOT}
/sbin/powerd /sbin/powerd
/sbin/detectups /sbin/detectups
%endif %endif
/sbin/poweroff
/sbin/reboot
/sbin/runlevel
/sbin/startproc
/sbin/start_daemon
/sbin/shutdown
/sbin/sulogin
/sbin/telinit
/sbin/startpar /sbin/startpar
/sbin/vhangup /sbin/vhangup
/sbin/mkill /sbin/mkill
/usr/bin/last /sbin/startproc
/usr/bin/lastb /sbin/start_daemon
/usr/bin/utmpdump /sbin/sulogin
# /usr/include/libblogger.h
# /usr/lib/libblogger.a
%doc %{_mandir}/man1/last.1.gz %doc %{_mandir}/man1/last.1.gz
%doc %{_mandir}/man1/lastb.1.gz %doc %{_mandir}/man1/lastb.1.gz
%doc %{_mandir}/man1/usleep.1.gz %doc %{_mandir}/man1/usleep.1.gz
%doc %{_mandir}/man1/fsync.1.gz %doc %{_mandir}/man1/fsync.1.gz
%ifnarch s390 s390x
%doc %{_mandir}/man8/powerd.8.gz
%doc %{_mandir}/man8/detectups.8.gz
%endif
# /usr/include/libblogger.h
# /usr/lib/libblogger.a
%doc %{_mandir}/man1/mountpoint.1.gz %doc %{_mandir}/man1/mountpoint.1.gz
# %doc %{_mandir}/man8/bootlogd.8.gz # %doc %{_mandir}/man8/bootlogd.8.gz
%doc %{_mandir}/man8/blogger.8.gz %doc %{_mandir}/man8/blogger.8.gz
@ -294,27 +313,14 @@ rm -rf ${RPM_BUILD_ROOT}
%doc %{_mandir}/man8/isserial.8.gz %doc %{_mandir}/man8/isserial.8.gz
%doc %{_mandir}/man8/checkproc.8.gz %doc %{_mandir}/man8/checkproc.8.gz
%doc %{_mandir}/man8/pidofproc.8.gz %doc %{_mandir}/man8/pidofproc.8.gz
%doc %{_mandir}/man8/halt.8.gz
%doc %{_mandir}/man5/initscript.5.gz
%doc %{_mandir}/man5/inittab.5.gz
%doc %{_mandir}/man8/init.8.gz
#%doc %{_mandir}/man8/intr.8.gz #%doc %{_mandir}/man8/intr.8.gz
%doc %{_mandir}/man8/killall5.8.gz %doc %{_mandir}/man8/killall5.8.gz
%doc %{_mandir}/man8/killproc.8.gz %doc %{_mandir}/man8/killproc.8.gz
%doc %{_mandir}/man8/pidof.8.gz %doc %{_mandir}/man8/pidof.8.gz
%ifnarch s390 s390x
%doc %{_mandir}/man8/powerd.8.gz
%doc %{_mandir}/man8/detectups.8.gz
%endif
%doc %{_mandir}/man8/poweroff.8.gz
%doc %{_mandir}/man8/reboot.8.gz
%doc %{_mandir}/man8/runlevel.8.gz
%doc %{_mandir}/man8/startproc.8.gz %doc %{_mandir}/man8/startproc.8.gz
%doc %{_mandir}/man8/start_daemon.8.gz %doc %{_mandir}/man8/start_daemon.8.gz
%doc %{_mandir}/man8/shutdown.8.gz
%doc %{_mandir}/man8/sulogin.8.gz
%doc %{_mandir}/man8/telinit.8.gz
%doc %{_mandir}/man8/startpar.8.gz %doc %{_mandir}/man8/startpar.8.gz
%doc %{_mandir}/man8/sulogin.8.gz
%doc %{_mandir}/man8/vhangup.8.gz %doc %{_mandir}/man8/vhangup.8.gz
%doc %{_mandir}/man8/mkill.8.gz %doc %{_mandir}/man8/mkill.8.gz