Hello, I am planning to:
- bump util-linux-ng to 2.14.2
- remove schedutils-1.5.0 as a package and enable its tools in util-linux-ng
(they are now maintained there)
- remove util-linux in favour of util-linux-ng
So far, I have successfully built all selectable tools on ARM and PPC.
As things look good so far, please keep this in mind if you use
ptxdist-trunk and util-linux 2.13-pre7: It might go away soon! (unless
there is a reason to keep it, then please speak up)
I am just wondering about this patch for util-linux:
Index: configure.ac
===================================================================
--- configure.ac.orig
+++ configure.ac
@@ -17,6 +17,8 @@ AC_PATH_PROG(PERL, perl)
AC_SYS_LARGEFILE
+AM_MAINTAINER_MODE
+
AC_CHECK_HEADERS(scsi/scsi.h)
AC_CHECK_HEADERS(linux/compiler.h)
AC_CHECK_HEADERS(linux/blkpg.h,,,[
@@ -45,6 +47,7 @@ AC_CHECK_FUNCS(updwtmp)
AC_FUNC_FSEEKO
AC_CHECK_FUNCS(lchown)
AC_CHECK_FUNCS(rpmatch)
+AC_CHECK_FUNCS(umount2)
AC_CHECK_LIB(uuid, uuid_is_null)
Index: mount/umount.c
===================================================================
--- mount/umount.c.orig
+++ mount/umount.c
@@ -29,28 +29,21 @@
#include "nfsmount.h"
#include <arpa/inet.h>
+#include <config.h>
+
#if defined(MNT_FORCE) && !defined(__sparc__) && !defined(__arm__)
/* Interesting ... it seems libc knows about MNT_FORCE and presumably
about umount2 as well -- need not do anything */
#else /* MNT_FORCE */
-/* Does the present kernel source know about umount2? */
-#include <linux/unistd.h>
-#ifdef __NR_umount2
-
-static int umount2(const char *path, int flags);
-
-_syscall2(int, umount2, const char *, path, int, flags);
-
-#else /* __NR_umount2 */
-
+#if !defined(HAVE_UMOUNT2)
static int
umount2(const char *path, int flags) {
fprintf(stderr, _("umount: compiled without support for -f\n"));
errno = ENOSYS;
return -1;
}
-#endif /* __NR_umount2 */
+#endif
#if !defined(MNT_FORCE)
/* dare not try to include <linux/mount.h> -- lots of errors */
Index: mount/Makefile.am
===================================================================
--- mount/Makefile.am.orig
+++ mount/Makefile.am
@@ -1,6 +1,6 @@
include $(top_srcdir)/config/include-Makefile.am
-AM_CPPFLAGS += -DHAVE_NFS
+AM_CPPFLAGS += -DHAVE_NFS -I$(top_srcdir)
bin_PROGRAMS = mount umount
sbin_PROGRAMS = losetup swapon
What is the story behind it? It looks a bit hackish to me, and so far
everything works with an unpatched version of util-linux-ng 2.14.2. Any
reason to keep it or even better, to send a fix solving the problem
upstream?
Regards,
Wolfram
--
Pengutronix e.K. | Wolfram Sang |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-5064 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
signature.asc
Description: Digital signature
-- ptxdist mailing list [email protected]
