diff --git a/0001-Support-more-architectures.patch b/0001-Support-more-architectures.patch deleted file mode 100644 index 6c96a9b..0000000 --- a/0001-Support-more-architectures.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 7d46257741a60291504b998ce0bc5ea1f2e28d00 Mon Sep 17 00:00:00 2001 -From: Ignaz Forster -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 - diff --git a/_service b/_service index 0858a04..f6def2a 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 2.2.0 - v2.2.0 + 2.2.1 + v2.2.1 git://github.com/coreos/ignition.git git enable diff --git a/_servicedata b/_servicedata index f0098d1..51e738e 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ git://github.com/coreos/ignition.git - fc98a80cb4184bfd1b7aff8d92d0047022850cf6 + 2d3ff5862dc9c1dd0cc78e797f42a19964ac1f4c \ No newline at end of file diff --git a/ignition-2.2.0.tar.xz b/ignition-2.2.0.tar.xz deleted file mode 100644 index fa81829..0000000 --- a/ignition-2.2.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:78a333420b496625f9397188652d5de03a13e100c32a75514ef06c16d5411987 -size 820980 diff --git a/ignition-2.2.1.tar.xz b/ignition-2.2.1.tar.xz new file mode 100644 index 0000000..784cb17 --- /dev/null +++ b/ignition-2.2.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:5809b70df835557da86e2ec71b4c6503cfae61281c376cf10480d49f49937f08 +size 821780 diff --git a/ignition.changes b/ignition.changes index e44c2d2..e1d519d 100644 --- a/ignition.changes +++ b/ignition.changes @@ -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 diff --git a/ignition.spec b/ignition.spec index 1f1deda..c79bf47 100644 --- a/ignition.spec +++ b/ignition.spec @@ -17,14 +17,13 @@ Name: ignition -Version: 2.2.0 +Version: 2.2.1 Release: 0 Summary: First boot installer and configuration tool License: Apache-2.0 Group: System/Management URL: https://github.com/coreos/ignition Source: %{name}-%{version}.tar.xz -Patch1: 0001-Support-more-architectures.patch Patch2: 0002-allow-multiple-mounts-of-same-device.patch Requires: dracut Recommends: /sbin/mkfs.btrfs @@ -53,7 +52,6 @@ applies the configuration. %prep %setup -q -%patch1 -p1 %patch2 -p1 %build