From cf737e4b40ec98de9674f9ef8e65f997cd0bb3cead51dd3460d6fc13858491b5 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Thu, 20 Nov 2008 14:54:02 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/mpt-firmware?expand=0&rev=4 --- hwcfg-mptfc | 5 ---- hwcfg-mptsas | 5 ---- hwcfg-mptspi | 5 ---- modprobe.mptctl | 3 +++ mpt-firmware.changes | 6 +++++ mpt-firmware.spec | 58 +++++++++++++++++++++----------------------- 6 files changed, 36 insertions(+), 46 deletions(-) delete mode 100644 hwcfg-mptfc delete mode 100644 hwcfg-mptsas delete mode 100644 hwcfg-mptspi create mode 100644 modprobe.mptctl diff --git a/hwcfg-mptfc b/hwcfg-mptfc deleted file mode 100644 index c53f2ec..0000000 --- a/hwcfg-mptfc +++ /dev/null @@ -1,5 +0,0 @@ -# MPT Fusion FC driver -# Autoload mpctl module -MODULE_0='mptfc' -MODULE_1='mptctl' -STARTMODE='auto' diff --git a/hwcfg-mptsas b/hwcfg-mptsas deleted file mode 100644 index 7fbb947..0000000 --- a/hwcfg-mptsas +++ /dev/null @@ -1,5 +0,0 @@ -# MPT Fusion SAS driver -# Autoload mpctl module -MODULE_0='mptsas' -MODULE_1='mptctl' -STARTMODE='auto' diff --git a/hwcfg-mptspi b/hwcfg-mptspi deleted file mode 100644 index 55c15ec..0000000 --- a/hwcfg-mptspi +++ /dev/null @@ -1,5 +0,0 @@ -# MPT Fusion SPI driver -# Autoload mpctl module -MODULE_0='mptspi' -MODULE_1='mptctl' -STARTMODE='auto' diff --git a/modprobe.mptctl b/modprobe.mptctl new file mode 100644 index 0000000..923ef38 --- /dev/null +++ b/modprobe.mptctl @@ -0,0 +1,3 @@ +# Autoload mptctl +install mptbase /sbin/modprobe --ignore-install mptbase && /sbin/modprobe --ignore-install mptctl +remove mptbase /sbin/modprobe -r --ignore-remove mptctl; /sbin/modprobe -r --ignore-remove mptbase diff --git a/mpt-firmware.changes b/mpt-firmware.changes index 01c689f..f949d29 100644 --- a/mpt-firmware.changes +++ b/mpt-firmware.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Nov 20 11:00:16 CET 2008 - hare@suse.de + +- Update to use modprobe files (bnc#444815) +- Update modalias definitions. + ------------------------------------------------------------------- Mon Nov 13 15:24:57 CET 2006 - hare@suse.de diff --git a/mpt-firmware.spec b/mpt-firmware.spec index 1518336..8852419 100644 --- a/mpt-firmware.spec +++ b/mpt-firmware.spec @@ -19,38 +19,36 @@ Name: mpt-firmware -Summary: Configuration files for autoloading mptctl at boot time. +Summary: Configuration files for autoloading mptctl at boot time Version: 1.0 -Release: 233 +Release: 234 License: GPL v2 or later Group: Hardware/Other -BuildRequires: kernel-default sysconfig -Requires: sysconfig +Requires: module-init-tools BuildArch: noarch BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: hwcfg-mptspi -Source1: hwcfg-mptfc -Source2: hwcfg-mptsas +Source0: modprobe.mptctl Source3: update-pci-id-list.sh # Module: mptspi.ko Supplements: modalias(pci:v00001000d00000030sv*sd*bc*sc*i*) -Supplements: modalias(pci:v00001000d00000032sv*sd*bc*sc*i*) +Supplements: modalias(pci:v0000117Cd00000030sv*sd*bc*sc*i*) +Supplements: modalias(pci:v00001000d00000040sv*sd*bc*sc*i*) # Module: mptfc.ko Supplements: modalias(pci:v00001000d00000621sv*sd*bc*sc*i*) -Supplements: modalias(pci:v00001000d00000624sv*sd*bc*sc*i*) Supplements: modalias(pci:v00001000d00000622sv*sd*bc*sc*i*) -Supplements: modalias(pci:v00001000d00000628sv*sd*bc*sc*i*) +Supplements: modalias(pci:v00001000d00000624sv*sd*bc*sc*i*) Supplements: modalias(pci:v00001000d00000626sv*sd*bc*sc*i*) -Supplements: modalias(pci:v00001000d00000642sv*sd*bc*sc*i*) +Supplements: modalias(pci:v00001000d00000628sv*sd*bc*sc*i*) Supplements: modalias(pci:v00001000d00000640sv*sd*bc*sc*i*) +Supplements: modalias(pci:v00001000d00000642sv*sd*bc*sc*i*) Supplements: modalias(pci:v00001000d00000646sv*sd*bc*sc*i*) +Supplements: modalias(pci:v00001657d00000646sv*sd*bc*sc*i*) # Module: mptsas.ko Supplements: modalias(pci:v00001000d00000050sv*sd*bc*sc*i*) -Supplements: modalias(pci:v00001000d0000005Esv*sd*bc*sc*i*) Supplements: modalias(pci:v00001000d00000054sv*sd*bc*sc*i*) Supplements: modalias(pci:v00001000d00000056sv*sd*bc*sc*i*) -Supplements: modalias(pci:v00001000d0000005Asv*sd*bc*sc*i*) Supplements: modalias(pci:v00001000d00000058sv*sd*bc*sc*i*) +Supplements: modalias(pci:v00001000d00000062sv*sd*bc*sc*i*) # end of supplements list %prep @@ -59,22 +57,16 @@ Supplements: modalias(pci:v00001000d00000058sv*sd*bc*sc*i*) # There is nothing to build %install -mkdir -p $RPM_BUILD_ROOT/etc/sysconfig/hardware -for pid in $(grep mptspi /lib/modules/*/modules.alias | sed 's/.*d0000\(.*\)sv.*/\1/g' | tr [A-F] [a-f]); do - cp %{S:0} $RPM_BUILD_ROOT/etc/sysconfig/hardware/hwcfg-vpid-1000-$pid -done -for pid in $(grep mptfc /lib/modules/*/modules.alias | sed 's/.*d0000\(.*\)sv.*/\1/g' | tr [A-F] [a-f]); do - cp %{S:1} $RPM_BUILD_ROOT/etc/sysconfig/hardware/hwcfg-vpid-1000-$pid -done -for pid in $(grep mptsas /lib/modules/*/modules.alias | sed 's/.*d0000\(.*\)sv.*/\1/g' | tr [A-F] [a-f]); do - cp %{S:2} $RPM_BUILD_ROOT/etc/sysconfig/hardware/hwcfg-vpid-1000-$pid -done +mkdir -p $RPM_BUILD_ROOT/etc/modprobe.d +cp %{S:0} $RPM_BUILD_ROOT/etc/modprobe.d/mptctl %description -This package contains hardware configuration files that autoload the - mptctl ioctl driver at boot time. The mptctl driver is an ioctl - character driver for the LSI Logic Fusion-MPT Host adapter - series. These adapters include - Ultra320 53C1030, 53C1020 +This package contains modprobe configuration files to autoload the +mptctl ioctl driver at boot time. The mptctl driver is an ioctl +character driver for the LSI Logic Fusion-MPT Host adapter series. +These adapters include + +- Ultra320 53C1030, 53C1020 - Fiber Channel FC909, FC919, FC929, FC919X and FC929X @@ -84,20 +76,24 @@ This package contains hardware configuration files that autoload the Authors: -------- - Eric Moore + Eric Moore %clean rm -rf $RPM_BUILD_ROOT %files -%defattr(0644,root,root) -/etc/sysconfig/hardware/* +%defattr(-,root,root) +%dir /etc/modprobe.d +%config /etc/modprobe.d/* %changelog +* Thu Nov 20 2008 hare@suse.de +- Update to use modprobe files (bnc#444815) +- Update modalias definitions. * Mon Nov 13 2006 hare@suse.de - Create hwcfg files based on the modalias provided by the respective modules. * Tue Oct 17 2006 hare@suse.de - Create files dynamically -* Wed Sep 13 2006 Eric.Moore@lsil.com +* Tue Sep 12 2006 Eric.Moore@lsil.com - Initial creation of this rpm (FATE 300676).