From 60a8f79e8692cda1813e40390008fe4fdef83eea54bc1861cf0a0f0f97e34fa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ismail=20D=C3=B6nmez?= Date: Wed, 17 Feb 2016 18:19:23 +0000 Subject: [PATCH] Accepting request 360012 from home:michel_mno:branches:hardware - new do_not_use_asm_generic.patch to avoid PowerPC build error OBS-URL: https://build.opensuse.org/request/show/360012 OBS-URL: https://build.opensuse.org/package/show/hardware/mmc-utils?expand=0&rev=5 --- do_not_use_asm_generic.patch | 24 ++++++++++++++++++++++++ mmc-utils.changes | 5 +++++ mmc-utils.spec | 4 +++- 3 files changed, 32 insertions(+), 1 deletion(-) create mode 100644 do_not_use_asm_generic.patch diff --git a/do_not_use_asm_generic.patch b/do_not_use_asm_generic.patch new file mode 100644 index 0000000..deff7e2 --- /dev/null +++ b/do_not_use_asm_generic.patch @@ -0,0 +1,24 @@ +From: Michel Normand +Subject: do not use asm generic +Date: Wed, 17 Feb 2016 18:44:43 +0100 + +do not use to avoid build error on PowerPC arch + +Signed-off-by: Michel Normand +--- + mmc.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: mmc-utils-20151118/mmc.h +=================================================================== +--- mmc-utils-20151118.orig/mmc.h ++++ mmc-utils-20151118/mmc.h +@@ -14,7 +14,7 @@ + * Boston, MA 021110-1307, USA. + */ + +-#include ++#include + #include + #include + diff --git a/mmc-utils.changes b/mmc-utils.changes index fddc666..f56a1ae 100644 --- a/mmc-utils.changes +++ b/mmc-utils.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Feb 17 17:47:54 UTC 2016 - normand@linux.vnet.ibm.com + +- new do_not_use_asm_generic.patch to avoid PowerPC build error + ------------------------------------------------------------------- Sat Dec 5 13:11:57 UTC 2015 - mpluskal@suse.com diff --git a/mmc-utils.spec b/mmc-utils.spec index 5d828a9..132e775 100644 --- a/mmc-utils.spec +++ b/mmc-utils.spec @@ -1,7 +1,7 @@ # # spec file for package mmc-utils # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -25,6 +25,7 @@ Group: Hardware/Other Url: http://git.kernel.org/cgit/linux/kernel/git/cjb/mmc-utils.git/ Source0: %{name}-%{version}.tar.xz Source1: https://www.gnu.org/licenses/gpl-2.0.txt +Patch0: do_not_use_asm_generic.patch BuildRequires: xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -34,6 +35,7 @@ Userspace tools for controlling and querying MMC/SD storage devices %prep %setup -q cp %{SOURCE1} LICENSE.GPL-2.0 +%patch0 -p1 %build export CFLAGS="%{optflags}"