>From e3b2ff83f8d2fa29d0c13dce65492c66b25c64be Mon Sep 17 00:00:00 2001
From: Bernhard <bguillon@cosy.sbg.ac.at>
Date: Sun, 28 Feb 2010 15:54:52 +0100
Subject: [PATCH] udev-151: add hack to compile udev-151 with uclibc


Signed-off-by: Bernhard <bguillon@cosy.sbg.ac.at>
---
 recipes/udev/files/udev-uclibc-0.9.30.2.HACK |  120 ++++++++++++++++++++++++++
 recipes/udev/udev_151.bb                     |    4 +-
 2 files changed, 123 insertions(+), 1 deletions(-)
 create mode 100644 recipes/udev/files/udev-uclibc-0.9.30.2.HACK

diff --git a/recipes/udev/files/udev-uclibc-0.9.30.2.HACK b/recipes/udev/files/udev-uclibc-0.9.30.2.HACK
new file mode 100644
index 0000000..72658c5
--- /dev/null
+++ b/recipes/udev/files/udev-uclibc-0.9.30.2.HACK
@@ -0,0 +1,120 @@
+diff -Nur udev-151.vanilla/extras/ata_id/ata_id.c udev-151/extras/ata_id/ata_id.c
+--- udev-151.vanilla/extras/ata_id/ata_id.c	2009-12-08 18:43:09.000000000 +0100
++++ udev-151/extras/ata_id/ata_id.c	2010-02-28 15:32:48.000000000 +0100
+@@ -47,6 +47,8 @@
+ 
+ #define COMMAND_TIMEOUT 2000
+ 
++#define le16toh __le16_to_cpu 
++
+ /* Sends a SCSI command block */
+ static int sg_io(int fd, int direction,
+ 		 const void *cdb, size_t cdb_len,
+diff -Nur udev-151.vanilla/libudev/libudev-monitor.c udev-151/libudev/libudev-monitor.c
+--- udev-151.vanilla/libudev/libudev-monitor.c	2009-12-03 13:45:03.000000000 +0100
++++ udev-151/libudev/libudev-monitor.c	2010-02-28 15:32:48.000000000 +0100
+@@ -18,7 +18,9 @@
+ #include <dirent.h>
+ #include <sys/poll.h>
+ #include <sys/stat.h>
+-#include <sys/socket.h>
++#include <linux/socket.h>
++#include <linux/net.h>
++#include <linux/fcntl.h>
+ #include <sys/un.h>
+ #include <arpa/inet.h>
+ #include <linux/netlink.h>
+@@ -27,6 +29,9 @@
+ #include "libudev.h"
+ #include "libudev-private.h"
+ 
++//define SOCK_CLOEXEC as  O_CLOEXEC see bits/socket.h
++#define SOCK_CLOEXEC O_CLOEXEC
++
+ /**
+  * SECTION:libudev-monitor
+  * @short_description: device event source
+diff -Nur udev-151.vanilla/udev/udev-node.c udev-151/udev/udev-node.c
+--- udev-151.vanilla/udev/udev-node.c	2010-01-26 13:44:02.000000000 +0100
++++ udev-151/udev/udev-node.c	2010-02-28 15:32:48.000000000 +0100
+@@ -178,7 +178,10 @@
+ 					info(udev, "preserve already existing symlink '%s' to '%s'\n",
+ 					     slink, target);
+ 					udev_selinux_lsetfilecon(udev, slink, S_IFLNK);
+-					lutimes(slink, NULL);
++//HACK MAKE THIS CODE NONWORKING :D
++//lutimes(slink, NULL);
++
++					utimes(slink, NULL);
+ 					goto exit;
+ 				}
+ 			}
+diff -Nur udev-151.vanilla/udev/udev-watch.c udev-151/udev/udev-watch.c
+--- udev-151.vanilla/udev/udev-watch.c	2009-12-03 13:45:05.000000000 +0100
++++ udev-151/udev/udev-watch.c	2010-02-28 15:32:48.000000000 +0100
+@@ -19,14 +19,16 @@
+ 
+ #include <sys/types.h>
+ #include <errno.h>
+-#include <fcntl.h>
++#include <linux/fcntl.h>
+ #include <stdio.h>
+ #include <dirent.h>
+ #include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
+-#include <sys/inotify.h>
++#include <linux/inotify.h>
++//#include <sys/inotify.h>
++
+ 
+ #include "udev.h"
+ 
+@@ -38,7 +40,10 @@
+  */
+ int udev_watch_init(struct udev *udev)
+ {
+-	inotify_fd = inotify_init1(IN_CLOEXEC);
++
++//HACK BREAK THIS CODE :D
++//	inotify_fd = inotify_init1(IN_CLOEXEC);
++ inotify_fd = inotify_init();
+ 	if (inotify_fd < 0)
+ 		err(udev, "inotify_init failed: %m\n");
+ 	return inotify_fd;
+diff -Nur udev-151.vanilla/udev/udevd.c udev-151/udev/udevd.c
+--- udev-151.vanilla/udev/udevd.c	2010-01-13 12:39:36.000000000 +0100
++++ udev-151/udev/udevd.c	2010-02-28 15:32:48.000000000 +0100
+@@ -27,13 +27,15 @@
+ #include <stdbool.h>
+ #include <string.h>
+ #include <ctype.h>
+-#include <fcntl.h>
++#include <linux/fcntl.h>
+ #include <time.h>
+ #include <getopt.h>
+ #include <dirent.h>
+ #include <sys/time.h>
+ #include <sys/prctl.h>
+ #include <sys/socket.h>
++//#include <linux/socket.h>
++//#include <linux/net.h>
+ #include <sys/signalfd.h>
+ #include <sys/select.h>
+ #include <sys/poll.h>
+@@ -42,11 +44,14 @@
+ #include <sys/ioctl.h>
+ #include <sys/inotify.h>
+ 
++
+ #include "udev.h"
+ 
+ #define UDEVD_PRIORITY			-4
+ #define UDEV_PRIORITY			-2
+ 
++#define SOCK_CLOEXEC O_CLOEXEC
++
+ static bool debug;
+ 
+ static void log_fn(struct udev *udev, int priority,
diff --git a/recipes/udev/udev_151.bb b/recipes/udev/udev_151.bb
index ee31b27..c79e27a 100644
--- a/recipes/udev/udev_151.bb
+++ b/recipes/udev/udev_151.bb
@@ -3,7 +3,7 @@ DESCRIPTION = "udev is a daemon which dynamically creates and removes device nod
 the hotplug package and requires a kernel not older than 2.6.12."
 LICENSE = "GPL"
 
-PR = "r3"
+PR = "r4"
 
 # Untested
 DEFAULT_PREFERENCE = "-1"
@@ -42,6 +42,8 @@ SRC_URI_append_bug = " \
 
 PACKAGE_ARCH_bug = "bug"
 
+SRC_URI_append_linux-uclibc = " file://udev-uclibc-0.9.30.2.HACK;patch=1 "
+
 inherit update-rc.d autotools
 
 EXTRA_OECONF += " --with-udev-prefix= \
-- 
1.5.6.5