From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 31 Dec 2022 07:08:15 +0000 (+0000)
Subject: sysvinit: Drop package
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16877482d92b36ba51b83158b219942ecb153bb2;p=ipfire-3.x.git

sysvinit: Drop package

This only ships killall5 which we don't use.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/dracut/dracut.nm b/dracut/dracut.nm
index 195e3f555..054cc0926 100644
--- a/dracut/dracut.nm
+++ b/dracut/dracut.nm
@@ -5,7 +5,7 @@
 
 name       = dracut
 version    = 048
-release    = 8
+release    = 9
 
 groups     = System/Boot
 url        = http://sourceforge.net/apps/trac/dracut/wiki
@@ -101,7 +101,6 @@ packages
 			kpartx
 			less
 			mdadm
-			sysvinit
 			systemd >= 187
 			tar
 			udev
diff --git a/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch b/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch
deleted file mode 100644
index 41e0f9078..000000000
--- a/sysvinit/patches/sysvinit-2.86-remove-utils-1.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff -Nur sysvinit-2.86-orig/src/Makefile sysvinit-2.86/src/Makefile
---- sysvinit-2.86-orig/src/Makefile	2004-06-09 14:47:45.000000000 +0200
-+++ sysvinit-2.86/src/Makefile	2015-01-24 20:17:45.980202112 +0100
-@@ -10,32 +10,30 @@
- 
- 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
--USRBIN	= last mesg
-+SBIN	= killall5
-+USRBIN	=
- 
--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
-+MAN1	=
-+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
-+BIN	+=
-+SBIN	+=
-+USRBIN	+=
-+MAN1	+=
-+MAN8	+=
- endif
- 
- ifeq ($(DISTRO),Debian)
--BIN	+= mountpoint
--SBIN	+= sulogin bootlogd
--MAN1	+= mountpoint.1
--MAN8	+= sulogin.8 bootlogd.8
-+BIN	+=
-+SBIN	+=
-+MAN1	+=
-+MAN8	+=
- endif
- 
- ifeq ($(DISTRO),Owl)
-@@ -50,7 +48,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 +118,7 @@
- 			$(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 +128,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
diff --git a/sysvinit/sysvinit.nm b/sysvinit/sysvinit.nm
deleted file mode 100644
index e1d1ad419..000000000
--- a/sysvinit/sysvinit.nm
+++ /dev/null
@@ -1,54 +0,0 @@
-###############################################################################
-# IPFire.org    - An Open Source Firewall Solution                            #
-# Copyright (C) - IPFire Development Team <info@ipfire.org>                   #
-###############################################################################
-
-name       = sysvinit
-version    = 2.86
-release    = 8
-
-groups     = System/Base
-url        = https://alioth.debian.org/projects/pkg-sysvinit/
-license    = GPLv2+
-summary    = Programs which control basic system processes.
-
-description
-	The sysvinit package contains a group of processes that control
-	the very basic functions of your system.
-end
-
-sources    = %{thisapp}.tar.gz
-
-CFLAGS    += -D_GNU_SOURCE
-
-build
-	make_build_targets += \
-		-C src CFLAGS="%{CFLAGS}" LDFLAGS="%{LDFLAGS}"
-
-	install
-		# Create directories.
-		mkdir -pv %{BUILDROOT}%{bindir}
-		mkdir -pv %{BUILDROOT}%{sbindir}
-		mkdir -pv %{BUILDROOT}%{mandir}/man8
-
-		# Install binaries.
-		install -m 0755 src/killall5 %{BUILDROOT}%{sbindir}
-
-		# Install man-pages.
-		install -m 0664 man/killall5.8 %{BUILDROOT}%{mandir}/man8
-	end
-end
-
-packages
-	package %{name}
-		groups += Base
-
-		provides
-			/sbin/killall5
-		end
-	end
-
-	package %{name}-debuginfo
-		template DEBUGINFO
-	end
-end