diff options
author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2015-08-11 18:27:16 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-16 09:25:46 +0100 |
commit | cc636032617964818211ccb47a9fb6d6163af8c0 (patch) | |
tree | d3b3121c4244853abb3ec42c1fa844da71fcfbbd | |
parent | 5c3682136358272a3a83300a865ff9b551b31834 (diff) | |
download | openembedded-core-contrib-cc636032617964818211ccb47a9fb6d6163af8c0.tar.gz |
apmd: update to 3.2.2-15
This basically means replacing a "-14" Debian patch with "-15" patch.
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r-- | meta/recipes-bsp/apmd/apmd/apmd.service (renamed from meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd.service) | 0 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd/apmd_proxy (renamed from meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy) | 0 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd/apmd_proxy.conf (renamed from meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy.conf) | 0 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd/default (renamed from meta/recipes-bsp/apmd/apmd-3.2.2-14/default) | 0 | ||||
-rwxr-xr-x | meta/recipes-bsp/apmd/apmd/init (renamed from meta/recipes-bsp/apmd/apmd-3.2.2-14/init) | 0 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd/legacy.patch | 133 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd/libtool.patch (renamed from meta/recipes-bsp/apmd/apmd-3.2.2-14/libtool.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd/unlinux.patch (renamed from meta/recipes-bsp/apmd/apmd-3.2.2-14/unlinux.patch) | 0 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd_3.2.2-15.bb (renamed from meta/recipes-bsp/apmd/apmd_3.2.2-14.bb) | 6 |
9 files changed, 134 insertions, 5 deletions
diff --git a/meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd.service b/meta/recipes-bsp/apmd/apmd/apmd.service index ffab82334f9..ffab82334f9 100644 --- a/meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd.service +++ b/meta/recipes-bsp/apmd/apmd/apmd.service diff --git a/meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy b/meta/recipes-bsp/apmd/apmd/apmd_proxy index c48ee4e5d5f..c48ee4e5d5f 100644 --- a/meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy +++ b/meta/recipes-bsp/apmd/apmd/apmd_proxy diff --git a/meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy.conf b/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf index 751145c522c..751145c522c 100644 --- a/meta/recipes-bsp/apmd/apmd-3.2.2-14/apmd_proxy.conf +++ b/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf diff --git a/meta/recipes-bsp/apmd/apmd-3.2.2-14/default b/meta/recipes-bsp/apmd/apmd/default index 4b7965abf85..4b7965abf85 100644 --- a/meta/recipes-bsp/apmd/apmd-3.2.2-14/default +++ b/meta/recipes-bsp/apmd/apmd/default diff --git a/meta/recipes-bsp/apmd/apmd-3.2.2-14/init b/meta/recipes-bsp/apmd/apmd/init index c0b41aa9d17..c0b41aa9d17 100755 --- a/meta/recipes-bsp/apmd/apmd-3.2.2-14/init +++ b/meta/recipes-bsp/apmd/apmd/init diff --git a/meta/recipes-bsp/apmd/apmd/legacy.patch b/meta/recipes-bsp/apmd/apmd/legacy.patch new file mode 100644 index 00000000000..5db895e8fec --- /dev/null +++ b/meta/recipes-bsp/apmd/apmd/legacy.patch @@ -0,0 +1,133 @@ +From 3595933d221f0ba836917debc0776b8723972ec9 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 11 Aug 2015 17:40:50 +0300 +Subject: [PATCH 1/3] Patch with fixes provided by Debian. + +This patch is taken from +ftp://ftp.debian.org/debian/pool/main/a/apmd/apmd_3.2.2-15.debian.tar.xz + +Upstream-Status: Inappropriate [upstream is dead] +Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> + +--- + Makefile | 2 +- + apm.c | 3 ++- + apm.h | 9 +++++++++ + apmd.c | 15 ++++++++------- + 4 files changed, 20 insertions(+), 9 deletions(-) + +diff --git a/Makefile b/Makefile +index bf346d9..92fc0fd 100644 +--- a/Makefile ++++ b/Makefile +@@ -43,7 +43,7 @@ DESTDIR= + + CC=gcc + CFLAGS=-O -g +-XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include \ ++XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include -I/usr/X11R6/include \ + -I/usr/src/linux-2.2/include -I /usr/src/linux-2.0/include \ + -DVERSION=\"$(VERSION)\" \ + -DDEFAULT_PROXY_NAME=\"$(PROXY_DIR)/apmd_proxy\" +diff --git a/apm.c b/apm.c +index b21c057..0359b1c 100644 +--- a/apm.c ++++ b/apm.c +@@ -219,12 +219,13 @@ int main(int argc, char **argv) + } + } + +- ++#if 0 + if (!(i.apm_flags & APM_32_BIT_SUPPORT)) + { + fprintf(stderr, "32-bit APM interface not supported\n"); + exit(1); + } ++#endif + + if (verbose && (i.apm_flags & 0x10)) + printf("APM BIOS Power Management is currently disabled\n"); +diff --git a/apm.h b/apm.h +index fb24dfd..824cc06 100644 +--- a/apm.h ++++ b/apm.h +@@ -20,6 +20,13 @@ + * $Id: apm.h,v 1.7 1999/07/05 22:31:11 apenwarr Exp $ + * + */ ++#ifndef _APM_H ++#define _APM_H 1 ++ ++#ifndef __KERNEL_STRICT_NAMES ++#define __KERNEL_STRICT_NAMES ++#endif ++ + #include <linux/apm_bios.h> + #include <sys/types.h> + +@@ -93,3 +100,5 @@ extern int apm_reject(int fd); + #else + #define apm_reject(fd) (-EINVAL) + #endif ++ ++#endif +diff --git a/apmd.c b/apmd.c +index 49ed3a1..560f536 100644 +--- a/apmd.c ++++ b/apmd.c +@@ -343,7 +343,7 @@ static int call_proxy(apm_event_t event) + /* parent */ + int status, retval; + ssize_t len; +- time_t time_limit; ++ time_t countdown; + + if (pid < 0) { + /* Couldn't fork */ +@@ -356,8 +356,9 @@ static int call_proxy(apm_event_t event) + /* Capture the child's output, if any, but only until it terminates */ + close(fds[1]); + fcntl(fds[0], F_SETFL, O_RDONLY|O_NONBLOCK); +- time_limit = time(0) + proxy_timeout; ++ countdown = proxy_timeout; + do { ++ countdown -= 1; + while ((len = read(fds[0], line, sizeof(line)-1)) > 0) { + line[len] = 0; + APMD_SYSLOG(LOG_INFO, "+ %s", line); +@@ -372,16 +373,16 @@ static int call_proxy(apm_event_t event) + goto proxy_done; + } + +- sleep(1); ++ while (sleep(1) > 0) ; + } while ( +- (time(0) < time_limit) ++ (countdown >= 0) + || (proxy_timeout < 0) + ); + + APMD_SYSLOG(LOG_NOTICE, "Proxy has been running more than %d seconds; killing it", proxy_timeout); + + kill(pid, SIGTERM); +- time_limit = time(0) + 5; ++ countdown = 5; + do { + retval = waitpid(pid, &status, WNOHANG); + if (retval == pid) +@@ -392,9 +393,9 @@ static int call_proxy(apm_event_t event) + goto proxy_done; + } + +- sleep(1); ++ while (sleep(1) > 0) ; + +- } while (time(0) < time_limit); ++ } while (countdown >= 0); + + kill(pid, SIGKILL); + status = __W_EXITCODE(0, SIGKILL); +-- +2.1.4 + diff --git a/meta/recipes-bsp/apmd/apmd-3.2.2-14/libtool.patch b/meta/recipes-bsp/apmd/apmd/libtool.patch index 834ee080a1f..834ee080a1f 100644 --- a/meta/recipes-bsp/apmd/apmd-3.2.2-14/libtool.patch +++ b/meta/recipes-bsp/apmd/apmd/libtool.patch diff --git a/meta/recipes-bsp/apmd/apmd-3.2.2-14/unlinux.patch b/meta/recipes-bsp/apmd/apmd/unlinux.patch index ec8206cf174..ec8206cf174 100644 --- a/meta/recipes-bsp/apmd/apmd-3.2.2-14/unlinux.patch +++ b/meta/recipes-bsp/apmd/apmd/unlinux.patch diff --git a/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb b/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb index 65dd01b2296..ea105268a60 100644 --- a/meta/recipes-bsp/apmd/apmd_3.2.2-14.bb +++ b/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb @@ -8,10 +8,9 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://apm.h;beginline=6;endline=18;md5=7d4acc1250910a89f84ce3cc6557c4c2" DEPENDS = "libtool-cross" -PR = "r2" SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_3.2.2.orig.tar.gz;name=tarball \ - ${DEBIAN_MIRROR}/main/a/apmd/apmd_${PV}.diff.gz;name=patch \ + file://legacy.patch \ file://libtool.patch \ file://unlinux.patch \ file://init \ @@ -23,9 +22,6 @@ SRC_URI = "${DEBIAN_MIRROR}/main/a/apmd/apmd_3.2.2.orig.tar.gz;name=tarball \ SRC_URI[tarball.md5sum] = "b1e6309e8331e0f4e6efd311c2d97fa8" SRC_URI[tarball.sha256sum] = "7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d" -SRC_URI[patch.md5sum] = "57e1b689264ea80f78353519eece0c92" -SRC_URI[patch.sha256sum] = "7905ff96be93d725544d0040e425c42f9c05580db3c272f11cff75b9aa89d430" - S = "${WORKDIR}/apmd-3.2.2.orig" inherit update-rc.d systemd |