diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-05-01 10:22:08 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-05-01 10:22:08 +0000 |
| commit | f6fc151b534b56ecd560eb3cd2b4d5cc68cef4ff (patch) | |
| tree | 0e9b00cec0a41233d582dd1d8ace1591ec03e100 /packages/util-linux | |
| parent | efeef9871fc6985f0638a8364a3634be0b6aec6e (diff) | |
| parent | 6cdb4b3fa2816832a6d04306320ca9c548fa4c56 (diff) | |
merge of '21fe2445ed0bb510a34a0e01c77e30f0e6c021c3'
and '28d894c206a3bfee24708913d7b2a4fbdfca447e'
Diffstat (limited to 'packages/util-linux')
| -rw-r--r-- | packages/util-linux/files/glibc-umount2.patch | 18 | ||||
| -rw-r--r-- | packages/util-linux/util-linux_2.12r.bb | 3 |
2 files changed, 20 insertions, 1 deletions
diff --git a/packages/util-linux/files/glibc-umount2.patch b/packages/util-linux/files/glibc-umount2.patch new file mode 100644 index 0000000000..3da3a85cfc --- /dev/null +++ b/packages/util-linux/files/glibc-umount2.patch @@ -0,0 +1,18 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10sparcumount.dpatch by Jeff Bailey <jbailey@ubuntu.com> +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Sparc and Arm have umount2 in glibc. + +@DPATCH@ +--- util-linux/mount/umount.c 2005-05-20 11:39:07.000000000 +0000 ++++ util-linux/mount/umount.c 2005-05-20 11:39:15.000000000 +0000 +@@ -31,7 +31,7 @@ + #include <arpa/inet.h> + #endif + +-#if defined(MNT_FORCE) && !defined(__sparc__) && !defined(__arm__) ++#if defined(MNT_FORCE) + /* Interesting ... it seems libc knows about MNT_FORCE and presumably + about umount2 as well -- need not do anything */ + #else /* MNT_FORCE */ diff --git a/packages/util-linux/util-linux_2.12r.bb b/packages/util-linux/util-linux_2.12r.bb index 32cbadae64..0409f61b74 100644 --- a/packages/util-linux/util-linux_2.12r.bb +++ b/packages/util-linux/util-linux_2.12r.bb @@ -2,5 +2,6 @@ require util-linux.inc SRC_URI += "file://util-linux_2.12r-12.diff.gz;patch=1" SRC_URI += "file://glibc-fix.patch;patch=1" +SRC_URI += "file://glibc-umount2.patch;patch=1" -PR = "r10" +PR = "r11" |