[arch-commits] Commit in hwdetect/trunk (PKGBUILD hwdetect)

[Tobias Powalowski]

    Date: Thursday, August 22, 2013 @ 13:59:21
  Author: tpowa
Revision: 193526

upgpkg: hwdetect 2013.08-2

remove not needed framebuffer parts and uvesafb

Modified:
  hwdetect/trunk/PKGBUILD
  hwdetect/trunk/hwdetect

----------+
 PKGBUILD |    4 ++--
 hwdetect |   23 +----------------------
 2 files changed, 3 insertions(+), 24 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-08-22 05:37:20 UTC (rev 193525)
+++ PKGBUILD	2013-08-22 11:59:21 UTC (rev 193526)
@@ -2,7 +2,7 @@
 # Maintainer: Tobias Powalowski <tpowa at archlinux.org>
 pkgname=hwdetect
 pkgver=2013.08
-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=('c40773ccf82b1a7da2d29d5fd4f7aefc')
+md5sums=('1ffabf5db0f3b98336045a5ba1580454')

Modified: hwdetect
===================================================================
--- hwdetect	2013-08-22 05:37:20 UTC (rev 193525)
+++ hwdetect	2013-08-22 11:59:21 UTC (rev 193526)
@@ -78,9 +78,6 @@
 	KERNEL_VERSION="$(uname -r)"
 fi
 
-# uvesafb switch
-[ "$(echo $* | grep '\-uvesafb')" ] && UVESAFB=1
-
 # dmraid switch
 [ "$(echo $* | grep '\-dmraid')" ] && DMRAID=1
 
@@ -310,26 +307,11 @@
 				MODULES_INITRAMFS="$KMS $MODULES_INITRAMFS"
 				showlist2 "MODULES" \"$MODULES_INITRAMFS\" | sed -e 's/(\  /(/g' -e 's/"\ /"/g' -e 's/\ "/"/g' -e 's/\ \ /\ /g'
 				;;
-		--uvesafb) 	FB="uvesafb"
-				MODULES_INITRAMFS="$FB $MODULES_INITRAMFS"
-				! [ "$HOOKS" = "1" ] && showlist2 "MODULES" \"$MODULES_INITRAMFS\" | sed -e 's/(\  /(/g' -e 's/"\ /"/g' -e 's/\ "/"/g' -e 's/\ \ /\ /g'
-				;;
-		--fbmodule) 	FB=""
-				for i in $(cat /etc/modprobe.d/framebuffer_blacklist.conf); do
-				    i=$(echo $i | sed -e 's/blacklist //g')
-				    # check if already in FB array, to avoid double entries
-				    if [ "$(cat /proc/modules | grep ^$i)" ]; then
-					! [ "$(grep -w $FB)" ] && FB="$i"
-				    fi
-                                done
-				MODULES_INITRAMFS="$FB $MODULES_INITRAMFS "
-				! [ "$HOOKS" = "1" ] && showlist2 "MODULES" \"$MODULES_INITRAMFS\" | sed -e 's/(\  /(/g' -e 's/"\ /"/g' -e 's/\ "/"/g' -e 's/\ \ /\ /g'
-				;;
 		--hooks) 
 			if [ "$HOOKS_DIR" = "" ]; then
 				HOOKS_DIR="/usr/lib/initcpio/install"
 			fi
-			START_HOOKS="base v86d udev keymap autodetect modconf block pcmcia net dmraid keyboard $ADVANCED btrfs filesystems fsck shutdown"
+			START_HOOKS="base udev keymap autodetect modconf block pcmcia net dmraid keyboard $ADVANCED btrfs filesystems fsck shutdown"
 			# remove the ones that don't exist on the system
 			for i in ${START_HOOKS}; do
 				if ! [ -e "${HOOKS_DIR}/$i" ]; then 
@@ -339,9 +321,6 @@
 			if ! [ "$KEYMAP" = "1" ]; then 
 				START_HOOKS=$(echo $START_HOOKS | sed -e "s/keymap//g")
 			fi
-			if ! [ "$UVESAFB" = "1" ]; then 
-				START_HOOKS=$(echo $START_HOOKS | sed -e "s/v86d//g")
-			fi
 			if ! [ "$DMRAID" = "1" ]; then 
 				START_HOOKS=$(echo $START_HOOKS | sed -e "s/dmraid//g")
 			fi