summaryrefslogtreecommitdiffstats
path: root/meta/recipes-bsp
diff options
context:
space:
mode:
authorZhai Edwin <edwin.zhai@intel.com>2010-11-28 15:48:25 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-06 22:02:26 +0000
commitbeb4b515ee8e57e17fe899a280af1d602a1020eb (patch)
tree480482fea7c0829cd5a7aed28146b960123ddd79 /meta/recipes-bsp
parent587873796d574f7ae35066c1240319530d27b62e (diff)
downloadpoky-beb4b515ee8e57e17fe899a280af1d602a1020eb.tar.gz
eee-acpi-scripts: Update to 1.1.11
Rebased remove-doc-check.patch Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r--meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb15
-rw-r--r--meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch76
2 files changed, 46 insertions, 45 deletions
diff --git a/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb b/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb
index 4c26504bd3..d186727886 100644
--- a/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb
+++ b/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb
@@ -1,8 +1,11 @@
1SECTION = "base"
2DESCRIPTION = "eeePC specific ACPI scripts" 1DESCRIPTION = "eeePC specific ACPI scripts"
2HOMEPAGE = "http://alioth.debian.org/projects/debian-eeepc/"
3SECTION = "base"
4
3LICENSE="GPL" 5LICENSE="GPL"
6LIC_FILES_CHKSUM = "file://debian/copyright;md5=77ef83ab5f4af938a93edb61f7b74f2c"
4 7
5PV = "0.0+git${SRCREV}" 8PV = "1.1.11+git${SRCREV}"
6PR = "r3" 9PR = "r3"
7 10
8RDEPENDS = "pm-utils" 11RDEPENDS = "pm-utils"
@@ -23,13 +26,13 @@ do_install () {
23 install -d ${D}${sysconfdir}/default/ 26 install -d ${D}${sysconfdir}/default/
24 install -d ${D}${sysconfdir}/acpi/actions/ 27 install -d ${D}${sysconfdir}/acpi/actions/
25 install -d ${D}${sysconfdir}/acpi/events/ 28 install -d ${D}${sysconfdir}/acpi/events/
26 install -d ${D}${sysconfdir}/acpi/lib/ 29 install -d ${D}${sysconfdir}/acpi/lib/udev/rules.d
27 install -d ${D}${datadir}/eeepc-acpi-scripts/ 30 install -d ${D}${datadir}/eeepc-acpi-scripts/
28 install -d ${D}${datadir}/acpi-support/ 31 install -d ${D}${datadir}/acpi-support/
29 install -m 644 ${S}/events/* ${D}${sysconfdir}/acpi/events/ 32 install -m 644 ${S}/events/* ${D}${sysconfdir}/acpi/events/
30 install -m 644 ${S}/lib/* ${D}${sysconfdir}/acpi/lib/ 33 install -m 644 ${S}/lib/udev/rules.d/* ${D}${sysconfdir}/acpi/lib/udev/rules.d/
31 install ${S}/actions/* ${D}${sysconfdir}/acpi/actions/ 34 install ${S}/actions/* ${D}${sysconfdir}/acpi/actions/
32 install -m 0644 ${S}/functions.sh ${D}${datadir}/eeepc-acpi-scripts/ 35 install -m 0644 ${S}/acpilib/functions.sh ${D}${datadir}/eeepc-acpi-scripts/
33 install -m 0644 ${WORKDIR}/policy-funcs ${D}${datadir}/acpi-support/ 36 install -m 0644 ${WORKDIR}/policy-funcs ${D}${datadir}/acpi-support/
34 install -m 0644 ${S}/debian/eeepc-acpi-scripts.default ${D}${sysconfdir}/default/ 37 install -m 0644 ${S}/debian/eeepc-acpi-scripts.default* ${D}${sysconfdir}/default/
35} 38}
diff --git a/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch b/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch
index 8f6c4fcaad..3e80b7fddf 100644
--- a/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch
+++ b/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch
@@ -5,56 +5,54 @@
5 actions/volume.sh | 3 --- 5 actions/volume.sh | 3 ---
6 4 files changed, 12 deletions(-) 6 4 files changed, 12 deletions(-)
7 7
8Index: git/actions/hotkey.sh 8Index: git/eeepc-acpi-scripts/hotkey.sh
9=================================================================== 9===================================================================
10--- git.orig/actions/hotkey.sh 2008-09-25 11:00:58.000000000 +0200 10--- git.orig/eeepc-acpi-scripts/hotkey.sh 2010-11-28 16:02:17.000000000 +0800
11+++ git/actions/hotkey.sh 2008-09-25 11:01:04.000000000 +0200 11+++ git/eeepc-acpi-scripts/hotkey.sh 2010-11-28 16:02:44.000000000 +0800
12@@ -1,8 +1,5 @@ 12@@ -1,12 +1,10 @@
13 #!/bin/sh 13 #!/bin/sh
14 14
15 test -d /sys/bus/platform/devices/eeepc || exit 0
15-# do nothing if package is removed 16-# do nothing if package is removed
16-[ -d /usr/share/doc/eeepc-acpi-scripts ] || exit 0 17 PKG=eeepc-acpi-scripts
17- 18 PKG_DIR=/usr/share/acpi-support/$PKG
18 . /etc/default/eeepc-acpi-scripts 19 FUNC_LIB=$PKG_DIR/lib/functions.sh
19 . /usr/share/eeepc-acpi-scripts/functions.sh 20 DEFAULT=/etc/default/$PKG
20 . /etc/acpi/lib/notify.sh 21-[ -e "$FUNC_LIB" ] || exit 0
21Index: git/actions/suspend.sh
22===================================================================
23--- git.orig/actions/suspend.sh 2008-09-25 11:00:32.000000000 +0200
24+++ git/actions/suspend.sh 2008-09-25 11:00:37.000000000 +0200
25@@ -1,8 +1,5 @@
26 #!/bin/sh
27 22
28-# do nothing if package is removed 23 case $(runlevel) in
29-[ -d /usr/share/doc/eeepc-acpi-scripts ] || exit 0 24 *0|*6)
30- 25Index: git/eeepc-acpi-scripts/vga-toggle.sh
31 if (runlevel | grep -q [06]) || (pidof '/sbin/shutdown' > /dev/null); then
32 exit 0
33 fi
34Index: git/actions/vga-toggle.sh
35=================================================================== 26===================================================================
36--- git.orig/actions/vga-toggle.sh 2008-09-25 11:02:00.000000000 +0200 27--- git.orig/eeepc-acpi-scripts/vga-toggle.sh 2010-11-28 16:03:57.000000000 +0800
37+++ git/actions/vga-toggle.sh 2008-09-25 11:02:06.000000000 +0200 28+++ git/eeepc-acpi-scripts/vga-toggle.sh 2010-11-28 16:04:03.000000000 +0800
38@@ -1,8 +1,5 @@ 29@@ -1,12 +1,10 @@
39 #!/bin/sh 30 #!/bin/sh
40 31
32 test -d /sys/bus/platform/devices/eeepc || exit 0
41-# do nothing if package is removed 33-# do nothing if package is removed
42-[ -d /usr/share/doc/eeepc-acpi-scripts ] || exit 0 34 PKG=eeepc-acpi-scripts
43- 35 PKG_DIR=/usr/share/acpi-support/$PKG
44 . /etc/default/eeepc-acpi-scripts 36 FUNC_LIB=$PKG_DIR/lib/functions.sh
37 DEFAULT=/etc/default/$PKG
38-[ -e "$FUNC_LIB" ] || exit 0
45 39
46 # return: 0 on disconnect, 1 on connected vga, 2 else 40 if [ -e "$DEFAULT" ]; then . "$DEFAULT"; fi
47Index: git/actions/volume.sh 41 . $FUNC_LIB
42Index: git/eeepc-acpi-scripts/volume.sh
48=================================================================== 43===================================================================
49--- git.orig/actions/volume.sh 2008-09-25 11:02:13.000000000 +0200 44--- git.orig/eeepc-acpi-scripts/volume.sh 2010-11-28 16:04:34.000000000 +0800
50+++ git/actions/volume.sh 2008-09-25 11:02:19.000000000 +0200 45+++ git/eeepc-acpi-scripts/volume.sh 2010-11-28 16:04:40.000000000 +0800
51@@ -2,9 +2,6 @@ 46@@ -3,12 +3,10 @@
52 47 test -d /sys/bus/platform/devices/eeepc || exit 0
53 # Volume controls 48 # Volume controls
54 49
55-# do nothing if package is removed 50-# do nothing if package is removed
56-[ -d /usr/share/doc/eeepc-acpi-scripts ] || exit 0 51 PKG=eeepc-acpi-scripts
57- 52 PKG_DIR=/usr/share/acpi-support/$PKG
58 . /etc/default/eeepc-acpi-scripts 53 FUNC_LIB=$PKG_DIR/lib/functions.sh
59 . /usr/share/eeepc-acpi-scripts/functions.sh 54 DEFAULT=/etc/default/$PKG
60 . /etc/acpi/lib/notify.sh 55-[ -e "$FUNC_LIB" ] || exit 0
56
57 . $FUNC_LIB
58 . $PKG_DIR/lib/sound.sh