diff options
6 files changed, 0 insertions, 131 deletions
diff --git a/meta/conf/distro/include/distro_alias.inc b/meta/conf/distro/include/distro_alias.inc index 793a1c2f09..7502542e89 100644 --- a/meta/conf/distro/include/distro_alias.inc +++ b/meta/conf/distro/include/distro_alias.inc | |||
@@ -80,7 +80,6 @@ DISTRO_PN_ALIAS_pn-docbook-xml-dtd4-native = "Ubuntu=docbook-xml Fedora=docbook- | |||
80 | DISTRO_PN_ALIAS_pn-docbook-xsl-stylesheets = "Fedora=docbook-xsl-stylesheets Opensuse=docbook-xsl-stylesheets" | 80 | DISTRO_PN_ALIAS_pn-docbook-xsl-stylesheets = "Fedora=docbook-xsl-stylesheets Opensuse=docbook-xsl-stylesheets" |
81 | DISTRO_PN_ALIAS_pn-dropbear = "Debian=dropbear Ubuntu=dropbear" | 81 | DISTRO_PN_ALIAS_pn-dropbear = "Debian=dropbear Ubuntu=dropbear" |
82 | DISTRO_PN_ALIAS_pn-dtc = "Fedora=dtc Ubuntu=dtc" | 82 | DISTRO_PN_ALIAS_pn-dtc = "Fedora=dtc Ubuntu=dtc" |
83 | DISTRO_PN_ALIAS_pn-eee-acpi-scripts = "Debian=eeepc-acpi-scripts Ubuntu=eeepc-acpi-scripts" | ||
84 | DISTRO_PN_ALIAS_pn-eglinfo-fb = "OE-Core" | 83 | DISTRO_PN_ALIAS_pn-eglinfo-fb = "OE-Core" |
85 | DISTRO_PN_ALIAS_pn-eglinfo-x11 = "OE-Core" | 84 | DISTRO_PN_ALIAS_pn-eglinfo-x11 = "OE-Core" |
86 | DISTRO_PN_ALIAS_pn-encodings = "Ubuntu=xfonts-encodings Mandriva=x11-font-encodings Debian=xfonts-encodings" | 85 | DISTRO_PN_ALIAS_pn-encodings = "Ubuntu=xfonts-encodings Mandriva=x11-font-encodings Debian=xfonts-encodings" |
diff --git a/meta/conf/distro/include/maintainers.inc b/meta/conf/distro/include/maintainers.inc index 4ec3c20b3b..2ecc3d61e3 100644 --- a/meta/conf/distro/include/maintainers.inc +++ b/meta/conf/distro/include/maintainers.inc | |||
@@ -142,7 +142,6 @@ RECIPE_MAINTAINER_pn-dtc = "Alexander Kanavin <alex.kanavin@gmail.com>" | |||
142 | RECIPE_MAINTAINER_pn-dwarfsrcfiles = "Alexander Kanavin <alex.kanavin@gmail.com>" | 142 | RECIPE_MAINTAINER_pn-dwarfsrcfiles = "Alexander Kanavin <alex.kanavin@gmail.com>" |
143 | RECIPE_MAINTAINER_pn-e2fsprogs = "Robert Yang <liezhi.yang@windriver.com>" | 143 | RECIPE_MAINTAINER_pn-e2fsprogs = "Robert Yang <liezhi.yang@windriver.com>" |
144 | RECIPE_MAINTAINER_pn-ed = "Alexander Kanavin <alex.kanavin@gmail.com>" | 144 | RECIPE_MAINTAINER_pn-ed = "Alexander Kanavin <alex.kanavin@gmail.com>" |
145 | RECIPE_MAINTAINER_pn-eee-acpi-scripts = "Alexander Kanavin <alex.kanavin@gmail.com>" | ||
146 | RECIPE_MAINTAINER_pn-eglinfo-fb = "Alexander Kanavin <alex.kanavin@gmail.com>" | 145 | RECIPE_MAINTAINER_pn-eglinfo-fb = "Alexander Kanavin <alex.kanavin@gmail.com>" |
147 | RECIPE_MAINTAINER_pn-eglinfo-x11 = "Alexander Kanavin <alex.kanavin@gmail.com>" | 146 | RECIPE_MAINTAINER_pn-eglinfo-x11 = "Alexander Kanavin <alex.kanavin@gmail.com>" |
148 | RECIPE_MAINTAINER_pn-elfutils = "Hongxu Jia <hongxu.jia@windriver.com>" | 147 | RECIPE_MAINTAINER_pn-elfutils = "Hongxu Jia <hongxu.jia@windriver.com>" |
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 deleted file mode 100644 index c2a02aadbb..0000000000 --- a/meta/recipes-bsp/eee-acpi-scripts/eee-acpi-scripts_git.bb +++ /dev/null | |||
@@ -1,39 +0,0 @@ | |||
1 | SUMMARY = "eeePC specific ACPI scripts" | ||
2 | HOMEPAGE = "http://alioth.debian.org/projects/debian-eeepc/" | ||
3 | SECTION = "base" | ||
4 | |||
5 | LICENSE = "GPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://debian/copyright;md5=77ef83ab5f4af938a93edb61f7b74f2c" | ||
7 | |||
8 | SRCREV = "9d4cdedca25b396405f8587f9c4fbf8229e041c2" | ||
9 | PV = "1.1.12+git${SRCPV}" | ||
10 | |||
11 | SRC_URI = "git://git.debian.org/git/debian-eeepc/eeepc-acpi-scripts.git \ | ||
12 | file://remove-doc-check.patch \ | ||
13 | file://powerbtn.patch \ | ||
14 | file://policy-funcs " | ||
15 | |||
16 | S = "${WORKDIR}/git" | ||
17 | |||
18 | FILES_${PN} = "${datadir}/acpi-support/ \ | ||
19 | ${datadir}/eeepc-acpi-scripts \ | ||
20 | ${sysconfdir}/default/ \ | ||
21 | ${sysconfdir}/acpi/" | ||
22 | |||
23 | do_install () { | ||
24 | install -d ${D}${sysconfdir}/default/ | ||
25 | install -d ${D}${sysconfdir}/acpi/actions/ | ||
26 | install -d ${D}${sysconfdir}/acpi/events/ | ||
27 | install -d ${D}${sysconfdir}/acpi/lib/udev/rules.d | ||
28 | install -d ${D}${datadir}/eeepc-acpi-scripts/ | ||
29 | install -d ${D}${datadir}/acpi-support/ | ||
30 | install -m 644 ${S}/events/* ${D}${sysconfdir}/acpi/events/ | ||
31 | install -m 644 ${S}/lib/udev/rules.d/* ${D}${sysconfdir}/acpi/lib/udev/rules.d/ | ||
32 | install ${S}/actions/* ${D}${sysconfdir}/acpi/actions/ | ||
33 | install -m 0644 ${S}/acpilib/functions.sh ${D}${datadir}/eeepc-acpi-scripts/ | ||
34 | install -m 0644 ${WORKDIR}/policy-funcs ${D}${datadir}/acpi-support/ | ||
35 | install -m 0644 ${S}/debian/eeepc-acpi-scripts.default* ${D}${sysconfdir}/default/ | ||
36 | } | ||
37 | |||
38 | RDEPENDS_${PN} = "pm-utils" | ||
39 | |||
diff --git a/meta/recipes-bsp/eee-acpi-scripts/files/policy-funcs b/meta/recipes-bsp/eee-acpi-scripts/files/policy-funcs deleted file mode 100644 index fd099df0d8..0000000000 --- a/meta/recipes-bsp/eee-acpi-scripts/files/policy-funcs +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | CheckPolicy() { | ||
2 | if pidof gnome-power-manager kpowersave > /dev/null || | ||
3 | (pidof dcopserver > /dev/null && test -x /usr/bin/dcop && /usr/bin/dcop kded kded loadedModules | grep -q klaptopdaemon) ; then | ||
4 | echo 0; | ||
5 | else | ||
6 | echo 1; | ||
7 | fi | ||
8 | } | ||
diff --git a/meta/recipes-bsp/eee-acpi-scripts/files/powerbtn.patch b/meta/recipes-bsp/eee-acpi-scripts/files/powerbtn.patch deleted file mode 100644 index 403e5569b8..0000000000 --- a/meta/recipes-bsp/eee-acpi-scripts/files/powerbtn.patch +++ /dev/null | |||
@@ -1,22 +0,0 @@ | |||
1 | --- | ||
2 | actions/power.sh | 3 +++ | ||
3 | events/powerbtn | 2 ++ | ||
4 | 2 files changed, 5 insertions(+) | ||
5 | |||
6 | Upstream-Status: Inappropriate [enable feature] | ||
7 | |||
8 | Index: git/events/powerbtn | ||
9 | =================================================================== | ||
10 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
11 | +++ git/events/powerbtn 2008-10-08 17:43:35.000000000 +0200 | ||
12 | @@ -0,0 +1,2 @@ | ||
13 | +event=button/power PWRF | ||
14 | +action=/etc/acpi/actions/power.sh | ||
15 | Index: git/actions/power.sh | ||
16 | =================================================================== | ||
17 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
18 | +++ git/actions/power.sh 2008-10-08 17:45:26.000000000 +0200 | ||
19 | @@ -0,0 +1,3 @@ | ||
20 | +#!/bin/sh | ||
21 | + | ||
22 | +/sbin/shutdown -h now "Power button pressed" | ||
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 deleted file mode 100644 index efb3dca7ac..0000000000 --- a/meta/recipes-bsp/eee-acpi-scripts/files/remove-doc-check.patch +++ /dev/null | |||
@@ -1,60 +0,0 @@ | |||
1 | --- | ||
2 | actions/hotkey.sh | 3 --- | ||
3 | actions/suspend.sh | 3 --- | ||
4 | actions/vga-toggle.sh | 3 --- | ||
5 | actions/volume.sh | 3 --- | ||
6 | 4 files changed, 12 deletions(-) | ||
7 | |||
8 | Upstream-Status: Inappropriate [configuration] | ||
9 | |||
10 | Index: git/eeepc-acpi-scripts/volume.sh | ||
11 | =================================================================== | ||
12 | --- git.orig/eeepc-acpi-scripts/volume.sh 2011-11-29 19:21:55.000000000 +0800 | ||
13 | +++ git/eeepc-acpi-scripts/volume.sh 2011-11-29 19:41:36.000000000 +0800 | ||
14 | @@ -3,12 +3,10 @@ | ||
15 | [ -d /sys/devices/platform/eeepc ] || [ -d /sys/devices/platform/eeepc-wmi ] || exit 0 | ||
16 | # Volume controls | ||
17 | |||
18 | -# do nothing if package is removed | ||
19 | PKG=eeepc-acpi-scripts | ||
20 | PKG_DIR=/usr/share/acpi-support/$PKG | ||
21 | FUNC_LIB=$PKG_DIR/lib/functions.sh | ||
22 | DEFAULT=/etc/default/$PKG | ||
23 | -[ -e "$FUNC_LIB" ] || exit 0 | ||
24 | |||
25 | . $FUNC_LIB | ||
26 | . $PKG_DIR/lib/sound.sh | ||
27 | Index: git/eeepc-acpi-scripts/hotkey.sh | ||
28 | =================================================================== | ||
29 | --- git.orig/eeepc-acpi-scripts/hotkey.sh 2011-11-29 19:21:55.000000000 +0800 | ||
30 | +++ git/eeepc-acpi-scripts/hotkey.sh 2011-11-29 19:39:51.000000000 +0800 | ||
31 | @@ -1,12 +1,10 @@ | ||
32 | #!/bin/sh | ||
33 | |||
34 | [ -d /sys/devices/platform/eeepc ] || [ -d /sys/devices/platform/eeepc-wmi ] || exit 0 | ||
35 | -# do nothing if package is removed | ||
36 | PKG=eeepc-acpi-scripts | ||
37 | PKG_DIR=/usr/share/acpi-support/$PKG | ||
38 | FUNC_LIB=$PKG_DIR/lib/functions.sh | ||
39 | DEFAULT=/etc/default/$PKG | ||
40 | -[ -e "$FUNC_LIB" ] || exit 0 | ||
41 | |||
42 | case $(runlevel) in | ||
43 | *0|*6) | ||
44 | Index: git/eeepc-acpi-scripts/vga-toggle.sh | ||
45 | =================================================================== | ||
46 | --- git.orig/eeepc-acpi-scripts/vga-toggle.sh 2011-11-29 19:21:55.000000000 +0800 | ||
47 | +++ git/eeepc-acpi-scripts/vga-toggle.sh 2011-11-29 19:40:24.000000000 +0800 | ||
48 | @@ -1,12 +1,10 @@ | ||
49 | #!/bin/sh | ||
50 | |||
51 | [ -d /sys/devices/platform/eeepc ] || [ -d /sys/devices/platform/eeepc-wmi ] || exit 0 | ||
52 | -# do nothing if package is removed | ||
53 | PKG=eeepc-acpi-scripts | ||
54 | PKG_DIR=/usr/share/acpi-support/$PKG | ||
55 | FUNC_LIB=$PKG_DIR/lib/functions.sh | ||
56 | DEFAULT=/etc/default/$PKG | ||
57 | -[ -e "$FUNC_LIB" ] || exit 0 | ||
58 | |||
59 | if [ -e "$DEFAULT" ]; then . "$DEFAULT"; fi | ||
60 | . $FUNC_LIB | ||