diff options
Diffstat (limited to 'core/rfkill')
-rw-r--r-- | core/rfkill/PKGBUILD | 30 | ||||
-rw-r--r-- | core/rfkill/conf.d | 20 | ||||
-rwxr-xr-x | core/rfkill/rc.d | 38 | ||||
-rw-r--r-- | core/rfkill/service.block | 2 | ||||
-rw-r--r-- | core/rfkill/service.unblock | 2 |
5 files changed, 13 insertions, 79 deletions
diff --git a/core/rfkill/PKGBUILD b/core/rfkill/PKGBUILD index 3ac08c05d..b58c7fec7 100644 --- a/core/rfkill/PKGBUILD +++ b/core/rfkill/PKGBUILD @@ -1,29 +1,23 @@ -# $Id: PKGBUILD 175740 2013-01-21 04:49:48Z bisson $ +# $Id: PKGBUILD 186265 2013-05-23 06:41:04Z bisson $ # Maintainer: Gaetan Bisson <bisson@archlinux.org> # Contributor: Thomas Bächler <thomas@archlinux.org> # Contributor: Giovanni Scafora <giovanni@archlinux.org> pkgname=rfkill -pkgver=0.4 -pkgrel=7 +pkgver=0.5 +pkgrel=1 pkgdesc='Tool for enabling and disabling wireless devices' -url='http://linuxwireless.org/en/users/Documentation/rfkill' +url='http://wireless.kernel.org/en/users/Documentation/rfkill' license=('custom') arch=('i686' 'x86_64') -source=("http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2" +source=("https://www.kernel.org/pub/software/network/${pkgname}/${pkgname}-${pkgver}.tar.xz" 'service.unblock' 'service.block' - 'rules.d' - 'conf.d' - 'rc.d') -sha1sums=('fccabf5a272ac2891f24dc35449dc6f4c45ff44b' - '4d0ef151891c32c882dcec8b03ab7204f015d0d1' - 'c44581c4cc19509f53afd0abea1341cc30751fe2' - '6390eaa793b473098aaa11b13c5254d611a4c13a' - 'd969fe927a9fb2926af43a311a7c1fa126fe59a9' - '380af0b002f51543557306ed68a27f0059fd5a6f') - -backup=('etc/conf.d/rfkill') + 'rules.d') +sha1sums=('03025d4ae285c40d5c19ec99ef7b317afda9d900' + '5f4a04a434df2ca28ca6687326c67c1f125aa3d4' + '6cc294af37232469cd5ba63455b571fe258e1cc6' + '6390eaa793b473098aaa11b13c5254d611a4c13a') build() { cd "${srcdir}/${pkgname}-${pkgver}" @@ -32,11 +26,9 @@ build() { package() { cd "${srcdir}/${pkgname}-${pkgver}" - make DESTDIR="${pkgdir}" install + make SBINDIR=/usr/bin DESTDIR="${pkgdir}" install install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" install -Dm644 ../rules.d "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules" install -Dm644 ../service.block "${pkgdir}/usr/lib/systemd/system/rfkill-block@.service" install -Dm644 ../service.unblock "${pkgdir}/usr/lib/systemd/system/rfkill-unblock@.service" - install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/rfkill" - install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/rfkill" } diff --git a/core/rfkill/conf.d b/core/rfkill/conf.d deleted file mode 100644 index 4483da26c..000000000 --- a/core/rfkill/conf.d +++ /dev/null @@ -1,20 +0,0 @@ -# -# /etc/conf.d/rfkill -# Configuration for the rfkill startup script -# - -# List of devices to block on startup (space-separated) -RFKILL_BLOCK="" - -# List of devices to unblock on startup (space-separated) -RFKILL_UNBLOCK="all" - -# Supported device names are: all, wifi, bluetooth, umb, wimax, wwan, gps and specific device names like phy0, hci0, ... -# See "rfkill list" for available devices -# Examples: -# -# Block all bluetooth devices: -# RFKILL_BLOCK="bluetooth" -# -# Unblock the phy0 wifi device and all wwan devices: -# RFKILL_UNBLOCK="phy0 wwan" diff --git a/core/rfkill/rc.d b/core/rfkill/rc.d deleted file mode 100755 index ce90ee150..000000000 --- a/core/rfkill/rc.d +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/bash - -. /etc/rc.conf -. /etc/rc.d/functions -. /etc/conf.d/rfkill - -case "$1" in - start) - for device in ${RFKILL_BLOCK}; do - stat_busy "Blocking rfkill device: ${device}" - /usr/sbin/rfkill block ${device} - if [ $? -eq 0 ]; then - stat_done - else - stat_fail - fi - done - for device in ${RFKILL_UNBLOCK}; do - stat_busy "Unblocking rfkill device: ${device}" - /usr/sbin/rfkill unblock ${device} - if [ $? -eq 0 ]; then - stat_done - else - stat_fail - fi - done - ;; - stop) - ;; - restart) - $0 start - ;; - *) - echo "usage: $0 {start}" - exit 1 - ;; -esac -exit 0 diff --git a/core/rfkill/service.block b/core/rfkill/service.block index 420272c5d..ede74d12d 100644 --- a/core/rfkill/service.block +++ b/core/rfkill/service.block @@ -4,7 +4,7 @@ After=rfkill-unblock@all.service [Service] Type=oneshot -ExecStart=/usr/sbin/rfkill block %I +ExecStart=/usr/bin/rfkill block %I [Install] WantedBy=multi-user.target diff --git a/core/rfkill/service.unblock b/core/rfkill/service.unblock index 40f4e3244..94ebf35af 100644 --- a/core/rfkill/service.unblock +++ b/core/rfkill/service.unblock @@ -4,7 +4,7 @@ After=rfkill-block@all.service [Service] Type=oneshot -ExecStart=/usr/sbin/rfkill unblock %I +ExecStart=/usr/bin/rfkill unblock %I [Install] WantedBy=multi-user.target |