forked from pool/ignition
Accepting request 789089 from devel:kubic:ignition
- Update to version 2.2.1: * news: add notes for 2.2.1 * providers/qemu: fix default to fwcfg * doc/development: remember to bump Accept header during spec bumps - Remove 0001-Support-more-architectures.patch: Patch added upstream OBS-URL: https://build.opensuse.org/request/show/789089 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ignition?expand=0&rev=13
This commit is contained in:
commit
f8d55f8f0e
@ -1,37 +0,0 @@
|
|||||||
From 7d46257741a60291504b998ce0bc5ea1f2e28d00 Mon Sep 17 00:00:00 2001
|
|
||||||
From: Ignaz Forster <iforster@suse.com>
|
|
||||||
Date: Tue, 24 Mar 2020 13:41:43 +0100
|
|
||||||
Subject: [PATCH] Support more architectures
|
|
||||||
References: gh#coreos/ignition#944
|
|
||||||
Upstream: submitted
|
|
||||||
|
|
||||||
Commit 3b930b made it impossible to build Ignition on any other arch then
|
|
||||||
s390x, ppc64le, amd64 or arm64 by explicitly stating the allowed platforms.
|
|
||||||
This made it impossible to build e.g. for 386.
|
|
||||||
Continue to use the fw_cfg interface as default instead.
|
|
||||||
---
|
|
||||||
internal/providers/qemu/qemu_fwcfg.go | 7 ++++---
|
|
||||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/internal/providers/qemu/qemu_fwcfg.go b/internal/providers/qemu/qemu_fwcfg.go
|
|
||||||
index 0758943..c485d6f 100644
|
|
||||||
--- a/internal/providers/qemu/qemu_fwcfg.go
|
|
||||||
+++ b/internal/providers/qemu/qemu_fwcfg.go
|
|
||||||
@@ -12,10 +12,11 @@
|
|
||||||
// See the License for the specific language governing permissions and
|
|
||||||
// limitations under the License.
|
|
||||||
|
|
||||||
-// +build amd64 arm64
|
|
||||||
+// +build !s390x,!ppc64le
|
|
||||||
|
|
||||||
-// The QEMU provider on amd64 and arm64 fetches a local configuration from the
|
|
||||||
-// firmware config interface (opt/com.coreos/config).
|
|
||||||
+// The default QEMU provider fetches a local configuration from the firmware
|
|
||||||
+// config interface (opt/com.coreos/config). Platforms without support for
|
|
||||||
+// qemu_fw_cfg should use the blockdev implementation instead.
|
|
||||||
|
|
||||||
package qemu
|
|
||||||
|
|
||||||
--
|
|
||||||
2.25.1
|
|
||||||
|
|
4
_service
4
_service
@ -1,7 +1,7 @@
|
|||||||
<services>
|
<services>
|
||||||
<service name="tar_scm" mode="disabled">
|
<service name="tar_scm" mode="disabled">
|
||||||
<param name="version">2.2.0</param>
|
<param name="version">2.2.1</param>
|
||||||
<param name="revision">v2.2.0</param>
|
<param name="revision">v2.2.1</param>
|
||||||
<param name="url">git://github.com/coreos/ignition.git</param>
|
<param name="url">git://github.com/coreos/ignition.git</param>
|
||||||
<param name="scm">git</param>
|
<param name="scm">git</param>
|
||||||
<param name="changesgenerate">enable</param>
|
<param name="changesgenerate">enable</param>
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
<servicedata>
|
<servicedata>
|
||||||
<service name="tar_scm">
|
<service name="tar_scm">
|
||||||
<param name="url">git://github.com/coreos/ignition.git</param>
|
<param name="url">git://github.com/coreos/ignition.git</param>
|
||||||
<param name="changesrevision">fc98a80cb4184bfd1b7aff8d92d0047022850cf6</param>
|
<param name="changesrevision">2d3ff5862dc9c1dd0cc78e797f42a19964ac1f4c</param>
|
||||||
</service>
|
</service>
|
||||||
</servicedata>
|
</servicedata>
|
@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:78a333420b496625f9397188652d5de03a13e100c32a75514ef06c16d5411987
|
|
||||||
size 820980
|
|
3
ignition-2.2.1.tar.xz
Normal file
3
ignition-2.2.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
|||||||
|
version https://git-lfs.github.com/spec/v1
|
||||||
|
oid sha256:5809b70df835557da86e2ec71b4c6503cfae61281c376cf10480d49f49937f08
|
||||||
|
size 821780
|
@ -1,3 +1,13 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Mar 25 10:11:53 UTC 2020 - kukuk@suse.de
|
||||||
|
|
||||||
|
- Update to version 2.2.1:
|
||||||
|
* news: add notes for 2.2.1
|
||||||
|
* providers/qemu: fix default to fwcfg
|
||||||
|
* doc/development: remember to bump Accept header during spec bumps
|
||||||
|
- Remove 0001-Support-more-architectures.patch:
|
||||||
|
Patch added upstream
|
||||||
|
|
||||||
-------------------------------------------------------------------
|
-------------------------------------------------------------------
|
||||||
Tue Mar 24 12:58:48 UTC 2020 - Ignaz Forster <iforster@suse.com>
|
Tue Mar 24 12:58:48 UTC 2020 - Ignaz Forster <iforster@suse.com>
|
||||||
|
|
||||||
|
@ -17,14 +17,13 @@
|
|||||||
|
|
||||||
|
|
||||||
Name: ignition
|
Name: ignition
|
||||||
Version: 2.2.0
|
Version: 2.2.1
|
||||||
Release: 0
|
Release: 0
|
||||||
Summary: First boot installer and configuration tool
|
Summary: First boot installer and configuration tool
|
||||||
License: Apache-2.0
|
License: Apache-2.0
|
||||||
Group: System/Management
|
Group: System/Management
|
||||||
URL: https://github.com/coreos/ignition
|
URL: https://github.com/coreos/ignition
|
||||||
Source: %{name}-%{version}.tar.xz
|
Source: %{name}-%{version}.tar.xz
|
||||||
Patch1: 0001-Support-more-architectures.patch
|
|
||||||
Patch2: 0002-allow-multiple-mounts-of-same-device.patch
|
Patch2: 0002-allow-multiple-mounts-of-same-device.patch
|
||||||
Requires: dracut
|
Requires: dracut
|
||||||
Recommends: /sbin/mkfs.btrfs
|
Recommends: /sbin/mkfs.btrfs
|
||||||
@ -53,7 +52,6 @@ applies the configuration.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
%patch1 -p1
|
|
||||||
%patch2 -p1
|
%patch2 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
|
Loading…
Reference in New Issue
Block a user