diff options
author | James Meyer <james.meyer@operamail.com> | 2010-10-23 18:17:40 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2010-10-23 18:19:39 (GMT) |
commit | adbcf19958300e9b6598990184c8815b945ba0ee (patch) | |
tree | f4283c850ac0ac202c17e78a637ee7ca8147621b /abs/core/hal/hal-remove-dell-killswitch.patch | |
parent | 61a68250df10d29b624650948484898334ff22d0 (diff) | |
download | linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.zip linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.gz linhes_pkgbuild-adbcf19958300e9b6598990184c8815b945ba0ee.tar.bz2 |
Removed old core and extra from repo. Renamed -testing to core/extra. This will setup the base for the testing branch.
Diffstat (limited to 'abs/core/hal/hal-remove-dell-killswitch.patch')
-rw-r--r-- | abs/core/hal/hal-remove-dell-killswitch.patch | 201 |
1 files changed, 201 insertions, 0 deletions
diff --git a/abs/core/hal/hal-remove-dell-killswitch.patch b/abs/core/hal/hal-remove-dell-killswitch.patch new file mode 100644 index 0000000..ae0cf7a --- /dev/null +++ b/abs/core/hal/hal-remove-dell-killswitch.patch @@ -0,0 +1,201 @@ +diff -upr hal-0.5.12/tools/linux/hal-system-killswitch-get-power-linux hal-0.5.12.new/tools/linux/hal-system-killswitch-get-power-linux +--- hal-0.5.12/tools/linux/hal-system-killswitch-get-power-linux 2008-08-22 07:34:47.000000000 +0100 ++++ hal-0.5.12.new/tools/linux/hal-system-killswitch-get-power-linux 2009-03-03 10:45:20.000000000 +0000 +@@ -8,11 +8,6 @@ + # the Free Software Foundation; either version 2 of the License, or + # (at your option) any later version. + +-DELL_WCTL=/usr/bin/dellWirelessCtl +-if [ -x "/usr/sbin/dellWirelessCtl" ]; then +- DELL_WCTL=/usr/sbin/dellWirelessCtl +-fi +- + if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then + if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then + value="`hal-system-sonypic getbluetooth`" +@@ -22,25 +17,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue + exit 1 + fi + exit ${value} +- elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then +- if [ -x "$DELL_WCTL" ]; then +- # TODO: write our own binary that links with libsmbios? +- $DELL_WCTL --st_bt +- value=$? +- if [ "$value" = "0" ]; then +- exit 1 +- elif [ "$value" = "1" ]; then +- exit 0 +- else +- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 +- echo "dellWirelessCtl returned $value" >&2 +- exit 1 +- fi +- else +- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 +- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 +- exit 1 +- fi + elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -r "$HAL_PROP_LINUX_SYSFS_PATH" ]; then + read value < $HAL_PROP_LINUX_SYSFS_PATH 2> /dev/null + if [ $? -eq 0 ]; then +@@ -55,56 +31,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue + echo "Access type not supported" >&2 + exit 1 + fi +-elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then +- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then +- if [ -x "$DELL_WCTL" ]; then +- # TODO: write our own binary that links with libsmbios? +- $DELL_WCTL --st_wlan +- value=$? +- if [ "$value" = "0" ]; then +- exit 1 +- elif [ "$value" = "1" ]; then +- exit 0 +- else +- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 +- echo "dellWirelessCtl returned $value" >&2 +- exit 1 +- fi +- else +- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 +- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 +- exit 1 +- fi +- else +- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 +- echo "Access type not supported" >&2 +- exit 1 +- fi +-elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then +- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then +- if [ -x "$DELL_WCTL" ]; then +- # TODO: write our own binary that links with libsmbios? +- $DELL_WCTL --st_wwan +- value=$? +- if [ "$value" = "0" ]; then +- exit 1 +- elif [ "$value" = "1" ]; then +- exit 0 +- else +- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 +- echo "dellWirelessCtl returned $value" >&2 +- exit 1 +- fi +- else +- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 +- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 +- exit 1 +- fi +- else +- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 +- echo "Access type not supported" >&2 +- exit 1 +- fi + else + echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 + echo "Killswitch type not supported" >&2 +diff -upr hal-0.5.12/tools/linux/hal-system-killswitch-set-power-linux hal-0.5.12.new/tools/linux/hal-system-killswitch-set-power-linux +--- hal-0.5.12/tools/linux/hal-system-killswitch-set-power-linux 2008-10-24 09:45:54.000000000 +0100 ++++ hal-0.5.12.new/tools/linux/hal-system-killswitch-set-power-linux 2009-03-03 10:44:49.000000000 +0000 +@@ -8,11 +8,6 @@ + # the Free Software Foundation; either version 2 of the License, or + # (at your option) any later version. + +-DELL_WCTL=/usr/bin/dellWirelessCtl +-if [ -x "/usr/sbin/dellWirelessCtl" ]; then +- DELL_WCTL=/usr/sbin/dellWirelessCtl +-fi +- + if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then + if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then + hal-system-sonypic setbluetooth $value +@@ -23,26 +18,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue + exit 1 + fi + exit 0 +- elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then +- if [ -x "$DELL_WCTL" ]; then +- # TODO: write our own binary that links with libsmbios? +- if [ "$value" = "true" ]; then +- $DELL_WCTL --bt 1 +- ret=$? +- else +- $DELL_WCTL --bt 0 +- ret=$? +- fi +- if [ "$ret" != "0" ]; then +- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 +- echo "dellWirelessCtl returned $ret" >&2 +- exit 1 +- fi +- else +- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 +- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 +- exit 1 +- fi + elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = thinkpad -a -w "$HAL_PROP_LINUX_SYSFS_PATH" ]; then + if [ "$value" = "true" ]; then + bit=1; +@@ -61,60 +36,6 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "blue + echo "Access type not supported" >&2 + exit 1 + fi +-elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then +- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then +- if [ -x "$DELL_WCTL" ]; then +- # As a side effect we disable the physical kill switch +- # TODO: write our own binary that links with libsmbios? +- if [ "$value" = "true" ]; then +- $DELL_WCTL --sw_wlan 0 --wlan 1 +- ret=$? +- else +- $DELL_WCTL --sw_wlan 0 --wlan 0 +- ret=$? +- fi +- if [ "$ret" != "0" ]; then +- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 +- echo "dellWirelessCtl returned $ret" >&2 +- exit 1 +- fi +- else +- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 +- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 +- exit 1 +- fi +- else +- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 +- echo "Access type not supported" >&2 +- exit 1 +- fi +-elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wwan" ]; then +- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then +- if [ -x "$DELL_WCTL" ]; then +- # As a side effect we disable the physical kill switch +- # TODO: write our own binary that links with libsmbios? +- if [ "$value" = "true" ]; then +- $DELL_WCTL --sw_wwan 0 --wwan 1 +- ret=$? +- else +- $DELL_WCTL --sw_wwan 0 --wwan 0 +- ret=$? +- fi +- if [ "$ret" != "0" ]; then +- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 +- echo "dellWirelessCtl returned $ret" >&2 +- exit 1 +- fi +- else +- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 +- echo "dellWirelessCtl ($DELL_WCTL) not available or executable" >&2 +- exit 1 +- fi +- else +- echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 +- echo "Access type not supported" >&2 +- exit 1 +- fi + else + echo "org.freedesktop.Hal.Device.KillSwitch.NotSupported" >&2 + echo "Killswitch type not supported" >&2 |