[oe-commits] org.oe.dev util-linux: fix build failure with newer kernel headers, patch from debian

[pH5 commit]

util-linux: fix build failure with newer kernel headers, patch from debian

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: a6299c22728f17401cebb09151d91c27e70c5583
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a6299c22728f17401cebb09151d91c27e70c5583
Files:
1
packages/util-linux/files/glibc-umount2.patch
packages/util-linux/util-linux_2.12r.bb
Diffs:

#
# mt diff -rcb611997ee14f51bf6877589c7d518d35ed52f50 -ra6299c22728f17401cebb09151d91c27e70c5583
#
# 
# 
# add_file "packages/util-linux/files/glibc-umount2.patch"
#  content [b23388a276e647109a4d0467dfb9ecc91142a53c]
# 
# patch "packages/util-linux/util-linux_2.12r.bb"
#  from [3925c575694ba9a5b31b7485c6976a3cdde7fae5]
#    to [21793def7bcd5450f58381cac211e01a3f0b218b]
# 
============================================================
--- packages/util-linux/files/glibc-umount2.patch	b23388a276e647109a4d0467dfb9ecc91142a53c
+++ packages/util-linux/files/glibc-umount2.patch	b23388a276e647109a4d0467dfb9ecc91142a53c
@@ -0,0 +1,18 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 10sparcumount.dpatch by Jeff Bailey <jbailey at ubuntu.com>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Sparc and Arm have umount2 in glibc.
+
+ at 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 */
============================================================
--- packages/util-linux/util-linux_2.12r.bb	3925c575694ba9a5b31b7485c6976a3cdde7fae5
+++ packages/util-linux/util-linux_2.12r.bb	21793def7bcd5450f58381cac211e01a3f0b218b
@@ -1,6 +1,7 @@ SRC_URI += "file://glibc-fix.patch;patch
 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 = "r11"
-PR = "r10"