diff options
Diffstat (limited to 'meta/recipes-bsp/apmd/apmd')
-rw-r--r-- | meta/recipes-bsp/apmd/apmd/legacy.patch | 2 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd/libtool.patch | 22 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd/linkage.patch | 53 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd/wexitcode.patch | 26 |
4 files changed, 95 insertions, 8 deletions
diff --git a/meta/recipes-bsp/apmd/apmd/legacy.patch b/meta/recipes-bsp/apmd/apmd/legacy.patch index 5db895e8fe..8871311805 100644 --- a/meta/recipes-bsp/apmd/apmd/legacy.patch +++ b/meta/recipes-bsp/apmd/apmd/legacy.patch @@ -7,7 +7,7 @@ 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> +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- Makefile | 2 +- diff --git a/meta/recipes-bsp/apmd/apmd/libtool.patch b/meta/recipes-bsp/apmd/apmd/libtool.patch index 834ee080a1..fd0a952890 100644 --- a/meta/recipes-bsp/apmd/apmd/libtool.patch +++ b/meta/recipes-bsp/apmd/apmd/libtool.patch @@ -1,3 +1,8 @@ +From d5dde7ca91a5aed273d8fe269e1a5194e85c8c79 Mon Sep 17 00:00:00 2001 +From: Scott Garman <scott.a.garman@intel.com> +Date: Tue, 13 Jul 2010 16:46:46 +0800 +Subject: [PATCH] apmd: upgrade to 3.2.2-14 + Add by RP to address "unable to infer tagged configuration" error: commit 35de05e61b88c0808a5e885bb0efdf420555d5ad Author: Richard Purdie <rpurdie@rpsys.net> @@ -15,15 +20,18 @@ Upstream-Status: Pending Signed-off-by: Scott Garman <scott.a.garman@intel.com> -Index: apmd-3.2.2.orig/Makefile -=================================================================== ---- apmd-3.2.2.orig.orig/Makefile 2004-01-04 08:13:18.000000000 +0000 -+++ apmd-3.2.2.orig/Makefile 2008-04-21 17:10:03.000000000 +0100 -@@ -58,9 +57,8 @@ - #CFLAGS=-O3 -m486 -fomit-frame-pointer +--- + Makefile | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/Makefile b/Makefile +index 92fc0fd..8e283dc 100644 +--- a/Makefile ++++ b/Makefile +@@ -59,8 +59,8 @@ RANLIB=ranlib #LDFLAGS=-s --LIBTOOL=libtool --quiet + LIBTOOL=libtool --quiet -LT_COMPILE = $(LIBTOOL) --mode=compile $(CC) -LT_LINK = $(LIBTOOL) --mode=link $(CC) +LT_COMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) diff --git a/meta/recipes-bsp/apmd/apmd/linkage.patch b/meta/recipes-bsp/apmd/apmd/linkage.patch new file mode 100644 index 0000000000..3d32c49cd2 --- /dev/null +++ b/meta/recipes-bsp/apmd/apmd/linkage.patch @@ -0,0 +1,53 @@ +When building use the libtool intermediate .lo files instead of explicitly using +the .o files. Under libtool foo.lo is the libtool intermediate wrapper, foo.o is +a static build, and .libs/foo.o is a shared build. + +If static libraries have been disabled globally then libtool won't generate them +and explicit references to foo.o won't be satisfied. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/Makefile b/Makefile +index bb695c6..5f60146 100644 +--- a/Makefile ++++ b/Makefile +@@ -28,7 +28,7 @@ endif + + .SUFFIXES: + +-OBJS=apmlib.o ++OBJS=apmlib.lo + EXES=apm apmd xapm apmsleep + HEADERS=apm.h + +@@ -66,22 +66,22 @@ all: $(EXES) + + $(OBJS): $(HEADERS) + +-%.o: %.c ++%.lo: %.c + $(LT_COMPILE) -c $(CPPFLAGS) $(CFLAGS) $(XTRACFLAGS) $< + +-%: %.o $(LIBAPM) ++%: %.lo $(LIBAPM) + $(LT_LINK) -o $@ $< $(LDFLAGS) $(LIBAPM) + +-xapm.o: xapm.c ++xapm.lo: xapm.c + $(LT_COMPILE) -c $(CPPFLAGS) $(CFLAGS) $(XTRACFLAGS) -DNARROWPROTO $< + +-apmd: apmd.o ++apmd: apmd.lo + +-apmsleep: apmsleep.o ++apmsleep: apmsleep.lo + +-apmexists: apmexists.o ++apmexists: apmexists.lo + +-xapm: xapm.o $(LIBAPM) ++xapm: xapm.lo $(LIBAPM) + $(LT_LINK) -o $@ $< $(LDFLAGS) $(LIBAPM) $(XLDFLAGS) $(XLIBS) + + $(LIBAPM): apmlib.lo diff --git a/meta/recipes-bsp/apmd/apmd/wexitcode.patch b/meta/recipes-bsp/apmd/apmd/wexitcode.patch new file mode 100644 index 0000000000..c5faa85fa7 --- /dev/null +++ b/meta/recipes-bsp/apmd/apmd/wexitcode.patch @@ -0,0 +1,26 @@ +Define non-posix W* funcitons + +C libraries like musl dont define them + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending + +Index: apmd-3.2.2.orig/apmd.c +=================================================================== +--- apmd-3.2.2.orig.orig/apmd.c ++++ apmd-3.2.2.orig/apmd.c +@@ -55,6 +55,14 @@ + #define MINIMUM_RATE_CALC_TIME 120 + #endif + ++#ifndef _POSIX_SOURCE ++ ++#define __WCOREFLAG 0200 ++#define __WCOREDUMP(x) (_W_INT(x) & __WCOREFLAG) ++#define __W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) ++ ++#endif ++ + /* + * For the verbosity level feature to be useful, + * we rely on the fact that syslog.h assigns adjacent |