From 2d41ae9f4e3612bc360d1dcd45212651979a028a Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Mon, 23 May 2016 10:56:10 -0600 Subject: [PATCH] Ignore arch specific binaries in plugin This change tells rpmbuilder to not fail the build if arch specific binaries are included as part of the plugin. This is helpful if a plugin wants to include a binary and deploy it via puppet or some other method that will just copy the file. Change-Id: Ic3ca86671f0a107b47ab68a54938b6f4040c90b2 Closes-Bug: #1578852 --- fuel_plugin_builder/templates/v2/build/plugin_rpm.spec.mako | 4 ++++ fuel_plugin_builder/templates/v3/build/plugin_rpm.spec.mako | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/fuel_plugin_builder/templates/v2/build/plugin_rpm.spec.mako b/fuel_plugin_builder/templates/v2/build/plugin_rpm.spec.mako index 58edd23..57434ce 100644 --- a/fuel_plugin_builder/templates/v2/build/plugin_rpm.spec.mako +++ b/fuel_plugin_builder/templates/v2/build/plugin_rpm.spec.mako @@ -19,6 +19,10 @@ Group: Development/Libraries Release: 1 BuildArch: noarch +# This will allow arch binaries to be included as part of the plugin package +# otherwise the build of the plugin fails. +%%define _binaries_in_noarch_packages_terminate_build 0 + %%description ${ description } diff --git a/fuel_plugin_builder/templates/v3/build/plugin_rpm.spec.mako b/fuel_plugin_builder/templates/v3/build/plugin_rpm.spec.mako index d55d847..146cf59 100644 --- a/fuel_plugin_builder/templates/v3/build/plugin_rpm.spec.mako +++ b/fuel_plugin_builder/templates/v3/build/plugin_rpm.spec.mako @@ -20,6 +20,10 @@ Release: 1 BuildArch: noarch AutoReq: no +# This will allow arch binaries to be included as part of the plugin package +# otherwise the build of the plugin fails. +%%define _binaries_in_noarch_packages_terminate_build 0 + %%description ${ description }