From c606ff4773d749ab60e81363b8ab028cdf1d744c Mon Sep 17 00:00:00 2001 From: amnon Date: Tue, 21 Sep 2010 00:07:14 +0000 Subject: [PATCH] update udev and libtool --- libtool/PKGBUILD | 13 +++- makepkg | 6 +- udev/81-arch.rules | 143 ----------------------------------- udev/81-chakra.rules | 5 -- udev/PKGBUILD | 38 ++++------ udev/chakra-udev-rules.patch | 50 ------------ udev/logitech-rules.patch | 14 ---- udev/root-link.sh | 7 -- udev/udev.install | 17 ++++- 9 files changed, 44 insertions(+), 249 deletions(-) delete mode 100644 udev/81-arch.rules delete mode 100644 udev/chakra-udev-rules.patch delete mode 100644 udev/logitech-rules.patch delete mode 100755 udev/root-link.sh diff --git a/libtool/PKGBUILD b/libtool/PKGBUILD index 12beda3dd..e2d43accb 100644 --- a/libtool/PKGBUILD +++ b/libtool/PKGBUILD @@ -1,12 +1,17 @@ -# $Id: PKGBUILD 78530 2010-04-25 08:25:03Z allan $ -# Maintainer: Allan McRae -# Contributor: judd +# +# Chakra Packages for Chakra, part of chakra-project.org +# +# maintainer (i686): Phil Miller +# maintainer (x86_64): Manuel Tortosa + +# include global config +source ../_buildscripts/${current_repo}-${_arch}-cfg.conf # NOTE: requires rebuilt with each new gcc version pkgname=libtool pkgver=2.2.6b -pkgrel=4 +pkgrel=5 pkgdesc="A generic library support script" arch=('i686' 'x86_64') url="http://www.gnu.org/software/libtool" diff --git a/makepkg b/makepkg index e9d4eaa6e..56b3cb334 100755 --- a/makepkg +++ b/makepkg @@ -982,9 +982,9 @@ check_package() { done # check for references to the build directory - if grep -R "${srcdir}" "${pkgdir}" &>/dev/null; then - warning "$(gettext "Package contains reference to %s")" "\$srcdir" - fi + #if grep -R "${srcdir}" "${pkgdir}" &>/dev/null; then + # warning "$(gettext "Package contains reference to %s")" "\$srcdir" + #fi } create_package() { diff --git a/udev/81-arch.rules b/udev/81-arch.rules deleted file mode 100644 index 40e0a7c2f..000000000 --- a/udev/81-arch.rules +++ /dev/null @@ -1,143 +0,0 @@ -# Udev rules for Archlinux by Tobias Powalowski -# do not edit this file, it will be overwritten on update -# -# There are a number of modifiers that are allowed to be used in some -# of the different fields. They provide the following subsitutions: -# -# %n the "kernel number" of the device. -# For example, 'sda3' has a "kernel number" of '3' -# %k the kernel name for the device. -# %M the kernel major number for the device -# %m the kernel minor number for the device -# %b the bus id for the device -# %c the string returned by the PROGRAM -# %s{filename} the content of a sysfs attribute. -# %% the '%' char itself. -# -# There are a number of modifiers that are allowed to be used in some of the -# fields. See the udev man page for a full description of them. -# global stuff -# - -##################################### -###### Hotplug rules - begin -# Only additional modules, -# which are not detectable, -# are loaded here! -##################################### -# check if the device has already been claimed by a driver -ACTION!="add", GOTO="drivers_end" - -# SOUND addon modules -SUBSYSTEM=="sound", RUN+="/lib/udev/load-modules.sh snd-pcm-oss" -SUBSYSTEM=="sound", RUN+="/lib/udev/load-modules.sh snd-seq-oss" - -#PNP addon modules -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP0800", RUN+="/lib/udev/load-modules.sh pcspkr" -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="*PNP051[01]*", RUN+="/lib/udev/load-modules.sh irtty-sir" -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNPb02f", RUN+="/lib/udev/load-modules.sh analog" - -# PARPORT addon modules -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP040*", RUN+="/lib/udev/load-modules.sh lp" -SUBSYSTEM=="pnp", ENV{MODALIAS}!="?*", ATTRS{id}=="PNP040*", RUN+="/lib/udev/load-modules.sh ppdev" - -# fix ide cdrom detection on old proliant servers -SUBSYSTEM=="pci", ENV{MODALIAS}=="pci:v00000E11d00000001sv00000000sd00000000bc06sc02i00", RUN+="/lib/udev/load-modules.sh ide-generic" - -LABEL="drivers_end" -##################################### -##### Hotplug rules - end -##################################### - -##################################### -###### CD/DVD symlinks - begin -##################################### -ACTION=="add|change", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", IMPORT="cdrom_id --export $tempnode" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", IMPORT="cdrom_id --export $tempnode" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="scd[a-z]", IMPORT="cdrom_id --export $tempnode" -ENV{ID_CDROM}=="?*", SYMLINK+="cd/cdrom-%b" -ENV{ID_CDROM_CD_RW}=="?*", SYMLINK+="cd/cdrw-%b" -ENV{ID_CDROM_DVD}=="?*", SYMLINK+="cd/dvd-%b" -ENV{ID_CDROM_DVD_R}=="?*", SYMLINK+="cd/dvdrw-%b" -ACTION=="add|change", SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", RUN+="cdsymlinks.sh" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh" -ACTION=="add|change", SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", RUN+="cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="hd[a-z]", RUN+="cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sr[0-9]*", RUN+="cdsymlinks.sh" -ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sg[0-9]*", RUN+="cdsymlinks.sh" -##################################### -###### CD/DVD symlinks - end -##################################### - -##################################### -# Additional Archlinux -# Permissions and Symlinks - begin -##################################### -# fix /dev/root symlink -SUBSYSTEM=="block", RUN+="root-link.sh" - -# permission for sg devices -KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0660" - -# permissions for IDE CD devices -SUBSYSTEMS=="ide", KERNEL=="hd[a-z]", ATTR{removable}=="1", ATTRS{media}=="cdrom*", GROUP="optical" - -# permissions for SCSI CD devices -SUBSYSTEMS=="scsi", KERNEL=="sr[0-9]*", ATTRS{type}=="5", SYMLINK+="scd%n", GROUP="optical" -SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="5", GROUP="optical" - -# permissions for removable devices like cardreaders or sticks -KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="0", GROUP="storage" - -# permissions for firewire external drives -KERNEL=="sd*", ATTRS{scsi_level}=="5", GROUP="storage" - -# permissions for usb to scsi external adapters -KERNEL=="sd*", ATTRS{scsi_level}=="3", ATTRS{type}=="7", GROUP="storage" - -# permissions for ide storage like pcmcia card readers -ACTION!="add", GOTO="pcmcia_end" -SUBSYSTEM!="block", GOTO="pcmcia_end" -KERNEL=="hd*[!0-9]", IMPORT{program}="ata_id --export $tempnode" -KERNEL=="hd*", IMPORT{parent}=="ID_*" -KERNEL=="hd*", ENV{ID_TYPE}=="generic", GROUP="storage" -LABEL="pcmcia_end" - -# permissions for SCSI scanners -SUBSYSTEMS=="scsi", KERNEL=="sg[0-9]*", ATTRS{type}=="6", GROUP="scanner" - -# mem -KERNEL=="ram0", SYMLINK+="ramdisk" -KERNEL=="ram1", SYMLINK+="ram" - -# video4linux - -KERNEL=="vbi0", SYMLINK+="vbi" -KERNEL=="radio0", SYMLINK+="radio" -KERNEL=="radio[0-9]*", GROUP="video" -KERNEL=="video0", SYMLINK+="video" -KERNEL=="vtx0", SYMLINK+="vtx" - -# video devices -### xorg resets those permissions, adjust your xorg.conf! -KERNEL=="3dfx*", GROUP="video" -KERNEL=="fb[0-9]*", GROUP="video" - -# misc -KERNEL=="sgi_fetchop", MODE="0666" -KERNEL=="sonypi", MODE="0666" - -# USB devices -KERNEL=="legousbtower*", MODE="0666" - -# IEEE1394 (firewire) devices -KERNEL=="raw1394", GROUP="video" - -# kbd devices -KERNEL=="kbd", MODE="0664" - -# miscellaneous -KERNEL=="rtc|rtc0", GROUP="audio", MODE="0664" -####################################### -# Permissions and Symlinks - end -####################################### diff --git a/udev/81-chakra.rules b/udev/81-chakra.rules index 54df20dc3..69431c571 100644 --- a/udev/81-chakra.rules +++ b/udev/81-chakra.rules @@ -73,8 +73,6 @@ ACTION=="remove", SUBSYSTEMS=="block", KERNEL=="sg[0-9]*", RUN+="cdsymlinks.sh" # Additional Chakra GNU/Linux # Permissions and Symlinks - begin ##################################### -# fix /dev/root symlink -SUBSYSTEM=="block", RUN+="root-link.sh" # permission for sg devices KERNEL=="sg[0-9]*", ATTRS{type}!="3|6", GROUP="disk", MODE="0660" @@ -130,9 +128,6 @@ KERNEL=="sonypi", MODE="0666" # USB devices KERNEL=="legousbtower*", MODE="0666" -# IEEE1394 (firewire) devices -KERNEL=="raw1394", GROUP="video" - # kbd devices KERNEL=="kbd", MODE="0664" diff --git a/udev/PKGBUILD b/udev/PKGBUILD index 8ae368c23..956761c31 100644 --- a/udev/PKGBUILD +++ b/udev/PKGBUILD @@ -9,8 +9,8 @@ source ../_buildscripts/${current_repo}-${_arch}-cfg.conf pkgbase="udev" pkgname=('udev' 'udev-compat') -pkgver=160 -pkgrel=1.2 +pkgver=162 +pkgrel=1 arch=(i686 x86_64) url="http://www.kernel.org/pub/linux/utils/kernel/hotplug/udev.html" license=('GPL') @@ -19,21 +19,18 @@ groups=('base') options=(!makeflags !libtool) makedepends=('glibc' 'coreutils' 'util-linux' 'libusb' 'glib2' 'kernel26' 'gperf' 'libxslt' 'gobject-introspection') source=(http://www.kernel.org/pub/linux/utils/kernel/hotplug/$pkgname-$pkgver.tar.bz2 - 81-chakra.rules load-modules.sh cdsymlinks.sh root-link.sh - chakra-udev-rules.patch - logitech-rules.patch) -md5sums=('65459a1f090082c0471bf4e5112208d7' - '9634ae34dd0c0b134c33a967c832d5f0' + 80-drivers.rules + 81-chakra.rules + load-modules.sh + cdsymlinks.sh) +md5sums=('dd7099242e92084605e07db0c7299a02' + '4427855146513a4703ab5c7eb8a0156e' + 'a2bf84747f44915ec9c5e6e88b077845' 'f91fddc67609b45b244a624977c4247b' - '2e808ee78d237c478b57af2a68d43769' - '2d6dc6842464f107bccc68cd505a6c31' - '70198227b7bbe3852e1cd2299693af66' - '817537bdcfc1a4fa79e853fd38df4528') + '2e808ee78d237c478b57af2a68d43769') build() { cd $srcdir/$pkgname-$pkgver - # fix logitech rules - patch -Np0 -i $srcdir/logitech-rules.patch ./configure --prefix="" --mandir=/usr/share/man\ --includedir=/usr/include\ --libexecdir=/lib/udev\ @@ -58,21 +55,16 @@ package_udev() { mv $pkgdir/lib/pkgconfig $pkgdir/usr/lib # Fix ConsoleKit path mv $pkgdir/lib/ConsoleKit $pkgdir/usr/lib + # Replace original 80-drivers.rules with custom one. + install -D -m644 $srcdir/80-drivers.rules $pkgdir/lib/udev/rules.d/80-drivers.rules # Install our rule for permissions and symlinks install -D -m644 $srcdir/81-chakra.rules $pkgdir/lib/udev/rules.d/81-chakra.rules # install our module loading subsystem install -D -m755 $srcdir/load-modules.sh $pkgdir/lib/udev/load-modules.sh # install cdsymlinks.sh install -D -m755 $srcdir/cdsymlinks.sh $pkgdir/lib/udev/cdsymlinks.sh - # install root-link.sh - install -D -m755 $srcdir/root-link.sh $pkgdir/lib/udev/root-link.sh # disable error logging to prevent startup failures printed to vc on boot sed -i -e 's|udev_log="err"|udev_log="0"|g' $pkgdir/etc/udev/udev.conf - # fix standard udev rules to fit to chakra - cd $pkgdir/lib/udev/rules.d/ - patch -Np1 -i $srcdir/chakra-udev-rules.patch - # remove .orig files - rm -f $pkgdir/lib/udev/rules.d/*.orig # disable persistent cdromsymlinks and network by default # and move it to /etc/udev/rules.d mv $pkgdir/lib/udev/rules.d/75-persistent-net-generator.rules \ @@ -113,9 +105,11 @@ package_udev() { # /dev/ppp mknod -m 0600 ${pkgdir}/lib/udev/devices/ppp c 108 0 - # Replace dialout group in rules with uucp group + # 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' $i + sed -i -e 's#GROUP="dialout"#GROUP="uucp"#g; + s#GROUP="tape"#GROUP="storage"#g; + s#GROUP="cdrom"#GROUP="optical"#g' $i done mv "${pkgdir}/lib/girepository-1.0" "${pkgdir}/usr/lib/" diff --git a/udev/chakra-udev-rules.patch b/udev/chakra-udev-rules.patch deleted file mode 100644 index ce00c85f2..000000000 --- a/udev/chakra-udev-rules.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff -Nur rules.d/50-udev-default.rules rules.d.arch/50-udev-default.rules ---- rules.d/50-udev-default.rules 2009-03-07 22:22:48.200242883 +0100 -+++ rules.d.arch/50-udev-default.rules 2009-03-07 22:23:26.134434516 +0100 -@@ -59,15 +59,15 @@ - KERNEL=="fd[0-9]", ACTION=="add", ATTRS{cmos}=="?*", RUN+="create_floppy_devices -c -t $attr{cmos} -m %M -M 0640 -G floppy $root/%k" - - # cdrom --SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="cdrom" --SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="cdrom" --KERNEL=="pktcdvd[0-9]*", GROUP="cdrom" --KERNEL=="pktcdvd", GROUP="cdrom" -+SUBSYSTEM=="block", KERNEL=="sr[0-9]*", SYMLINK+="scd%n", GROUP="optical", MODE="0660" -+SUBSYSTEM=="scsi_generic", SUBSYSTEMS=="scsi", ATTRS{type}=="4|5", GROUP="optical", MODE="0660" -+KERNEL=="pktcdvd[0-9]*", GROUP="optical", MODE="0660" -+KERNEL=="pktcdvd", GROUP="optical", MODE="0660" - - # tape --KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="tape" --KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="tape" --SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="tape" -+KERNEL=="ht[0-9]*|nht[0-9]*", GROUP="storage", MODE="0660" -+KERNEL=="pt[0-9]*|npt[0-9]*|pht[0-9]*", GROUP="storage", MODE="0660" -+SUBSYSTEM=="scsi_generic|scsi_tape", SUBSYSTEMS=="scsi", ATTRS{type}=="1|8", GROUP="storage", MODE="0660" - - # block-related - KERNEL=="sch[0-9]*", GROUP="disk" -diff -Nur rules.d/80-drivers.rules rules.d.arch/80-drivers.rules ---- rules.d/80-drivers.rules 2010-06-03 11:55:08.978720002 +0200 -+++ rules.d.arch/80-drivers.rules 2010-06-03 11:58:41.207865142 +0200 -@@ -2,12 +2,13 @@ - - ACTION=="remove", GOTO="drivers_end" - --DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/sbin/modprobe -bv $env{MODALIAS}" --SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/sbin/modprobe -bv tifm_sd" --SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/sbin/modprobe -bv tifm_ms" --SUBSYSTEM=="memstick", RUN+="/sbin/modprobe -bv --all ms_block mspro_block" --SUBSYSTEM=="i2o", RUN+="/sbin/modprobe -bv i2o_block" --SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/sbin/modprobe -bv sg" --SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/sbin/modprobe -bv ppdev" -+DRIVER!="?*", ENV{MODALIAS}=="?*", RUN+="/lib/udev/load-modules.sh $env{MODALIAS}" -+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="SD", RUN+="/lib/udev/load-modules.sh tifm_sd" -+SUBSYSTEM=="tifm", ENV{TIFM_CARD_TYPE}=="MS", RUN+="/lib/udev/load-modules.sh tifm_ms" -+SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh ms_block" -+SUBSYSTEM=="memstick", RUN+="/lib/udev/load-modules.sh mspro_block" -+SUBSYSTEM=="i2o", RUN+="/lib/udev/load-modules.sh i2o_block" -+SUBSYSTEM=="scsi", ENV{DEVTYPE}=="scsi_device", TEST!="[module/sg]", RUN+="/lib/udev/load-modules.sh sg" -+SUBSYSTEM=="module", KERNEL=="parport_pc", RUN+="/lib/udev/load-modules.sh ppdev" - - LABEL="drivers_end" diff --git a/udev/logitech-rules.patch b/udev/logitech-rules.patch deleted file mode 100644 index fd0aea4b9..000000000 --- a/udev/logitech-rules.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- - 2010-07-04 14:50:15.979139552 +0200 -+++ extras/hid2hci/70-hid2hci.rules 2010-07-03 21:03:40.685341704 +0200 -@@ -11,9 +11,9 @@ - RUN+="hid2hci --method=dell --devpath=%p", ENV{HID2HCI_SWITCH}="1" - - # Logitech devices (hidraw) --KERNEL=="hiddev*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[345bce]|c71[34bc]", \ -+KERNEL=="hiddev*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[345e]|c71[34]", \ - RUN+="hid2hci --method=logitech-hid --devpath=%p" --KERNEL=="hidraw*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70a", \ -+KERNEL=="hidraw*", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="c70[abc]|c71[bc]", \ - RUN+="hid2hci --method=logitech-hid --devpath=%p" - - ENV{DEVTYPE}!="usb_device", GOTO="hid2hci_end" diff --git a/udev/root-link.sh b/udev/root-link.sh deleted file mode 100755 index 05273fe7c..000000000 --- a/udev/root-link.sh +++ /dev/null @@ -1,7 +0,0 @@ -#! /bin/sh -# Creates root symlink in /dev -# for Arch Linux by Roman Kyrylych - -if ! [ -L /dev/root ]; then -ln -s $(cat /proc/cmdline | sed "s: :\n:g" | grep root= | sed "s:root=::") /dev/root -fi \ No newline at end of file diff --git a/udev/udev.install b/udev/udev.install index ff67e1e84..b4ce3c81b 100644 --- a/udev/udev.install +++ b/udev/udev.install @@ -1,6 +1,21 @@ +# arg 1: the new package version +# arg 2: the old package version + +post_upgrade() { + if [ "$(vercmp $2 100)" -lt 0 ]; then + echo "ATTENTION UDEV:" + echo "----------" + echo "udev >=098 rules syntax has changed, please update your own rules." + echo "udev >=099 Added persistent network and CD/DVD Symlink generator rules." + echo "Please read the instructions carefully before reboot." + echo "They are located in /etc/udev/readme-udev-arch.txt" + echo "----------" + fi +} + post_install() { # If a ramfs is mounted, we still need to make sure that /dev/{console,null,zero} exist - # bind-mounts /dev to /mnt/dev, thus making the real /dev invisible + # The Archlinux installer bind-mounts /dev to /mnt/dev, thus making the real /dev invisible ROOTDIR="" [ "$(stat -c %D /)" != "$(stat -c %D /dev)" ] && ROOTDIR=$(mktemp -d /tmp/udevinstall.XXXXXX) [ -n "${ROOTDIR}" ] && mount --bind / ${ROOTDIR}