[arch-commits] Commit in crda/trunk (4 files)

[Thomas Bächler]

    Date: Thursday, August 23, 2012 @ 14:08:27
  Author: thomas
Revision: 165553

Update crda

* Remove rc.d script
* Add /usr/bin/set-wireless-regdom, run automatically on boot
* Move everything to /usr/bin, for the future

Added:
  crda/trunk/set-wireless-regdom
Modified:
  crda/trunk/PKGBUILD
  crda/trunk/crda.install
Deleted:
  crda/trunk/crda.rc

---------------------+
 PKGBUILD            |   17 ++++++++++-------
 crda.install        |   15 +--------------
 crda.rc             |   26 --------------------------
 set-wireless-regdom |    5 +++++
 4 files changed, 16 insertions(+), 47 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2012-08-23 17:48:12 UTC (rev 165552)
+++ PKGBUILD	2012-08-23 18:08:27 UTC (rev 165553)
@@ -3,18 +3,19 @@
 
 pkgname=crda
 pkgver=1.1.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Central Regulatory Domain Agent for wireless networks"
 arch=(i686 x86_64)
 url="http://wireless.kernel.org/en/developers/Regulatory/CRDA"
 license=('custom')
-depends=('wireless-regdb' 'libnl' 'libgcrypt' 'udev' 'iw')
+depends=('wireless-regdb' 'libnl' 'libgcrypt' 'systemd-tools' 'iw')
 makedepends=('python-m2crypto')
 install=crda.install
 source=(http://wireless.kernel.org/download/crda/${pkgname}-${pkgver}.tar.bz2
-        crda.rc libnl32.patch)
+        set-wireless-regdom
+        libnl32.patch)
 md5sums=('5226f65aebacf94baaf820f8b4e06df4'
-         '014eef3f8655e9a130064ec6891317fc'
+         '65c93f2ff2eb1b29d9e9fa102ae2dd45'
          'c1f7aff29f15a0364ae6f7905a1d4ae6')
                   
 build() {
@@ -27,11 +28,13 @@
 package() {
   # Install crda, regdbdump and udev rules
   cd "${srcdir}"/${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" UDEV_RULE_DIR=/usr/lib/udev/rules.d/ install
+  make DESTDIR="${pkgdir}" UDEV_RULE_DIR=/usr/lib/udev/rules.d/ SBINDIR=/usr/bin/ install
+  # Adjust paths in udev rule file
+  sed 's|/sbin/crda|/usr/bin/crda|' -i "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules
   # This rule automatically sets the regulatory domain when cfg80211 is loaded
-  echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules
+  echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/usr/bin/set-wireless-regdom"' >> "${pkgdir}"/usr/lib/udev/rules.d/85-regulatory.rules
 
   install -D -m644 "${srcdir}"/${pkgname}-${pkgver}/LICENSE "${pkgdir}"/usr/share/licenses/crda/LICENSE
   
-  install -D -m755 "${srcdir}"/crda.rc "${pkgdir}"/etc/rc.d/wireless-regdom
+  install -D -m755 "${srcdir}"/set-wireless-regdom "${pkgdir}"/usr/bin/set-wireless-regdom
 }

Modified: crda.install
===================================================================
--- crda.install	2012-08-23 17:48:12 UTC (rev 165552)
+++ crda.install	2012-08-23 18:08:27 UTC (rev 165553)
@@ -1,18 +1,5 @@
 ## arg 1:  the new package version
 post_install() {
   echo "Uncomment the right regulatory domain in /etc/conf.d/wireless-regdom."
-  echo "It will automatically be set when necessary."
+  echo "It will automatically be set on boot."
 }
-
-## arg 1:  the new package version
-## arg 2:  the old package version
-post_upgrade() {
-  # In an upgrade from 1.0.1-1 or older, the wireless-regdom file moves from the crda package
-  # to the new wireless-regdb package. If the user changed the file, it is save to overwrite the one
-  # from wireless-regdb by the user-defined one
-  if [ $(vercmp $2 1.0.1-2) -lt 0 ]; then
-    if [ -f /etc/conf.d/wireless-regdom.pacorig -a -n "$(grep -v ^# /etc/conf.d/wireless-regdom.pacorig 2>/dev/null | grep -v ^$)" ]; then
-      mv /etc/conf.d/wireless-regdom.pacorig /etc/conf.d/wireless-regdom
-    fi
-  fi
-}

Deleted: crda.rc
===================================================================
--- crda.rc	2012-08-23 17:48:12 UTC (rev 165552)
+++ crda.rc	2012-08-23 18:08:27 UTC (rev 165553)
@@ -1,26 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-. /etc/conf.d/wireless-regdom
-
-case "$1" in
-  start)
-    if [ -n "${WIRELESS_REGDOM}" ]; then
-        stat_busy "Setting wireless regulatory domain: ${WIRELESS_REGDOM}"
-        if iw reg set ${WIRELESS_REGDOM}; then
-            stat_done
-        else
-            stat_fail
-        fi
-    fi
-    ;;
-  stop)
-    ;;
-  restart)
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 start"  
-esac
-exit 0

Added: set-wireless-regdom
===================================================================
--- set-wireless-regdom	                        (rev 0)
+++ set-wireless-regdom	2012-08-23 18:08:27 UTC (rev 165553)
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+unset WIRELESS_REGDOM
+. /etc/conf.d/wireless-regdom
+[ -n "${WIRELESS_REGDOM}" ] && iw reg set ${WIRELESS_REGDOM}


Property changes on: crda/trunk/set-wireless-regdom
___________________________________________________________________
Added: svn:executable
## -0,0 +1 ##
+*
\ No newline at end of property