From 214db3dee33ef0bdb5fdd6e77fb8f7a25ae57bb6e60fd900fa8961fbda22f023 Mon Sep 17 00:00:00 2001 From: Christian Brauner Date: Wed, 24 Aug 2016 12:33:39 +0000 Subject: [PATCH] Accepting request 421577 from home:jordimassaguerpla:branch:V:c:add_go_arches_in_prjconf - add go_arches in project configuration: this way, we can use the same spec file but decide in the project configuration if to use gc-go or gcc-go for some archs. OBS-URL: https://build.opensuse.org/request/show/421577 OBS-URL: https://build.opensuse.org/package/show/Virtualization:containers/docker?expand=0&rev=128 --- docker.changes | 7 +++++++ docker.spec | 18 +++++++++++++++++- 2 files changed, 24 insertions(+), 1 deletion(-) diff --git a/docker.changes b/docker.changes index 04eb803..72a6e8a 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Wed Aug 24 12:31:23 UTC 2016 - jmassaguerpla@suse.com + +- add go_arches in project configuration: this way, we can use the + same spec file but decide in the project configuration if to + use gc-go or gcc-go for some archs. + ------------------------------------------------------------------- Tue Aug 23 11:35:09 UTC 2016 - jmassaguerpla@suse.com diff --git a/docker.spec b/docker.spec index 1a1a96e..26bca92 100644 --- a/docker.spec +++ b/docker.spec @@ -17,12 +17,28 @@ # nodebuginfo +# Check if go_arches is defined in the project configuration +# Otherwise, define it here +# In order to define it in the project configuration, you need to add +# +# %define go_arches %ix86 x86_64 aarch64 +# Macros: +# %go_arches %ix86 x86_64 aarch64 +# :Macros +# +# The Macros is the one that defines the go_arches variable to be used +# in the spec file. +# The "define" one is to help the specfile parser of the buildservice +# to see what packages are being built. You also want to define it here +# for keeping things consistent. + +%{!?go_arches: %define go_arches %ix86 x86_64 aarch64 ppc64le} + %global docker_store %{_localstatedir}/lib/docker %global docker_migration_testfile %{docker_store}/.suse-image-migration-v1to2-complete %global docker_migration_warnfile %{docker_store}/docker-update-message.txt %define docker_graph %{docker_store}/graph %define git_version 8eab29e -%define go_arches %ix86 x86_64 aarch64 ppc64le %define docker_version 1.12.0 %define __arch_install_post export NO_BRP_STRIP_DEBUG=true # When upgrading to a new version requires the service not to be restarted