Author: arekm Date: Sun Nov 27 20:55:12 2011 GMT Module: packages Tag: HEAD ---- Log message: - rel 1; disable libmount for initrd (dietlibc doesn't support required modifiers)
---- Files affected: packages/util-linux: util-linux.spec (1.329 -> 1.330) , util-linux-build.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/util-linux/util-linux.spec diff -u packages/util-linux/util-linux.spec:1.329 packages/util-linux/util-linux.spec:1.330 --- packages/util-linux/util-linux.spec:1.329 Sun Nov 27 21:29:25 2011 +++ packages/util-linux/util-linux.spec Sun Nov 27 21:55:06 2011 @@ -31,7 +31,7 @@ Summary(uk.UTF-8): Набір базових системних утиліт для Linux Name: util-linux Version: 2.20.1 -Release: 0.1 +Release: 1 License: GPL Group: Applications/System #Source0: http://ftp.kernel.org/pub/linux/utils/util-linux/v2.20/%{name}-%{version}.tar.bz2 @@ -55,6 +55,7 @@ Patch9: %{name}-swaponsymlink.patch Patch10: %{name}-diet.patch Patch11: no-openat.patch +Patch12: %{name}-build.patch URL: http://userweb.kernel.org/~kzak/util-linux/ BuildRequires: audit-libs-devel >= 1.0.6 BuildRequires: autoconf >= 2.60 @@ -636,6 +637,7 @@ %if %{without partx} %patch11 -p1 %endif +%patch12 -p1 %if "%{pld_release}" != "ac" sed -i -e 's/-lncursesw/-lncursesw -ltinfow/' configure.ac @@ -666,6 +668,7 @@ --disable-shared \ --enable-static \ --disable-fsck \ + --disable-libmount \ --disable-login-utils \ --disable-schedutils \ --disable-silent-rules \ @@ -681,7 +684,7 @@ sed -i -e 's/ cal\$(EXEEXT) / /; s/ lsblk\$(EXEEXT)//' misc-utils/Makefile -for dir in libblkid libmount libuuid disk-utils misc-utils fsck fdisk schedutils hwclock; do +for dir in libblkid libuuid disk-utils misc-utils fsck fdisk schedutils hwclock; do %{__make} -C $dir \ %if %{with uClibc} LDFLAGS="-Wl,-static" @@ -1417,11 +1420,6 @@ %{_libdir}/libmount.a %if %{with initrd} && %{with dietlibc} -%files -n libmount-dietlibc -%defattr(644,root,root,755) -%{dietlibdir}/libmount.a -%endif - %files -n fsck %defattr(644,root,root,755) %attr(755,root,root) /sbin/fsck @@ -1439,6 +1437,9 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.330 2011/11/27 20:55:06 arekm +- rel 1; disable libmount for initrd (dietlibc doesn't support required modifiers) + Revision 1.329 2011/11/27 20:29:25 arekm - up to 2.20.1 (builds but not without dietlibc since diet does not support %m/%a scanf modifiers) ================================================================ Index: packages/util-linux/util-linux-build.patch diff -u /dev/null packages/util-linux/util-linux-build.patch:1.1 --- /dev/null Sun Nov 27 21:55:12 2011 +++ packages/util-linux/util-linux-build.patch Sun Nov 27 21:55:06 2011 @@ -0,0 +1,11 @@ +--- util-linux-2.20.1/configure.ac~ 2011-11-27 21:36:59.000000000 +0100 ++++ util-linux-2.20.1/configure.ac 2011-11-27 21:44:54.089830949 +0100 +@@ -491,7 +491,7 @@ + AC_DEFINE([HAVE_SCANF_AS_MODIFIER], [1], [scanf %as modifier]) ;; + *) + AC_MSG_RESULT([no]) +- if "x$build_libmount" = xyes; then ++ if test "x$build_libmount" = xyes; then + AC_MSG_WARN([%as or %ms for sscanf() not found; do not build libmount]) + build_libmount=no + fi ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/util-linux/util-linux.spec?r1=1.329&r2=1.330&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
