jengelh/cdemu-daemon
SHA256
1
0
Fork 0
forked from pool/cdemu-daemon
Code Pull Requests Activity

Accepting request 288084 from filesystems

Browse Source 
- new cdemu_daemon_typo_in_mmc_packet_commands_h.patch to avoid ppc/ppc64 build failure

OBS-URL: https://build.opensuse.org/request/show/288084
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/cdemu-daemon?expand=0&rev=14
This commit is contained in:
Dominique Leuenberger 2015-03-01 13:46:55 +00:00 committed by Git OBS Bridge
commit aff448b5ee
3 changed files with 44 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
cdemu-daemon.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Thu Feb 26 12:44:38 UTC 2015 - normand@linux.vnet.ibm.com
- new cdemu_daemon_typo_in_mmc_packet_commands_h.patch
to avoid ppc/ppc64 build failure
related to upstream ticket https://sourceforge.net/p/cdemu/patches/22/
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Oct 2 13:49:10 UTC 2014 - jengelh@inai.de Thu Oct 2 13:49:10 UTC 2014 - jengelh@inai.de

5
cdemu-daemon.spec
View File

@ -1,7 +1,7 @@
# #
# spec file for package cdemu-daemon # spec file for package cdemu-daemon
# #
# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2015 SUSE LINUX 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
@ -29,6 +29,7 @@ Source: http://downloads.sf.net/cdemu/%name-%version.tar.bz2
Source2: 60-vhba.rules Source2: 60-vhba.rules
Source3: cdemu-daemon.sysconfig Source3: cdemu-daemon.sysconfig
Patch1: logfile.diff Patch1: logfile.diff
Patch2: cdemu_daemon_typo_in_mmc_packet_commands_h.patch
BuildRequires: cmake >= 2.8.5 BuildRequires: cmake >= 2.8.5
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: pkgconfig(ao) >= 0.8.0 BuildRequires: pkgconfig(ao) >= 0.8.0
@ -52,7 +53,7 @@ that can be used by clients to control it.
%prep %prep
%setup -q %setup -q
%patch -P 1 -p1 %patch -P 1 -P 2 -p1
%build %build
cmake . \ cmake . \

34
cdemu_daemon_typo_in_mmc_packet_commands_h.patch Normal file
View File

@ -0,0 +1,34 @@
From: Michel Normand <normand@linux.vnet.ibm.com>
Subject: cdemu daemon typo in mmc packet commands h
Date: Thu, 26 Feb 2015 13:21:14 +0100
References: https://sourceforge.net/p/cdemu/patches/22/
cdemu daemon typo in mmc packet commands h
that make build failure for ppc/ppc64 archi:
===
Building C object CMakeFiles/cdemu-daemon.dir/src/device.c.o
In file included from /home/abuild/rpmbuild/BUILD/cdemu-daemon-3.0.2/src/cdemu.h:51:0,
from /home/abuild/rpmbuild/BUILD/cdemu-daemon-3.0.2/src/daemon.c:20:
/home/abuild/rpmbuild/BUILD/cdemu-daemon-3.0.2/src/mmc-packet-commands.h:1671:9: error: expected ',', ';' or '}' before 'guint8'
guint8 itwp : 3;
^
===
Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
---
src/mmc-packet-commands.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
Index: cdemu-daemon-3.0.2/src/mmc-packet-commands.h
===================================================================
--- cdemu-daemon-3.0.2.orig/src/mmc-packet-commands.h
+++ cdemu-daemon-3.0.2/src/mmc-packet-commands.h
@@ -1667,7 +1667,7 @@ struct READ_TOC_PMA_ATIP_4_Header
struct READ_TOC_PMA_ATIP_4_Descriptor
{
#if G_BYTE_ORDER == G_BIG_ENDIAN
- guint8 one1 : 1
+ guint8 one1 : 1;
guint8 itwp : 3;
guint8 reserved1 : 1;
guint8 ref_speed : 3;