u/fuel: Bump & rebase for new deploy arg `-E`

[armband.git] / patches / reclass-system-salt-model / 0001-linux-system-repo-mcp-Add-Armband-repos.patch

diff --git a/patches/reclass-system-salt-model/0001-linux-system-repo-mcp-Add-Armband-repos.patch b/patches/reclass-system-salt-model/0001-linux-system-repo-mcp-Add-Armband-repos.patch
index 3fa4b7c..b99fa73 100644 (file)
--- a/patches/reclass-system-salt-model/0001-linux-system-repo-mcp-Add-Armband-repos.patch
+++ b/patches/reclass-system-salt-model/0001-linux-system-repo-mcp-Add-Armband-repos.patch
@@ -1,3 +1,11 @@
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
+: Copyright (c) 2017 Enea AB and others.
+:
+: All rights reserved. This program and the accompanying materials
+: are made available under the terms of the Apache License, Version 2.0
+: which accompanies this distribution, and is available at
+: http://www.apache.org/licenses/LICENSE-2.0
+::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
 Date: Mon, 10 Jul 2017 15:31:08 +0000
 Subject: [PATCH] linux/system/repo/mcp: Add Armband repos
@@ -19,12 +27,12 @@ index 826969b..01b9cc5 100644
              priority: 1100
              package: '*'
 +        armband_mcp_extra:
-+          source: "deb [arch=arm64] http://linux.enea.com/apt-mk/${_param:linux_system_codename}/ ${_param:linux_system_repo_mcp_extra_version} extra"
++          source: "deb [arch=arm64] http://linux.enea.com/apt-mk/${_param:linux_system_codename}/ nightly extra"
 +          architectures: arm64
 +          key_url: "http://linux.enea.com/apt-mk/public.gpg"
 +          clean_file: true
 +          pin:
-+          - pin: 'release a=${_param:linux_system_repo_mcp_extra_version}'
++          - pin: 'release a=nightly'
 +            priority: 1100
 +            package: '*'
 diff --git a/linux/system/repo/mcp/openstack.yml b/linux/system/repo/mcp/openstack.yml
@@ -76,10 +84,10 @@ index 2235b2c..be8ffd2 100644
 +            priority: 1100
 +            package: '*'
 +        armband_mk_openstack:
-+          source: "deb [arch=arm64] http://linux.enea.com/apt-mk/${_param:linux_system_codename}/ ${_param:linux_system_repo_mk_openstack_version} ${_param:openstack_version}"
++          source: "deb [arch=arm64] http://linux.enea.com/apt-mk/${_param:linux_system_codename}/ nightly ${_param:openstack_version}"
 +          architectures: arm64
 +          key_url: "http://linux.enea.com/apt-mk/public.gpg"
 +          pin:
-+          - pin: 'release a=${_param:linux_system_repo_mk_openstack_version}'
++          - pin: 'release a=nightly'
 +            priority: 1100
 +            package: '*'