rpm/hdparm
SHA256
1
0
Fork 0
forked from pool/hdparm
Code Pull Requests Activity

Accepting request 250173 from home:elvigia:branches:Base:System

Browse Source 
- Fix udev rules, broken script location, scriptlets 
  macro usages..

OBS-URL: https://build.opensuse.org/request/show/250173
OBS-URL: https://build.opensuse.org/package/show/Base:System/hdparm?expand=0&rev=72
This commit is contained in:
Stephan Kulow 2014-09-25 05:47:51 +00:00 committed by Git OBS Bridge
parent ab336cf6c6
commit fcc7cb8fd2
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
56-idedma.rules
View File

@ -1,2 +1,2 @@
# start idedma script for each added IDE device # start idedma script for each added IDE device
ACTION=="add", SUBSYSTEM=="block", KERNEL=="hd*[!0-9]", RUN+="/lib/udev/idedma.sh $env{DEVNAME}" ACTION=="add", SUBSYSTEM=="block", KERNEL=="hd*[!0-9]", RUN+="/usr/lib/udev/idedma.sh $env{DEVNAME}"

6
hdparm.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Sep 19 05:49:02 UTC 2014 - crrodriguez@opensuse.org
- Fix udev rules, broken script location, scriptlets
macro usages..
------------------------------------------------------------------- -------------------------------------------------------------------
Sat Jul 19 13:31:06 UTC 2014 - p.drouand@gmail.com Sat Jul 19 13:31:06 UTC 2014 - p.drouand@gmail.com

15
hdparm.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package hdparm # spec file for package hdparm
# #
# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -35,7 +35,9 @@ BuildRequires: pkgconfig
BuildRequires: pkgconfig(udev) BuildRequires: pkgconfig(udev)
Url: http://sourceforge.net/projects/hdparm/ Url: http://sourceforge.net/projects/hdparm/
BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRoot: %{_tmppath}/%{name}-%{version}-build
%define _udevdir %(pkg-config --variable udevdir udev)
%{!?_udevdir: %global _udevdir %(pkg-config --variable=udevdir udev) }
%{!?_udevrulesdir: %global _udevrulesdir %(pkg-config --variable=udevdir udev)/rules.d }
%description %description
A shell utility to access and tune the ioctl features of the Linux IDE A shell utility to access and tune the ioctl features of the Linux IDE
@ -56,8 +58,8 @@ mkdir -p $RPM_BUILD_ROOT/usr/share/man/man8
install -d $RPM_BUILD_ROOT/%{_sbindir} install -d $RPM_BUILD_ROOT/%{_sbindir}
%make_install binprefix=%{_prefix} %make_install binprefix=%{_prefix}
mv contrib/README contrib/README.contrib mv contrib/README contrib/README.contrib
install -d $RPM_BUILD_ROOT%{_udevdir}/rules.d install -d $RPM_BUILD_ROOT%{_udevrulesdir}
install -m 644 %{S:1} $RPM_BUILD_ROOT%{_udevdir}/rules.d install -m 644 %{S:1} $RPM_BUILD_ROOT%{_udevrulesdir}
install -d $RPM_BUILD_ROOT/var/adm/fillup-templates install -d $RPM_BUILD_ROOT/var/adm/fillup-templates
install -m 644 %{S:2} $RPM_BUILD_ROOT/var/adm/fillup-templates install -m 644 %{S:2} $RPM_BUILD_ROOT/var/adm/fillup-templates
install -m 755 %{S:3} $RPM_BUILD_ROOT/%{_udevdir}/idedma.sh install -m 755 %{S:3} $RPM_BUILD_ROOT/%{_udevdir}/idedma.sh
@ -99,6 +101,7 @@ if [ "$NEW_DMA" != "" ] ; then
&& mv etc/sysconfig/ide.new etc/sysconfig/ide && mv etc/sysconfig/ide.new etc/sysconfig/ide
rm -f etc/sysconfig/ide.new rm -f etc/sysconfig/ide.new
fi fi
%{?udev_rules_update:%{udev_rules_update}}
%files %files
%defattr(-,root,root) %defattr(-,root,root)
@ -110,10 +113,8 @@ fi
#EndUserMerge #EndUserMerge
%{_sbindir}/hdparm %{_sbindir}/hdparm
%{_sbindir}/wiper.sh %{_sbindir}/wiper.sh
%dir %{_udevdir}
%{_udevdir}/idedma.sh %{_udevdir}/idedma.sh
%dir %{_udevdir}/rules.d %{_udevrulesdir}/56-idedma.rules
%{_udevdir}/rules.d/56-idedma.rules
/usr/lib/hdparm /usr/lib/hdparm
/var/adm/fillup-templates/sysconfig.ide /var/adm/fillup-templates/sysconfig.ide

2
udev.idedma.sh
View File

@ -10,7 +10,7 @@
# status is not changed. # status is not changed.
# #
HDPARM=/sbin/hdparm HDPARM=/usr/sbin/hdparm
test -x $HDPARM || exit 5 test -x $HDPARM || exit 5
# read values from sysconfig # read values from sysconfig