From c8b18df4f061edf000cb5ef8e79500bba77286ef Mon Sep 17 00:00:00 2001 From: Alejandro Mery Date: Sat, 16 Aug 2014 13:30:06 +0200 Subject: [PATCH] sysvinit: update no_init patches --- base/sysvinit/no_init.diff | 18 +++++++++++++----- .../sysvinit-2.88dsf-remove-last-mesg.diff | 11 +++++------ 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/base/sysvinit/no_init.diff b/base/sysvinit/no_init.diff index aadbe02bb..6513688e0 100644 --- a/base/sysvinit/no_init.diff +++ b/base/sysvinit/no_init.diff @@ -2,6 +2,7 @@ # This copyright note is auto-generated by ./scripts/Create-CopyPatch. # # Filename: package/.../sysvinit/no_init.diff +# Copyright (C) 2014 The OpenSDE Project # Copyright (C) 2004 - 2006 The T2 SDE Project # # More information can be found in the files COPYING and README. @@ -13,14 +14,21 @@ # Foundation; either version 2 of the License, or (at your option) any later # version. # --- SDE-COPYRIGHT-NOTE-END --- ---- ./src/Makefile.orig 2004-12-28 16:32:07.000000000 -0300 -+++ ./src/Makefile 2004-12-28 16:43:03.000000000 -0300 -@@ -15,7 +15,7 @@ + +--- ./src/Makefile.orig 2014-08-12 16:18:42.000000000 +0200 ++++ ./src/Makefile 2014-08-12 16:20:37.057108108 +0200 +@@ -15,12 +15,12 @@ # For some known distributions we do not build all programs, otherwise we do. BIN = --SBIN = init halt shutdown runlevel killall5 -+SBIN = halt shutdown killall5 +-SBIN = init halt shutdown runlevel killall5 fstab-decode ++SBIN = halt shutdown killall5 fstab-decode 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 = halt.8 killall5.8 pidof.8 poweroff.8 reboot.8 + MAN8 += shutdown.8 telinit.8 fstab-decode.8 + + ifeq ($(DISTRO),) diff --git a/base/sysvinit/sysvinit-2.88dsf-remove-last-mesg.diff b/base/sysvinit/sysvinit-2.88dsf-remove-last-mesg.diff index 14e996d95..c5de6dff7 100644 --- a/base/sysvinit/sysvinit-2.88dsf-remove-last-mesg.diff +++ b/base/sysvinit/sysvinit-2.88dsf-remove-last-mesg.diff @@ -13,22 +13,21 @@ # Foundation; either version 2 of the License, or (at your option) any later # version. # --- SDE-COPYRIGHT-NOTE-END --- - ---- ./src/Makefile.orig 2014-01-24 13:37:31.226403034 +0100 -+++ ./src/Makefile 2014-01-24 13:50:47.760823361 +0100 +--- ./src/Makefile.orig 2014-08-12 16:23:09.612649037 +0200 ++++ ./src/Makefile 2014-08-12 16:28:04.227457692 +0200 @@ -16,9 +16,9 @@ # For some known distributions we do not build all programs, otherwise we do. BIN = - SBIN = init halt shutdown runlevel killall5 fstab-decode + SBIN = halt shutdown killall5 fstab-decode -USRBIN = last mesg +USRBIN = -MAN1 = last.1 lastb.1 mesg.1 +MAN1 = MAN5 = initscript.5 inittab.5 - MAN8 = halt.8 init.8 killall5.8 pidof.8 poweroff.8 reboot.8 runlevel.8 + MAN8 = halt.8 killall5.8 pidof.8 poweroff.8 reboot.8 MAN8 += shutdown.8 telinit.8 fstab-decode.8 -@@ -155,9 +155,6 @@ +@@ -162,9 +162,6 @@ ln -sf halt $(ROOT)/sbin/poweroff ln -sf init $(ROOT)/sbin/telinit ln -sf /sbin/killall5 $(ROOT)/bin/pidof