From f703916c3702d8f32dc535161571874cb007ca6d Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 14 Aug 2018 20:22:43 +0000
Subject:  Remove s6-devd, s6-uevent-listener, s6-uevent-spawner, prepare for
 2.5.0.0

---
 package/deps.mak    | 9 ---------
 package/info        | 2 +-
 package/modes       | 3 ---
 package/targets.mak | 3 ---
 4 files changed, 1 insertion(+), 16 deletions(-)

(limited to 'package')

diff --git a/package/deps.mak b/package/deps.mak
index a9773ae..1d187aa 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -3,7 +3,6 @@
 #
 
 src/minutils/s6-chroot.o src/minutils/s6-chroot.lo: src/minutils/s6-chroot.c
-src/minutils/s6-devd.o src/minutils/s6-devd.lo: src/minutils/s6-devd.c src/include/s6-linux-utils/config.h
 src/minutils/s6-fillurandompool.o src/minutils/s6-fillurandompool.lo: src/minutils/s6-fillurandompool.c
 src/minutils/s6-freeramdisk.o src/minutils/s6-freeramdisk.lo: src/minutils/s6-freeramdisk.c
 src/minutils/s6-hostname.o src/minutils/s6-hostname.lo: src/minutils/s6-hostname.c
@@ -13,8 +12,6 @@ src/minutils/s6-pivotchroot.o src/minutils/s6-pivotchroot.lo: src/minutils/s6-pi
 src/minutils/s6-ps.o src/minutils/s6-ps.lo: src/minutils/s6-ps.c src/minutils/s6-ps.h
 src/minutils/s6-swapoff.o src/minutils/s6-swapoff.lo: src/minutils/s6-swapoff.c
 src/minutils/s6-swapon.o src/minutils/s6-swapon.lo: src/minutils/s6-swapon.c
-src/minutils/s6-uevent-listener.o src/minutils/s6-uevent-listener.lo: src/minutils/s6-uevent-listener.c
-src/minutils/s6-uevent-spawner.o src/minutils/s6-uevent-spawner.lo: src/minutils/s6-uevent-spawner.c
 src/minutils/s6-umount.o src/minutils/s6-umount.lo: src/minutils/s6-umount.c
 src/minutils/s6ps_grcache.o src/minutils/s6ps_grcache.lo: src/minutils/s6ps_grcache.c src/minutils/s6-ps.h
 src/minutils/s6ps_otree.o src/minutils/s6ps_otree.lo: src/minutils/s6ps_otree.c src/minutils/s6-ps.h
@@ -26,8 +23,6 @@ src/minutils/s6ps_wchan.o src/minutils/s6ps_wchan.lo: src/minutils/s6ps_wchan.c
 
 s6-chroot: EXTRA_LIBS :=
 s6-chroot: src/minutils/s6-chroot.o -lskarnet
-s6-devd: EXTRA_LIBS :=
-s6-devd: src/minutils/s6-devd.o -lskarnet
 s6-fillurandompool: EXTRA_LIBS :=
 s6-fillurandompool: src/minutils/s6-fillurandompool.o -lskarnet
 s6-freeramdisk: EXTRA_LIBS :=
@@ -46,9 +41,5 @@ s6-swapoff: EXTRA_LIBS :=
 s6-swapoff: src/minutils/s6-swapoff.o -lskarnet
 s6-swapon: EXTRA_LIBS :=
 s6-swapon: src/minutils/s6-swapon.o -lskarnet
-s6-uevent-listener: EXTRA_LIBS := ${SPAWN_LIB}
-s6-uevent-listener: src/minutils/s6-uevent-listener.o -lskarnet
-s6-uevent-spawner: EXTRA_LIBS := ${SPAWN_LIB}
-s6-uevent-spawner: src/minutils/s6-uevent-spawner.o -lskarnet
 s6-umount: EXTRA_LIBS :=
 s6-umount: src/minutils/s6-umount.o -lskarnet
diff --git a/package/info b/package/info
index b9ca69d..919a1fd 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-linux-utils
-version=2.4.0.3
+version=2.5.0.0
 category=admin
 package_macro_name=S6_LINUX_UTILS
diff --git a/package/modes b/package/modes
index b6e43a2..7578bae 100644
--- a/package/modes
+++ b/package/modes
@@ -1,7 +1,4 @@
 s6-chroot		0700
-s6-devd			0700
-s6-uevent-listener	0700
-s6-uevent-spawner	0755
 s6-fillurandompool	0755
 s6-freeramdisk		0700
 s6-hostname		0755
diff --git a/package/targets.mak b/package/targets.mak
index 59b7441..0fa35ef 100644
--- a/package/targets.mak
+++ b/package/targets.mak
@@ -1,8 +1,5 @@
 BIN_TARGETS := \
 s6-chroot \
-s6-devd \
-s6-uevent-listener \
-s6-uevent-spawner \
 s6-fillurandompool \
 s6-freeramdisk \
 s6-hostname \
-- 
cgit v1.2.3