71f7b74020
- Drop /bin/pidof and /sbin/pidof, including corresponding man
page: let's switch to pidof as provided by procps-ng.
- Update to sysvinit 2.97:
* Check $(ROOT) filesystem for libcrypt instead of a hardcoded
path to /usr.
* Code clean-up and making sure we avoid freeing unused memory.
* Added shell script which converts systemd unit files into
init.d style scripts.
* Allow init to load configuration data from files stored in
/etc/inittab.d/
* Allow shutdown time to be specified in the format +hh:mm. This
is in addition to the existing formats such as hh:mm, +m, and
"now".
* Fixed typos in manual pages.
- Update startpar to 0.65:
+ Make sure startpar testsuite can find insserv executable in
/usr/sbin or /sbin.
+ Added PREFIX variable to Makefile and testsuite to make
location of startpar and insserv more flexible.
- Rebase sysvinit-2.90.dif.
- Drop SCVER defines: not used in any place.
- Drop startpar-sysmacros.patch: fixed upstream.
OBS-URL: https://build.opensuse.org/request/show/829755
OBS-URL: https://build.opensuse.org/package/show/Base:System/sysvinit?expand=0&rev=243
65 lines
1.9 KiB
Plaintext
65 lines
1.9 KiB
Plaintext
---
|
|
src/Makefile | 27 +++++++++------------------
|
|
1 file changed, 9 insertions(+), 18 deletions(-)
|
|
|
|
Index: src/Makefile
|
|
===================================================================
|
|
--- src/Makefile.orig
|
|
+++ src/Makefile
|
|
@@ -9,7 +9,7 @@
|
|
#
|
|
|
|
CPPFLAGS =
|
|
-CFLAGS ?= -O2
|
|
+CFLAGS ?= $(RPM_OPT_FLAGS)
|
|
override CFLAGS += -ansi -fomit-frame-pointer -fstack-protector-strong -W -Wall -Wunreachable-code -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2 -D_XOPEN_SOURCE -D_GNU_SOURCE -DVERSION=\"$(VERSION)\"
|
|
override CFLAGS += $(shell getconf LFS_CFLAGS)
|
|
STATIC =
|
|
@@ -23,13 +23,13 @@ MNTPOINT=
|
|
|
|
# For some known distributions we do not build all programs, otherwise we do.
|
|
BIN =
|
|
-SBIN = init halt shutdown runlevel killall5 fstab-decode logsave
|
|
-USRBIN = last mesg readbootlog
|
|
+SBIN = killall5 fstab-decode
|
|
+USRBIN =
|
|
|
|
-MAN1 = last.1 lastb.1 mesg.1 readbootlog.1
|
|
-MAN5 = initscript.5 inittab.5 initctl.5
|
|
-MAN8 = halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8
|
|
-MAN8 += shutdown.8 telinit.8 fstab-decode.8 logsave.8
|
|
+MAN1 =
|
|
+MAN5 =
|
|
+MAN8 = killall5.8 pidof.8
|
|
+MAN8 += fstab-decode.8
|
|
|
|
ifeq ($(DISTRO),)
|
|
SBIN += sulogin bootlogd
|
|
@@ -53,10 +53,6 @@ endif
|
|
|
|
ifeq ($(DISTRO),SuSE)
|
|
CPPFLAGS+= -DUSE_SYSFS -DSANE_TIO -DSIGINT_ONLYONCE -DUSE_ONELINE
|
|
-SBIN += sulogin
|
|
-USRBIN += utmpdump
|
|
-MAN1 += utmpdump.1
|
|
-MAN8 += sulogin.8
|
|
MANDB :=
|
|
endif
|
|
|
|
@@ -205,13 +201,8 @@ install: all
|
|
# $(INSTALL_DIR) $(ROOT)/etc/
|
|
$(INSTALL_DIR) $(ROOT)/etc/inittab.d
|
|
# $(INSTALL_EXEC) ../doc/initscript.sample $(ROOT)/etc/
|
|
- 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
|
|
$(INSTALL_DIR) $(ROOT)/usr/include/
|
|
$(INSTALL_DATA) initreq.h $(ROOT)/usr/include/
|
|
$(INSTALL_DIR) $(ROOT)$(MANDIR)/man1/
|