diff options
-rw-r--r-- | meta/conf/distro/include/default-providers.inc | 1 | ||||
-rw-r--r-- | meta/conf/distro/include/maintainers.inc | 1 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd/apmd.service | 7 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd/apmd_proxy | 91 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd/apmd_proxy.conf | 16 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd/default | 8 | ||||
-rwxr-xr-x | meta/recipes-bsp/apmd/apmd/init | 51 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd/legacy.patch | 133 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd/libtool.patch | 41 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd/linkage.patch | 53 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd/unlinux.patch | 25 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd/wexitcode.patch | 26 | ||||
-rw-r--r-- | meta/recipes-bsp/apmd/apmd_3.2.2-15.bb | 85 | ||||
-rw-r--r-- | meta/recipes-core/packagegroups/packagegroup-base.bb | 7 | ||||
-rw-r--r-- | meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb | 2 | ||||
-rw-r--r-- | meta/recipes-sato/matchbox-sato/matchbox-session-sato/session | 1 | ||||
-rw-r--r-- | meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb | 2 |
17 files changed, 1 insertions, 549 deletions
diff --git a/meta/conf/distro/include/default-providers.inc b/meta/conf/distro/include/default-providers.inc index 3a4e989c1f..d18173c744 100644 --- a/meta/conf/distro/include/default-providers.inc +++ b/meta/conf/distro/include/default-providers.inc | |||
@@ -24,7 +24,6 @@ PREFERRED_PROVIDER_virtual/make-native ?= "make-native" | |||
24 | # Default virtual runtime providers | 24 | # Default virtual runtime providers |
25 | # | 25 | # |
26 | VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-opkg" | 26 | VIRTUAL-RUNTIME_update-alternatives ?= "update-alternatives-opkg" |
27 | VIRTUAL-RUNTIME_apm ?= "apm" | ||
28 | VIRTUAL-RUNTIME_alsa-state ?= "alsa-state" | 27 | VIRTUAL-RUNTIME_alsa-state ?= "alsa-state" |
29 | VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt" | 28 | VIRTUAL-RUNTIME_getopt ?= "util-linux-getopt" |
30 | VIRTUAL-RUNTIME_base-utils ?= "busybox" | 29 | VIRTUAL-RUNTIME_base-utils ?= "busybox" |
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index b06ae43dac..823fb5b900 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
@@ -38,7 +38,6 @@ RECIPE_MAINTAINER:pn-alsa-tools = "Michael Opdenacker <michael.opdenacker@bootli | |||
38 | RECIPE_MAINTAINER:pn-alsa-topology-conf = "Michael Opdenacker <michael.opdenacker@bootlin.com>" | 38 | RECIPE_MAINTAINER:pn-alsa-topology-conf = "Michael Opdenacker <michael.opdenacker@bootlin.com>" |
39 | RECIPE_MAINTAINER:pn-alsa-ucm-conf = "Michael Opdenacker <michael.opdenacker@bootlin.com>" | 39 | RECIPE_MAINTAINER:pn-alsa-ucm-conf = "Michael Opdenacker <michael.opdenacker@bootlin.com>" |
40 | RECIPE_MAINTAINER:pn-alsa-utils = "Michael Opdenacker <michael.opdenacker@bootlin.com>" | 40 | RECIPE_MAINTAINER:pn-alsa-utils = "Michael Opdenacker <michael.opdenacker@bootlin.com>" |
41 | RECIPE_MAINTAINER:pn-apmd = "Anuj Mittal <anuj.mittal@intel.com>" | ||
42 | RECIPE_MAINTAINER:pn-apr = "Hongxu Jia <hongxu.jia@windriver.com>" | 41 | RECIPE_MAINTAINER:pn-apr = "Hongxu Jia <hongxu.jia@windriver.com>" |
43 | RECIPE_MAINTAINER:pn-apr-util = "Hongxu Jia <hongxu.jia@windriver.com>" | 42 | RECIPE_MAINTAINER:pn-apr-util = "Hongxu Jia <hongxu.jia@windriver.com>" |
44 | RECIPE_MAINTAINER:pn-apt = "Unassigned <unassigned@yoctoproject.org>" | 43 | RECIPE_MAINTAINER:pn-apt = "Unassigned <unassigned@yoctoproject.org>" |
diff --git a/meta/recipes-bsp/apmd/apmd/apmd.service b/meta/recipes-bsp/apmd/apmd/apmd.service deleted file mode 100644 index ffab82334f..0000000000 --- a/meta/recipes-bsp/apmd/apmd/apmd.service +++ /dev/null | |||
@@ -1,7 +0,0 @@ | |||
1 | [Unit] | ||
2 | Description=Advanced Power Management daemon | ||
3 | After=remote-fs.target | ||
4 | |||
5 | [Service] | ||
6 | EnvironmentFile=-@SYSCONFDIR@/default/apmd | ||
7 | ExecStart=@SBINDIR@/apmd -P @SYSCONFDIR@/apm/apmd_proxy $APMD | ||
diff --git a/meta/recipes-bsp/apmd/apmd/apmd_proxy b/meta/recipes-bsp/apmd/apmd/apmd_proxy deleted file mode 100644 index c48ee4e5d5..0000000000 --- a/meta/recipes-bsp/apmd/apmd/apmd_proxy +++ /dev/null | |||
@@ -1,91 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | # | ||
3 | # apmd_proxy - program dispatcher for APM daemon | ||
4 | # | ||
5 | # Written by Craig Markwardt (craigm@lheamail.gsfc.nasa.gov) 21 May 1999 | ||
6 | # Modified for Debian by Avery Pennarun | ||
7 | # | ||
8 | # This shell script is called by the APM daemon (apmd) when a power | ||
9 | # management event occurs. Its first and second arguments describe the | ||
10 | # event. For example, apmd will call "apmd_proxy suspend system" just | ||
11 | # before the system is suspended. | ||
12 | # | ||
13 | # Here are the possible arguments: | ||
14 | # | ||
15 | # start - APM daemon has started | ||
16 | # stop - APM daemon is shutting down | ||
17 | # suspend critical - APM system indicates critical suspend (++) | ||
18 | # suspend system - APM system has requested suspend mode | ||
19 | # suspend user - User has requested suspend mode | ||
20 | # standby system - APM system has requested standby mode | ||
21 | # standby user - User has requested standby mode | ||
22 | # resume suspend - System has resumed from suspend mode | ||
23 | # resume standby - System has resumed from standby mode | ||
24 | # resume critical - System has resumed from critical suspend | ||
25 | # change battery - APM system reported low battery | ||
26 | # change power - APM system reported AC/battery change | ||
27 | # change time - APM system reported time change (*) | ||
28 | # change capability - APM system reported config. change (+) | ||
29 | # | ||
30 | # (*) - APM daemon may be configured to not call these sequences | ||
31 | # (+) - Available if APM kernel supports it. | ||
32 | # (++) - "suspend critical" is never passed to apmd from the kernel, | ||
33 | # so we will never see it here. Scripts that process "resume | ||
34 | # critical" events need to take this into account. | ||
35 | # | ||
36 | # It is the proxy script's responsibility to examine the APM status | ||
37 | # (via /proc/apm) or other status and to take appropriate actions. | ||
38 | # For example, the script might unmount network drives before the | ||
39 | # machine is suspended. | ||
40 | # | ||
41 | # In Debian, the usual way of adding functionality to the proxy is to | ||
42 | # add a script to /etc/apm/event.d. This script will be called by | ||
43 | # apmd_proxy (via run-parts) with the same arguments. | ||
44 | # | ||
45 | # If it is important that a certain set of script be run in a certain | ||
46 | # order on suspend and in a different order on resume, then put all | ||
47 | # the scripts in /etc/apm/scripts.d instead of /etc/apm/event.d and | ||
48 | # symlink to these from /etc/apm/suspend.d, /etc/apm/resume.d and | ||
49 | # /etc/apm/other.d using names whose lexicographical order is the same | ||
50 | # as the desired order of execution. | ||
51 | # | ||
52 | # If the kernel's APM driver supports it, apmd_proxy can return a non-zero | ||
53 | # exit status on suspend and standby events, indicating that the suspend | ||
54 | # or standby event should be rejected. | ||
55 | # | ||
56 | # ******************************************************************* | ||
57 | |||
58 | set -e | ||
59 | |||
60 | # The following doesn't yet work, because current kernels (up to at least | ||
61 | # 2.4.20) do not support rejection of APM events. Supporting this would | ||
62 | # require substantial modifications to the APM driver. We will re-enable | ||
63 | # this feature if the driver is ever modified. -- cph@debian.org | ||
64 | # | ||
65 | #SUSPEND_ON_AC=false | ||
66 | #[ -r /etc/apm/apmd_proxy.conf ] && . /etc/apm/apmd_proxy.conf | ||
67 | # | ||
68 | #if [ "${SUSPEND_ON_AC}" = "false" -a "${2}" = "system" ] \ | ||
69 | # && on_ac_power >/dev/null; then | ||
70 | # # Reject system suspends and standbys if we are on AC power | ||
71 | # exit 1 # Reject (NOTE kernel support must be enabled) | ||
72 | #fi | ||
73 | |||
74 | if [ "${1}" = "suspend" -o "${1}" = "standby" ]; then | ||
75 | run-parts -a "${1}" -a "${2}" /etc/apm/event.d | ||
76 | if [ -d /etc/apm/suspend.d ]; then | ||
77 | run-parts -a "${1}" -a "${2}" /etc/apm/suspend.d | ||
78 | fi | ||
79 | elif [ "${1}" = "resume" ]; then | ||
80 | if [ -d /etc/apm/resume.d ]; then | ||
81 | run-parts -a "${1}" -a "${2}" /etc/apm/resume.d | ||
82 | fi | ||
83 | run-parts -a "${1}" -a "${2}" /etc/apm/event.d | ||
84 | else | ||
85 | run-parts -a "${1}" -a "${2}" /etc/apm/event.d | ||
86 | if [ -d /etc/apm/other.d ]; then | ||
87 | run-parts -a "${1}" -a "${2}" /etc/apm/other.d | ||
88 | fi | ||
89 | fi | ||
90 | |||
91 | exit 0 | ||
diff --git a/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf b/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf deleted file mode 100644 index 751145c522..0000000000 --- a/meta/recipes-bsp/apmd/apmd/apmd_proxy.conf +++ /dev/null | |||
@@ -1,16 +0,0 @@ | |||
1 | # /etc/apm/apmd_proxy.conf: configuration file for apmd. | ||
2 | # | ||
3 | # This file is managed by debconf when installing or reconfiguring the | ||
4 | # package. It is generated by merging the answers gathered by debconf | ||
5 | # into the template file "/usr/share/apmd/apmd_proxy.conf". | ||
6 | |||
7 | # The following doesn't yet work, because current kernels (up to at least | ||
8 | # 2.4.20) do not support rejection of APM events. Supporting this would | ||
9 | # require substantial modifications to the APM driver. We will re-enable | ||
10 | # this feature if the driver is ever modified. -- cph@debian.org | ||
11 | # | ||
12 | # Set the following to "false" if you want to reject system suspend or | ||
13 | # system standby requests when the computer is running on AC power. | ||
14 | # Otherwise set this to "true". Such requests are never rejected when | ||
15 | # the computer is running on battery power. | ||
16 | #SUSPEND_ON_AC=true | ||
diff --git a/meta/recipes-bsp/apmd/apmd/default b/meta/recipes-bsp/apmd/apmd/default deleted file mode 100644 index 4b7965abf8..0000000000 --- a/meta/recipes-bsp/apmd/apmd/default +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | # | ||
2 | # Default for /etc/init.d/apmd | ||
3 | # | ||
4 | |||
5 | # As apmd can be called with arguments, we use the following variable | ||
6 | # to store them, e.g., APMD="-w 5 -p 2". | ||
7 | # See the manual page apmd(8) for details. | ||
8 | APMD="--proxy-timeout 30" | ||
diff --git a/meta/recipes-bsp/apmd/apmd/init b/meta/recipes-bsp/apmd/apmd/init deleted file mode 100755 index c0b41aa9d1..0000000000 --- a/meta/recipes-bsp/apmd/apmd/init +++ /dev/null | |||
@@ -1,51 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | ### BEGIN INIT INFO | ||
3 | # Provides: apmd | ||
4 | # Required-Start: $remote_fs | ||
5 | # Required-Stop: $remote_fs | ||
6 | # Default-Start: 2 3 4 5 | ||
7 | # Default-Stop: 0 1 6 | ||
8 | # Short-Description: Advanced Power Management daemon | ||
9 | ### END INIT INFO | ||
10 | |||
11 | # Source function library. | ||
12 | . /etc/init.d/functions | ||
13 | |||
14 | PATH=/bin:/usr/bin:/sbin:/usr/sbin | ||
15 | |||
16 | [ -f /etc/default/rcS ] && . /etc/default/rcS | ||
17 | [ -f /etc/default/apmd ] && . /etc/default/apmd | ||
18 | |||
19 | case "$1" in | ||
20 | start) | ||
21 | echo -n "Starting advanced power management daemon: " | ||
22 | start-stop-daemon -S -x /usr/sbin/apmd -- \ | ||
23 | -P /etc/apm/apmd_proxy $APMD | ||
24 | if [ $? = 0 ]; then | ||
25 | echo "apmd." | ||
26 | else | ||
27 | echo "(failed.)" | ||
28 | fi | ||
29 | ;; | ||
30 | stop) | ||
31 | echo -n "Stopping advanced power management daemon: " | ||
32 | start-stop-daemon -K \ | ||
33 | -x /usr/sbin/apmd | ||
34 | echo "apmd." | ||
35 | ;; | ||
36 | status) | ||
37 | status /usr/sbin/apmd; | ||
38 | exit $? | ||
39 | ;; | ||
40 | restart|force-reload) | ||
41 | $0 stop | ||
42 | $0 start | ||
43 | exit | ||
44 | ;; | ||
45 | *) | ||
46 | echo "Usage: /etc/init.d/apmd {start|stop|status|restart|force-reload}" | ||
47 | exit 1 | ||
48 | ;; | ||
49 | esac | ||
50 | |||
51 | exit 0 | ||
diff --git a/meta/recipes-bsp/apmd/apmd/legacy.patch b/meta/recipes-bsp/apmd/apmd/legacy.patch deleted file mode 100644 index 8871311805..0000000000 --- a/meta/recipes-bsp/apmd/apmd/legacy.patch +++ /dev/null | |||
@@ -1,133 +0,0 @@ | |||
1 | From 3595933d221f0ba836917debc0776b8723972ec9 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 11 Aug 2015 17:40:50 +0300 | ||
4 | Subject: [PATCH 1/3] Patch with fixes provided by Debian. | ||
5 | |||
6 | This patch is taken from | ||
7 | ftp://ftp.debian.org/debian/pool/main/a/apmd/apmd_3.2.2-15.debian.tar.xz | ||
8 | |||
9 | Upstream-Status: Inappropriate [upstream is dead] | ||
10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
11 | |||
12 | --- | ||
13 | Makefile | 2 +- | ||
14 | apm.c | 3 ++- | ||
15 | apm.h | 9 +++++++++ | ||
16 | apmd.c | 15 ++++++++------- | ||
17 | 4 files changed, 20 insertions(+), 9 deletions(-) | ||
18 | |||
19 | diff --git a/Makefile b/Makefile | ||
20 | index bf346d9..92fc0fd 100644 | ||
21 | --- a/Makefile | ||
22 | +++ b/Makefile | ||
23 | @@ -43,7 +43,7 @@ DESTDIR= | ||
24 | |||
25 | CC=gcc | ||
26 | CFLAGS=-O -g | ||
27 | -XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include \ | ||
28 | +XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include -I/usr/X11R6/include \ | ||
29 | -I/usr/src/linux-2.2/include -I /usr/src/linux-2.0/include \ | ||
30 | -DVERSION=\"$(VERSION)\" \ | ||
31 | -DDEFAULT_PROXY_NAME=\"$(PROXY_DIR)/apmd_proxy\" | ||
32 | diff --git a/apm.c b/apm.c | ||
33 | index b21c057..0359b1c 100644 | ||
34 | --- a/apm.c | ||
35 | +++ b/apm.c | ||
36 | @@ -219,12 +219,13 @@ int main(int argc, char **argv) | ||
37 | } | ||
38 | } | ||
39 | |||
40 | - | ||
41 | +#if 0 | ||
42 | if (!(i.apm_flags & APM_32_BIT_SUPPORT)) | ||
43 | { | ||
44 | fprintf(stderr, "32-bit APM interface not supported\n"); | ||
45 | exit(1); | ||
46 | } | ||
47 | +#endif | ||
48 | |||
49 | if (verbose && (i.apm_flags & 0x10)) | ||
50 | printf("APM BIOS Power Management is currently disabled\n"); | ||
51 | diff --git a/apm.h b/apm.h | ||
52 | index fb24dfd..824cc06 100644 | ||
53 | --- a/apm.h | ||
54 | +++ b/apm.h | ||
55 | @@ -20,6 +20,13 @@ | ||
56 | * $Id: apm.h,v 1.7 1999/07/05 22:31:11 apenwarr Exp $ | ||
57 | * | ||
58 | */ | ||
59 | +#ifndef _APM_H | ||
60 | +#define _APM_H 1 | ||
61 | + | ||
62 | +#ifndef __KERNEL_STRICT_NAMES | ||
63 | +#define __KERNEL_STRICT_NAMES | ||
64 | +#endif | ||
65 | + | ||
66 | #include <linux/apm_bios.h> | ||
67 | #include <sys/types.h> | ||
68 | |||
69 | @@ -93,3 +100,5 @@ extern int apm_reject(int fd); | ||
70 | #else | ||
71 | #define apm_reject(fd) (-EINVAL) | ||
72 | #endif | ||
73 | + | ||
74 | +#endif | ||
75 | diff --git a/apmd.c b/apmd.c | ||
76 | index 49ed3a1..560f536 100644 | ||
77 | --- a/apmd.c | ||
78 | +++ b/apmd.c | ||
79 | @@ -343,7 +343,7 @@ static int call_proxy(apm_event_t event) | ||
80 | /* parent */ | ||
81 | int status, retval; | ||
82 | ssize_t len; | ||
83 | - time_t time_limit; | ||
84 | + time_t countdown; | ||
85 | |||
86 | if (pid < 0) { | ||
87 | /* Couldn't fork */ | ||
88 | @@ -356,8 +356,9 @@ static int call_proxy(apm_event_t event) | ||
89 | /* Capture the child's output, if any, but only until it terminates */ | ||
90 | close(fds[1]); | ||
91 | fcntl(fds[0], F_SETFL, O_RDONLY|O_NONBLOCK); | ||
92 | - time_limit = time(0) + proxy_timeout; | ||
93 | + countdown = proxy_timeout; | ||
94 | do { | ||
95 | + countdown -= 1; | ||
96 | while ((len = read(fds[0], line, sizeof(line)-1)) > 0) { | ||
97 | line[len] = 0; | ||
98 | APMD_SYSLOG(LOG_INFO, "+ %s", line); | ||
99 | @@ -372,16 +373,16 @@ static int call_proxy(apm_event_t event) | ||
100 | goto proxy_done; | ||
101 | } | ||
102 | |||
103 | - sleep(1); | ||
104 | + while (sleep(1) > 0) ; | ||
105 | } while ( | ||
106 | - (time(0) < time_limit) | ||
107 | + (countdown >= 0) | ||
108 | || (proxy_timeout < 0) | ||
109 | ); | ||
110 | |||
111 | APMD_SYSLOG(LOG_NOTICE, "Proxy has been running more than %d seconds; killing it", proxy_timeout); | ||
112 | |||
113 | kill(pid, SIGTERM); | ||
114 | - time_limit = time(0) + 5; | ||
115 | + countdown = 5; | ||
116 | do { | ||
117 | retval = waitpid(pid, &status, WNOHANG); | ||
118 | if (retval == pid) | ||
119 | @@ -392,9 +393,9 @@ static int call_proxy(apm_event_t event) | ||
120 | goto proxy_done; | ||
121 | } | ||
122 | |||
123 | - sleep(1); | ||
124 | + while (sleep(1) > 0) ; | ||
125 | |||
126 | - } while (time(0) < time_limit); | ||
127 | + } while (countdown >= 0); | ||
128 | |||
129 | kill(pid, SIGKILL); | ||
130 | status = __W_EXITCODE(0, SIGKILL); | ||
131 | -- | ||
132 | 2.1.4 | ||
133 | |||
diff --git a/meta/recipes-bsp/apmd/apmd/libtool.patch b/meta/recipes-bsp/apmd/apmd/libtool.patch deleted file mode 100644 index fd0a952890..0000000000 --- a/meta/recipes-bsp/apmd/apmd/libtool.patch +++ /dev/null | |||
@@ -1,41 +0,0 @@ | |||
1 | From d5dde7ca91a5aed273d8fe269e1a5194e85c8c79 Mon Sep 17 00:00:00 2001 | ||
2 | From: Scott Garman <scott.a.garman@intel.com> | ||
3 | Date: Tue, 13 Jul 2010 16:46:46 +0800 | ||
4 | Subject: [PATCH] apmd: upgrade to 3.2.2-14 | ||
5 | |||
6 | Add by RP to address "unable to infer tagged configuration" error: | ||
7 | commit 35de05e61b88c0808a5e885bb0efdf420555d5ad | ||
8 | Author: Richard Purdie <rpurdie@rpsys.net> | ||
9 | Date: Sun Jun 1 16:13:38 2008 +0000 | ||
10 | |||
11 | apmd: Use libtool --tag options to avoid problems with libtool 2.2.4 (from poky) | ||
12 | |||
13 | However I didn't see same issue with current libtool-2.2.10. Also per my understanding, | ||
14 | the default tag, if not specified, falls back to CC. So disable it from patching, but | ||
15 | keep it here. If we encounter similar issue in the future, we could then push upstream | ||
16 | |||
17 | Comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-16 | ||
18 | |||
19 | Upstream-Status: Pending | ||
20 | |||
21 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
22 | |||
23 | --- | ||
24 | Makefile | 4 ++-- | ||
25 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
26 | |||
27 | diff --git a/Makefile b/Makefile | ||
28 | index 92fc0fd..8e283dc 100644 | ||
29 | --- a/Makefile | ||
30 | +++ b/Makefile | ||
31 | @@ -59,8 +59,8 @@ RANLIB=ranlib | ||
32 | #LDFLAGS=-s | ||
33 | |||
34 | LIBTOOL=libtool --quiet | ||
35 | -LT_COMPILE = $(LIBTOOL) --mode=compile $(CC) | ||
36 | -LT_LINK = $(LIBTOOL) --mode=link $(CC) | ||
37 | +LT_COMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) | ||
38 | +LT_LINK = $(LIBTOOL) --tag=CC --mode=link $(CC) | ||
39 | LT_INSTALL = $(LIBTOOL) --mode=install install | ||
40 | LT_CLEAN = $(LIBTOOL) --mode=clean rm | ||
41 | |||
diff --git a/meta/recipes-bsp/apmd/apmd/linkage.patch b/meta/recipes-bsp/apmd/apmd/linkage.patch deleted file mode 100644 index 3d32c49cd2..0000000000 --- a/meta/recipes-bsp/apmd/apmd/linkage.patch +++ /dev/null | |||
@@ -1,53 +0,0 @@ | |||
1 | When building use the libtool intermediate .lo files instead of explicitly using | ||
2 | the .o files. Under libtool foo.lo is the libtool intermediate wrapper, foo.o is | ||
3 | a static build, and .libs/foo.o is a shared build. | ||
4 | |||
5 | If static libraries have been disabled globally then libtool won't generate them | ||
6 | and explicit references to foo.o won't be satisfied. | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | Signed-off-by: Ross Burton <ross.burton@intel.com> | ||
10 | |||
11 | diff --git a/Makefile b/Makefile | ||
12 | index bb695c6..5f60146 100644 | ||
13 | --- a/Makefile | ||
14 | +++ b/Makefile | ||
15 | @@ -28,7 +28,7 @@ endif | ||
16 | |||
17 | .SUFFIXES: | ||
18 | |||
19 | -OBJS=apmlib.o | ||
20 | +OBJS=apmlib.lo | ||
21 | EXES=apm apmd xapm apmsleep | ||
22 | HEADERS=apm.h | ||
23 | |||
24 | @@ -66,22 +66,22 @@ all: $(EXES) | ||
25 | |||
26 | $(OBJS): $(HEADERS) | ||
27 | |||
28 | -%.o: %.c | ||
29 | +%.lo: %.c | ||
30 | $(LT_COMPILE) -c $(CPPFLAGS) $(CFLAGS) $(XTRACFLAGS) $< | ||
31 | |||
32 | -%: %.o $(LIBAPM) | ||
33 | +%: %.lo $(LIBAPM) | ||
34 | $(LT_LINK) -o $@ $< $(LDFLAGS) $(LIBAPM) | ||
35 | |||
36 | -xapm.o: xapm.c | ||
37 | +xapm.lo: xapm.c | ||
38 | $(LT_COMPILE) -c $(CPPFLAGS) $(CFLAGS) $(XTRACFLAGS) -DNARROWPROTO $< | ||
39 | |||
40 | -apmd: apmd.o | ||
41 | +apmd: apmd.lo | ||
42 | |||
43 | -apmsleep: apmsleep.o | ||
44 | +apmsleep: apmsleep.lo | ||
45 | |||
46 | -apmexists: apmexists.o | ||
47 | +apmexists: apmexists.lo | ||
48 | |||
49 | -xapm: xapm.o $(LIBAPM) | ||
50 | +xapm: xapm.lo $(LIBAPM) | ||
51 | $(LT_LINK) -o $@ $< $(LDFLAGS) $(LIBAPM) $(XLDFLAGS) $(XLIBS) | ||
52 | |||
53 | $(LIBAPM): apmlib.lo | ||
diff --git a/meta/recipes-bsp/apmd/apmd/unlinux.patch b/meta/recipes-bsp/apmd/apmd/unlinux.patch deleted file mode 100644 index ec8206cf17..0000000000 --- a/meta/recipes-bsp/apmd/apmd/unlinux.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | copy OE commit message here: | ||
2 | commit 9456cdc1cf43e3ba9e6d88c63560c1b6fdee4359 | ||
3 | Author: Michael Krelin <hacker@klever.net> | ||
4 | Date: Tue May 29 12:27:45 2007 +0000 | ||
5 | |||
6 | apmd: prevent build from interferring with host kernel headers. Closes #1257 | ||
7 | |||
8 | comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-13 | ||
9 | |||
10 | Upstream-Status: Pending | ||
11 | |||
12 | Signed-off-by: Scott Garman <scott.a.garman@intel.com> | ||
13 | |||
14 | --- apmd-3.2.2.orig/Makefile | ||
15 | +++ apmd-3.2.2/Makefile | ||
16 | @@ -43,8 +43,7 @@ | ||
17 | |||
18 | CC=gcc | ||
19 | CFLAGS=-O -g | ||
20 | -XTRACFLAGS=-Wall -pipe -I. -I/usr/src/linux/include -I/usr/X11R6/include \ | ||
21 | - -I/usr/src/linux-2.2/include -I /usr/src/linux-2.0/include \ | ||
22 | +XTRACFLAGS=-Wall -pipe -I. \ | ||
23 | -DVERSION=\"$(VERSION)\" \ | ||
24 | -DDEFAULT_PROXY_NAME=\"$(PROXY_DIR)/apmd_proxy\" | ||
25 | LDFLAGS= | ||
diff --git a/meta/recipes-bsp/apmd/apmd/wexitcode.patch b/meta/recipes-bsp/apmd/apmd/wexitcode.patch deleted file mode 100644 index c5faa85fa7..0000000000 --- a/meta/recipes-bsp/apmd/apmd/wexitcode.patch +++ /dev/null | |||
@@ -1,26 +0,0 @@ | |||
1 | Define non-posix W* funcitons | ||
2 | |||
3 | C libraries like musl dont define them | ||
4 | |||
5 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
6 | Upstream-Status: Pending | ||
7 | |||
8 | Index: apmd-3.2.2.orig/apmd.c | ||
9 | =================================================================== | ||
10 | --- apmd-3.2.2.orig.orig/apmd.c | ||
11 | +++ apmd-3.2.2.orig/apmd.c | ||
12 | @@ -55,6 +55,14 @@ | ||
13 | #define MINIMUM_RATE_CALC_TIME 120 | ||
14 | #endif | ||
15 | |||
16 | +#ifndef _POSIX_SOURCE | ||
17 | + | ||
18 | +#define __WCOREFLAG 0200 | ||
19 | +#define __WCOREDUMP(x) (_W_INT(x) & __WCOREFLAG) | ||
20 | +#define __W_EXITCODE(ret, sig) ((ret) << 8 | (sig)) | ||
21 | + | ||
22 | +#endif | ||
23 | + | ||
24 | /* | ||
25 | * For the verbosity level feature to be useful, | ||
26 | * we rely on the fact that syslog.h assigns adjacent | ||
diff --git a/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb b/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb deleted file mode 100644 index 92c35c9896..0000000000 --- a/meta/recipes-bsp/apmd/apmd_3.2.2-15.bb +++ /dev/null | |||
@@ -1,85 +0,0 @@ | |||
1 | SUMMARY = "Utilities for Advanced Power Management" | ||
2 | DESCRIPTION = "The Advanced Power Management (APM) support provides \ | ||
3 | access to battery status information and a set of tools for managing \ | ||
4 | notebook power consumption." | ||
5 | HOMEPAGE = "http://apenwarr.ca/apmd/" | ||
6 | SECTION = "base" | ||
7 | LICENSE = "GPL-2.0-or-later" | ||
8 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
9 | file://apm.h;beginline=6;endline=18;md5=7d4acc1250910a89f84ce3cc6557c4c2" | ||
10 | DEPENDS = "libtool-cross" | ||
11 | |||
12 | SRC_URI = "http://snapshot.debian.org/archive/debian/20160728T043443Z/pool/main/a/${BPN}/${BPN}_3.2.2.orig.tar.gz;name=tarball \ | ||
13 | file://legacy.patch \ | ||
14 | file://libtool.patch \ | ||
15 | file://unlinux.patch \ | ||
16 | file://wexitcode.patch \ | ||
17 | file://linkage.patch \ | ||
18 | file://init \ | ||
19 | file://default \ | ||
20 | file://apmd_proxy \ | ||
21 | file://apmd_proxy.conf \ | ||
22 | file://apmd.service" | ||
23 | |||
24 | SRC_URI[tarball.md5sum] = "b1e6309e8331e0f4e6efd311c2d97fa8" | ||
25 | SRC_URI[tarball.sha256sum] = "7f7d9f60b7766b852881d40b8ff91d8e39fccb0d1d913102a5c75a2dbb52332d" | ||
26 | |||
27 | # for this package we're mostly interested in tracking debian patches, | ||
28 | # and not in the upstream version where all development has effectively stopped | ||
29 | UPSTREAM_CHECK_URI = "${DEBIAN_MIRROR}/main/a/apmd/" | ||
30 | UPSTREAM_CHECK_REGEX = "(?P<pver>((\d+\.*)+)-((\d+\.*)+))\.(diff|debian\.tar)\.(gz|xz)" | ||
31 | |||
32 | S = "${WORKDIR}/apmd-3.2.2.orig" | ||
33 | |||
34 | inherit update-rc.d systemd | ||
35 | |||
36 | INITSCRIPT_NAME = "apmd" | ||
37 | INITSCRIPT_PARAMS = "defaults" | ||
38 | |||
39 | SYSTEMD_SERVICE:${PN} = "apmd.service" | ||
40 | SYSTEMD_AUTO_ENABLE = "disable" | ||
41 | |||
42 | EXTRA_OEMAKE = "-e MAKEFLAGS=" | ||
43 | |||
44 | do_compile() { | ||
45 | # apmd doesn't use whole autotools. Just libtool for installation | ||
46 | oe_runmake apm apmd | ||
47 | } | ||
48 | |||
49 | do_install() { | ||
50 | install -d ${D}${sysconfdir} | ||
51 | install -d ${D}${sysconfdir}/apm | ||
52 | install -d ${D}${sysconfdir}/apm/event.d | ||
53 | install -d ${D}${sysconfdir}/apm/other.d | ||
54 | install -d ${D}${sysconfdir}/apm/suspend.d | ||
55 | install -d ${D}${sysconfdir}/apm/resume.d | ||
56 | install -d ${D}${sysconfdir}/apm/scripts.d | ||
57 | install -d ${D}${sysconfdir}/default | ||
58 | install -d ${D}${sysconfdir}/init.d | ||
59 | install -d ${D}${sbindir} | ||
60 | install -d ${D}${bindir} | ||
61 | install -d ${D}${libdir} | ||
62 | install -d ${D}${datadir}/apmd | ||
63 | install -d ${D}${includedir} | ||
64 | |||
65 | install -m 4755 ${S}/.libs/apm ${D}${bindir}/apm | ||
66 | install -m 0755 ${S}/.libs/apmd ${D}${sbindir}/apmd | ||
67 | install -m 0755 ${WORKDIR}/apmd_proxy ${D}${sysconfdir}/apm/ | ||
68 | install -m 0644 ${WORKDIR}/apmd_proxy.conf ${D}${datadir}/apmd/ | ||
69 | install -m 0644 ${WORKDIR}/default ${D}${sysconfdir}/default/apmd | ||
70 | oe_libinstall -so libapm ${D}${libdir} | ||
71 | install -m 0644 apm.h ${D}${includedir} | ||
72 | |||
73 | sed -e 's,/usr/sbin,${sbindir},g; s,/etc,${sysconfdir},g;' ${WORKDIR}/init > ${D}${sysconfdir}/init.d/apmd | ||
74 | chmod 755 ${D}${sysconfdir}/init.d/apmd | ||
75 | |||
76 | install -d ${D}${systemd_system_unitdir} | ||
77 | install -m 0644 ${WORKDIR}/apmd.service ${D}${systemd_system_unitdir}/ | ||
78 | sed -i -e 's,@SYSCONFDIR@,${sysconfdir},g' \ | ||
79 | -e 's,@SBINDIR@,${sbindir},g' ${D}${systemd_system_unitdir}/apmd.service | ||
80 | } | ||
81 | |||
82 | PACKAGES =+ "libapm apm" | ||
83 | |||
84 | FILES:libapm = "${libdir}/libapm${SOLIBS}" | ||
85 | FILES:apm = "${bindir}/apm*" | ||
diff --git a/meta/recipes-core/packagegroups/packagegroup-base.bb b/meta/recipes-core/packagegroups/packagegroup-base.bb index d60e177471..eeb26ca588 100644 --- a/meta/recipes-core/packagegroups/packagegroup-base.bb +++ b/meta/recipes-core/packagegroups/packagegroup-base.bb | |||
@@ -16,7 +16,6 @@ PACKAGES = ' \ | |||
16 | \ | 16 | \ |
17 | ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "packagegroup-base-acpi", "",d)} \ | 17 | ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "packagegroup-base-acpi", "",d)} \ |
18 | ${@bb.utils.contains("MACHINE_FEATURES", "alsa", "packagegroup-base-alsa", "", d)} \ | 18 | ${@bb.utils.contains("MACHINE_FEATURES", "alsa", "packagegroup-base-alsa", "", d)} \ |
19 | ${@bb.utils.contains("MACHINE_FEATURES", "apm", "packagegroup-base-apm", "", d)} \ | ||
20 | ${@bb.utils.contains("MACHINE_FEATURES", "ext2", "packagegroup-base-ext2", "", d)} \ | 19 | ${@bb.utils.contains("MACHINE_FEATURES", "ext2", "packagegroup-base-ext2", "", d)} \ |
21 | ${@bb.utils.contains("MACHINE_FEATURES", "vfat", "packagegroup-base-vfat", "", d)} \ | 20 | ${@bb.utils.contains("MACHINE_FEATURES", "vfat", "packagegroup-base-vfat", "", d)} \ |
22 | ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "packagegroup-base-keyboard", "", d)} \ | 21 | ${@bb.utils.contains("MACHINE_FEATURES", "keyboard", "packagegroup-base-keyboard", "", d)} \ |
@@ -52,7 +51,6 @@ RDEPENDS:packagegroup-base = "\ | |||
52 | packagegroup-machine-base \ | 51 | packagegroup-machine-base \ |
53 | \ | 52 | \ |
54 | module-init-tools \ | 53 | module-init-tools \ |
55 | ${@bb.utils.contains('MACHINE_FEATURES', 'apm', 'packagegroup-base-apm', '',d)} \ | ||
56 | ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'packagegroup-base-acpi', '',d)} \ | 54 | ${@bb.utils.contains('MACHINE_FEATURES', 'acpi', 'packagegroup-base-acpi', '',d)} \ |
57 | ${@bb.utils.contains('MACHINE_FEATURES', 'keyboard', 'packagegroup-base-keyboard', '',d)} \ | 55 | ${@bb.utils.contains('MACHINE_FEATURES', 'keyboard', 'packagegroup-base-keyboard', '',d)} \ |
58 | ${@bb.utils.contains('MACHINE_FEATURES', 'phone', 'packagegroup-base-phone', '',d)} \ | 56 | ${@bb.utils.contains('MACHINE_FEATURES', 'phone', 'packagegroup-base-phone', '',d)} \ |
@@ -149,11 +147,6 @@ SUMMARY:packagegroup-base-acpi = "ACPI support" | |||
149 | RDEPENDS:packagegroup-base-acpi = "\ | 147 | RDEPENDS:packagegroup-base-acpi = "\ |
150 | acpid" | 148 | acpid" |
151 | 149 | ||
152 | SUMMARY:packagegroup-base-apm = "APM support" | ||
153 | RDEPENDS:packagegroup-base-apm = "\ | ||
154 | ${VIRTUAL-RUNTIME_apm} \ | ||
155 | apmd" | ||
156 | |||
157 | SUMMARY:packagegroup-base-ext2 = "ext2 filesystem support" | 150 | SUMMARY:packagegroup-base-ext2 = "ext2 filesystem support" |
158 | RDEPENDS:packagegroup-base-ext2 = "\ | 151 | RDEPENDS:packagegroup-base-ext2 = "\ |
159 | e2fsprogs-e2fsck \ | 152 | e2fsprogs-e2fsck \ |
diff --git a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb index b71d1e5cd9..83425f60fe 100644 --- a/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb +++ b/meta/recipes-sato/matchbox-panel-2/matchbox-panel-2_2.12.bb | |||
@@ -11,7 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | |||
11 | 11 | ||
12 | DEPENDS = "gtk+3 startup-notification dbus dbus-glib dbus-glib-native" | 12 | DEPENDS = "gtk+3 startup-notification dbus dbus-glib dbus-glib-native" |
13 | DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" | 13 | DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "libacpi", "",d)}" |
14 | DEPENDS += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "apmd", "",d)}" | ||
15 | 14 | ||
16 | # The startup-notification requires x11 in DISTRO_FEATURES | 15 | # The startup-notification requires x11 in DISTRO_FEATURES |
17 | REQUIRED_DISTRO_FEATURES = "x11" | 16 | REQUIRED_DISTRO_FEATURES = "x11" |
@@ -28,7 +27,6 @@ SRC_URI = "git://git.yoctoproject.org/${BPN};protocol=https;branch=master \ | |||
28 | 27 | ||
29 | EXTRA_OECONF = "--enable-startup-notification --enable-dbus" | 28 | EXTRA_OECONF = "--enable-startup-notification --enable-dbus" |
30 | EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" | 29 | EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "acpi", "--with-battery=acpi", "",d)}" |
31 | EXTRA_OECONF += " ${@bb.utils.contains("MACHINE_FEATURES", "apm", "--with-battery=apm", "",d)}" | ||
32 | 30 | ||
33 | S = "${WORKDIR}/git" | 31 | S = "${WORKDIR}/git" |
34 | 32 | ||
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session index 3a70574af9..61fea51054 100644 --- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session +++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato/session | |||
@@ -22,7 +22,6 @@ matchbox-desktop & | |||
22 | START_APPLETS=showdesktop,windowselector | 22 | START_APPLETS=showdesktop,windowselector |
23 | END_APPLETS=$KEYBOARD_APPLET,systray,startup-notify,notify | 23 | END_APPLETS=$KEYBOARD_APPLET,systray,startup-notify,notify |
24 | END_APPLETS=battery,$END_APPLETS # feature-acpi | 24 | END_APPLETS=battery,$END_APPLETS # feature-acpi |
25 | END_APPLETS=battery,$END_APPLETS # feature-apm | ||
26 | END_APPLETS=clock,$END_APPLETS | 25 | END_APPLETS=clock,$END_APPLETS |
27 | END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone | 26 | END_APPLETS=openmoko-panel-gsm,$END_APPLETS # feature-phone |
28 | 27 | ||
diff --git a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb index 020e211ea5..49bf30ee5e 100644 --- a/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb +++ b/meta/recipes-sato/matchbox-sato/matchbox-session-sato_0.1.bb | |||
@@ -26,7 +26,7 @@ FILES:${PN} += "${datadir}/themes/Sato/index.theme" | |||
26 | 26 | ||
27 | do_install() { | 27 | do_install() { |
28 | # This is the set of machine features that the script has markers for | 28 | # This is the set of machine features that the script has markers for |
29 | FEATURES="acpi apm phone" | 29 | FEATURES="acpi phone" |
30 | SCRIPT="${S}/sedder" | 30 | SCRIPT="${S}/sedder" |
31 | rm -f $SCRIPT | 31 | rm -f $SCRIPT |
32 | touch $SCRIPT | 32 | touch $SCRIPT |