[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)
Tobias Powalowski
tpowa at nymeria.archlinux.org
Thu Jun 6 15:05:42 UTC 2013
Date: Thursday, June 6, 2013 @ 17:05:42
Author: tpowa
Revision: 187823
upgpkg: hwdetect 2013.06-2
remove not needed functions and rc.conf listings
Modified:
hwdetect/trunk/PKGBUILD
hwdetect/trunk/hwdetect
----------+
PKGBUILD | 4 ++--
hwdetect | 28 ----------------------------
2 files changed, 2 insertions(+), 30 deletions(-)
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2013-06-06 15:03:16 UTC (rev 187822)
+++ PKGBUILD 2013-06-06 15:05:42 UTC (rev 187823)
@@ -2,7 +2,7 @@
# Maintainer: Tobias Powalowski <tpowa at archlinux.org>
pkgname=hwdetect
pkgver=2013.06
-pkgrel=1
+pkgrel=2
pkgdesc="Hardware detection script with loading modules and mkinitcpio.conf / rc.conf support"
arch=(any)
license=('GPL')
@@ -16,4 +16,4 @@
package() {
install -D -m 755 "${srcdir}/hwdetect" "${pkgdir}/usr/bin/hwdetect"
}
-md5sums=('2a14a8d06e8ede72891559ac1f491d3d')
+md5sums=('8fb738c159c9e8b397473f6aaaa834d9')
Modified: hwdetect
===================================================================
--- hwdetect 2013-06-06 15:03:16 UTC (rev 187822)
+++ hwdetect 2013-06-06 15:05:42 UTC (rev 187823)
@@ -1,7 +1,6 @@
#! /bin/sh
# Autodetection script for scanning /sys for hardware
# for Archlinux by Tobias Powalowski <tpowa at archlinux.org>
-# '--modules-not-loaded' patch by Grzegorz Wierzowiecki <grzegorz.wierzowiecki_4t_pjwstk.edu.pl>
usage () {
echo "$0 [options]"
echo ""
@@ -26,8 +25,6 @@
echo " --show-sound show SOUND modules"
echo " --show-staging show STAGING modules"
echo " --show-other show OTHER modules"
- echo " --modules show all detected MODULES"
- echo " --modules-not-loaded show all detected MODULES but not actually loaded"
echo ""
echo " For /etc/mkinitcpio.conf use:"
echo " --filesystem add filesystems to MODULES="
@@ -329,27 +326,6 @@
echo ""
}
-showlist3() {
- cat=$1 ; shift
- [ $# -gt 0 ] || return
- for i in $*; do echo -n "$i "; done
- echo ""
-}
-
-showlist4() {
- cat=$1 ; shift
- [ $# -gt 0 ] || return
- echo -n "$cat=(\${MODULES[*]} "
- lsmod > /tmp/modules-showlist4-$$
- for i in $*; do
- if ! grep -sq $(echo $i|tr - _) /tmp/modules-showlist4-$$ ; then
- echo -n "$i ";
- fi
- done
- echo ")"
- rm /tmp/modules-showlist4-$$
-}
-
# starting different actions
while [ -n "$*" ]; do
case $1 in
@@ -443,10 +419,6 @@
MODULES_INITRAMFS="$FB $MODULES_INITRAMFS "
! [ "$HOOKS" = "1" ] && showlist2 "MODULES" \"$MODULES_INITRAMFS\" | sed -e 's/(\ /(/g' -e 's/"\ /"/g' -e 's/\ "/"/g' -e 's/\ \ /\ /g'
;;
- --modules) showlist2 "MODULES" \($(listmods modules/)\) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
- ;;
- --modules-not-loaded) showlist4 "MODULES" $(listmods modules/) | sed -e 's/(\ /(/g' -e 's/\ )/)/g' -e 's/\ \ /\ /g'
- ;;
--hooks)
if [ "$HOOKS_DIR" = "" ]; then
HOOKS_DIR="/usr/lib/initcpio/install"
More information about the arch-commits
mailing list