Patchwork [v3,10/16] libcgroup: new package

login
register
mail settings
Submitter Clayton Shotwell
Date Sept. 25, 2013, 7:32 p.m.
Message ID <1380137571-688-11-git-send-email-clshotwe@rockwellcollins.com>
Download mbox | patch
Permalink /patch/277984/
State Superseded
Headers show

Comments

Clayton Shotwell - Sept. 25, 2013, 7:32 p.m.
Signed-off-by: Clayton Shotwell <clshotwe@rockwellcollins.com>
---
Changes v2 -> v3:
  - No changes.
Changes v1 -> v2:
  - General cleanup to the mk file to conform to the standard format.
  - Corrected the license version and license file to be correct.
  - Cleaned up the configure options to enable options for static
    libraries and linux-pam if they are selected in the configuration.

 package/Config.in              |    1 +
 package/libcgroup/Config.in    |    4 ++++
 package/libcgroup/libcgroup.mk |   38 ++++++++++++++++++++++++++++++++++++++
 3 files changed, 43 insertions(+), 0 deletions(-)
 create mode 100644 package/libcgroup/Config.in
 create mode 100644 package/libcgroup/libcgroup.mk
Thomas Petazzoni - Oct. 1, 2013, 7:48 p.m.
Dear Clayton Shotwell,

On this one, we're almost ready to go. A few comments below.

On Wed, 25 Sep 2013 14:32:45 -0500, Clayton Shotwell wrote:

> diff --git a/package/libcgroup/Config.in b/package/libcgroup/Config.in
> new file mode 100644
> index 0000000..17d2db2
> --- /dev/null
> +++ b/package/libcgroup/Config.in
> @@ -0,0 +1,4 @@
> +config BR2_PACKAGE_LIBCGROUP
> +	bool "libcgroup"
> +	help
> +	  libcgroup is a library that abstracts the control group file system in Linux. 

I believe this line is slightly too long. Also, the upstream URL is
missing. It should probably be:

	  http://libcg.sourceforge.net/

> diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk
> new file mode 100644
> index 0000000..06f1e60
> --- /dev/null
> +++ b/package/libcgroup/libcgroup.mk
> @@ -0,0 +1,38 @@
> +################################################################################
> +#
> +# libcgroup
> +#
> +################################################################################
> +
> +LIBCGROUP_VERSION = 0.38
> +LIBCGROUP_SOURCE = libcgroup-$(LIBCGROUP_VERSION).tar.bz2
> +LIBCGROUP_SITE = http://sourceforge.net/projects/libcg/files/latest/download
> +LIBCGROUP_LICENSE = LGPLv2.1
> +LIBCGROUP_LICENSE_FILES = COPYING
> +
> +LIBCGROUP_INSTALL_STAGING = YES
> +
> +# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h 
> +# large file support. See https://bugzilla.redhat.com/show_bug.cgi?id=574992 
> +# for more information.
> +LIBCGROUP_CONF_ENV = \
> +	CXXFLAGS+="-U_FILE_OFFSET_BITS" \
> +	CFLAGS+="-U_FILE_OFFSET_BITS"
> +
> +LIBCGROUP_CONF_OPT = \
> +	--disable-tools \
> +	--disable-daemon \
> +	--disable-initscript-install
> +
> +ifeq ($(BR2_PREFER_STATIC_LIB),y)
> +	LIBCGROUP_CONF_OPT += --enable-static --disable-shared
> +endif

This part is not needed, as it is passed by the autotools
infrastructure already.

Maybe you want to resend just this patch with those fixes, so we can
get it merged quickly, independently of the other SELinux changes.

Thanks!

Thomas
Clayton Shotwell - Oct. 1, 2013, 8:04 p.m.
Thomas,

Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote on 10/01/2013 
02:48:53 PM:

> I believe this line is slightly too long. Also, the upstream URL is
> missing. It should probably be:
> 
>      http://libcg.sourceforge.net/

I can fix both of those.

> > diff --git a/package/libcgroup/libcgroup.mk 
b/package/libcgroup/libcgroup.mk
> > new file mode 100644
> > index 0000000..06f1e60
> > --- /dev/null
> > +++ b/package/libcgroup/libcgroup.mk
> > @@ -0,0 +1,38 @@
> > 
> 
+################################################################################
> > +#
> > +# libcgroup
> > +#
> > 
> 
+################################################################################
> > +
> > +LIBCGROUP_VERSION = 0.38
> > +LIBCGROUP_SOURCE = libcgroup-$(LIBCGROUP_VERSION).tar.bz2
> > +LIBCGROUP_SITE = http://sourceforge.net/projects/libcg/files/
> latest/download
> > +LIBCGROUP_LICENSE = LGPLv2.1
> > +LIBCGROUP_LICENSE_FILES = COPYING
> > +
> > +LIBCGROUP_INSTALL_STAGING = YES
> > +
> > +# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc 
fts.h 
> > +# large file support. See https://bugzilla.redhat.com/
> show_bug.cgi?id=574992 
> > +# for more information.
> > +LIBCGROUP_CONF_ENV = \
> > +   CXXFLAGS+="-U_FILE_OFFSET_BITS" \
> > +   CFLAGS+="-U_FILE_OFFSET_BITS"
> > +
> > +LIBCGROUP_CONF_OPT = \
> > +   --disable-tools \
> > +   --disable-daemon \
> > +   --disable-initscript-install
> > +
> > +ifeq ($(BR2_PREFER_STATIC_LIB),y)
> > +   LIBCGROUP_CONF_OPT += --enable-static --disable-shared
> > +endif
> 
> This part is not needed, as it is passed by the autotools
> infrastructure already.

I'll remove it.

> Maybe you want to resend just this patch with those fixes, so we can
> get it merged quickly, independently of the other SELinux changes.

Should I do that with all of the simple patches?

Thanks,
Clayton

Clayton Shotwell
Software Engineer
clshotwe@rockwellcollins.com
www.rockwellcollins.com
Thomas Petazzoni - Oct. 1, 2013, 9:14 p.m.
Clayton,

On Tue, 1 Oct 2013 15:04:47 -0500, clshotwe@rockwellcollins.com wrote:

> > Maybe you want to resend just this patch with those fixes, so we can
> > get it merged quickly, independently of the other SELinux changes.
> 
> Should I do that with all of the simple patches?

It's a matter of strategy. When a relatively simple patch is part of a
larger, more complicated patch series, then it is unlikely to get
committed until the entire patch series gets committed. So,
strategically speaking, you might want to progressively reduce the size
of your patch series by merging parts of it that are independent of the
rest of the series, but are needed for it. Your libcgroup package is a
good candidate :)

Best regards,

Thomas

Patch

diff --git a/package/Config.in b/package/Config.in
index a85cbdd..0a18d8d 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -659,6 +659,7 @@  source "package/libatomic_ops/Config.in"
 source "package/libbsd/Config.in"
 source "package/libcap/Config.in"
 source "package/libcap-ng/Config.in"
+source "package/libcgroup/Config.in"
 source "package/libdaemon/Config.in"
 source "package/libelf/Config.in"
 source "package/libevent/Config.in"
diff --git a/package/libcgroup/Config.in b/package/libcgroup/Config.in
new file mode 100644
index 0000000..17d2db2
--- /dev/null
+++ b/package/libcgroup/Config.in
@@ -0,0 +1,4 @@ 
+config BR2_PACKAGE_LIBCGROUP
+	bool "libcgroup"
+	help
+	  libcgroup is a library that abstracts the control group file system in Linux. 
diff --git a/package/libcgroup/libcgroup.mk b/package/libcgroup/libcgroup.mk
new file mode 100644
index 0000000..06f1e60
--- /dev/null
+++ b/package/libcgroup/libcgroup.mk
@@ -0,0 +1,38 @@ 
+################################################################################
+#
+# libcgroup
+#
+################################################################################
+
+LIBCGROUP_VERSION = 0.38
+LIBCGROUP_SOURCE = libcgroup-$(LIBCGROUP_VERSION).tar.bz2
+LIBCGROUP_SITE = http://sourceforge.net/projects/libcg/files/latest/download
+LIBCGROUP_LICENSE = LGPLv2.1
+LIBCGROUP_LICENSE_FILES = COPYING
+
+LIBCGROUP_INSTALL_STAGING = YES
+
+# Undefining _FILE_OFFSET_BITS here because of a "bug" with glibc fts.h 
+# large file support. See https://bugzilla.redhat.com/show_bug.cgi?id=574992 
+# for more information.
+LIBCGROUP_CONF_ENV = \
+	CXXFLAGS+="-U_FILE_OFFSET_BITS" \
+	CFLAGS+="-U_FILE_OFFSET_BITS"
+
+LIBCGROUP_CONF_OPT = \
+	--disable-tools \
+	--disable-daemon \
+	--disable-initscript-install
+
+ifeq ($(BR2_PREFER_STATIC_LIB),y)
+	LIBCGROUP_CONF_OPT += --enable-static --disable-shared
+endif
+
+ifeq ($(BR2_PACKAGE_LINUX_PAM),y)
+	LIBCGROUP_DEPENDENCIES += linux-pam
+	LIBCGROUP_CONF_OPT += --enable-pam
+else
+	LIBCGROUP_CONF_OPT += --disable-pam
+endif
+
+$(eval $(autotools-package))