Date: Sunday, January 16, 2011 @ 09:09:48 Author: thomas Revision: 106284
Fix PKGBUILD for python2, use package function, rebuild against libnl 2 Modified: crda/trunk/PKGBUILD ----------+ PKGBUILD | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2011-01-16 14:08:40 UTC (rev 106283) +++ PKGBUILD 2011-01-16 14:09:48 UTC (rev 106284) @@ -3,7 +3,7 @@ pkgname=crda pkgver=1.1.1 -pkgrel=1 +pkgrel=2 pkgdesc="Central Regulatory Domain Agent" arch=(i686 x86_64) url="http://wireless.kernel.org/en/developers/Regulatory/CRDA" @@ -17,17 +17,23 @@ '014eef3f8655e9a130064ec6891317fc') build() { + msg "Compiling crda ..." + cd "${srcdir}"/${pkgname}-${pkgver} + sed 's|^#!/usr/bin/env python|#!/usr/bin/python2|' -i utils/key2pub.py + make crda regdbdump +} + +package() { # Install crda, regdbdump and udev rules - msg "Compiling and installing crda ..." + msg "Installing crda ..." cd ${srcdir}/${pkgname}-${pkgver} - make crda regdbdump || return 1 - make DESTDIR=${pkgdir} install || return 1 + make DESTDIR=${pkgdir} install # 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}/lib/udev/rules.d/85-regulatory.rules || return 1 + echo 'ACTION=="add" SUBSYSTEM=="module", DEVPATH=="/module/cfg80211", RUN+="/etc/rc.d/wireless-regdom start >/dev/null"' >> ${pkgdir}/lib/udev/rules.d/85-regulatory.rules msg "Installing license ..." - install -D -m644 ${srcdir}/${pkgname}-${pkgver}/LICENSE ${pkgdir}/usr/share/licenses/crda/LICENSE || return 1 + install -D -m644 ${srcdir}/${pkgname}-${pkgver}/LICENSE ${pkgdir}/usr/share/licenses/crda/LICENSE msg "Installing boot script ..." - install -D -m755 ${srcdir}/crda.rc ${pkgdir}/etc/rc.d/wireless-regdom || return 1 + install -D -m755 ${srcdir}/crda.rc ${pkgdir}/etc/rc.d/wireless-regdom }