mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-06-02 13:29:49 +00:00
Code Issues Projects Releases Wiki Activity

eee-acpi-scripts: Update to 1.1.11

Browse Source 
Rebased remove-doc-check.patch

Signed-off-by: Zhai Edwin <edwin.zhai@intel.com>
This commit is contained in:
Zhai Edwin
2010-11-28 15:48:25 +08:00
committed by Richard Purdie
parent 587873796d
commit beb4b515ee
3 changed files with 50 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/conf/distro/include/poky-default-revisions.inc
+1 -1
View File
@@ -35,7 +35,7 @@ SRCREV_pn-dtc ??= "73dca9ae0b9abe6924ba640164ecce9f8df69c5a"
SRCREV_pn-dtc-native ??= "73dca9ae0b9abe6924ba640164ecce9f8df69c5a" SRCREV_pn-dtc-native ??= "73dca9ae0b9abe6924ba640164ecce9f8df69c5a"
SRCREV_pn-eds-dbus ??= "7337d11aed576e7caaa12b4e881ad8d33668799f" SRCREV_pn-eds-dbus ??= "7337d11aed576e7caaa12b4e881ad8d33668799f"
SRCREV_pn-eds-tools ??= "2008-02-04" SRCREV_pn-eds-tools ??= "2008-02-04"
SRCREV_pn-eee-acpi-scripts ??= "df785afdacedf869b20fb88a793c13b539819270" SRCREV_pn-eee-acpi-scripts ??= "e224937ba51165e2a52252f9a113c8a82c01bb36"
EGLIBCREV = "11982" EGLIBCREV = "11982"
SRCREV_pn-eglibc ??= "${EGLIBCREV}" SRCREV_pn-eglibc ??= "${EGLIBCREV}"
SRCREV_pn-eglibc-initial ??= "${EGLIBCREV}" SRCREV_pn-eglibc-initial ??= "${EGLIBCREV}"
meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb
+10 -7
View File
@@ -1,8 +1,11 @@
SECTION = "base"
DESCRIPTION = "eeePC specific ACPI scripts" DESCRIPTION = "eeePC specific ACPI scripts"
LICENSE="GPL" HOMEPAGE = "http://alioth.debian.org/projects/debian-eeepc/"
SECTION = "base"
PV = "0.0+git${SRCREV}" LICENSE="GPL"
LIC_FILES_CHKSUM = "file://debian/copyright;md5=77ef83ab5f4af938a93edb61f7b74f2c"
PV = "1.1.11+git${SRCREV}"
PR = "r3" PR = "r3"
RDEPENDS = "pm-utils" RDEPENDS = "pm-utils"
@@ -23,13 +26,13 @@ do_install () {
install -d ${D}${sysconfdir}/default/ install -d ${D}${sysconfdir}/default/
install -d ${D}${sysconfdir}/acpi/actions/ install -d ${D}${sysconfdir}/acpi/actions/
install -d ${D}${sysconfdir}/acpi/events/ install -d ${D}${sysconfdir}/acpi/events/
install -d ${D}${sysconfdir}/acpi/lib/ install -d ${D}${sysconfdir}/acpi/lib/udev/rules.d
install -d ${D}${datadir}/eeepc-acpi-scripts/ install -d ${D}${datadir}/eeepc-acpi-scripts/
install -d ${D}${datadir}/acpi-support/ install -d ${D}${datadir}/acpi-support/
install -m 644 ${S}/events/* ${D}${sysconfdir}/acpi/events/ install -m 644 ${S}/events/* ${D}${sysconfdir}/acpi/events/
install -m 644 ${S}/lib/* ${D}${sysconfdir}/acpi/lib/ install -m 644 ${S}/lib/udev/rules.d/* ${D}${sysconfdir}/acpi/lib/udev/rules.d/
install ${S}/actions/* ${D}${sysconfdir}/acpi/actions/ install ${S}/actions/* ${D}${sysconfdir}/acpi/actions/
install -m 0644 ${S}/functions.sh ${D}${datadir}/eeepc-acpi-scripts/ install -m 0644 ${S}/acpilib/functions.sh ${D}${datadir}/eeepc-acpi-scripts/
install -m 0644 ${WORKDIR}/policy-funcs ${D}${datadir}/acpi-support/ install -m 0644 ${WORKDIR}/policy-funcs ${D}${datadir}/acpi-support/
install -m 0644 ${S}/debian/eeepc-acpi-scripts.default ${D}${sysconfdir}/default/ install -m 0644 ${S}/debian/eeepc-acpi-scripts.default* ${D}${sysconfdir}/default/
} }
meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch
+39 -41
View File
@@ -5,56 +5,54 @@
actions/volume.sh | 3 --- actions/volume.sh | 3 ---
4 files changed, 12 deletions(-) 4 files changed, 12 deletions(-)
Index: git/actions/hotkey.sh Index: git/eeepc-acpi-scripts/hotkey.sh
=================================================================== ===================================================================
--- git.orig/actions/hotkey.sh 2008-09-25 11:00:58.000000000 +0200 --- git.orig/eeepc-acpi-scripts/hotkey.sh 2010-11-28 16:02:17.000000000 +0800
+++ git/actions/hotkey.sh 2008-09-25 11:01:04.000000000 +0200 +++ git/eeepc-acpi-scripts/hotkey.sh 2010-11-28 16:02:44.000000000 +0800
@@ -1,8 +1,5 @@ @@ -1,12 +1,10 @@
#!/bin/sh #!/bin/sh
test -d /sys/bus/platform/devices/eeepc || exit 0
-# do nothing if package is removed -# do nothing if package is removed
-[ -d /usr/share/doc/eeepc-acpi-scripts ] || exit 0 PKG=eeepc-acpi-scripts
- PKG_DIR=/usr/share/acpi-support/$PKG
. /etc/default/eeepc-acpi-scripts FUNC_LIB=$PKG_DIR/lib/functions.sh
. /usr/share/eeepc-acpi-scripts/functions.sh DEFAULT=/etc/default/$PKG
. /etc/acpi/lib/notify.sh -[ -e "$FUNC_LIB" ] || exit 0
Index: git/actions/suspend.sh
case $(runlevel) in
*0|*6)
Index: git/eeepc-acpi-scripts/vga-toggle.sh
=================================================================== ===================================================================
--- git.orig/actions/suspend.sh 2008-09-25 11:00:32.000000000 +0200 --- git.orig/eeepc-acpi-scripts/vga-toggle.sh 2010-11-28 16:03:57.000000000 +0800
+++ git/actions/suspend.sh 2008-09-25 11:00:37.000000000 +0200 +++ git/eeepc-acpi-scripts/vga-toggle.sh 2010-11-28 16:04:03.000000000 +0800
@@ -1,8 +1,5 @@ @@ -1,12 +1,10 @@
#!/bin/sh #!/bin/sh
test -d /sys/bus/platform/devices/eeepc || exit 0
-# do nothing if package is removed -# do nothing if package is removed
-[ -d /usr/share/doc/eeepc-acpi-scripts ] || exit 0 PKG=eeepc-acpi-scripts
- PKG_DIR=/usr/share/acpi-support/$PKG
if (runlevel | grep -q [06]) || (pidof '/sbin/shutdown' > /dev/null); then FUNC_LIB=$PKG_DIR/lib/functions.sh
exit 0 DEFAULT=/etc/default/$PKG
fi -[ -e "$FUNC_LIB" ] || exit 0
Index: git/actions/vga-toggle.sh
if [ -e "$DEFAULT" ]; then . "$DEFAULT"; fi
. $FUNC_LIB
Index: git/eeepc-acpi-scripts/volume.sh
=================================================================== ===================================================================
--- git.orig/actions/vga-toggle.sh 2008-09-25 11:02:00.000000000 +0200 --- git.orig/eeepc-acpi-scripts/volume.sh 2010-11-28 16:04:34.000000000 +0800
+++ git/actions/vga-toggle.sh 2008-09-25 11:02:06.000000000 +0200 +++ git/eeepc-acpi-scripts/volume.sh 2010-11-28 16:04:40.000000000 +0800
@@ -1,8 +1,5 @@ @@ -3,12 +3,10 @@
#!/bin/sh test -d /sys/bus/platform/devices/eeepc || exit 0
-# do nothing if package is removed
-[ -d /usr/share/doc/eeepc-acpi-scripts ] || exit 0
-
. /etc/default/eeepc-acpi-scripts
# return: 0 on disconnect, 1 on connected vga, 2 else
Index: git/actions/volume.sh
===================================================================
--- git.orig/actions/volume.sh 2008-09-25 11:02:13.000000000 +0200
+++ git/actions/volume.sh 2008-09-25 11:02:19.000000000 +0200
@@ -2,9 +2,6 @@
# Volume controls # Volume controls
-# do nothing if package is removed -# do nothing if package is removed
-[ -d /usr/share/doc/eeepc-acpi-scripts ] || exit 0 PKG=eeepc-acpi-scripts
- PKG_DIR=/usr/share/acpi-support/$PKG
. /etc/default/eeepc-acpi-scripts FUNC_LIB=$PKG_DIR/lib/functions.sh
. /usr/share/eeepc-acpi-scripts/functions.sh DEFAULT=/etc/default/$PKG
. /etc/acpi/lib/notify.sh -[ -e "$FUNC_LIB" ] || exit 0
. $FUNC_LIB
. $PKG_DIR/lib/sound.sh