From 21c622d30aa1a542debcdc8de1be6801283486eb Mon Sep 17 00:00:00 2001
From: Richard Purdie <rpurdie@linux.intel.com>
Date: Thu, 27 Aug 2009 14:52:12 +0100
Subject: acpid: Fix issues with glibc 2.9 and remove old versions

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
---
 meta/packages/acpid/acpid.inc         |  3 ++-
 meta/packages/acpid/acpid/gcc40.patch | 16 ----------------
 meta/packages/acpid/acpid/init        | 26 ++++++++++++++++++++++++++
 meta/packages/acpid/acpid_1.0.2.bb    |  3 ---
 meta/packages/acpid/acpid_1.0.3.bb    |  4 ----
 meta/packages/acpid/acpid_1.0.4.bb    |  4 ----
 meta/packages/acpid/acpid_1.0.6.bb    |  2 +-
 meta/packages/acpid/files/init        | 26 --------------------------
 8 files changed, 29 insertions(+), 55 deletions(-)
 delete mode 100644 meta/packages/acpid/acpid/gcc40.patch
 create mode 100755 meta/packages/acpid/acpid/init
 delete mode 100644 meta/packages/acpid/acpid_1.0.2.bb
 delete mode 100644 meta/packages/acpid/acpid_1.0.3.bb
 delete mode 100644 meta/packages/acpid/acpid_1.0.4.bb
 delete mode 100755 meta/packages/acpid/files/init

(limited to 'meta/packages/acpid')

diff --git a/meta/packages/acpid/acpid.inc b/meta/packages/acpid/acpid.inc
index 6e7991552..8ac523d19 100644
--- a/meta/packages/acpid/acpid.inc
+++ b/meta/packages/acpid/acpid.inc
@@ -11,8 +11,9 @@ INITSCRIPT_NAME = "acpid"
 INITSCRIPT_PARAMS = "defaults"
 
 EXTRA_OEMAKE = ""
+
 do_compile () {
-	oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}'
+	oe_runmake 'CC=${CC} -D_GNU_SOURCE' 'CROSS=${HOST_PREFIX}'
 }
 
 do_install () {
diff --git a/meta/packages/acpid/acpid/gcc40.patch b/meta/packages/acpid/acpid/gcc40.patch
deleted file mode 100644
index 8e3b31da6..000000000
--- a/meta/packages/acpid/acpid/gcc40.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-upstream: https://sourceforge.net/tracker/index.php?func=detail&aid=1895615&group_id=33140&atid=407341
-status: not necessary anymore at least from version 1.0.6 onwards where this patch reverse-applies cleanly
-
-Index: acpid-1.0.3/ud_socket.c
-===================================================================
---- acpid-1.0.3.orig/ud_socket.c	2003-11-17 14:24:58.000000000 -0700
-+++ acpid-1.0.3/ud_socket.c	2005-06-27 14:44:17.785576106 -0700
-@@ -58,7 +58,7 @@
- 	while (1) {
- 		int newsock = 0;
- 		struct sockaddr_un cliaddr;
--		int len = sizeof(struct sockaddr_un);
-+		socklen_t len = sizeof(struct sockaddr_un);
- 
- 		newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len);
- 		if (newsock < 0) {
diff --git a/meta/packages/acpid/acpid/init b/meta/packages/acpid/acpid/init
new file mode 100755
index 000000000..ef08b5959
--- /dev/null
+++ b/meta/packages/acpid/acpid/init
@@ -0,0 +1,26 @@
+#! /bin/sh -e
+
+test -x /usr/sbin/acpid || exit 0
+test -d /proc/acpi || exit 0
+
+case "$1" in
+  start)
+    echo -n "Starting Advanced Configuration and Power Interface daemon: "
+    start-stop-daemon -S -x /usr/sbin/acpid -- -c /etc/acpi/events
+    echo "acpid."
+    ;;
+  stop)
+    echo -n "Stopping Advanced Configuration and Power Interface daemon: "
+    start-stop-daemon -K -x /usr/sbin/acpid
+    echo "acpid."
+    ;;
+  restart|force-reload) 
+    $0 stop
+    $0 start
+    ;;
+  *)
+    echo "Usage: /etc/init.d/acpid {start|stop|restart|force-reload}"
+    exit 1
+esac
+
+exit 0
diff --git a/meta/packages/acpid/acpid_1.0.2.bb b/meta/packages/acpid/acpid_1.0.2.bb
deleted file mode 100644
index 2a305eeac..000000000
--- a/meta/packages/acpid/acpid_1.0.2.bb
+++ /dev/null
@@ -1,3 +0,0 @@
-require acpid.inc
-PR = "r2"
-
diff --git a/meta/packages/acpid/acpid_1.0.3.bb b/meta/packages/acpid/acpid_1.0.3.bb
deleted file mode 100644
index 640acd520..000000000
--- a/meta/packages/acpid/acpid_1.0.3.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require acpid.inc
-SRC_URI += "file://gcc40.patch;patch=1"
-PR = "r2"
-
diff --git a/meta/packages/acpid/acpid_1.0.4.bb b/meta/packages/acpid/acpid_1.0.4.bb
deleted file mode 100644
index f48c26225..000000000
--- a/meta/packages/acpid/acpid_1.0.4.bb
+++ /dev/null
@@ -1,4 +0,0 @@
-require acpid.inc
-SRC_URI += "file://gcc40.patch;patch=1"
-PR = "r3"
-
diff --git a/meta/packages/acpid/acpid_1.0.6.bb b/meta/packages/acpid/acpid_1.0.6.bb
index e096796fb..364aa8200 100644
--- a/meta/packages/acpid/acpid_1.0.6.bb
+++ b/meta/packages/acpid/acpid_1.0.6.bb
@@ -1,3 +1,3 @@
 require acpid.inc
 
-PR = "r4"
+PR = "r5"
diff --git a/meta/packages/acpid/files/init b/meta/packages/acpid/files/init
deleted file mode 100755
index ef08b5959..000000000
--- a/meta/packages/acpid/files/init
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh -e
-
-test -x /usr/sbin/acpid || exit 0
-test -d /proc/acpi || exit 0
-
-case "$1" in
-  start)
-    echo -n "Starting Advanced Configuration and Power Interface daemon: "
-    start-stop-daemon -S -x /usr/sbin/acpid -- -c /etc/acpi/events
-    echo "acpid."
-    ;;
-  stop)
-    echo -n "Stopping Advanced Configuration and Power Interface daemon: "
-    start-stop-daemon -K -x /usr/sbin/acpid
-    echo "acpid."
-    ;;
-  restart|force-reload) 
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "Usage: /etc/init.d/acpid {start|stop|restart|force-reload}"
-    exit 1
-esac
-
-exit 0
-- 
cgit v1.2.3