util-linux: gcc 4.1.1 did not like umount being redeclared as static

	made patch to remove static, included it in the inc file
	bumped all PRs of the files that include that file

diff --git a/packages/util-linux/files/umount.diff b/packages/util-linux/files/umount.diff
new file mode 100644 (file)
index 0000000..7833078
--- /dev/null
+++ b/packages/util-linux/files/umount.diff
@@ -0,0 +1,19 @@
+*** util-linux-2.12r/mount/umount.c.orig       2005-09-10 20:07:38.000000000 +0200
+--- util-linux-2.12r/mount/umount.c    2006-06-07 21:14:04.000000000 +0200
+***************
+*** 40,46 ****
+  #include <linux/unistd.h>
+  #ifdef __NR_umount2
+  
+! static int umount2(const char *path, int flags);
+  
+  _syscall2(int, umount2, const char *, path, int, flags);
+  
+--- 40,46 ----
+  #include <linux/unistd.h>
+  #ifdef __NR_umount2
+  
+! int umount2(const char *path, int flags);
+  
+  _syscall2(int, umount2, const char *, path, int, flags);
+  

diff --git a/packages/util-linux/util-linux.inc b/packages/util-linux/util-linux.inc
index 21af53cab6379ab14230026fd963c6fc73d88f32..99207213bd9d7753a49387cf1d03ee6c9e895572 100644 (file)
--- a/packages/util-linux/util-linux.inc
+++ b/packages/util-linux/util-linux.inc
@@ -11,6 +11,7 @@ SRC_URI = "ftp://ftp.kernel.org/pub/linux/utils/util-linux/util-linux-${PV}.tar.
            file://make_include \
            file://swapargs.h \
           file://fdiskbsdlabel_thumb.diff;patch=1 \
+          file://umount.diff;patch=1 \
            file://defines.h"
 
 PACKAGES_prepend = "util-linux-fdisk util-linux-cfdisk util-linux-sfdisk util-linux-swaponoff util-linux-losetup util-linux-umount util-linux-mount util-linux-readprofile "

diff --git a/packages/util-linux/util-linux_2.12.bb b/packages/util-linux/util-linux_2.12.bb
index 77323de5b8141bc9f88ba2ee7b7fc22e0a355ad6..27d80e085b92fba8c817d951dca3b43a2a035464 100644 (file)
--- a/packages/util-linux/util-linux_2.12.bb
+++ b/packages/util-linux/util-linux_2.12.bb
@@ -1,4 +1,4 @@
-PR = "r2"
+PR = "r3"
 
 include util-linux.inc
 

diff --git a/packages/util-linux/util-linux_2.12o.bb b/packages/util-linux/util-linux_2.12o.bb
index 7a27192f90a21d25b52d03e1cd7dad81260a91c5..0d8f7649b5e136b3be518f1a91876d799a1a414f 100644 (file)
--- a/packages/util-linux/util-linux_2.12o.bb
+++ b/packages/util-linux/util-linux_2.12o.bb
@@ -1,3 +1,3 @@
 include util-linux.inc
 
-PR = "r5"
+PR = "r6"

diff --git a/packages/util-linux/util-linux_2.12q.bb b/packages/util-linux/util-linux_2.12q.bb
index 0603b993ce5b4ab9dcf8d8e0653d7a1bf865180a..d419547c5f783685e83556637fed84f0f3bb442c 100644 (file)
--- a/packages/util-linux/util-linux_2.12q.bb
+++ b/packages/util-linux/util-linux_2.12q.bb
@@ -4,4 +4,4 @@ ARM_INSTRUCTION_SET = "arm"
 
 include util-linux.inc
 
-PR = "r4"
+PR = "r5"

diff --git a/packages/util-linux/util-linux_2.12r.bb b/packages/util-linux/util-linux_2.12r.bb
index 7a27192f90a21d25b52d03e1cd7dad81260a91c5..0d8f7649b5e136b3be518f1a91876d799a1a414f 100644 (file)
--- a/packages/util-linux/util-linux_2.12r.bb
+++ b/packages/util-linux/util-linux_2.12r.bb
@@ -1,3 +1,3 @@
 include util-linux.inc
 
-PR = "r5"
+PR = "r6"