----- Original Message -----
> From: "Josh Boyer" <[email protected]>
> To: "Jakub Cajka" <[email protected]>
> Cc: "Kernel Fedora" <[email protected]>
> Sent: Thursday, January 15, 2015 4:27:20 PM
> Subject: Re: [PATCH] build fix 3.18.2-200.fc21(ppc, s390, aarch64)
>
> On Thu, Jan 15, 2015 at 10:17 AM, Jakub Cajka <[email protected]> wrote:
> > Hello,
> >
> > in attachment is build fix(I'm not sure if kernel spec file formatting,
> > patch numbering... is correct). Consists of upstream commit
> > d47fb4ec7e101a63754939fa49d75fd7e81e94f8 "Build mic/mpssd only for
> > x86_64", and replaced "MULTILIBDIR=..." with "lib=..." in spec file to
> > reflect upstream change in /tools/perf/config/Makefile.
> >
> > I have made successful scratch build on s390 with these changes
> > http://s390.koji.fedoraproject.org/koji/taskinfo?taskID=1696483.
> >
> > Failed builds:
> > http://ppc.koji.fedoraproject.org/koji/buildinfo?buildID=288391
> > http://arm.koji.fedoraproject.org/koji/buildinfo?buildID=256003
> > http://s390.koji.fedoraproject.org/koji/buildinfo?buildID=296544
> >
> > Could you please check this.
>
> The list eats attachments, so there is nothing attached here. Post it
> inline?
Missed that sorry... diff follows.
> josh
> _______________________________________________
> kernel mailing list
> [email protected]
> https://admin.fedoraproject.org/mailman/listinfo/kernel
diff --git a/kernel.spec b/kernel.spec
index 2fe383c..8b704aa 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -655,6 +655,9 @@ Patch26132:
x86_64-vdso-Fix-the-vdso-address-randomization-algor.patch
# git clone ssh://git.fedorahosted.org/git/kernel-arm64.git, git diff
master...devel
Patch30000: kernel-arm64.patch
+#upstream commit d47fb4ec7e101a63754939fa49d75fd7e81e94f8(Build mic/mpssd only
for x86_64)
+Patch30001: mpssd-x86-only.patch
+
# END OF PATCH DEFINITIONS
%endif
@@ -1415,6 +1418,9 @@ ApplyPatch
acpi-video-Add-disable_native_backlight-quirk-for-Sa.patch
#CVE-2014-9585 rhbz 1181054 1181056
ApplyPatch x86_64-vdso-Fix-the-vdso-address-randomization-algor.patch
+#upstream commit d47fb4ec7e101a63754939fa49d75fd7e81e94f8(Build mic/mpssd only
for x86_64)
+ApplyPatch mpssd-x86-only.patch
+
%if 0%{?aarch64patches}
ApplyPatch kernel-arm64.patch
%ifnarch aarch64 # this is stupid, but i want to notice before secondary koji
does.
@@ -1954,7 +1960,7 @@ find $RPM_BUILD_ROOT/usr/include \
%if %{with_perf}
# perf tool binary and supporting scripts/binaries
-%{perf_make} DESTDIR=$RPM_BUILD_ROOT MULTILIBDIR=%{_lib} install-bin
install-traceevent-plugins
+%{perf_make} DESTDIR=$RPM_BUILD_ROOT lib=%{_lib} install-bin
install-traceevent-plugins
# remove the 'trace' symlink.
rm -f %{buildroot}%{_bindir}/trace
diff --git a/mpssd-x86-only.patch b/mpssd-x86-only.patch
new file mode 100644
index 0000000..de68cfe
--- /dev/null
+++ b/mpssd-x86-only.patch
@@ -0,0 +1,29 @@
+From d47fb4ec7e101a63754939fa49d75fd7e81e94f8 Mon Sep 17 00:00:00 2001
+From: Ashutosh Dixit <[email protected]>
+Date: Thu, 4 Dec 2014 13:27:29 -0800
+Subject: Documentation: Build mic/mpssd only for x86_64
+
+mic/mpssd along with MIC drivers are currently only usable on
+x86_64. So build mic/mpssd only for x86_64 to avoid build breaks on
+big-endian systems.
+
+Reported-by: Daniel Borkmann <[email protected]>
+Reported-by: Dan Streetman <[email protected]>
+Suggested-by: Peter Foley <[email protected]>
+Signed-off-by: Ashutosh Dixit <[email protected]>
+Signed-off-by: Jonathan Corbet <[email protected]>
+
+diff --git a/Documentation/mic/mpssd/Makefile
b/Documentation/mic/mpssd/Makefile
+index 0f31568..f47fe6b 100644
+--- a/Documentation/mic/mpssd/Makefile
++++ b/Documentation/mic/mpssd/Makefile
+@@ -1,5 +1,5 @@
+ # List of programs to build
+-hostprogs-y := mpssd
++hostprogs-$(CONFIG_X86_64) := mpssd
+
+ mpssd-objs := mpssd.o sysfs.o
+
+--
+cgit v0.10.2
+
_______________________________________________
kernel mailing list
[email protected]
https://admin.fedoraproject.org/mailman/listinfo/kernel
