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 21af53c..9920721 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 77323de..27d80e0 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 7a27192..0d8f764 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 0603b99..d419547 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 7a27192..0d8f764 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"