From a26ce336126d18cde915c2331250b8dfbffc24f8 Mon Sep 17 00:00:00 2001 From: root Date: Wed, 28 Mar 2012 00:01:38 +0000 Subject: Wed Mar 28 00:01:38 UTC 2012 --- community/astyle/PKGBUILD | 23 +++++++----- community/cdemu-daemon/PKGBUILD | 54 ++++++++++++++++++----------- community/cdemu-daemon/cdemu-daemon.install | 20 +++++++++++ community/cdemu-daemon/cdemud.conf | 13 ++++--- community/cdemu-daemon/cdemud.rc | 8 ++--- community/cdemu-daemon/system.patch | 45 ++++++++++++++++++++++++ community/luakit/PKGBUILD | 22 +++++------- community/luakit/luakit.install | 8 ++--- community/naev/PKGBUILD | 8 ++--- community/optipng/PKGBUILD | 8 +++-- community/python-sqlalchemy/PKGBUILD | 6 ++-- community/qtcurve-kde4/PKGBUILD | 6 ++-- community/rygel/PKGBUILD | 10 +++--- community/vhba-module/60-vhba.rules | 1 + community/vhba-module/PKGBUILD | 35 +++++++++++++------ community/vhba-module/vhba-module.install | 20 +++++++---- 16 files changed, 195 insertions(+), 92 deletions(-) create mode 100644 community/cdemu-daemon/cdemu-daemon.install create mode 100644 community/cdemu-daemon/system.patch create mode 100644 community/vhba-module/60-vhba.rules (limited to 'community') diff --git a/community/astyle/PKGBUILD b/community/astyle/PKGBUILD index 4b3589421..85c4597ea 100644 --- a/community/astyle/PKGBUILD +++ b/community/astyle/PKGBUILD @@ -1,4 +1,4 @@ -# $Id: PKGBUILD 66384 2012-02-24 12:10:04Z lfleischer $ +# $Id: PKGBUILD 68495 2012-03-26 08:43:21Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Mateusz Herych # Contributor: Thomas Mader @@ -6,22 +6,29 @@ # Contributor: tardo pkgname=astyle -pkgver=2.02 -pkgrel=2 +pkgver=2.02.1 +pkgrel=1 pkgdesc='A free, fast and small automatic formatter for C, C++, C#, and Java source code.' arch=('i686' 'x86_64') url='http://sourceforge.net/projects/astyle/' license=('LGPL') depends=('gcc-libs') source=("http://downloads.sourceforge.net/sourceforge/astyle/${pkgname}_${pkgver}_linux.tar.gz") -md5sums=('6ce1f5c766ba142f152dab4ddd1ee3b7') +md5sums=('3e3ef8024c175ef4e1720b7aa4c75202') build() { - cd "$srcdir/$pkgname/build/gcc" - make + cd "$srcdir/$pkgname/build/gcc" + make } package() { - cd "$srcdir/$pkgname/build/gcc" - install -Dm0755 bin/astyle "$pkgdir/usr/bin/astyle" + cd "$srcdir/$pkgname/build/gcc" + + install -Dm0755 bin/astyle "$pkgdir/usr/bin/astyle" + + # install documentation (implements FS#23290) + install -d "$pkgdir/usr/share/doc/$pkgname/" + for f in ../../doc/*.html; do + install -m0644 "$f" "$pkgdir/usr/share/doc/$pkgname/" + done } diff --git a/community/cdemu-daemon/PKGBUILD b/community/cdemu-daemon/PKGBUILD index e70da39d3..4163ffbc1 100644 --- a/community/cdemu-daemon/PKGBUILD +++ b/community/cdemu-daemon/PKGBUILD @@ -1,40 +1,54 @@ -# $Id: PKGBUILD 66730 2012-02-27 20:43:21Z heftig $ -# Maintainer: Mateusz Herych +# $Id: PKGBUILD 68530 2012-03-26 10:24:56Z schiv $ +# Maintainer: Ray Rashif +# Contributor: Mateusz Herych # Contributor: Charles Lindsay pkgname=cdemu-daemon pkgver=1.5.0 -pkgrel=1 +pkgrel=5 pkgdesc="CD/DVD-ROM device emulator daemon" arch=('i686' 'x86_64') -backup=('etc/conf.d/cdemud' - 'etc/dbus-1/system.d/cdemud-dbus.conf') url="http://cdemu.sourceforge.net/" license=('GPL') -depends=('glib2' 'dbus' 'dbus-glib' 'libdaemon' 'vhba-module' "libmirage=$pkgver" 'libao') -install=cdemud.install -source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2 - cdemud.conf cdemud.rc 60-vhba.rules) +depends=('dbus' 'vhba-module>=20110915-5' 'libao' "libmirage=$pkgver") +optdepends=('alsa-lib: to enable the ALSA audio driver' + 'pulseaudio: to enable the PA audio driver') +backup=('etc/conf.d/cdemud' + 'etc/dbus-1/system.d/cdemud-dbus.conf') +install=$pkgname.install +source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2" + 'cdemud.conf' + 'cdemud.rc' + 'system.patch') md5sums=('5ba780caa26d855942512b5b3c22405a' - '2b94bd399873e585e40b2bfd8634f322' - '340a30ab2c42162b3bd042c74a399219' - 'f551504552d7693ac79e8e0d302f62b9') + '5d9e08255e45ca3c0987329b7920e206' + '4bbf42b69133e4e91c1be2c6825fa392' + '90a2516639c05737fa10a110a1cba467') build() { - cd $srcdir/$pkgname-$pkgver - ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib/$pkgname + cd "$srcdir/$pkgname-$pkgver" + + # make things Arch-friendly + patch -Np1 -i "$srcdir/system.patch" + + ./configure --prefix=/usr \ + --sysconfdir=/etc \ + --libexecdir=/usr/lib/$pkgname make } package() { - cd $srcdir/$pkgname-$pkgver - make DESTDIR=$pkgdir install - install -m 644 -D ../cdemud.conf $pkgdir/etc/conf.d/cdemud - install -m 755 -D ../cdemud.rc $pkgdir/etc/rc.d/cdemud + cd "$srcdir/$pkgname-$pkgver" + + make DESTDIR="$pkgdir" install - # Install udev rule for non-root mounting of iso's - install -D -m 644 "${srcdir}/60-vhba.rules" "$pkgdir/lib/udev/rules.d/60-vhba.rules" + # the init stuff + install -Dm644 "$srcdir/cdemud.conf" "$pkgdir/etc/conf.d/cdemud" + install -Dm755 "$srcdir/cdemud.rc" "$pkgdir/etc/rc.d/cdemud" + # for systemd install -d "$pkgdir/usr/lib/modules-load.d" echo "vhba" > "$pkgdir/usr/lib/modules-load.d/cdemu.conf" } + +# vim:set ts=2 sw=2 et: diff --git a/community/cdemu-daemon/cdemu-daemon.install b/community/cdemu-daemon/cdemu-daemon.install new file mode 100644 index 000000000..7a3e8a9f5 --- /dev/null +++ b/community/cdemu-daemon/cdemu-daemon.install @@ -0,0 +1,20 @@ +post_upgrade() { + echo " > The 'cdemu' group is now created by vhba-module" + echo " >> you may have to re-add yourself to the group and relogin" + echo + echo " > Daemon can be used in session mode as user, simply run 'cdemud'" + echo " >> you do not need to use the init script in this case" + echo " >> put your configuration in ~/.cdemud instead" +} + +post_install () { + echo " > Add yourself to the 'cdemu' group for non-root access" + echo " > Start the daemon as root with /etc/rc.d/cdemud" + echo " > See /etc/conf.d/cdemud for further configuration" + echo + echo " > Daemon can be used in session mode as user, simply run 'cdemud'" + echo " >> you do not need to use the init script in this case" + echo " >> put your configuration in ~/.cdemud instead" +} + +# vim:set ts=2 sw=2 et: diff --git a/community/cdemu-daemon/cdemud.conf b/community/cdemu-daemon/cdemud.conf index 8e49cdfd5..6f14947a6 100644 --- a/community/cdemu-daemon/cdemud.conf +++ b/community/cdemu-daemon/cdemud.conf @@ -1,12 +1,11 @@ # how many optical drives to emulate -NUM_DRIVES=1 +NUM_DEVICES=2 -# control device -CTL_DEVICE=/dev/vhba_ctl +# audio backend (null, alsa or pulse) +AUDIO_DRIVER=null -# audio backend (null or alsa) -AUDIO_BACKEND=null +# log file +LOG_FILE=/var/log/cdemud.log -DAEMON="/usr/bin/cdemud" +# bus to use (system or session) BUS="system" -LOG_FILE="/var/log/cdemu.log" diff --git a/community/cdemu-daemon/cdemud.rc b/community/cdemu-daemon/cdemud.rc index 6e1b0b091..e8dab1f08 100644 --- a/community/cdemu-daemon/cdemud.rc +++ b/community/cdemu-daemon/cdemud.rc @@ -14,20 +14,20 @@ case "$1" in stat_done fi - stat_busy "Waiting for $CTL_DEVICE" + stat_busy "Waiting for /dev/vhba_ctl" i=0 - until [ -c $CTL_DEVICE -o $i -ge 10 ]; do + until [ -c /dev/vhba_ctl -o $i -ge 10 ]; do i=`expr $i + 1` sleep 1 done - if [ -c $CTL_DEVICE ]; then + if [ -c /dev/vhba_ctl ]; then stat_done else stat_fail fi stat_busy "Starting cdemud" - cdemud --ctl-device=$CTL_DEVICE --bus=$SYSTEM --num-devices=$NUM_DEVICES --audio-driver=$AUDIO_DRIVER --logfile=$LOG_FILE & + cdemud --ctl-device=/dev/vhba_ctl --bus=$BUS --num-devices=$NUM_DEVICES --audio-driver=$AUDIO_DRIVER --logfile=$LOG_FILE & if [ $? -ne 0 ]; then stat_fail else diff --git a/community/cdemu-daemon/system.patch b/community/cdemu-daemon/system.patch new file mode 100644 index 000000000..3c3d4b221 --- /dev/null +++ b/community/cdemu-daemon/system.patch @@ -0,0 +1,45 @@ +diff -aur cdemu-daemon-1.5.0.orig/session/cdemu-daemon-session.sh cdemu-daemon-1.5.0/session/cdemu-daemon-session.sh +--- cdemu-daemon-1.5.0.orig/session/cdemu-daemon-session.sh 2012-03-25 16:35:40.577837996 +0800 ++++ cdemu-daemon-1.5.0/session/cdemu-daemon-session.sh 2012-03-25 16:39:12.180024983 +0800 +@@ -1,15 +1,15 @@ + #!/bin/sh + # Starts the CDEmu daemon instance on D-Bus *session* bus. Optional + # configuration (number of devices, audio driver, log file) are read +-# from ~/.cdemu-daemon ++# from ~/.cdemud + + # Default settings + NUM_DEVICES=2 +-AUDIO_DRIVER=pulse +-LOG_FILE=~/.cdemu-daemon.log ++AUDIO_DRIVER=null ++LOG_FILE=~/.cdemud.log + + # Read the settings +-CONFIG_FILE=~/.cdemu-daemon ++CONFIG_FILE=~/.cdemud + + if [ -f ${CONFIG_FILE} ]; then + . ${CONFIG_FILE}; +diff -aur cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh +--- cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh 2012-03-25 16:35:40.581171312 +0800 ++++ cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh 2012-03-25 16:36:48.810801678 +0800 +@@ -1,15 +1,15 @@ + #!/bin/sh + # Starts the CDEmu daemon instance on D-Bus *system* bus. Optional + # configuration (number of devices, audio driver, log file) are read +-# from /etc/sysconfig/cdemu-daemon ++# from /etc/conf.d/cdemud + + # Default settings + NUM_DEVICES=2 + AUDIO_DRIVER=null +-LOG_FILE=/tmp/cdemu-daemon.log ++LOG_FILE=/var/log/cdemud.log + + # Read the settings +-CONFIG_FILE=/etc/sysconfig/cdemu-daemon ++CONFIG_FILE=/etc/conf.d/cdemud + + if [ -f ${CONFIG_FILE} ]; then + . ${CONFIG_FILE}; diff --git a/community/luakit/PKGBUILD b/community/luakit/PKGBUILD index e92f5a99f..da4fda4cf 100644 --- a/community/luakit/PKGBUILD +++ b/community/luakit/PKGBUILD @@ -1,32 +1,28 @@ -# Maintainer: Thomas Dziedzic < gostrc at gmail > +# Maintainer: Bartłomiej Piotrowski +# Contributor: Thomas Dziedzic < gostrc at gmail > # Contributor: J. W. Birdsong pkgname=luakit -pkgver=2011.07.22 -pkgrel=3 -pkgdesc='Highly configurable, micro-browser framework based on the WebKit web content engine and the GTK+ toolkit. "Stable" release.' +pkgver=2012.03.25 +pkgrel=1 +pkgdesc='Fast, small, webkit based browser framework extensible by Lua' arch=('i686' 'x86_64') url='http://www.luakit.org/projects/luakit' license=('GPL3') -depends=('libwebkit' 'luafilesystem' 'libunique' 'desktop-file-utils') +depends=('libwebkit' 'luafilesystem' 'libunique' 'desktop-file-utils' 'luajit') makedepends=('git' 'help2man') options=(!makeflags) conflicts=('luakit-git' 'luakit-develop-git') install='luakit.install' -source=("${pkgver}.tar.gz::https://github.com/mason-larobina/luakit/tarball/${pkgver}-r1") -md5sums=('4937deb6bc81416e2deb037f4a5763e4') +source=("${pkgver}.tar.gz::https://github.com/mason-larobina/luakit/tarball/${pkgver}") +md5sums=('e25aaeacfa5758127b3f677eafba9aa2') build() { cd mason-larobina-luakit-* - - # Add missing library to PKGS in config.mk - sed -i 's|PKGS := .*|& javascriptcoregtk-1.0|' config.mk - - make PREFIX=/usr DESTDIR=${pkgdir} all + make USE_LUAJIT=1 PREFIX=/usr DESTDIR=${pkgdir} all } package() { cd mason-larobina-luakit-* - make PREFIX=/usr DESTDIR=${pkgdir} install } diff --git a/community/luakit/luakit.install b/community/luakit/luakit.install index 2c37d0597..3010f25a4 100644 --- a/community/luakit/luakit.install +++ b/community/luakit/luakit.install @@ -1,8 +1,8 @@ post_install() { - echo 'Configs are located in /etc/xdg/luakit/*.lua' - echo 'Copy to ~/.config/luakit/ (this folder is created on 1st start of Luakit) for local config.' - echo 'Or edit in place for global changes.' - echo 'You NEED to replace local configs after each update' + echo 'Configuration files are located in /etc/xdg/luakit/*.lua' + echo 'Copy them to ~/.config/luakit/ (this folder is created on 1st start of Luakit) for local config.' + echo 'You can edit them in place for global changes.' + echo 'You NEED to replace local configs after each update!' } post_upgrade() { diff --git a/community/naev/PKGBUILD b/community/naev/PKGBUILD index dcbf3965a..415e48c0c 100644 --- a/community/naev/PKGBUILD +++ b/community/naev/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 66940 2012-03-02 03:03:12Z svenstaro $ +# $Id: PKGBUILD 68487 2012-03-26 07:00:35Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Johan Rehnberg pkgname=naev -pkgver=0.5.1 -pkgrel=2 +pkgver=0.5.2 +pkgrel=1 pkgdesc='2D action/rpg space game' arch=('i686' 'x86_64') url="http://code.google.com/p/naev/" @@ -12,7 +12,7 @@ license=('GPL3') depends=('openal' 'libvorbis' 'sdl_image' 'sdl_mixer' 'libgl' 'libxml2' 'freetype2' 'libpng' 'naev-data') makedepends=('freeglut') source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2") -md5sums=('a5fea2f4e0fef23d8932167b568d1868') +md5sums=('c23a2ca80553a7d1d75497dc6672e61b') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/optipng/PKGBUILD b/community/optipng/PKGBUILD index 67b2a044b..37853da52 100644 --- a/community/optipng/PKGBUILD +++ b/community/optipng/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 67303 2012-03-08 12:19:11Z lfleischer $ +# $Id: PKGBUILD 68497 2012-03-26 08:52:32Z lfleischer $ # Maintainer: Lukas Fleischer # Contributor: Stefan Husmann # Contributor: Aaron Schaefer pkgname=optipng -pkgver=0.7 +pkgver=0.7.1 pkgrel=1 pkgdesc='Compresses PNG files to a smaller size, without losing any information.' arch=('i686' 'x86_64') @@ -12,7 +12,7 @@ url='http://optipng.sourceforge.net/' license=('ZLIB') depends=('glibc') source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz") -md5sums=('9b2f526ce79ea779c7004c7964ee8bcc') +md5sums=('b6181d566998ad489397b985ebfc4a03') build() { cd "$srcdir/$pkgname-$pkgver" @@ -24,5 +24,7 @@ package() { cd "$srcdir/$pkgname-$pkgver" make prefix="$pkgdir/usr" mandir="$pkgdir/usr/share/man" install + + # install license install -Dm0644 LICENSE.txt "$pkgdir/usr/share/licenses/$pkgname/LICENSE" } diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD index f525225be..8668fa654 100644 --- a/community/python-sqlalchemy/PKGBUILD +++ b/community/python-sqlalchemy/PKGBUILD @@ -1,17 +1,17 @@ -# $Id: PKGBUILD 67332 2012-03-09 00:22:36Z seblu $ +# $Id: PKGBUILD 68536 2012-03-27 03:51:47Z tdziedzic $ # Maintainer: Angel Velasquez # Contributor: Sébastien Luttringer pkgbase=python-sqlalchemy pkgname=('python-sqlalchemy' 'python2-sqlalchemy') -pkgver=0.7.5 +pkgver=0.7.6 pkgrel=1 arch=('i686' 'x86_64') # python2 package contain .so url="http://www.sqlalchemy.org/" license=('custom: MIT') makedepends=('python' 'python2' 'python-distribute' 'python2-distribute') source=("http://downloads.sourceforge.net/sourceforge/sqlalchemy/SQLAlchemy-$pkgver.tar.gz") -md5sums=('52e71dddfdb8ca8c5049558a23d26557') +md5sums=('ecc3f73339dcd7e32275bdbabebf0dd8') build() { cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver diff --git a/community/qtcurve-kde4/PKGBUILD b/community/qtcurve-kde4/PKGBUILD index 34e5651ab..427455e56 100644 --- a/community/qtcurve-kde4/PKGBUILD +++ b/community/qtcurve-kde4/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 65722 2012-02-22 11:58:14Z svenstaro $ +# $Id: PKGBUILD 68485 2012-03-26 06:57:23Z svenstaro $ # Maintainer: Sven-Hendrik Haase # Contributor: Andrea Scarpino # Contributor: Pierre Schmitz pkgname=qtcurve-kde4 -pkgver=1.8.10 +pkgver=1.8.11 pkgrel=1 arch=('i686' 'x86_64') groups=('qtcurve') @@ -15,7 +15,7 @@ depends=('kdebase-workspace') makedepends=('cmake' 'automoc4') source=("http://craigd.wikispaces.com/file/view/QtCurve-KDE4-${pkgver}.tar.bz2" 'bypass-kde-config.patch') -md5sums=('b77e9a176a6324652a637edc10d051aa' +md5sums=('62dde2f3a2fabf2a209b07c2cf2b9c13' '3f6681147cc361bd2bfd4d7477f2a8d0') build() { diff --git a/community/rygel/PKGBUILD b/community/rygel/PKGBUILD index a8b670950..841d80fe6 100644 --- a/community/rygel/PKGBUILD +++ b/community/rygel/PKGBUILD @@ -1,14 +1,14 @@ -# $Id: PKGBUILD 68453 2012-03-24 21:52:58Z bgyorgy $ +# $Id: PKGBUILD 68534 2012-03-26 23:21:25Z bgyorgy $ # Maintainer: Balló György pkgname=rygel -pkgver=0.12.7 -pkgrel=2 +pkgver=0.14.0 +pkgrel=1 pkgdesc="UPnP AV MediaServer and MediaRenderer that allows you to easily share audio, video and pictures, and control of media player on your home network" arch=('i686' 'x86_64') url="http://live.gnome.org/Rygel" license=('LGPL') -depends=('gupnp-av' 'gupnp-dlna' 'libgee' 'gtk3' 'sqlite3' 'hicolor-icon-theme' 'xdg-utils') +depends=('gupnp-av' 'gupnp-dlna' 'libgee' 'gtk3' 'hicolor-icon-theme' 'xdg-utils') makedepends=('vala' 'intltool') optdepends=('gstreamer0.10-good-plugins: Extra media codecs' 'gstreamer0.10-bad-plugins: Extra media codecs' @@ -19,7 +19,7 @@ backup=('etc/rygel.conf') options=('!libtool') install=$pkgname.install source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz) -sha256sums=('e26f642ad6b44fef89d4dfea7c9862c0c77bc38a1b45bb63bb0038a9e4e0854d') +sha256sums=('828c080eba89abaea34b94b5ab53b2f89bf03937cb3838c787ee17846b6d7e02') build() { cd "$srcdir/$pkgname-$pkgver" diff --git a/community/vhba-module/60-vhba.rules b/community/vhba-module/60-vhba.rules new file mode 100644 index 000000000..91de6f86a --- /dev/null +++ b/community/vhba-module/60-vhba.rules @@ -0,0 +1 @@ +KERNEL=="vhba_ctl", NAME="vhba_ctl", MODE="0660", OWNER="root", GROUP="cdemu" diff --git a/community/vhba-module/PKGBUILD b/community/vhba-module/PKGBUILD index 2a5a2f511..c79ca4bec 100644 --- a/community/vhba-module/PKGBUILD +++ b/community/vhba-module/PKGBUILD @@ -1,29 +1,42 @@ -# $Id: PKGBUILD 67390 2012-03-11 05:55:10Z schiv $ -# Maintainer: Mateusz Herych +# $Id: PKGBUILD 68509 2012-03-26 09:56:23Z schiv $ +# Maintainer: Ray Rashif +# Contributor: Mateusz Herych # Contributor: Charles Lindsay pkgname=vhba-module pkgver=20110915 _extramodules=extramodules-3.2-ARCH -_kernver="$(cat /lib/modules/${_extramodules}/version)" -pkgrel=4 +pkgrel=5 pkgdesc="Kernel module that emulates SCSI devices" arch=('i686' 'x86_64') url="http://cdemu.sourceforge.net/" -license=('GPL2') +license=('GPL') depends=('linux>=3.2' 'linux<3.3') makedepends=('linux-headers>=3.2') -install=vhba-module.install -source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2) -md5sums=('8bb99b427ca67bad448f4dd211bdd1a2') +install=$pkgname.install +source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2" + '60-vhba.rules') +md5sums=('8bb99b427ca67bad448f4dd211bdd1a2' + '549bd2d9696bd1884c8eed7193c00e21') build() { cd "$srcdir/$pkgname-$pkgver" - make -j1 KDIR=/usr/src/linux-${_kernver} + + _kernver="$(cat /lib/modules/$_extramodules/version)" + + make -j1 KDIR=/usr/src/linux-$_kernver } package() { cd "$srcdir/$pkgname-$pkgver" - install -D vhba.ko "$pkgdir/lib/modules/${_extramodules}/vhba.ko" - sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='${_extramodules}'/" "${startdir}/vhba-module.install" + + install -D vhba.ko "$pkgdir/lib/modules/$_extramodules/vhba.ko" + + sed -i -e "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" \ + "$startdir/vhba-module.install" + + install -Dm644 "$srcdir/60-vhba.rules" \ + "$pkgdir/lib/udev/rules.d/60-vhba.rules" } + +# vim:set ts=2 sw=2 et: diff --git a/community/vhba-module/vhba-module.install b/community/vhba-module/vhba-module.install index 665a1d3c5..73029498f 100644 --- a/community/vhba-module/vhba-module.install +++ b/community/vhba-module/vhba-module.install @@ -1,16 +1,22 @@ -post_install() { - echo ">> Place 'vhba' in MODULES= in /etc/rc.conf to enable vhba on system boot." - echo ">> This module needs to be recompiled for every kernel version upgrade." +post_upgrade() { + ! grep -q 'cdemu' /etc/group && groupadd cdemu + echo " > Updating module dependencies..." EXTRAMODULES='extramodules-3.2-ARCH' depmod $(cat /lib/modules/$EXTRAMODULES/version) } -post_upgrade() { - post_install + +post_install() { + echo " > Adding 'cdemu' group" + ! grep -q 'cdemu' /etc/group && groupadd cdemu + echo " > Add 'vhba' to your modules array to autoload it" + post_upgrade } post_remove() { - EXTRAMODULES='extramodules-3.2-ARCH' - depmod $(cat /lib/modules/$EXTRAMODULES/version) + post_upgrade + echo "Removing 'cdemu' group" + groupdel cdemu } +# vim:set ts=2 sw=2 et: -- cgit v1.2.3-54-g00ecf