diff options
author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 12:56:34 +1000 |
---|---|---|
committer | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2010-09-14 12:56:34 +1000 |
commit | c31744ca1a86b2276c37c6d9a884660185debed6 (patch) | |
tree | bb051c35c3430a3793ceef173a01cb522fb4ae05 /runit | |
parent | 1a286d510c2125bdab601ce47afd4d27b6ce6f41 (diff) | |
parent | e329089c62ed813e97344f8c61d7dc34221fd5ee (diff) | |
download | busybox-w32-c31744ca1a86b2276c37c6d9a884660185debed6.tar.gz busybox-w32-c31744ca1a86b2276c37c6d9a884660185debed6.tar.bz2 busybox-w32-c31744ca1a86b2276c37c6d9a884660185debed6.zip |
Merge branch 'origin/master' (early part)
Diffstat (limited to 'runit')
-rw-r--r-- | runit/Config.src | 2 | ||||
-rw-r--r-- | runit/Kbuild.src | 3 |
2 files changed, 5 insertions, 0 deletions
diff --git a/runit/Config.src b/runit/Config.src index 53b445101..9db974002 100644 --- a/runit/Config.src +++ b/runit/Config.src | |||
@@ -5,6 +5,8 @@ | |||
5 | 5 | ||
6 | menu "Runit Utilities" | 6 | menu "Runit Utilities" |
7 | 7 | ||
8 | INSERT | ||
9 | |||
8 | config RUNSV | 10 | config RUNSV |
9 | bool "runsv" | 11 | bool "runsv" |
10 | default y | 12 | default y |
diff --git a/runit/Kbuild.src b/runit/Kbuild.src index ab9eef6ff..4d85372df 100644 --- a/runit/Kbuild.src +++ b/runit/Kbuild.src | |||
@@ -5,6 +5,9 @@ | |||
5 | # Licensed under the GPL v2, see the file LICENSE in this tarball. | 5 | # Licensed under the GPL v2, see the file LICENSE in this tarball. |
6 | 6 | ||
7 | lib-y:= | 7 | lib-y:= |
8 | |||
9 | INSERT | ||
10 | |||
8 | lib-$(CONFIG_RUNSV) += runsv.o runit_lib.o | 11 | lib-$(CONFIG_RUNSV) += runsv.o runit_lib.o |
9 | lib-$(CONFIG_RUNSVDIR) += runsvdir.o runit_lib.o | 12 | lib-$(CONFIG_RUNSVDIR) += runsvdir.o runit_lib.o |
10 | lib-$(CONFIG_SV) += sv.o runit_lib.o | 13 | lib-$(CONFIG_SV) += sv.o runit_lib.o |