Hello community, here is the log from the commit of package libhugetlbfs checked in at Fri Dec 8 16:27:16 CET 2006. -------- --- libhugetlbfs/libhugetlbfs.changes 2006-10-29 11:26:31.000000000 +0100 +++ /mounts/work_src_done/STABLE/libhugetlbfs/libhugetlbfs.changes 2006-12-08 16:20:46.000000000 +0100 @@ -1,0 +2,10 @@ +Fri Dec 8 16:20:25 CET 2006 - olh@suse.de + +- package testsuite, fix make check + +------------------------------------------------------------------- +Tue Dec 5 14:48:13 CET 2006 - olh@suse.de + +- add the hugetlbd (214426) + +------------------------------------------------------------------- Old: ---- libhugetlbfs.install.patch libhugetlbfs.ldscript-path.patch New: ---- get_release_number.sh libhugetlbfs.ABI-tag.patch libhugetlbfs.LOGFILE.patch libhugetlbfs.make_check.patch libhugetlbfs.rchugetlbd libhugetlbfs.sysconfig.hugetlbd ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libhugetlbfs.spec ++++++ --- /var/tmp/diff_new_pack.JCbrJH/_old 2006-12-08 16:25:44.000000000 +0100 +++ /var/tmp/diff_new_pack.JCbrJH/_new 2006-12-08 16:25:44.000000000 +0100 @@ -16,12 +16,16 @@ Group: Development/Libraries/Other Summary: hugetlbfs helper library Version: 1.0.1 -Release: 1 +Release: 200612081525 URL: http://libhugetlbfs.sourceforge.net/ BuildRoot: %{_tmppath}/%{name}-%{version}-build +PreReq: %insserv_prereq %fillup_prereq Source0: libhugetlbfs-%{version}.tar.gz -Patch0: libhugetlbfs.install.patch -Patch1: libhugetlbfs.ldscript-path.patch +Source1: libhugetlbfs.sysconfig.hugetlbd +Source2: libhugetlbfs.rchugetlbd +Patch1: libhugetlbfs.LOGFILE.patch +Patch2: libhugetlbfs.ABI-tag.patch +Patch3: libhugetlbfs.make_check.patch %description libhugetlbfs interacts with the Linux hugetlbfs to make large pages @@ -36,44 +40,46 @@ %prep %setup -q +%patch1 -p1 +%patch2 -p1 +%patch3 -p1 %build -make V=1 CFLAGS="$RPM_OPT_FLAGS -fPIC" CC32=gcc CC64= PREFIX=/usr libs +make V=1 CFLAGS="$RPM_OPT_FLAGS -fPIC" CC32=gcc CC64= PREFIX=/usr LIBDIR32=%{_libdir} %install +make V=1 CFLAGS="$RPM_OPT_FLAGS -fPIC" CC32=gcc CC64= PREFIX=/usr LIBDIR32=%{_libdir} DESTDIR=$RPM_BUILD_ROOT install install-tests +mkdir -p $RPM_BUILD_ROOT/etc/init.d mkdir -p $RPM_BUILD_ROOT/usr/include -mkdir -p $RPM_BUILD_ROOT/usr/bin -mkdir -p $RPM_BUILD_ROOT%{_libdir} -%ifarch ppc ppc64 %ix86 x86_64 -mkdir -p $RPM_BUILD_ROOT%{_libdir}/libhugetlbfs -%endif -%ifarch ppc -cp -avL ldscripts/*32ppc* $RPM_BUILD_ROOT%{_libdir}/libhugetlbfs -%endif -%ifarch ppc64 -cp -avL ldscripts/*64ppc* $RPM_BUILD_ROOT%{_libdir}/libhugetlbfs -%endif -%ifarch %ix86 -cp -avL ldscripts/*i386* $RPM_BUILD_ROOT%{_libdir}/libhugetlbfs -%endif -%ifarch x86_64 -cp -avL ldscripts/*x86_64* $RPM_BUILD_ROOT%{_libdir}/libhugetlbfs -%endif -cp -avL */libhugetlbfs.so */libhugetlbfs.a $RPM_BUILD_ROOT%{_libdir} +mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates cp -avL hugetlbfs.h $RPM_BUILD_ROOT/usr/include -cp -avL ld.hugetlbfs $RPM_BUILD_ROOT/usr/bin/ +cp -avL %{S:1} $RPM_BUILD_ROOT/var/adm/fillup-templates/sysconfig.hugetlbd +chmod 644 $RPM_BUILD_ROOT/var/adm/fillup-templates/* +cp -avL %{S:2} $RPM_BUILD_ROOT/etc/init.d/hugetlbd +ln -sfvbn ../../etc/init.d/hugetlbd $RPM_BUILD_ROOT/usr/sbin/rchugetlbd %clean rm -rf $RPM_BUILD_ROOT +%post +%{fillup_and_insserv -n hugetlbd} +echo "Do not forget to configure /proc/sys/vm/nr_hugepages" + %files %defattr(-, root, root) %doc LGPL-2.1 HOWTO README NEWS +/usr/share/libhugetlbfs /usr/include/* -%attr(755,root,root) /usr/bin/* +%attr(755,root,root) /etc/init.d/hugetlbd +%attr(755,root,root) /usr/sbin/* %{_libdir}/lib* +%attr(644,root,root) /var/adm/fillup-templates/sysconfig.hugetlbd %changelog -n libhugetlbfs +* Fri Dec 08 2006 - olh@suse.de +- package testsuite, fix make check +* Tue Dec 05 2006 - olh@suse.de +- add the hugetlbd (214426) * Sun Oct 29 2006 - olh@suse.de - update to bugfix release 1.0.1 (214426) * Always install linker scripts for all targets ++++++ libhugetlbfs.ABI-tag.patch ++++++ ldscripts: Fix .note.SuSE and .note.ABI-tag sections Since we are explicitly placing things into output segments, we must include placement information for .note.SuSE and .note.ABI-tag sections. Otherwise, they can be incorrectly placed in the .interp segment, which makes an un-runnable binary. tests: Fix zero_filesize_segment testcase This testcase is implemented as a linker script which can be "compiled" like a program. As such, the caveats with .note.ABI-tag and .note.SuSE in our other linker scripts apply here as well. Add explicit placement of these sections so ld's implicit guessing doesn't get it wrong. Signed-off-by: Steve Fox <drfickle@us.ibm.com> --- ldscripts/elf32ppclinux.xB | 2 +- ldscripts/elf32ppclinux.xBDT | 2 +- ldscripts/elf64ppc.xB | 2 +- ldscripts/elf64ppc.xBDT | 2 +- ldscripts/elf_x86_64.xB | 2 ++ ldscripts/elf_x86_64.xBDT | 2 ++ tests/zero_filesize_segment.ld | 2 ++ 7 files changed, 10 insertions(+), 4 deletions(-) Index: libhugetlbfs-1.0.1/ldscripts/elf32ppclinux.xB =================================================================== --- libhugetlbfs-1.0.1.orig/ldscripts/elf32ppclinux.xB +++ libhugetlbfs-1.0.1/ldscripts/elf32ppclinux.xB @@ -21,7 +21,7 @@ SECTIONS /* Read-only sections, merged into text segment: */ __executable_start = 0x10000000; . = 0x10000000 + SIZEOF_HEADERS; .interp : { *(.interp) } :text :interp - .note.SuSE : { *(.note.ABI-tag) } :text :note + .note.SuSE : { *(.note.SuSE) } :text :note .note.ABI-tag : { *(.note.ABI-tag) } :text :note .hash : { *(.hash) } :text .dynsym : { *(.dynsym) } :text Index: libhugetlbfs-1.0.1/ldscripts/elf32ppclinux.xBDT =================================================================== --- libhugetlbfs-1.0.1.orig/ldscripts/elf32ppclinux.xBDT +++ libhugetlbfs-1.0.1/ldscripts/elf32ppclinux.xBDT @@ -20,7 +20,7 @@ SECTIONS /* Read-only sections, merged into text segment: */ __executable_start = 0x10000000; . = 0x10000000 + SIZEOF_HEADERS; .interp : { *(.interp) } :htext :interp - .note.SuSE : { *(.note.ABI-tag) } :htext :note + .note.SuSE : { *(.note.SuSE) } :htext :note .note.ABI-tag : { *(.note.ABI-tag) } :htext :note .hash : { *(.hash) } :htext .dynsym : { *(.dynsym) } :htext Index: libhugetlbfs-1.0.1/ldscripts/elf64ppc.xB =================================================================== --- libhugetlbfs-1.0.1.orig/ldscripts/elf64ppc.xB +++ libhugetlbfs-1.0.1/ldscripts/elf64ppc.xB @@ -20,7 +20,7 @@ SECTIONS /* Read-only sections, merged into text segment: */ __executable_start = 0x10000000; . = 0x10000000 + SIZEOF_HEADERS; .interp : { *(.interp) } :text :interp - .note.SuSE : { *(.note.ABI-tag) } :text :note + .note.SuSE : { *(.note.SuSE) } :text :note .note.ABI-tag : { *(.note.ABI-tag) } :text :note .hash : { *(.hash) } :text .dynsym : { *(.dynsym) } Index: libhugetlbfs-1.0.1/ldscripts/elf64ppc.xBDT =================================================================== --- libhugetlbfs-1.0.1.orig/ldscripts/elf64ppc.xBDT +++ libhugetlbfs-1.0.1/ldscripts/elf64ppc.xBDT @@ -19,7 +19,7 @@ SECTIONS /* Read-only sections, merged into text segment: */ __executable_start = 0x10000000; . = 0x10000000 + SIZEOF_HEADERS; .interp : { *(.interp) } :interp :htext - .note.SuSE : { *(.note.ABI-tag) } :htext :note + .note.SuSE : { *(.note.SuSE) } :htext :note .note.ABI-tag : { *(.note.ABI-tag) } :htext :note .hash : { *(.hash) } :htext .dynsym : { *(.dynsym) } :htext Index: libhugetlbfs-1.0.1/ldscripts/elf_x86_64.xB =================================================================== --- libhugetlbfs-1.0.1.orig/ldscripts/elf_x86_64.xB +++ libhugetlbfs-1.0.1/ldscripts/elf_x86_64.xB @@ -23,6 +23,8 @@ SECTIONS /* Read-only sections, merged into text segment: */ __executable_start = 0x400000; . = 0x400000 + SIZEOF_HEADERS; .interp : { *(.interp) } :text :interp + .note.SuSE : { *(.note.SuSE) } :text :note + .note.ABI-tag : { *(.note.ABI-tag) } :text :note .hash : { *(.hash) } :text .dynsym : { *(.dynsym) } :text .dynstr : { *(.dynstr) } :text Index: libhugetlbfs-1.0.1/ldscripts/elf_x86_64.xBDT =================================================================== --- libhugetlbfs-1.0.1.orig/ldscripts/elf_x86_64.xBDT +++ libhugetlbfs-1.0.1/ldscripts/elf_x86_64.xBDT @@ -25,6 +25,8 @@ SECTIONS __executable_start = 0x1000000; . = 0x1000000 + SIZEOF_HEADERS; .interp : { *(.interp) } :interp :text .hash : { *(.hash) } :text + .note.SuSE : { *(.note.SuSE) } :text :note + .note.ABI-tag : { *(.note.ABI-tag) } :text :note .dynsym : { *(.dynsym) } :text .dynstr : { *(.dynstr) } :text .gnu.version : { *(.gnu.version) } :text Index: libhugetlbfs-1.0.1/tests/zero_filesize_segment.ld =================================================================== --- libhugetlbfs-1.0.1.orig/tests/zero_filesize_segment.ld +++ libhugetlbfs-1.0.1/tests/zero_filesize_segment.ld @@ -12,6 +12,8 @@ PHDRS SECTIONS { .interp : { } :interp :text + .note.ABI-tag : { *(.note.ABI-tag) } :text + .note.SuSE : { *(.note.SuSE) } :text .hash : { } :text .tdata : { } :data .dynamic : { } :dynamic :data ++++++ libhugetlbfs.LOGFILE.patch ++++++ --- HOWTO | 2 +- hugetlbd.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) Index: libhugetlbfs-1.0.1/hugetlbd.h =================================================================== --- libhugetlbfs-1.0.1.orig/hugetlbd.h +++ libhugetlbfs-1.0.1/hugetlbd.h @@ -25,7 +25,7 @@ #endif /* __LIBHUGETLBFS__ */ #define ID_KEY 0x56 -#define LOGFILE "/tmp/hugetlbd.log" +#define LOGFILE "/var/log/hugetlbd.log" #define SOCKFILE "/var/run/libhugetlbfs-sock" /* Index: libhugetlbfs-1.0.1/HOWTO =================================================================== --- libhugetlbfs-1.0.1.orig/HOWTO +++ libhugetlbfs-1.0.1/HOWTO @@ -332,7 +332,7 @@ First, a system-wide daemon must be star (which will be installed into $PREFIX/sbin by make install) should be run as root and will automatically spawn a child process to wait for segment sharing into the background. The process will log any output -requested to /tmp/hugetlbd.log. The complete usage for hugetlbd is: +requested to /ver/log/hugetlbd.log. The complete usage for hugetlbd is: hugetlbd [-v] [-V verbosity] [-p timeout1] [-s timeout2] -v: display this help and exit ++++++ libhugetlbfs.make_check.patch ++++++ --- tests/Makefile | 4 ++++ tests/run_tests.sh | 11 ++--------- 2 files changed, 6 insertions(+), 9 deletions(-) Index: libhugetlbfs-1.0.1/tests/Makefile =================================================================== --- libhugetlbfs-1.0.1.orig/tests/Makefile +++ libhugetlbfs-1.0.1/tests/Makefile @@ -141,6 +141,7 @@ obj32/install: $(INSTALL) -d $(DESTDIR)$(INST_TESTSDIR32)/obj32 $(INSTALL) -m 755 $(TESTS:%=obj32/%) $(DESTDIR)$(INST_TESTSDIR32)/obj32 $(INSTALL) -m 755 run_tests.sh $(DESTDIR)$(INST_TESTSDIR32) + sed -i -e 's@^#CD@cd $(INST_TESTSDIR32) ; pwd@' $(DESTDIR)$(INST_TESTSDIR32)/run_tests.sh obj64/install: @$(VECHO) INSTALL64 $(INST_TESTSDIR64) @@ -149,5 +150,8 @@ obj64/install: $(INSTALL) -m 755 $(TESTS:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64 $(INSTALL) -m 755 $(TESTS_64:%=obj64/%) $(DESTDIR)$(INST_TESTSDIR64)/obj64 $(INSTALL) -m 755 run_tests.sh $(DESTDIR)$(INST_TESTSDIR64) + sed -i -e 's@^#CD@cd $(INST_TESTSDIR64) ; pwd@' $(DESTDIR)$(INST_TESTSDIR64)/run_tests.sh install: $(OBJDIRS:%=%/install) + rm -fv $(DESTDIR)$(INST_TESTSDIR32)/obj32/zero_filesize_segment + rm -fv $(DESTDIR)$(INST_TESTSDIR64)/obj64/zero_filesize_segment Index: libhugetlbfs-1.0.1/tests/run_tests.sh =================================================================== --- libhugetlbfs-1.0.1.orig/tests/run_tests.sh +++ libhugetlbfs-1.0.1/tests/run_tests.sh @@ -1,5 +1,7 @@ #! /bin/sh +#CD + export QUIET_TEST=1 export HUGETLB_VERBOSE=2 unset HUGETLB_ELF @@ -129,16 +131,7 @@ functional_tests () { elflink_test linkhuge # Sharing tests - # stop all running instances for clean testing - killall -INT hugetlbd - # start the daemon in the bg - PATH=../obj32:../obj64:$PATH hugetlbd - # XXX: Wait for daemon to start - sleep 5 elfshare_test linkshare - # stop our instance of the daemon - killall -INT hugetlbd - # Accounting bug tests # reset free hpages because sharing will have held some # alternatively, use ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org