summary refs log tree commit diff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2016-08-12 13:07:06 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2016-08-12 13:07:06 +0000
commit4cb21dae6df27d8930e6bdd993d256e949eeee11 (patch)
tree60a0138653d442a0c5b236e90ebd19f511d1d164
parenta73c24566bb0d18a5b8f141e93eefa4f2eadc2ba (diff)
downloads6-linux-utils-4cb21dae6df27d8930e6bdd993d256e949eeee11.tar.gz
s6-linux-utils-4cb21dae6df27d8930e6bdd993d256e949eeee11.tar.xz
s6-linux-utils-4cb21dae6df27d8930e6bdd993d256e949eeee11.zip
Add spawn_lib support
-rw-r--r--INSTALL2
-rw-r--r--doc/index.html4
-rw-r--r--doc/upgrade.html6
-rw-r--r--package/deps.mak4
-rw-r--r--package/info2
-rw-r--r--src/minutils/deps-exe/s6-uevent-listener1
-rw-r--r--src/minutils/deps-exe/s6-uevent-spawner1
7 files changed, 14 insertions, 6 deletions
diff --git a/INSTALL b/INSTALL
index 0df574c..d782afb 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,7 +6,7 @@ Build Instructions
 
   - A Linux-based system with a standard C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.3.10.0 or later: http://skarnet.org/software/skalibs/
+  - skalibs version 2.4.0.0 or later: http://skarnet.org/software/skalibs/
 
  This software is Linux-specific. It will run on a Linux kernel,
 version 2.6.32 or later.
diff --git a/doc/index.html b/doc/index.html
index 43f3cf5..1d2527b 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -33,7 +33,7 @@
  <li> A Linux-based system with a standard C development environment </li>
  <li> GNU make, version 3.81 or later </li>
  <li> <a href="http://skarnet.org/software/skalibs/">skalibs</a> version
-2.3.10.0 or later. It's a build-time requirement. It's also a run-time
+2.4.0.0 or later. It's a build-time requirement. It's also a run-time
 requirement if you link against the shared version of the skalibs
 library. </li>
 </ul>
@@ -49,7 +49,7 @@ library. </li>
 
 <ul>
  <li> The current released version of s6-linux-utils is
-<a href="s6-linux-utils-2.1.0.0.tar.gz">2.1.0.0</a>. </li>
+<a href="s6-linux-utils-2.2.0.0.tar.gz">2.2.0.0</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="http://git.skarnet.org/cgi-bin/cgit.cgi/s6-linux-utils/">s6-linux-utils
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 738bfad..5524600 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,12 @@
 
 <h1> What has changed in s6-linux-utils </h1>
 
+<h2> in 2.2.0.0 </h2>
+
+<ul>
+ <li> skalibs dependency bumped to 2.4.0.0 </li>
+</ul>
+
 <h2> in 2.1.0.0 </h2>
 
 <ul>
diff --git a/package/deps.mak b/package/deps.mak
index a34f14b..6239279 100644
--- a/package/deps.mak
+++ b/package/deps.mak
@@ -53,9 +53,9 @@ 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 :=
+s6-uevent-listener: EXTRA_LIBS := ${SPAWN_LIB}
 s6-uevent-listener: src/minutils/s6-uevent-listener.o -lskarnet
-s6-uevent-spawner: EXTRA_LIBS :=
+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 bc62fcf..b6ad411 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-linux-utils
-version=2.1.0.0
+version=2.2.0.0
 category=admin
 package_macro_name=S6_LINUX_UTILS
diff --git a/src/minutils/deps-exe/s6-uevent-listener b/src/minutils/deps-exe/s6-uevent-listener
index e7187fe..39597dd 100644
--- a/src/minutils/deps-exe/s6-uevent-listener
+++ b/src/minutils/deps-exe/s6-uevent-listener
@@ -1 +1,2 @@
 -lskarnet
+${SPAWN_LIB}
diff --git a/src/minutils/deps-exe/s6-uevent-spawner b/src/minutils/deps-exe/s6-uevent-spawner
index e7187fe..39597dd 100644
--- a/src/minutils/deps-exe/s6-uevent-spawner
+++ b/src/minutils/deps-exe/s6-uevent-spawner
@@ -1 +1,2 @@
 -lskarnet
+${SPAWN_LIB}