aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Terjan <pterjan@mageia.org>2018-06-13 06:58:08 +0000
committerPascal Terjan <pterjan@mageia.org>2018-06-13 06:58:08 +0000
commit151bc7f061d6722c4400fed540dc5d06b85d745a (patch)
tree8263572fcfa865af3f35f62dac1aecf814ed0164
parent4feff26641040385c8490b07bb82c10f23bb05dc (diff)
downloadpuppet-151bc7f061d6722c4400fed540dc5d06b85d745a.tar
puppet-151bc7f061d6722c4400fed540dc5d06b85d745a.tar.gz
puppet-151bc7f061d6722c4400fed540dc5d06b85d745a.tar.bz2
puppet-151bc7f061d6722c4400fed540dc5d06b85d745a.tar.xz
puppet-151bc7f061d6722c4400fed540dc5d06b85d745a.zip
Do not set arch in infra media.cfg for armv7hl
-rw-r--r--modules/buildsystem/templates/media.cfg6
1 files changed, 6 insertions, 0 deletions
diff --git a/modules/buildsystem/templates/media.cfg b/modules/buildsystem/templates/media.cfg
index 9368e66b..ba01fde5 100644
--- a/modules/buildsystem/templates/media.cfg
+++ b/modules/buildsystem/templates/media.cfg
@@ -29,7 +29,13 @@ distro = scope.lookupvar('buildsystem::var::distros::distros')[@distro_name]
version=<%= distro['version'] %>
mediacfg_version=2
branch=<%= distro['branch'] %>
+<%-
+if @arch != 'armv7hl'
+-%>
arch=<%= @arch %>
+<%-
+end
+-%>
xml-info=1
<%-