From a8af5a5c69262015ba6e61d0ba75c7d5787af8d7 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Mon, 23 Jan 2012 15:33:34 +0100
Subject: [PATCH] initramfs-tools: remove obsolete/unexistend modules from
 hooks.

---
 srcpkgs/initramfs-tools/files/hook-functions | 15 ++++-----------
 srcpkgs/initramfs-tools/files/hooks/drm-kms  |  1 -
 srcpkgs/initramfs-tools/template             |  2 +-
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/srcpkgs/initramfs-tools/files/hook-functions b/srcpkgs/initramfs-tools/files/hook-functions
index f30a67b8e69..5f383f3884a 100644
--- a/srcpkgs/initramfs-tools/files/hook-functions
+++ b/srcpkgs/initramfs-tools/files/hook-functions
@@ -352,7 +352,6 @@ dep_add_modules()
 	if [ -d "${DESTDIR}/lib/modules/${version}/kernel/drivers/ide" ]; then
 		sys_walk_modalias ${root_dev_path}
 		manual_add_modules ide-gd_mod
-		manual_add_modules ide-cd
 	fi
 
 	if [ -d "${DESTDIR}/lib/modules/${version}/kernel/drivers/scsi" ]; then
@@ -379,10 +378,10 @@ auto_add_modules()
 {
 	case "${1:-}" in
 	base)
-		for x in ehci-hcd ohci-hcd uhci-hcd usbhid xhci xhci-hcd \
+		for x in ehci-hcd ohci-hcd uhci-hcd usbhid xhci-hcd \
 		hid-apple hid-cherry hid-logitech hid-microsoft hid-sunplus \
-		btrfs ext2 ext3 ext4 ext4dev isofs jfs reiserfs udf xfs \
-		af_packet atkbd i8042 virtio_pci; do
+		btrfs ext2 ext3 ext4 isofs jfs reiserfs udf xfs \
+		i8042 virtio_pci; do
 			manual_add_modules "${x}"
 		done
 	;;
@@ -394,7 +393,7 @@ auto_add_modules()
 	;;
 	scsi)
 		copy_modules_dir kernel/drivers/scsi
-		for x in mptfc mptsas mptscsih mptspi zfcp; do
+		for x in mptfc mptsas mptscsih mptspi; do
 			manual_add_modules "${x}"
 		done
 	;;
@@ -419,11 +418,6 @@ auto_add_modules()
 			manual_add_modules "${x}"
 		done
 	;;
-	dasd)
-		for x in dasd_diag_mod dasd_eckd_mod dasd_fba_mod; do
-			manual_add_modules "${x}"
-		done
-	;;
 	usb_storage)
 		copy_modules_dir kernel/drivers/usb/storage
 	;;
@@ -434,7 +428,6 @@ auto_add_modules()
 		auto_add_modules block
 		auto_add_modules ata
 		auto_add_modules i2o
-		auto_add_modules dasd
 		auto_add_modules ieee1394
 		auto_add_modules firewire
 		auto_add_modules mmc
diff --git a/srcpkgs/initramfs-tools/files/hooks/drm-kms b/srcpkgs/initramfs-tools/files/hooks/drm-kms
index 5fe49f9ab11..0bc033ff829 100755
--- a/srcpkgs/initramfs-tools/files/hooks/drm-kms
+++ b/srcpkgs/initramfs-tools/files/hooks/drm-kms
@@ -20,7 +20,6 @@ esac
 
 manual_add_modules fbcon
 manual_add_modules intel-agp
-manual_add_modules ati-agp
 manual_add_modules i915
 manual_add_modules radeon
 
diff --git a/srcpkgs/initramfs-tools/template b/srcpkgs/initramfs-tools/template
index 9d1b3af1a13..9c79e52129b 100644
--- a/srcpkgs/initramfs-tools/template
+++ b/srcpkgs/initramfs-tools/template
@@ -1,6 +1,6 @@
 # Template file for 'initramfs-tools'
 pkgname=initramfs-tools
-_localver=112		# This is the XBPS version
+_localver=113		# This is the XBPS version
 _distver=0.99		# This should match debian version
 version=${_distver}.${_localver}
 short_desc="Tools for generating an initramfs"