diff --git a/libhugetlbfs-2.13.tar.gz b/libhugetlbfs-2.13.tar.gz deleted file mode 100644 index ac8714f..0000000 --- a/libhugetlbfs-2.13.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:73f072cd7068c86cec2c6cb0d7e1883430da4c59413cb6441483dccb7569ad28 -size 174729 diff --git a/libhugetlbfs-2.15.tar.gz b/libhugetlbfs-2.15.tar.gz new file mode 100644 index 0000000..a03dc2f --- /dev/null +++ b/libhugetlbfs-2.15.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:1ff30080b983b2d067c9f2629e4a4dee0aa37ef664dc3a7241abedbfc8e21a24 +size 178317 diff --git a/libhugetlbfs.changes b/libhugetlbfs.changes index dbf88d2..e079371 100644 --- a/libhugetlbfs.changes +++ b/libhugetlbfs.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Wed Jan 23 10:34:58 UTC 2013 - trenn@suse.de + +- Update to version 2.15 + Features: + * Some System z functionality went into 2.15 + * Updated man pages + * Added basic events for core_i7 to oprofile_map_events + + Fixes: + * Disable Unable to verify address range warning when offset < page_size + * Remove sscanf in library setup to avoid heap allocation before _morecore + override + * Revert heap exhaustion patch + * hugectl no longer clips LD_LIBRARY_PATH variable + * Fix clean on failure code to avoid closing stdout + ------------------------------------------------------------------- Wed Jul 11 06:24:07 UTC 2012 - adrian@suse.de diff --git a/libhugetlbfs.s390.patch b/libhugetlbfs.s390.patch index 091dbf6..3ef0e9c 100644 --- a/libhugetlbfs.s390.patch +++ b/libhugetlbfs.s390.patch @@ -1,27 +1,39 @@ -Do not build 31 bit for S390x, allow to build on S390 - --- - Makefile | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) + Makefile | 12 ++++++++---- + 1 file changed, 8 insertions(+), 4 deletions(-) -Index: libhugetlbfs-2.5/Makefile +Index: libhugetlbfs-2.15/Makefile =================================================================== ---- libhugetlbfs-2.5.orig/Makefile -+++ libhugetlbfs-2.5/Makefile -@@ -74,8 +74,11 @@ CFLAGS += -DNO_ELFLINK +--- libhugetlbfs-2.15.orig/Makefile ++++ libhugetlbfs-2.15/Makefile +@@ -69,19 +69,22 @@ else + ifeq ($(ARCH),ia64) + CC64 = gcc + TMPLIB64 = lib +-CFLAGS += -DNO_ELFLINK ++CPPFLAGS += -DNO_ELFLINK + else + ifeq ($(ARCH),sparc64) + CC64 = gcc -m64 + TMPLIB64 = lib64 +-CFLAGS += -DNO_ELFLINK ++CPPFLAGS += -DNO_ELFLINK else ifeq ($(ARCH),s390x) CC64 = gcc -m64 -CC32 = gcc -m31 +-ELF32 = elf_s390 + ELF64 = elf64_s390 TMPLIB64 = lib64 -+CFLAGS += -DNO_ELFLINK ++CUSTOM_LDSCRIPTS = no +else +ifeq ($(ARCH),s390) +CC32 = gcc -m31 ++ELF32 = elf_s390 TMPLIB32 = lib - CFLAGS += -DNO_ELFLINK + CUSTOM_LDSCRIPTS = no else -@@ -83,6 +86,7 @@ $(error "Unrecognized architecture ($(AR +@@ -89,6 +92,7 @@ $(error "Unrecognized architecture ($(AR endif endif endif diff --git a/libhugetlbfs.spec b/libhugetlbfs.spec index 966f85f..57a5151 100644 --- a/libhugetlbfs.spec +++ b/libhugetlbfs.spec @@ -1,7 +1,7 @@ # # spec file for package libhugetlbfs # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,6 +16,7 @@ # + Name: libhugetlbfs %if 0%{?suse_version} > 1140 @@ -31,7 +32,7 @@ Group: Development/Libraries/Other Obsoletes: libhugetlbfs-64bit %endif # -Version: 2.13 +Version: 2.15 Release: 0 Url: http://libhugetlbfs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -43,6 +44,8 @@ ExcludeArch: %arm Patch1: libhugetlbfs.ia64-libdir.patch Patch2: libhugetlbfs.s390.patch Patch4: libhugetlbfs.tests-malloc.patch +Patch7: libhugetlbfs_ia64_fix_missing_test.patch +Patch8: libhugetlbfs_fix_tests.patch %description The libhugetlbfs package interacts with the Linux hugetlbfs to @@ -61,6 +64,8 @@ Devel package, header and static library, of libhugetlb %patch1 -p1 %patch2 -p1 %patch4 -p1 +%patch7 -p1 +%patch8 -p1 %build make %{my_make_flags} @@ -69,6 +74,7 @@ make %{my_make_flags} tests= %ifarch ppc ppc64 %ix86 x86_64 tests=install-tests +make %{my_make_flags} install $tests %endif make \ %ifarch sparc sparcv9 diff --git a/libhugetlbfs_fix_tests.patch b/libhugetlbfs_fix_tests.patch new file mode 100644 index 0000000..0b40505 --- /dev/null +++ b/libhugetlbfs_fix_tests.patch @@ -0,0 +1,15 @@ +References: bnc#706891 + +Signed-off-by: Thomas Renninger + +--- libhugetlbfs-2.12/tests/run_tests.py.org 2011-07-20 00:00:46.000000000 -0400 ++++ libhugetlbfs-2.12/tests/run_tests.py 2011-07-20 00:01:55.000000000 -0400 +@@ -234,7 +234,7 @@ def get_pagesizes(): + """ + sizes = set() + out = "" +- (rc, out) = bash("../obj/hugeadm --page-sizes") ++ (rc, out) = bash("hugeadm --page-sizes") + if rc != 0 or out == "": return sizes + + for size in out.split("\n"): sizes.add(int(size)) diff --git a/libhugetlbfs_ia64_fix_missing_test.patch b/libhugetlbfs_ia64_fix_missing_test.patch new file mode 100644 index 0000000..5f45cf8 --- /dev/null +++ b/libhugetlbfs_ia64_fix_missing_test.patch @@ -0,0 +1,25 @@ +libhugetlbfs: TESTS_64 is not defined for ia64, check when trying to install it + +That was for libhugetlbfs version 2.12 (TEST_64 is not defined for ia64), +same seem to be the case for x86_64 in version 2.15. +-> Revert the installation of this test totally. + +Signed-off-by: Thomas Renninger + +--- + tests/Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: libhugetlbfs-2.15/tests/Makefile +=================================================================== +--- libhugetlbfs-2.15.orig/tests/Makefile ++++ libhugetlbfs-2.15/tests/Makefile +@@ -292,7 +292,7 @@ obj64/install: + $(INSTALL) -m 755 wrapper-utils.sh $(DESTDIR)$(INST_TESTSDIR64)/obj64 + $(INSTALL) -m 755 $(HELPERS:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64 + $(INSTALL) -m 755 $(HELPER_LIBS:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64 +- $(INSTALL) -m 755 $(TESTS_64:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64 ++ + $(INSTALL) -m 755 run_tests.py $(DESTDIR)$(INST_TESTSDIR64) + + install: $(OBJDIRS:%=%/install)