Skip to contentSkip to conversation

package/libcgroup: allow to build cgroup-tools

PATCH New Bartosz Golaszewski 3 participants 3 messages Aug 24, 2015 – Aug 27, 2015

lore
Share & tools
lore

Bartosz Golaszewski

author
#0 lore raw

PATCH v2 1/1 package/libcgroup: allow to build cgroup-tools

Add a new config option that allows to build cgroup-tools - a set of command-line utils for managing cgroups.

Signed-off-by Bartosz Golaszewski <[email protected]>

---
v2:
- prefix package option with package name
- use if/endif instead of depends on for libcgroup dependence

v1:
http://lists.busybox.net/pipermail/buildroot/2015-August/137816.html

 package/libcgroup/Config.in    | 9 +++++++++
 package/libcgroup/libcgroup.mk | 7 ++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
package/libcgroup/Config.in +9 -0
index b7a84e0..7852567 100644
@@ -9,5 +9,14 @@ config BR2_PACKAGE_LIBCGROUP
 
 	  http://libcg.sourceforge.net/
 
+if BR2_PACKAGE_LIBCGROUP
+
+config BR2_PACKAGE_LIBCGROUP_TOOLS
+	bool "build cgroup-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
package/libcgroup/libcgroup.mk +6 -1
index ace2744..a4c3084 100644
@@ -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
Signature · 1 line
2.1.4
#1 lore raw

PATCH v2 1/1 package/libcgroup: allow to build cgroup-tools

Dear Bartosz Golaszewski,

Quoted 47 lines · Bartosz Golaszewski

Add a new config option that allows to build cgroup-tools - a set of command-line utils for managing cgroups.

Signed-off-by Bartosz Golaszewski <[email protected]>

---
v2:
- prefix package option with package name
- use if/endif instead of depends on for libcgroup dependence

v1:
http://lists.busybox.net/pipermail/buildroot/2015-August/137816.html

 package/libcgroup/Config.in    | 9 +++++++++
 package/libcgroup/libcgroup.mk | 7 ++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
package/libcgroup/Config.in +9 -0
index b7a84e0..7852567 100644
@@ -9,5 +9,14 @@ config BR2_PACKAGE_LIBCGROUP
 
 	  http://libcg.sourceforge.net/
 
+if BR2_PACKAGE_LIBCGROUP
+
+config BR2_PACKAGE_LIBCGROUP_TOOLS
+	bool "build cgroup-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
package/libcgroup/libcgroup.mk +0 -1
index ace2744..a4c3084 100644
@@ -20,10 +20,15 @@ LIBCGROUP_CONF_ENV = \
 	CFLAGS="$(TARGET_CFLAGS) -U_FILE_OFFSET_BITS"
 
 LIBCGROUP_CONF_OPTS = \
-	--disable-tools \
 	--disable-daemon \
 	--disable-initscript-install

package/libcgroup/libcgroup.mk LIBCGROUP_CONF_ENV = \ · line 34

Quoted 10 lines
package/libcgroup/libcgroup.mk +6 -0
 
+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
Reviewed-by Vicente Olivert Riera <[email protected]>

Regards,

Vincent.

#2 lore raw

PATCH v2 1/1 package/libcgroup: allow to build cgroup-tools

In reply to Bartosz Golaszewski

Dear Bartosz Golaszewski,

Quoted 21 lines · Bartosz Golaszewski

Add a new config option that allows to build cgroup-tools - a set of command-line utils for managing cgroups.

Signed-off-by Bartosz Golaszewski <[email protected]>

---
v2:
- prefix package option with package name
- use if/endif instead of depends on for libcgroup dependence

v1:
http://lists.busybox.net/pipermail/buildroot/2015-August/137816.html

 package/libcgroup/Config.in    | 9 +++++++++
 package/libcgroup/libcgroup.mk | 7 ++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
package/libcgroup/Config.in +0 -0
index b7a84e0..7852567 100644

package/libcgroup/Config.in config BR2_PACKAGE_LIBCGROUP · line 15

Quoted 7 lines
package/libcgroup/Config.in +4 -0
@@ -9,5 +9,14 @@ config BR2_PACKAGE_LIBCGROUP
 
 	  http://libcg.sourceforge.net/
 
+if BR2_PACKAGE_LIBCGROUP
+
+config BR2_PACKAGE_LIBCGROUP_TOOLS
+	bool "build cgroup-tools"

I've adjusted the prompt of the option to be "install tools": there's no need to repeat "cgroup" since the option will already be indented under "libcgroup".

Applied with this change, thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com