From 27df1f80aee99c28cda181395f36896bf2f3e859 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Sun, 29 Apr 2007 14:41:44 +0000 Subject: util-linux: fix build failure with newer kernel headers, patch from debian --- packages/util-linux/files/glibc-umount2.patch | 18 ++++++++++++++++++ packages/util-linux/util-linux_2.12r.bb | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 packages/util-linux/files/glibc-umount2.patch 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 +## +## 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 + #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" -- cgit v1.2.3