From: Michael Tremer <michael.tremer@ipfire.org>
Date: Mon, 5 Apr 2010 14:01:53 +0000 (+0200)
Subject: sysvinit: Add patch that does remove tools that are provided by upstart.
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f95181bd4535ae7f6703295f723b10e82bca5b13;p=ipfire-3.x.git

sysvinit: Add patch that does remove tools that are provided by upstart.
---

diff --git a/pkgs/core/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch b/pkgs/core/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch
new file mode 100644
index 000000000..b3c22ef25
--- /dev/null
+++ b/pkgs/core/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch
@@ -0,0 +1,77 @@
+--- sysvinit-2.86/src/Makefile.old	2009-08-05 17:57:57.000000000 +0200
++++ sysvinit-2.86/src/Makefile	2009-08-05 19:03:04.000000000 +0200
+@@ -10,32 +10,26 @@
+ 
+ CC	= gcc
+ CFLAGS	= -Wall -O2 -fomit-frame-pointer -D_GNU_SOURCE
+-LDFLAGS	= -s
++LDFLAGS	=
+ STATIC	=
+ 
+ # For some known distributions we do not build all programs, otherwise we do.
+ BIN	=
+-SBIN	= init halt shutdown runlevel killall5
++SBIN	= killall5
+ USRBIN	= last mesg
+ 
+ MAN1	= last.1 lastb.1 mesg.1
+-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
++MAN8	= killall5.8 pidof.8
+ 
+ ifeq ($(DISTRO),)
+ BIN	+= mountpoint
+-SBIN	+= sulogin bootlogd
+-USRBIN	+= utmpdump wall
+-MAN1	+= mountpoint.1 wall.1
+-MAN8	+= sulogin.8 bootlogd.8
++USRBIN	+= utmpdump
++MAN1	+= mountpoint.1
+ endif
+ 
+ ifeq ($(DISTRO),Debian)
+ BIN	+= mountpoint
+-SBIN	+= sulogin bootlogd
+ MAN1	+= mountpoint.1
+-MAN8	+= sulogin.8 bootlogd.8
+ endif
+ 
+ ifeq ($(DISTRO),Owl)
+@@ -50,7 +44,7 @@
+ MANDIR		= /usr/share/man
+ 
+ # Additional libs for GNU libc.
+-ifneq ($(wildcard /usr/lib/libcrypt.a),)
++ifneq ($(wildcard /usr/lib/libcrypt.so),)
+ LCRYPT		= -lcrypt
+ endif
+ 
+@@ -120,14 +114,10 @@
+ 			$(INSTALL) -m 755 $$i $(ROOT)/usr/bin/; \
+ 		done
+ 		# $(INSTALL) -m 755 etc/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
+-		$(INSTALL) -m 644 initreq.h $(ROOT)/usr/include/
+ 		for i in $(MAN1); do \
+ 			$(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man1/; \
+ 		done
+@@ -137,12 +127,3 @@
+ 		for i in $(MAN8); do \
+ 			$(INSTALL) -m 644 ../man/$$i $(ROOT)$(MANDIR)/man8/; \
+ 		done
+-ifeq ($(ROOT),)
+-		#
+-		# This part is skipped on Debian systems, the
+-		# debian.preinst script takes care of it.
+-		@if [ ! -p /dev/initctl ]; then \
+-		 echo "Creating /dev/initctl"; \
+-		 rm -f /dev/initctl; \
+-		 mknod -m 600 /dev/initctl p; fi
+-endif