From 76774d40da5ce246c9f2178fdf937706d99af4b2 Mon Sep 17 00:00:00 2001 From: root Date: Thu, 16 Feb 2012 23:15:21 +0000 Subject: Thu Feb 16 23:15:21 UTC 2012 --- testing/kmod/PKGBUILD | 8 +++-- testing/r/PKGBUILD | 68 +++++++++++++++++++++++++++++++++++ testing/r/r.desktop | 11 ++++++ testing/r/r.install | 12 +++++++ testing/r/r.png | Bin 0 -> 4771 bytes testing/udev/PKGBUILD | 70 +++++++++++++++++++++++++++++++++++++ testing/udev/initcpio-hooks-udev | 9 +++++ testing/udev/initcpio-install-udev | 26 ++++++++++++++ testing/udev/modprobe.nouevau.conf | 7 ++++ testing/udev/udev.install | 55 +++++++++++++++++++++++++++++ 10 files changed, 263 insertions(+), 3 deletions(-) create mode 100644 testing/r/PKGBUILD create mode 100644 testing/r/r.desktop create mode 100644 testing/r/r.install create mode 100644 testing/r/r.png create mode 100644 testing/udev/PKGBUILD create mode 100644 testing/udev/initcpio-hooks-udev create mode 100644 testing/udev/initcpio-install-udev create mode 100644 testing/udev/modprobe.nouevau.conf create mode 100644 testing/udev/udev.install (limited to 'testing') diff --git a/testing/kmod/PKGBUILD b/testing/kmod/PKGBUILD index 64017dd1a..028413d8c 100644 --- a/testing/kmod/PKGBUILD +++ b/testing/kmod/PKGBUILD @@ -1,9 +1,9 @@ -# $Id: PKGBUILD 150158 2012-02-13 18:05:27Z dreisner $ +# $Id: PKGBUILD 150255 2012-02-16 00:05:20Z dreisner $ # Maintainer: Dave Reisner pkgname=kmod pkgver=5 -pkgrel=3 +pkgrel=4 pkgdesc="Linux kernel module handling" arch=('i686' 'x86_64') url="http://git.profusion.mobi/cgit.cgi/kmod.git" @@ -51,7 +51,9 @@ package() { # add symlinks to kmod ln -s ../usr/bin/kmod "$pkgdir/sbin/modprobe" - for tool in {dep,ins,ls,rm}mod modinfo; do + ln -s ../usr/bin/kmod "$pkgdir/sbin/depmod" + + for tool in {ins,ls,rm}mod modinfo; do ln -s kmod "$pkgdir/usr/bin/$tool" done diff --git a/testing/r/PKGBUILD b/testing/r/PKGBUILD new file mode 100644 index 000000000..0fb507a08 --- /dev/null +++ b/testing/r/PKGBUILD @@ -0,0 +1,68 @@ +# $Id: PKGBUILD 150251 2012-02-15 21:44:40Z ronald $ +# Maintainer: Ronald van Haren +# Contributor: Damir Perisa +# Contributor: K. Piche + +pkgname=r +pkgver=2.14.1 +pkgrel=3 +pkgdesc="Language and environment for statistical computing and graphics" +arch=('i686' 'x86_64') +license=('GPL') +url=('http://www.r-project.org/') +depends=('blas' 'lapack' 'bzip2' 'libpng' 'libjpeg' 'libtiff' + 'ncurses' 'pcre' 'readline' 'zlib' 'perl' 'gcc-libs' + 'tk' 'libxt' 'libxmu' 'pango' 'xz') +makedepends=('openjdk6' 'gcc-fortran') +backup=('etc/R/Makeconf' 'etc/R/Renviron' 'etc/R/ldpaths' 'etc/R/repositories') +options=('!makeflags') +source=("http://cran.r-project.org/src/base/R-2/R-${pkgver}.tar.gz" + 'r.desktop' + 'r.png') +install=r.install +sha1sums=('5803a213480a749e36bccc155aecb13070ade096' + '13aa29219bcaa102e575de8c1c8e0833d233e836' + 'a69a07ec363440efc18ce0a7f2af103375dea978') +build() { + cd "${srcdir}/R-${pkgver}" + sed -i 's|#define NeedFunctionPrototypes 0|#define NeedFunctionPrototypes 1|g' src/modules/X11/dataentry.c + ./configure --prefix=/usr \ + --libdir=/usr/lib \ + --sysconfdir=/etc/R \ + --datarootdir=/usr/share \ + rsharedir=/usr/share/R/ \ + rincludedir=/usr/include/R/ \ + rdocdir=/usr/share/doc/R/ \ + --with-x \ + --enable-R-shlib \ + --with-lapack \ + --with-blas \ + F77=gfortran \ + LIBnn=lib + make +} + +package() { + cd "${srcdir}/R-${pkgver}" + make -j1 DESTDIR="${pkgdir}" install + + # Fixup R wrapper scripts. + sed -i "s|${pkgdir} ||" "${pkgdir}/usr/bin/R" + rm "${pkgdir}/usr/lib/R/bin/R" + cd "${pkgdir}/usr/lib/R/bin" + ln -s ../../../bin/R + + # install some freedesktop.org compatibility + install -Dm644 "${srcdir}/r.desktop" \ + "${pkgdir}/usr/share/applications/r.desktop" + install -Dm644 "${srcdir}/r.png" \ + "${pkgdir}/usr/share/pixmaps/r.png" + + # move the config directory to /etc and create symlinks + install -d "${pkgdir}/etc/R" + cd "${pkgdir}/usr/lib/R/etc" + for i in *; do + mv -f ${i} "${pkgdir}/etc/R" + ln -s /etc/R/${i} ${i} + done +} diff --git a/testing/r/r.desktop b/testing/r/r.desktop new file mode 100644 index 000000000..68b49c447 --- /dev/null +++ b/testing/r/r.desktop @@ -0,0 +1,11 @@ +[Desktop Entry] +Name=R +GenericName=environment for statistical computing +Comment=language and environment for statistical computing and graphics +Exec=R +Icon=/usr/share/pixmaps/r.png +DocPath=/usr/lib/R/doc/html/index.html +StartupNotify=true +Terminal=true +Type=Application +Categories=Education;Science;Math; diff --git a/testing/r/r.install b/testing/r/r.install new file mode 100644 index 000000000..d3289ab64 --- /dev/null +++ b/testing/r/r.install @@ -0,0 +1,12 @@ +post_install() { + update-desktop-database -q +} + +post_upgrade() { + post_install +} + +post_remove() { + post_install +} + diff --git a/testing/r/r.png b/testing/r/r.png new file mode 100644 index 000000000..1303ccdb9 Binary files /dev/null and b/testing/r/r.png differ diff --git a/testing/udev/PKGBUILD b/testing/udev/PKGBUILD new file mode 100644 index 000000000..531c062d3 --- /dev/null +++ b/testing/udev/PKGBUILD @@ -0,0 +1,70 @@ +# $Id: PKGBUILD 150221 2012-02-15 08:53:37Z tomegun $ +# Maintainer: Tom Gundersen +# Contributor: Aaron Griffin +# Contributor: Tobias Powalowski +# Contributor: Thomas Bächler + +pkgname=udev +pkgver=181 +pkgrel=3 +pkgdesc="The userspace dev tools (udev)" +depends=('util-linux' 'libusb-compat' 'glib2' 'kmod' 'pciutils' 'usbutils' 'pciutils') +install=udev.install +arch=(i686 x86_64) +license=('GPL') +makedepends=('gobject-introspection' 'gperf' 'libxslt' 'usbutils' 'kmod') +source=(ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.xz + initcpio-hooks-udev + initcpio-install-udev + modprobe.nouevau.conf) +url="http://git.kernel.org/?p=linux/hotplug/udev.git;a=summary" +backup=(etc/udev/udev.conf) +groups=('base') +options=(!makeflags !libtool) + +build() { + cd $srcdir/$pkgname-$pkgver + + ./configure --prefix=/usr \ + --with-rootprefix= \ + --sysconfdir=/etc \ + --libdir=/usr/lib \ + --libexecdir=/lib \ + --with-systemdsystemunitdir=/lib/systemd/system \ + --enable-udev_acl + + make +} + +package() { + cd $srcdir/$pkgname-$pkgver + make DESTDIR=${pkgdir} install + + # /dev/loop0 is created for convenience, to autoload the module if necessary + # this is no longer needed when util-linux-2.21 is released as /dev/loop-control + # will be used instead. Support for this will go away in a future version of udev + install -d -m755 ${pkgdir}/lib/udev/devices/ + mknod ${pkgdir}/lib/udev/devices/loop0 b 7 0 + chgrp disk ${pkgdir}/lib/udev/devices/loop0 + + # udevd moved, symlink to make life easy for restarting udevd manually + ln -s /lib/udev/udevd ${pkgdir}/usr/bin/udevd + + # Replace dialout/tape/cdrom group in rules with uucp/storage/optical group + for i in $pkgdir/lib/udev/rules.d/*.rules; do + sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g; + s#GROUP="tape"#GROUP="storage"#g; + s#GROUP="cdrom"#GROUP="optical"#g' $i + done + + # nouveau still conflicts with some other standard kernel modules, should go away soon + install -D -m644 ../modprobe.nouevau.conf ${pkgdir}/lib/modprobe.d/nouveau.conf + + # install the mkinitpcio hook + install -D -m644 ../initcpio-hooks-udev ${pkgdir}/lib/initcpio/hooks/udev + install -D -m644 ../initcpio-install-udev ${pkgdir}/lib/initcpio/install/udev +} +md5sums=('0d7af750702620a871b9f9b98d8ad859' + 'a4dd853050bf2e0ae6b2e3d2c75499c2' + 'ee0bfe91a20fff12cc25ab1d1e024853' + '633dabda1fbfa4b6fe4dab5452b40fed') diff --git a/testing/udev/initcpio-hooks-udev b/testing/udev/initcpio-hooks-udev new file mode 100644 index 000000000..87aa7960f --- /dev/null +++ b/testing/udev/initcpio-hooks-udev @@ -0,0 +1,9 @@ +# vim: set ft=sh: +run_hook () +{ + msg -n ":: Triggering uevents..." + udevadm trigger --action=add --type=subsystems + udevadm trigger --action=add --type=devices + udevadm settle + msg "done." +} diff --git a/testing/udev/initcpio-install-udev b/testing/udev/initcpio-install-udev new file mode 100644 index 000000000..e7e2c0f60 --- /dev/null +++ b/testing/udev/initcpio-install-udev @@ -0,0 +1,26 @@ +#!/bin/bash + +build() { + FILES="/etc/udev/udev.conf" + SCRIPT="udev" + + add_binary /lib/udev/udevd + add_binary /usr/bin/udevadm + + for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do + add_file "/lib/udev/rules.d/$rules" + done + for tool in ata_id scsi_id; do + add_file "/lib/udev/$tool" + done +} + +help() { + cat < +# +blacklist nvidiafb +blacklist rivafb diff --git a/testing/udev/udev.install b/testing/udev/udev.install new file mode 100644 index 000000000..58d1111fb --- /dev/null +++ b/testing/udev/udev.install @@ -0,0 +1,55 @@ +# arg 1: the new package version +# arg 2: the old package version + +post_upgrade() { + if [ "$(vercmp $2 181)" -lt 0 ]; then + echo "udev changes:" + if [ "$(vercmp $2 168)" -lt 0 ]; then + echo " * Kernel 2.6.32 or newer is now required." + echo " * OSS emulation modules are not loaded by default, add to rc.conf if needed." + echo " * Arch specific cd symlinks are now no longer created." + echo " * cd and net persistent rules will no longer be autogenerated," + echo " see for details." + echo " * Errors are now logged (possibly to the console) by default." + fi + if [ "$(vercmp $2 171)" -lt 0 ]; then + echo " * Arch's custom blacklisting logic has been removed. MOD_AUTOLOAD and" + echo " blacklisting in MODULES no longer works." + echo " See 'man modprobe.conf' for a replacement to blacklisting." + echo " To disable a module mod1 on the kernel command line, use" + echo " mod1.disable=1" + echo " or" + echo " modprobe.blacklist=mod1" + echo " * The following modules are no longer unconditionally loaded:" + echo " pcspkr irtty-sir analog lp ppdev ide-generic" + echo " Add them to MODULES in rc.conf if you need them." + fi + if [ "$(vercmp $2 172)" -lt 0 ]; then + echo " * Blacklisting of framebuffer devices has moved from /etc/modprobe.d to" + echo " /lib/modprobe.d. Any customizations shoud be done to the file in /etc, as it" + echo " takes precedence." + echo " * kbd and rtc devices are no longer world readable." + echo " * rtc is no longer in the audio group and fb devices are no longer in" + echo " the video group, as permissions and ownership of fb devices are controlled" + echo " by X." + fi + if [ "$(vercmp $2 174)" -lt 0 ]; then + echo " * We now use upstream rules for assigning devices to the 'disk', 'optical'," + echo " 'scanner' and 'video' groups. Beware of any changes." + echo " * We no longer create symlinks from /dev/ to /dev/0." + echo " * For security reasons, we no longer add devices to the 'storage' group. Use" + echo " udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want" + echo " this functionality back." + echo " * We no longer create the static nodes on install needed for an initrd-less" + echo " boot where devtmpfs is not mounted by the kernel, this only affects fresh" + echo " installs." + fi + if [ "$(vercmp $2 175)" -lt 0 ]; then + echo " * devtmpfs support is now a hard requirement. Users of the official Arch" + echo " kernels have this enabled." + fi + echo " * udev-compat has been removed, and should be uninstalled." + echo " * Framebuffers are no longer blacklisted by default." + echo " * binaries moved from /sbin to /usr/bin" + fi +} -- cgit v1.2.3-54-g00ecf