acpid: Fix issues with glibc 2.9 and remove old versions

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

7 files changed, 3 insertions, 29 deletions

diff --git a/meta/packages/acpid/acpid.inc b/meta/packages/acpid/acpid.inc
index 6e79915527..8ac523d19a 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 8e3b31da60..0000000000
--- 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/files/init b/meta/packages/acpid/acpid/init
index ef08b59596..ef08b59596 100755
--- a/meta/packages/acpid/files/init
+++ b/meta/packages/acpid/acpid/init
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 2a305eeac4..0000000000
--- 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 640acd5203..0000000000
--- 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 f48c262254..0000000000
--- 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 e096796fbd..364aa8200b 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"