summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-08-27 14:52:12 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2009-08-27 14:52:12 +0100
commit21c622d30aa1a542debcdc8de1be6801283486eb (patch)
tree6243d1726e63f7398ef0092df8a5897636043699
parent0445add6164edf5df8c83b66d72c0e7ddc5cfdde (diff)
downloadpoky-21c622d30aa1a542debcdc8de1be6801283486eb.tar.gz
acpid: Fix issues with glibc 2.9 and remove old versions
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/acpid/acpid.inc3
-rw-r--r--meta/packages/acpid/acpid/gcc40.patch16
-rwxr-xr-xmeta/packages/acpid/acpid/init (renamed from meta/packages/acpid/files/init)0
-rw-r--r--meta/packages/acpid/acpid_1.0.2.bb3
-rw-r--r--meta/packages/acpid/acpid_1.0.3.bb4
-rw-r--r--meta/packages/acpid/acpid_1.0.4.bb4
-rw-r--r--meta/packages/acpid/acpid_1.0.6.bb2
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"
11INITSCRIPT_PARAMS = "defaults" 11INITSCRIPT_PARAMS = "defaults"
12 12
13EXTRA_OEMAKE = "" 13EXTRA_OEMAKE = ""
14
14do_compile () { 15do_compile () {
15 oe_runmake 'CC=${CC}' 'CROSS=${HOST_PREFIX}' 16 oe_runmake 'CC=${CC} -D_GNU_SOURCE' 'CROSS=${HOST_PREFIX}'
16} 17}
17 18
18do_install () { 19do_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 @@
1upstream: https://sourceforge.net/tracker/index.php?func=detail&aid=1895615&group_id=33140&atid=407341
2status: not necessary anymore at least from version 1.0.6 onwards where this patch reverse-applies cleanly
3
4Index: acpid-1.0.3/ud_socket.c
5===================================================================
6--- acpid-1.0.3.orig/ud_socket.c 2003-11-17 14:24:58.000000000 -0700
7+++ acpid-1.0.3/ud_socket.c 2005-06-27 14:44:17.785576106 -0700
8@@ -58,7 +58,7 @@
9 while (1) {
10 int newsock = 0;
11 struct sockaddr_un cliaddr;
12- int len = sizeof(struct sockaddr_un);
13+ socklen_t len = sizeof(struct sockaddr_un);
14
15 newsock = accept(listenfd, (struct sockaddr *)&cliaddr, &len);
16 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 @@
1require acpid.inc
2PR = "r2"
3
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 @@
1require acpid.inc
2SRC_URI += "file://gcc40.patch;patch=1"
3PR = "r2"
4
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 @@
1require acpid.inc
2SRC_URI += "file://gcc40.patch;patch=1"
3PR = "r3"
4
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 @@
1require acpid.inc 1require acpid.inc
2 2
3PR = "r4" 3PR = "r5"