diff options
author | Zhai Edwin <edwin.zhai@intel.com> | 2011-11-30 07:24:18 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-11-30 22:18:10 +0000 |
commit | e4ba78ff1c8d4099c66492ea385f1e8edd289c65 (patch) | |
tree | bf3d504e8d55c42f7c4726dc8c17e5f9c6ff2f4a /meta/recipes-bsp | |
parent | 961ee2fc8debcd8a1488c532f1ca6070fde9529a (diff) | |
download | poky-e4ba78ff1c8d4099c66492ea385f1e8edd289c65.tar.gz |
eee-acpi-scritps: Upgrade to 1.1.12 via git tag
(From OE-Core rev: ba6441316651ba1739f7e827b46653f78c099721)
Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-bsp')
-rw-r--r-- | meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb | 6 | ||||
-rw-r--r-- | meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch | 42 |
2 files changed, 24 insertions, 24 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 b721bb5c11..244cd941df 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 | |||
@@ -5,9 +5,9 @@ SECTION = "base" | |||
5 | LICENSE="GPL" | 5 | LICENSE="GPL" |
6 | LIC_FILES_CHKSUM = "file://debian/copyright;md5=77ef83ab5f4af938a93edb61f7b74f2c" | 6 | LIC_FILES_CHKSUM = "file://debian/copyright;md5=77ef83ab5f4af938a93edb61f7b74f2c" |
7 | 7 | ||
8 | SRCREV = "e224937ba51165e2a52252f9a113c8a82c01bb36" | 8 | SRCREV = "9d4cdedca25b396405f8587f9c4fbf8229e041c2" |
9 | PV = "1.1.11+git${SRCPV}" | 9 | PV = "1.1.12+git${SRCPV}" |
10 | PR = "r4" | 10 | PR = "r0" |
11 | 11 | ||
12 | RDEPENDS_${PN} = "pm-utils" | 12 | RDEPENDS_${PN} = "pm-utils" |
13 | 13 | ||
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 fc2c29120b..efb3dca7ac 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 | |||
@@ -7,14 +7,14 @@ | |||
7 | 7 | ||
8 | Upstream-Status: Inappropriate [configuration] | 8 | Upstream-Status: Inappropriate [configuration] |
9 | 9 | ||
10 | Index: git/eeepc-acpi-scripts/hotkey.sh | 10 | Index: git/eeepc-acpi-scripts/volume.sh |
11 | =================================================================== | 11 | =================================================================== |
12 | --- git.orig/eeepc-acpi-scripts/hotkey.sh 2010-11-28 16:02:17.000000000 +0800 | 12 | --- git.orig/eeepc-acpi-scripts/volume.sh 2011-11-29 19:21:55.000000000 +0800 |
13 | +++ git/eeepc-acpi-scripts/hotkey.sh 2010-11-28 16:02:44.000000000 +0800 | 13 | +++ git/eeepc-acpi-scripts/volume.sh 2011-11-29 19:41:36.000000000 +0800 |
14 | @@ -1,12 +1,10 @@ | 14 | @@ -3,12 +3,10 @@ |
15 | #!/bin/sh | 15 | [ -d /sys/devices/platform/eeepc ] || [ -d /sys/devices/platform/eeepc-wmi ] || exit 0 |
16 | # Volume controls | ||
16 | 17 | ||
17 | test -d /sys/bus/platform/devices/eeepc || exit 0 | ||
18 | -# do nothing if package is removed | 18 | -# do nothing if package is removed |
19 | PKG=eeepc-acpi-scripts | 19 | PKG=eeepc-acpi-scripts |
20 | PKG_DIR=/usr/share/acpi-support/$PKG | 20 | PKG_DIR=/usr/share/acpi-support/$PKG |
@@ -22,16 +22,16 @@ Index: git/eeepc-acpi-scripts/hotkey.sh | |||
22 | DEFAULT=/etc/default/$PKG | 22 | DEFAULT=/etc/default/$PKG |
23 | -[ -e "$FUNC_LIB" ] || exit 0 | 23 | -[ -e "$FUNC_LIB" ] || exit 0 |
24 | 24 | ||
25 | case $(runlevel) in | 25 | . $FUNC_LIB |
26 | *0|*6) | 26 | . $PKG_DIR/lib/sound.sh |
27 | Index: git/eeepc-acpi-scripts/vga-toggle.sh | 27 | Index: git/eeepc-acpi-scripts/hotkey.sh |
28 | =================================================================== | 28 | =================================================================== |
29 | --- git.orig/eeepc-acpi-scripts/vga-toggle.sh 2010-11-28 16:03:57.000000000 +0800 | 29 | --- git.orig/eeepc-acpi-scripts/hotkey.sh 2011-11-29 19:21:55.000000000 +0800 |
30 | +++ git/eeepc-acpi-scripts/vga-toggle.sh 2010-11-28 16:04:03.000000000 +0800 | 30 | +++ git/eeepc-acpi-scripts/hotkey.sh 2011-11-29 19:39:51.000000000 +0800 |
31 | @@ -1,12 +1,10 @@ | 31 | @@ -1,12 +1,10 @@ |
32 | #!/bin/sh | 32 | #!/bin/sh |
33 | 33 | ||
34 | test -d /sys/bus/platform/devices/eeepc || exit 0 | 34 | [ -d /sys/devices/platform/eeepc ] || [ -d /sys/devices/platform/eeepc-wmi ] || exit 0 |
35 | -# do nothing if package is removed | 35 | -# do nothing if package is removed |
36 | PKG=eeepc-acpi-scripts | 36 | PKG=eeepc-acpi-scripts |
37 | PKG_DIR=/usr/share/acpi-support/$PKG | 37 | PKG_DIR=/usr/share/acpi-support/$PKG |
@@ -39,16 +39,16 @@ Index: git/eeepc-acpi-scripts/vga-toggle.sh | |||
39 | DEFAULT=/etc/default/$PKG | 39 | DEFAULT=/etc/default/$PKG |
40 | -[ -e "$FUNC_LIB" ] || exit 0 | 40 | -[ -e "$FUNC_LIB" ] || exit 0 |
41 | 41 | ||
42 | if [ -e "$DEFAULT" ]; then . "$DEFAULT"; fi | 42 | case $(runlevel) in |
43 | . $FUNC_LIB | 43 | *0|*6) |
44 | Index: git/eeepc-acpi-scripts/volume.sh | 44 | Index: git/eeepc-acpi-scripts/vga-toggle.sh |
45 | =================================================================== | 45 | =================================================================== |
46 | --- git.orig/eeepc-acpi-scripts/volume.sh 2010-11-28 16:04:34.000000000 +0800 | 46 | --- git.orig/eeepc-acpi-scripts/vga-toggle.sh 2011-11-29 19:21:55.000000000 +0800 |
47 | +++ git/eeepc-acpi-scripts/volume.sh 2010-11-28 16:04:40.000000000 +0800 | 47 | +++ git/eeepc-acpi-scripts/vga-toggle.sh 2011-11-29 19:40:24.000000000 +0800 |
48 | @@ -3,12 +3,10 @@ | 48 | @@ -1,12 +1,10 @@ |
49 | test -d /sys/bus/platform/devices/eeepc || exit 0 | 49 | #!/bin/sh |
50 | # Volume controls | ||
51 | 50 | ||
51 | [ -d /sys/devices/platform/eeepc ] || [ -d /sys/devices/platform/eeepc-wmi ] || exit 0 | ||
52 | -# do nothing if package is removed | 52 | -# do nothing if package is removed |
53 | PKG=eeepc-acpi-scripts | 53 | PKG=eeepc-acpi-scripts |
54 | PKG_DIR=/usr/share/acpi-support/$PKG | 54 | PKG_DIR=/usr/share/acpi-support/$PKG |
@@ -56,5 +56,5 @@ Index: git/eeepc-acpi-scripts/volume.sh | |||
56 | DEFAULT=/etc/default/$PKG | 56 | DEFAULT=/etc/default/$PKG |
57 | -[ -e "$FUNC_LIB" ] || exit 0 | 57 | -[ -e "$FUNC_LIB" ] || exit 0 |
58 | 58 | ||
59 | if [ -e "$DEFAULT" ]; then . "$DEFAULT"; fi | ||
59 | . $FUNC_LIB | 60 | . $FUNC_LIB |
60 | . $PKG_DIR/lib/sound.sh | ||