Accepting request 346994 from home:rudi_m:branches:Base:System

- don't install last, we will take it from util-linux

OBS-URL: https://build.opensuse.org/request/show/346994
OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=212
This commit is contained in:
Marcus Meissner 2015-12-02 15:46:09 +00:00 committed by Git OBS Bridge
parent 47cba579ca
commit 2f93e802ec
3 changed files with 14 additions and 10 deletions

View File

@ -13,23 +13,26 @@
BIN =
SBIN = init halt shutdown runlevel killall5 fstab-decode
-USRBIN = last mesg
+USRBIN = last
+USRBIN =
-MAN1 = last.1 lastb.1 mesg.1
+MAN1 = last.1 lastb.1
+MAN1 =
MAN5 = initscript.5 inittab.5
MAN8 = halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8
MAN8 += shutdown.8 telinit.8 fstab-decode.8
@@ -170,7 +170,8 @@ endif
@@ -176,10 +176,8 @@ endif
ln -sf halt $(ROOT)/sbin/reboot
ln -sf halt $(ROOT)/sbin/poweroff
ln -sf init $(ROOT)/sbin/telinit
- ln -sf /sbin/killall5 $(ROOT)/bin/pidof
- if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
- ln -sf last $(ROOT)/usr/bin/lastb; \
- fi
+ ln -sf killall5 $(ROOT)/sbin/pidof
+ ln -sf ../sbin/killall5 $(ROOT)/bin/pidof
if [ ! -f $(ROOT)/usr/bin/lastb ]; then \
ln -sf last $(ROOT)/usr/bin/lastb; \
fi
$(INSTALL_DIR) $(ROOT)/usr/include/
$(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
$(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/
--- src/bootlogd.c
+++ src/bootlogd.c 2011-03-15 14:58:54.000000000 +0000
@@ -241,7 +241,7 @@

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Tue Dec 1 10:48:20 UTC 2015 - sweet_f_a@gmx.de
- don't install last, we will take it from util-linux
-------------------------------------------------------------------
Mon Feb 23 09:30:00 UTC 2015 - rguenther@suse.com

View File

@ -341,8 +341,6 @@ fi
/bin/pidof
/bin/usleep
/bin/fsync
/usr/bin/last
/usr/bin/lastb
/sbin/blogger
/sbin/blogd
/sbin/fstab-decode
@ -365,8 +363,6 @@ fi
%doc %{_mandir}/man1/utmpdump.1.gz
%doc %{_mandir}/man8/sulogin.8.gz
%endif
%doc %{_mandir}/man1/last.1.gz
%doc %{_mandir}/man1/lastb.1.gz
%doc %{_mandir}/man1/usleep.1.gz
%doc %{_mandir}/man1/fsync.1.gz
# /usr/include/libblogger.h