rpms/libcgroup/devel fedora-fix-initscripts.patch, NONE, 1.1 fedora-workaround-for-sysdefault.patch, NONE, 1.1 .cvsignore, 1.8, 1.9 libcgroup.spec, 1.12, 1.13 sources, 1.8, 1.9 01-fedora-fix-build.patch, 1.1, NONE 02-fedora-fix-initscripts.patch, 1.1, NONE 03-fedora-adjust-initscript-priority.patch, 1.1, NONE 04-fedora-workaround-for-sysdefault.patch, 1.1, NONE fix_makefile_to_link_with_builddir.patch, 1.1, NONE fix_overflow.patch, 1.1, NONE

Jan Šafránek jsafrane at fedoraproject.org
Tue Jul 7 16:28:14 UTC 2009


Author: jsafrane

Update of /cvs/pkgs/rpms/libcgroup/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21077

Modified Files:
	.cvsignore libcgroup.spec sources 
Added Files:
	fedora-fix-initscripts.patch 
	fedora-workaround-for-sysdefault.patch 
Removed Files:
	01-fedora-fix-build.patch 02-fedora-fix-initscripts.patch 
	03-fedora-adjust-initscript-priority.patch 
	04-fedora-workaround-for-sysdefault.patch 
	fix_makefile_to_link_with_builddir.patch fix_overflow.patch 
Log Message:
Update to 0.34
Also rename the patches, sequence of patches can change often

fedora-fix-initscripts.patch:

--- NEW FILE fedora-fix-initscripts.patch ---
Remove depencency on LSB. The redhat-lsb package pulls lot of dependencies
we do not care about (like X11, QT, ...). We want libcgroup to be able to
run without this bloat.

From: Jan Safranek <jsafrane at redhat.com>
---

 scripts/init.d/cgconfig.in |   11 ++++++++++-
 scripts/init.d/cgred.in    |   10 +++++++++-
 2 files changed, 19 insertions(+), 2 deletions(-)


diff --git a/scripts/init.d/cgconfig.in b/scripts/init.d/cgconfig.in
index 543cb9f..80df311 100644
--- a/scripts/init.d/cgconfig.in
+++ b/scripts/init.d/cgconfig.in
@@ -46,7 +46,16 @@ servicename=cgconfig
 #
 # Source LSB routines
 #
-. /lib/lsb/init-functions
+. /etc/rc.d/init.d/functions
+log_success_msg () {
+    echo -n $*; success "$*"; echo
+}
+log_failure_msg () {
+    echo -n $*; failure "$*"; echo
+}
+log_warning_msg () {
+    echo -n $*; warning "$*"; echo
+}
 
 parse_mounts() {
     while read name mountpt fs opts other
diff --git a/scripts/init.d/cgred.in b/scripts/init.d/cgred.in
index db9c2ac..e810d5b 100644
--- a/scripts/init.d/cgred.in
+++ b/scripts/init.d/cgred.in
@@ -40,7 +40,15 @@ CGRED_BIN=$sbindir/cgrulesengd
 
 # Source function library & LSB routines
 . /etc/rc.d/init.d/functions
-. /lib/lsb/init-functions
+log_success_msg () {
+    echo -n $*; success "$*"; echo
+}
+log_failure_msg () {
+    echo -n $*; failure "$*"; echo
+}
+log_warning_msg () {
+    echo -n $*; warning "$*"; echo
+}
 
 # Read in configuration options.
 if [ -f "/etc/sysconfig/cgred.conf" ] ; then

fedora-workaround-for-sysdefault.patch:

--- NEW FILE fedora-workaround-for-sysdefault.patch ---
diff --git a/scripts/init.d/cgconfig b/scripts/init.d/cgconfig
index 1c60b86..fe3ff65 100644
--- a/scripts/init.d/cgconfig.in
+++ b/scripts/init.d/cgconfig.in
@@ -122,6 +122,15 @@ start() {
                     ${MOUNTPOINT[$i]}/$defaultcgroup/cpuset.mems
             fi
             #
+            # special rule for cpu
+            #
+            echo ${MOUNTOPTS[$i]} | grep -q -w cpu
+            if [ $? -eq 0 ]
+            then
+                cat ${MOUNTPOINT[$i]}/cpu.rt_runtime_us > \
+                    ${MOUNTPOINT[$i]}/$defaultcgroup/cpu.rt_runtime_us
+	    fi
+            #
             # classify everything to default cgroup
             #
             for j in `ps --no-headers -eL o tid`


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libcgroup/devel/.cvsignore,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- .cvsignore	2 Mar 2009 11:32:59 -0000	1.8
+++ .cvsignore	7 Jul 2009 16:28:14 -0000	1.9
@@ -1 +1 @@
-libcgroup-0.33.tar.bz2
+libcgroup-0.34.tar.bz2


Index: libcgroup.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libcgroup/devel/libcgroup.spec,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- libcgroup.spec	9 Mar 2009 17:46:10 -0000	1.12
+++ libcgroup.spec	7 Jul 2009 16:28:14 -0000	1.13
@@ -1,24 +1,22 @@
+%define soversion 1.0.34
+
 Name: libcgroup
 Summary: Tools and libraries to control and monitor control groups
 Group: Development/Libraries
-Version: 0.33
-Release: 3%{?dist}
+Version: 0.34
+Release:        1%{?dist}
 License: LGPLv2+
 URL: http://libcg.sourceforge.net/
 Source0: http://downloads.sourceforge.net/libcg/%{name}-%{version}.tar.bz2
-Patch0: http://downloads.sourceforge.net/libcg/01-fedora-fix-build.patch
-Patch1: http://downloads.sourceforge.net/libcg/02-fedora-fix-initscripts.patch
-Patch2: http://downloads.sourceforge.net/libcg/03-fedora-adjust-initscript-priority.patch
-Patch3: http://downloads.sourceforge.net/libcg/04-fedora-workaround-for-sysdefault.patch
+Patch0: fedora-fix-initscripts.patch
+Patch1: fedora-workaround-for-sysdefault.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: pam-devel
 BuildRequires: byacc
 BuildRequires: flex
 BuildRequires: coreutils
-BuildRequires: pam-devel
-Requires(post): chkconfig
-Requires(post): initscripts
-Requires(preun): initscripts
-Requires(preun): chkconfig
+Requires(post): chkconfig, /sbin/service
+Requires(preun): /sbin/chkconfig
 
 %description
 Control groups infrastructure. The tools and library help manipulate, control,
@@ -36,11 +34,8 @@ provide scripts to manage that configura
 
 %prep
 %setup -q
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-
+%patch0 -p1 -b .fedora
+%patch1 -p1 -b .sysdefault
 %build
 %configure --bindir=/bin --sbindir=/sbin --libdir=/%{_lib}
 
@@ -50,31 +45,44 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
+
+# install init scripts
 mkdir -p $RPM_BUILD_ROOT/%{_initrddir}
 cp scripts/init.d/cgconfig $RPM_BUILD_ROOT/%{_initrddir}/cgconfig
 cp scripts/init.d/cgred $RPM_BUILD_ROOT/%{_initrddir}/cgred
+
+# install config files
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig
 cp samples/cgred.conf $RPM_BUILD_ROOT/%{_sysconfdir}/sysconfig/cgred.conf
 cp samples/cgconfig.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgconfig.conf
 cp samples/cgrules.conf $RPM_BUILD_ROOT/%{_sysconfdir}/cgrules.conf
 
+# sanitize pam module, we need only pam_cgroup.so in the right directory
+mkdir -p $RPM_BUILD_ROOT/%{_lib}/security
+mv -f $RPM_BUILD_ROOT/%{_lib}/pam_cgroup.so.*.*.* $RPM_BUILD_ROOT/%{_lib}/security/pam_cgroup.so
+rm -f $RPM_BUILD_ROOT/%{_lib}/pam_cgroup*
+
+# move the devel stuff to /usr
+mkdir -p $RPM_BUILD_ROOT/%{_libdir}
+mv -f $RPM_BUILD_ROOT/%{_lib}/libcgroup.la $RPM_BUILD_ROOT/%{_libdir}
+rm -f $RPM_BUILD_ROOT/%{_lib}/libcgroup.so
+ln -sf ../../%{_lib}/libcgroup.so.%{soversion} $RPM_BUILD_ROOT/%{_libdir}/libcgroup.so
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post 
 /sbin/ldconfig
-#
-# Do this later if required
-#
 /sbin/chkconfig --add cgred
 /sbin/chkconfig --add cgconfig
 
 %preun
-/sbin/service cgred stop > /dev/null 2>&1 || :
-/sbin/service cgconfig stop > /dev/null 2>&1 || :
-/sbin/chkconfig --del cgconfig
-/sbin/chkconfig --del cgred
+if [ $1 = 0 ]; then
+    /sbin/service cgred stop > /dev/null 2>&1 || :
+    /sbin/service cgconfig stop > /dev/null 2>&1 || :
+    /sbin/chkconfig --del cgconfig
+    /sbin/chkconfig --del cgred
+fi
 
 %postun -p /sbin/ldconfig
 
@@ -83,12 +91,14 @@ rm -rf $RPM_BUILD_ROOT
 %config(noreplace) %{_sysconfdir}/sysconfig/cgred.conf
 %config(noreplace) %{_sysconfdir}/cgconfig.conf
 %config(noreplace) %{_sysconfdir}/cgrules.conf
-/%{_lib}/libcgroup-%{version}.so
 /%{_lib}/libcgroup.so.*
 /bin/cgexec
 /bin/cgclassify
+/bin/cgcreate
+/bin/cgset
 /sbin/cgconfigparser
-/bin/cgrulesengd
+/sbin/cgrulesengd
+/sbin/cgclear
 %attr(0644, root, root) %{_mandir}/man1/*
 %attr(0644, root, root) %{_mandir}/man5/*
 %attr(0644, root, root) %{_mandir}/man8/*
@@ -101,35 +111,23 @@ rm -rf $RPM_BUILD_ROOT
 %files devel
 %defattr(-,root,root,-)
 %{_includedir}/libcgroup.h
-/%{_lib}/libcgroup.so
-%doc COPYING INSTALL
+%{_libdir}/libcgroup.*
+%doc COPYING INSTALL 
 
 
 %changelog
-* Mon Mar 09 2009 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.33-3
-- Add a workaround for rt cgroup controller.
-* Mon Mar 09 2009 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.33-2
-- Change the cgconfig script to start earlier
-- Move the binaries to /bin and /sbin
-* Mon Mar 02 2009 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.33-1
-- Update to latest upstream
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.32.2-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Mon Jan 05 2009 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.32.2-3
-- Fix redhat-lsb dependency
-* Mon Dec 29 2008 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.32.2-2
-- Fix build dependencies
-* Mon Dec 29 2008 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.32.2-1
-- Update to latest upstream
-* Thu Oct 23 2008 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.32.1-1
+* Tue Jul  7 2009 Jan Safranek <jsafrane at redhat.com> 0.34-1
+- Update to 0.34
+* Tue Feb 24 2009 Balbir Singh <balbir at linux.vnet.ibm.com> 0.33-1
+- Update to 0.33, spec file changes to add Makefiles and pam_cgroup module
+* Fri Oct 10 2008 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.32-1
 - Update to latest upstream
 * Thu Sep 11 2008 Dhaval Giani <dhaval at linux-vnet.ibm.com> 0.31-1
 - Update to latest upstream
 * Sat Aug 2 2008 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.1c-3
 - Change release to fix broken upgrade path
 * Wed Jun 11 2008 Dhaval Giani <dhaval at linux.vnet.ibm.com> 0.1c-1
-- Update to latest upstream
+- Update to latest upstream version
 * Tue Jun 3 2008 Balbir Singh <balbir at linux.vnet.ibm.com> 0.1b-3
 - Add post and postun. Also fix Requires for devel to depend on base n-v-r
 * Sat May 31 2008 Balbir Singh <balbir at linux.vnet.ibm.com> 0.1b-2


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libcgroup/devel/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	2 Mar 2009 11:32:59 -0000	1.8
+++ sources	7 Jul 2009 16:28:14 -0000	1.9
@@ -1 +1 @@
-d67de6001bff6c6d086d6ccb7757a5dc  libcgroup-0.33.tar.bz2
+681c751d1a1ea78615094007d39db6cb  libcgroup-0.34.tar.bz2


--- 01-fedora-fix-build.patch DELETED ---


--- 02-fedora-fix-initscripts.patch DELETED ---


--- 03-fedora-adjust-initscript-priority.patch DELETED ---


--- 04-fedora-workaround-for-sysdefault.patch DELETED ---


--- fix_makefile_to_link_with_builddir.patch DELETED ---


--- fix_overflow.patch DELETED ---




More information about the fedora-extras-commits mailing list