diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2015-09-01 09:59:08 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2015-09-01 09:59:08 +0200 |
| commit | cfc70a48027b1b56231df62a30a7da888f33e3ce (patch) | |
| tree | cb2e856d51f1a79822a2b21d8c2cbaea55ae170d /package/libcgroup | |
| parent | 70874e321dbd50203187c41214cb888507cd6df1 (diff) | |
| parent | aa016797444017d4379a139e39697e38ed2e2357 (diff) | |
| download | buildroot-cfc70a48027b1b56231df62a30a7da888f33e3ce.tar.gz buildroot-cfc70a48027b1b56231df62a30a7da888f33e3ce.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/libcgroup')
| -rw-r--r-- | package/libcgroup/Config.in | 9 | ||||
| -rw-r--r-- | package/libcgroup/libcgroup.mk | 7 |
2 files changed, 15 insertions, 1 deletions
diff --git a/package/libcgroup/Config.in b/package/libcgroup/Config.in index b7a84e06e0..d02c2829ad 100644 --- a/package/libcgroup/Config.in +++ b/package/libcgroup/Config.in @@ -9,5 +9,14 @@ config BR2_PACKAGE_LIBCGROUP http://libcg.sourceforge.net/ +if BR2_PACKAGE_LIBCGROUP + +config BR2_PACKAGE_LIBCGROUP_TOOLS + bool "install tools" + help + Include a set of command-line tools for managing cgroups. + +endif + comment "libcgroup needs an (e)glibc toolchain w/ C++" depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_USES_GLIBC diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk index ace2744699..a4c3084c6c 100644 --- a/package/libcgroup/libcgroup.mk +++ b/package/libcgroup/libcgroup.mk @@ -20,10 +20,15 @@ LIBCGROUP_CONF_ENV = \ CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS" LIBCGROUP_CONF_OPTS = \ - --disable-tools \ --disable-daemon \ --disable-initscript-install +ifeq ($(BR2_PACKAGE_LIBCGROUP_TOOLS),y) +LIBCGROUP_CONF_OPTS += --enable-tools +else +LIBCGROUP_CONF_OPTS += --disable-tools +endif + ifeq ($(BR2_PACKAGE_LINUX_PAM),y) LIBCGROUP_DEPENDENCIES += linux-pam LIBCGROUP_CONF_OPTS += --enable-pam |
