source: patches/sysvinit-2.88dsf-tools_updates-1.patch @ 05109c2

clfs-3.0.0-systemdsystemd
Last change on this file since 05109c2 was 0d68a5c, checked in by Chris Staub <chris@…>, 9 years ago

Actually add sysvnit patch

  • Property mode set to 100644
File size: 2.3 KB
RevLine 
[0d68a5c]1diff -Naur sysvinit-2.88dsf.orig/src/Makefile sysvinit-2.88dsf/src/Makefile
2--- sysvinit-2.88dsf.orig/src/Makefile  2010-04-11 05:30:27.000000000 -0400
3+++ sysvinit-2.88dsf/src/Makefile       2014-04-14 17:00:32.000000000 -0400
4@@ -16,27 +16,20 @@
5 # For some known distributions we do not build all programs, otherwise we do.
6 BIN    =
7 SBIN   = init halt shutdown runlevel killall5 fstab-decode
8-USRBIN = last mesg
9 
10-MAN1   = last.1 lastb.1 mesg.1
11 MAN5   = initscript.5 inittab.5
12 MAN8   = halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8
13 MAN8   += shutdown.8 telinit.8 fstab-decode.8
14 
15 ifeq ($(DISTRO),)
16-BIN    += mountpoint
17-SBIN   += sulogin bootlogd
18-USRBIN += utmpdump wall
19-MAN1   += utmpdump.1 mountpoint.1 wall.1
20-MAN8   += sulogin.8 bootlogd.8
21+SBIN   += bootlogd
22+MAN8   += bootlogd.8
23 endif
24 
25 ifeq ($(DISTRO),Debian)
26 CPPFLAGS+= -DACCTON_OFF
27-BIN    += mountpoint
28-SBIN   += sulogin bootlogd
29-MAN1   += mountpoint.1
30-MAN8   += sulogin.8 bootlogd.8
31+SBIN   += bootlogd
32+MAN8   += bootlogd.8
33 endif
34 
35 ifeq ($(DISTRO),Owl)
36@@ -46,11 +39,8 @@
37 
38 ifeq ($(DISTRO),SuSE)
39 CPPFLAGS+= -DUSE_SYSFS -DSANE_TIO -DSIGINT_ONLYONCE -DUSE_ONELINE
40-BIN    += mountpoint
41-SBIN   += sulogin
42-USRBIN += utmpdump
43-MAN1   += utmpdump.1 mountpoint.1
44-MAN8   += sulogin.8
45+SBIN   +=
46+MAN8   +=
47 endif
48 
49 ID             = $(shell id -u)
50@@ -78,7 +68,7 @@
51 endif
52 
53 # Additional libs for GNU libc.
54-ifneq ($(wildcard /usr/lib*/libcrypt.a),)
55+ifneq ($(wildcard /tools/lib*/libcrypt.a),)
56   SULOGINLIBS  += -lcrypt
57 endif
58 
59@@ -96,11 +86,8 @@
60 
61 last:          last.o oldutmp.h
62 
63-mesg:          mesg.o
64 
65-mountpoint:    mountpoint.o
66 
67-utmpdump:      utmpdump.o
68 
69 runlevel:      runlevel.o
70 
71diff -Naur sysvinit-2.88dsf.orig/src/paths.h sysvinit-2.88dsf/src/paths.h
72--- sysvinit-2.88dsf.orig/src/paths.h   2010-04-11 05:30:27.000000000 -0400
73+++ sysvinit-2.88dsf/src/paths.h        2014-04-14 17:00:36.000000000 -0400
74@@ -26,7 +26,7 @@
75 #define CONSOLE                "/dev/console"          /* Logical system console */
76 #define SECURETTY      "/etc/securetty"        /* List of root terminals */
77 #define SDALLOW                "/etc/shutdown.allow"   /* Users allowed to shutdown */
78-#define INITTAB                "/etc/inittab"          /* Location of inittab */
79+#define INITTAB                "/tools/etc/inittab"            /* Location of inittab */
80 #define INIT           "/sbin/init"            /* Location of init itself. */
81 #define NOLOGIN                "/etc/nologin"          /* Stop user logging in. */
82 #define FASTBOOT       "/fastboot"             /* Enable fast boot. */
Note: See TracBrowser for help on using the repository browser.