rpms/libhugetlbfs/F-11 libhugetlbfs-2.6-s390x-build.patch, NONE, 1.1 .cvsignore, 1.17, 1.18 import.log, 1.11, 1.12 libhugetlbfs.spec, 1.29, 1.30 sources, 1.18, 1.19 remove-s390-libhugetlbfs-2.4.patch, 1.1, NONE

[Eric Munson]

Author: emunson

Update of /cvs/pkgs/rpms/libhugetlbfs/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3060/F-11

Modified Files:
	.cvsignore import.log libhugetlbfs.spec sources 
Added Files:
	libhugetlbfs-2.6-s390x-build.patch 
Removed Files:
	remove-s390-libhugetlbfs-2.4.patch 
Log Message:
Update for 2.7 release


libhugetlbfs-2.6-s390x-build.patch:
 Makefile |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE libhugetlbfs-2.6-s390x-build.patch ---
diff -up libhugetlbfs-2.6/Makefile.s390x-build libhugetlbfs-2.6/Makefile
--- libhugetlbfs-2.6/Makefile.s390x-build	2009-08-24 14:56:07.000000000 +0200
+++ libhugetlbfs-2.6/Makefile	2009-09-01 10:08:15.939516241 +0200
@@ -74,10 +74,12 @@ CFLAGS += -DNO_ELFLINK
 else
 ifeq ($(ARCH),s390x)
 CC64 = gcc -m64
-CC32 = gcc -m31
 TMPLIB64 = lib64
 TMPLIB32 = lib
 CFLAGS += -DNO_ELFLINK
+ifneq ($(BUILDTYPE),NATIVEONLY)
+CC32 = gcc -m31
+endif
 else
 $(error "Unrecognized architecture ($(ARCH))")
 endif


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-11/.cvsignore,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -p -r1.17 -r1.18
--- .cvsignore	31 Aug 2009 11:22:22 -0000	1.17
+++ .cvsignore	5 Jan 2010 09:09:28 -0000	1.18
@@ -1 +1 @@
-libhugetlbfs-2.6.tar.gz
+libhugetlbfs-2.7.tar.gz


Index: import.log
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-11/import.log,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- import.log	31 Aug 2009 11:22:22 -0000	1.11
+++ import.log	5 Jan 2010 09:09:28 -0000	1.12
@@ -9,3 +9,4 @@ libhugetlbfs-2_4-2_fc11:F-11:libhugetlbf
 libhugetlbfs-2_5-1_fc11:F-11:libhugetlbfs-2.5-1.src.rpm:1246360112
 libhugetlbfs-2_5-2_fc11:F-11:libhugetlbfs-2.5.2.src.rpm:1248078830
 libhugetlbfs-2_6-1_fc11:F-11:libhugetlbfs-2.6-1.src.rpm:1251718073
+libhugetlbfs-2_7-1_fc12:F-11:libhugetlbfs-2.7-1.src.rpm:1262682446


Index: libhugetlbfs.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-11/libhugetlbfs.spec,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -p -r1.29 -r1.30
--- libhugetlbfs.spec	31 Aug 2009 11:22:22 -0000	1.29
+++ libhugetlbfs.spec	5 Jan 2010 09:09:28 -0000	1.30
@@ -1,5 +1,5 @@
 Name: libhugetlbfs
-Version: 2.6
+Version: 2.7
 Release: 1%{?dist}
 Summary: A library which provides easy access to huge pages of memory
 
@@ -7,7 +7,7 @@ Group: System Environment/Libraries
 License: LGPLv2+
 URL: http://libhugetlbfs.sourceforge.net/
 Source0: http://downloads.sourceforge.net/libhugetlbfs/%{name}-%{version}.tar.gz
-Patch0: remove-s390-libhugetlbfs-2.4.patch
+Patch0: libhugetlbfs-2.6-s390x-build.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: kernel-devel glibc-headers
 Conflicts: kernel < 2.6.16
@@ -42,6 +42,7 @@ pool size control. pagesize lists page s
 
 %prep
 %setup -q -n %{name}-%{version}
+%patch0 -p1 -b .s390x-build
 
 %build
 # Parallel builds are not reliable
@@ -50,6 +51,9 @@ make BUILDTYPE=NATIVEONLY
 %install
 rm -rf $RPM_BUILD_ROOT
 make install PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT LDSCRIPTDIR=%{ldscriptdir} BUILDTYPE=NATIVEONLY
+make install-helper PREFIX=%{_prefix} DESTDIR=$RPM_BUILD_ROOT LDSCRIPTDIR=%{ldscriptdir} BUILDTYPE=NATIVEONLY
+mkdir -p -m755 $RPM_BUILD_ROOT%{_sysconfdir}/security/limits.d
+touch $RPM_BUILD_ROOT%{_sysconfdir}/security/limits.d/hugepages.conf
 
 # remove statically built libraries:
 rm -f $RPM_BUILD_ROOT/%{_libdir}/*.a
@@ -68,6 +72,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libhugetlbfs.so*
 %{_datadir}/%{name}/
 %{_mandir}/man7/libhugetlbfs.7.gz
+%ghost %config(noreplace) %{_sysconfdir}/security/limits.d/hugepages.conf
 %exclude %{_libdir}/libhugetlbfs_privutils.so
 %doc README HOWTO LGPL-2.1 NEWS
 
@@ -87,6 +92,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_bindir}/hugeadm
 %{_bindir}/hugectl
 %{_bindir}/pagesize
+%{_bindir}/huge_page_setup_helper.py
 %exclude %{_bindir}/cpupcstat
 %exclude %{_bindir}/oprofile_map_events.pl
 %exclude %{_bindir}/oprofile_start.sh
@@ -98,9 +104,22 @@ rm -rf $RPM_BUILD_ROOT
 %exclude /usr/lib/perl5/TLBC
 
 %changelog
+* Tue Jan 05 2010 Eric B Munson <ebmunson at us.ibm.com> 2.7-1
+- Update for upstream 2.7 release
+
+* Fri Oct 02 2009 Jarod Wilson <jarod at redhat.com> 2.6-3
+- Add hopefully-about-to-be-merged-upstream hugeadm enhancements
+- Add huge pages setup helper script, using new hugeadm enhancements
+
+* Thu Sep 03 2009 Nils Philippsen <nils at redhat.com> 2.6-2
+- fix building on s390x
+
 * Mon Aug 31 2009 Eric Munson <ebmunson at us.ibm.com> 2.6-1
 - Updating for the libhugetlbfs-2.6 release
 
+* Fri Jul 24 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.5-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Mon Jul 20 2009 Eric Munson <ebmunson at us.ibm.com> 2.5-2
 - Update Group for -utils package to Applications/System
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/libhugetlbfs/F-11/sources,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -p -r1.18 -r1.19
--- sources	31 Aug 2009 11:22:22 -0000	1.18
+++ sources	5 Jan 2010 09:09:29 -0000	1.19
@@ -1 +1 @@
-cda489010e5bb89eb59994f689f8693e  libhugetlbfs-2.6.tar.gz
+88bb5ea970ae9c85a0209050494ed7d2  libhugetlbfs-2.7.tar.gz


--- remove-s390-libhugetlbfs-2.4.patch DELETED ---