rpms/cdrkit
7
0
Fork 0
Code Issues Pull Requests Releases Activity

libusal: added /dev/srN next to /dev/scdN path when scanning for devices

Browse Source 
added cdrkit-1.1.11-devname.patch
  bz#1053056
This commit is contained in:
Frantisek Kluknavsky 2015-05-29 13:51:24 +02:00
parent 430adff64e
commit 44f01f1477
2 changed files with 38 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
cdrkit-1.1.11-devname.patch Normal file
View File

@ -0,0 +1,30 @@
diff -up wrk/libusal/scsi-linux-sg.c.wrk wrk/libusal/scsi-linux-sg.c
--- wrk/libusal/scsi-linux-sg.c.wrk 2015-05-29 13:30:41.088896572 +0200
+++ wrk/libusal/scsi-linux-sg.c 2015-05-29 13:38:25.776303388 +0200
@@ -509,7 +509,9 @@ usalo_open(SCSI *usalp, char *device)
/* scan and maybe keep one open, sg_setup decides */
#define HDX 0
#define SCD 1
-#define SG 2
+/* second scd option included because of Fedora naming convention /dev/srN */
+#define SCD2 2
+#define SG 3
int h;
/*
retry_scan_open:
@@ -533,6 +535,15 @@ retry_scan_open:
first=0;
last=255;
break;
+ }
+ case(SCD2):
+ {
+ if(!check_linux_26())
+ continue;
+ pattern="/dev/sr%d";
+ first=0;
+ last=255;
+ break;
}
case(SG):
{

9
cdrkit.spec
View File

@ -1,7 +1,7 @@
Summary: A collection of CD/DVD utilities Summary: A collection of CD/DVD utilities
Name: cdrkit Name: cdrkit
Version: 1.1.11 Version: 1.1.11
Release: 27%{?dist} Release: 28%{?dist}
License: GPLv2 License: GPLv2
Group: Applications/System Group: Applications/System
URL: http://cdrkit.org/ URL: http://cdrkit.org/
@ -25,6 +25,7 @@ Patch16: cdrkit-1.1.11-cmakewarn.patch
Patch17: cdrkit-1.1.11-memset.patch Patch17: cdrkit-1.1.11-memset.patch
Patch19: cdrkit-1.1.11-ppc64le_elfheader.patch Patch19: cdrkit-1.1.11-ppc64le_elfheader.patch
Patch20: cdrkit-1.1.11-werror_gcc5.patch Patch20: cdrkit-1.1.11-werror_gcc5.patch
Patch21: cdrkit-1.1.11-devname.patch
BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel BuildRequires: cmake libcap-devel zlib-devel perl file-devel bzip2-devel
@ -136,6 +137,7 @@ SCSI devices.
%patch17 -p1 -b .edcspeed %patch17 -p1 -b .edcspeed
%patch19 -p1 -b .elfheader %patch19 -p1 -b .elfheader
%patch20 -p1 -b .werror_gcc5 %patch20 -p1 -b .werror_gcc5
%patch21 -p1 -b .devname
# we do not want bundled paranoia library # we do not want bundled paranoia library
rm -rf libparanoia rm -rf libparanoia
@ -300,6 +302,11 @@ fi
%{_includedir}/usal %{_includedir}/usal
%changelog %changelog
* Fri May 29 2015 Frantisek Kluknavsky <fkluknav@redhat.com> - 1.1.11-28
- libusal: added /dev/srN next to /dev/scdN path when scanning for devices
added cdrkit-1.1.11-devname.patch
bz#1053056
* Wed Feb 25 2015 Frantisek Kluknavsky <fkluknav@redhat.com> - 1.1.11-27 * Wed Feb 25 2015 Frantisek Kluknavsky <fkluknav@redhat.com> - 1.1.11-27
- fixed FTBFS with gcc5, added cdrkit-1.1.11-werror_gcc5.patch - fixed FTBFS with gcc5, added cdrkit-1.1.11-werror_gcc5.patch