pool/sysvinit
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 875937 from Base:System

Browse Source 
- prepare usrmerge (boo#1029961)

This is not strictly mandatory at this point as there are no compat symlinks.
So just for consistency. (forwarded request 875922 from lnussel)

OBS-URL: https://build.opensuse.org/request/show/875937
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/sysvinit?expand=0&rev=174
This commit is contained in:
Dominique Leuenberger 2021-03-10 07:48:30 +00:00 committed by Git OBS Bridge
commit 590edde363
7 changed files with 62 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
powerd.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Wed Nov 25 15:04:45 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Jun 18 10:25:28 UTC 2019 - Dr. Werner Fink <werner@suse.de> Tue Jun 18 10:25:28 UTC 2019 - Dr. Werner Fink <werner@suse.de>

18
powerd.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package powerd # spec file for package powerd
# #
# Copyright (c) 2020 SUSE LLC # Copyright (c) 2021 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,6 +16,12 @@
# #
%if 0%{?usrmerged}
%define sbindir %_sbindir
%else
%define sbindir /sbin
%endif
Name: powerd Name: powerd
Version: 2.0.2 Version: 2.0.2
Release: 0 Release: 0
@ -50,9 +56,9 @@ than a specified number of minutes.
RPM_OPT_FLAGS="${RPM_OPT_FLAGS} $(getconf LFS_CFLAGS) -pipe" RPM_OPT_FLAGS="${RPM_OPT_FLAGS} $(getconf LFS_CFLAGS) -pipe"
CC=%__cc CC=%__cc
export RPM_OPT_FLAGS CC export RPM_OPT_FLAGS CC
%configure --prefix= --bindir='$(DESTDIR)/sbin' \ %configure --prefix= --bindir='$(DESTDIR)%{sbindir}' \
--mandir='$(DESTDIR)%{_mandir}' \ --mandir='$(DESTDIR)%{_mandir}' \
--sbindir='$(DESTDIR)/sbin' --sbindir='$(DESTDIR)%{sbindir}'
make %{?_smp_mflags} CFLAGS="-I. $RPM_OPT_FLAGS -DWITH_SYSVINIT" make %{?_smp_mflags} CFLAGS="-I. $RPM_OPT_FLAGS -DWITH_SYSVINIT"
%install %install
@ -71,7 +77,7 @@ than a specified number of minutes.
echo '# systemctl start powerd.service' >> %{buildroot}/etc/powerd.conf echo '# systemctl start powerd.service' >> %{buildroot}/etc/powerd.conf
mkdir -p %{buildroot}/%{_unitdir} mkdir -p %{buildroot}/%{_unitdir}
install -m 0644 %{S:2} %{buildroot}/%{_unitdir}/powerd.service install -m 0644 %{S:2} %{buildroot}/%{_unitdir}/powerd.service
ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rcpowerd ln -sf service %{buildroot}%{_sbindir}/rcpowerd
%pre %pre
%service_add_post powerd.service %service_add_post powerd.service
@ -89,8 +95,8 @@ than a specified number of minutes.
%defattr (-,root,root,755) %defattr (-,root,root,755)
%license COPYING %license COPYING
%doc README SUPPORTED FAQ powerd.conf.monitor powerd.conf.peer %doc README SUPPORTED FAQ powerd.conf.monitor powerd.conf.peer
/sbin/powerd %{sbindir}/powerd
/sbin/detectups %{sbindir}/detectups
%{_sbindir}/rcpowerd %{_sbindir}/rcpowerd
%config /etc/powerd.conf %config /etc/powerd.conf
%attr(0644,root,root) %{_unitdir}/powerd.service %attr(0644,root,root) %{_unitdir}/powerd.service

2
sysvinit-2.90-no-kill.patch
View File

@ -43,7 +43,7 @@
* Read the proc filesystem. * Read the proc filesystem.
* CWD must be /proc to avoid problems if / is affected by the killing (ie depend on fuse). * CWD must be /proc to avoid problems if / is affected by the killing (ie depend on fuse).
*/ */
@@ -683,6 +715,26 @@ int readproc(int do_stat) @@ -676,6 +708,26 @@ int readproc(int do_stat)
p->nfs = 0; p->nfs = 0;
switch (do_stat) { switch (do_stat) {

3
sysvinit-2.98.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:7b2c3ffaf19eaf1ca80268762f85f9e4eb8e3c973213d49f9802605b72caa7dc
size 127028

3
sysvinit-2.99.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:b05c3677bb698afe64c997968b00c49b2a9bd320ce963523230ee7ea41197757
size 126908

12
sysvinit.changes
View File

@ -1,3 +1,15 @@
-------------------------------------------------------------------
Mon Feb 22 16:00:28 UTC 2021 - Dr. Werner Fink <werner@suse.de>
- Update to sysvinit 2.99:
* Mostly typo and just better documentation and easier to read
code comments
-------------------------------------------------------------------
Wed Nov 25 15:04:42 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
- prepare usrmerge (boo#1029961)
------------------------------------------------------------------- -------------------------------------------------------------------
Tue Nov 17 11:26:22 UTC 2020 - Dr. Werner Fink <werner@suse.de> Tue Nov 17 11:26:22 UTC 2020 - Dr. Werner Fink <werner@suse.de>

43
sysvinit.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package sysvinit # spec file for package sysvinit
# #
# Copyright (c) 2020 SUSE LLC # Copyright (c) 2021 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,9 +16,17 @@
# #
%if 0%{?usrmerged}
%define sbindir %_sbindir
%define bindir %_bindir
%else
%define sbindir /sbin
%define bindir /bin
%endif
Name: sysvinit Name: sysvinit
%define KPVER 2.23 %define KPVER 2.23
%define SIVER 2.98 %define SIVER 2.99
%define START 0.65 %define START 0.65
Version: %{SIVER} Version: %{SIVER}
Release: 0 Release: 0
@ -105,23 +113,30 @@ popd
rm -vf %{buildroot}/usr/include/initreq.h rm -vf %{buildroot}/usr/include/initreq.h
# pidof is part of procps-ng; let's remove the symlinks to killproc5 here # pidof is part of procps-ng; let's remove the symlinks to killproc5 here
rm -f %{buildroot}{/sbin,/bin,%{_mandir}/man8}/pidof{,.8} rm -f %{buildroot}{/sbin,/bin,%{_mandir}/man8}/pidof{,.8}
%if 0%{?usrmerged}
# it's all hardcoded in Makefiles so move here
mkdir -p %{buildroot}%{_bindir}
mkdir -p %{buildroot}%{_sbindir}
mv %{buildroot}/bin/* %{buildroot}%{_bindir}
mv %{buildroot}/sbin/* %{buildroot}%{_sbindir}
%endif
%files tools %files tools
%defattr (-,root,root,755) %defattr (-,root,root,755)
%license COPYING COPYRIGHT %license COPYING COPYRIGHT
%doc doc/Propaganda doc/Changelog doc/killproc %doc doc/Propaganda doc/Changelog doc/killproc
/bin/usleep %{bindir}/usleep
/bin/fsync %{bindir}/fsync
/sbin/fstab-decode %{sbindir}/fstab-decode
/sbin/checkproc %{sbindir}/checkproc
/sbin/pidofproc %{sbindir}/pidofproc
/sbin/killproc %{sbindir}/killproc
/sbin/killall5 %{sbindir}/killall5
/sbin/startproc %{sbindir}/startproc
/sbin/rvmtab %{sbindir}/rvmtab
/sbin/vhangup %{sbindir}/vhangup
/sbin/mkill %{sbindir}/mkill
/sbin/start_daemon %{sbindir}/start_daemon
%{_bindir}/startpar %{_bindir}/startpar
%doc %{_mandir}/man1/usleep.1.gz %doc %{_mandir}/man1/usleep.1.gz
%doc %{_mandir}/man1/fsync.1.gz %doc %{_mandir}/man1/fsync.1.gz