apmd: drop obsolete zaurus 2.4 kernels hack

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5481 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 1 insertions, 52 deletions

diff --git a/meta/packages/apmd/apmd-3.2.2/zaurus24.patch b/meta/packages/apmd/apmd-3.2.2/zaurus24.patch
deleted file mode 100644
index 5df016ab77..0000000000
--- a/meta/packages/apmd/apmd-3.2.2/zaurus24.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-Index: apmd-3.2.2.orig/apm.c
-===================================================================
---- apmd-3.2.2.orig.orig/apm.c  2006-01-26 15:15:27.000000000 +0100
-+++ apmd-3.2.2.orig/apm.c       2006-01-26 17:50:14.000000000 +0100
-@@ -24,10 +24,12 @@
- #include <unistd.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-+#include <sys/utsname.h>
- #include <fcntl.h>
- #include <errno.h>
- #include <time.h>
- #include <getopt.h>
-+#include <signal.h>
- #include "apm.h"
- 
- static int verbose = 0;
-@@ -43,6 +45,9 @@
-     int fd;
-     time_t then, now;
-     int error;
-+    FILE* pid_file;
-+    int apmd_pid;
-+    struct utsname uname_ver;
- 
-     fd = open(APM_DEVICE, O_WRONLY);
-     if (fd < 0)
-@@ -54,6 +59,22 @@
-     switch (mode)
-     {
-     case SUSPEND:
-+       if(0 == system("grep -i hardware /proc/cpuinfo|grep -i SHARP"))
-+       {
-+           uname(&uname_ver);
-+
-+           if(0 == strncmp("2.4", uname_ver.release, 3))
-+           {
-+               pid_file = fopen("/var/run/apmd.pid", "r");
-+               if(pid_file)
-+               {
-+                   fscanf(pid_file, "%d", &apmd_pid);
-+                   fclose(pid_file);
-+               }
-+
-+               kill(apmd_pid, SIGKILL);
-+           }
-+       }
-        error = apm_suspend(fd);
-        break;
-     case STANDBY:
diff --git a/meta/packages/apmd/apmd_3.2.2.bb b/meta/packages/apmd/apmd_3.2.2.bb
index 136d9293df..1706e9c683 100644
--- a/meta/packages/apmd/apmd_3.2.2.bb
+++ b/meta/packages/apmd/apmd_3.2.2.bb
@@ -3,12 +3,11 @@ SECTION = "base"
 PRIORITY = "required"
 DEPENDS = "libtool-cross"
 LICENSE = "GPL"
-PR = "r12"
+PR = "r13"
 
 SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.orig.tar.gz \
            file://debian.patch;patch=1 \
            file://workaround.patch;patch=1 \
-           file://zaurus24.patch;patch=1 \
            file://unlinux.patch;patch=1 \
            file://libtool.patch;patch=1 \
            file://init \