Accepting request 787794 from devel:kubic:ignition
OBS-URL: https://build.opensuse.org/request/show/787794 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ignition?expand=0&rev=12
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
7cfe0f0003
37
0001-Support-more-architectures.patch
Normal file
37
0001-Support-more-architectures.patch
Normal file
@ -0,0 +1,37 @@
|
||||
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
|
||||
|
||||
@ -1,29 +0,0 @@
|
||||
commit 7d5235ce7ab91ec21e50f09295dd40fd59a98005
|
||||
Author: Ignaz Forster <iforster@suse.com>
|
||||
Date: Wed Jan 8 17:29:55 2020 +0100
|
||||
References: [boo#1159232]
|
||||
Upstream: Merged [gh#coreos/ignition#908]
|
||||
|
||||
Throw error if SSH keys could not be written
|
||||
|
||||
diff --git a/internal/exec/util/passwd.go b/internal/exec/util/passwd.go
|
||||
index 5d961e3..55c378c 100644
|
||||
--- a/internal/exec/util/passwd.go
|
||||
+++ b/internal/exec/util/passwd.go
|
||||
@@ -173,11 +173,14 @@ func (u Util) AuthorizeSSHKeys(c types.PasswdUser) error {
|
||||
}
|
||||
|
||||
if distro.WriteAuthorizedKeysFragment() {
|
||||
- writeAuthKeysFile(usr, filepath.Join(usr.HomeDir, ".ssh", "authorized_keys.d", "ignition"), []byte(ks))
|
||||
+ err = writeAuthKeysFile(usr, filepath.Join(usr.HomeDir, ".ssh", "authorized_keys.d", "ignition"), []byte(ks))
|
||||
} else {
|
||||
- writeAuthKeysFile(usr, filepath.Join(usr.HomeDir, ".ssh", "authorized_keys"), []byte(ks))
|
||||
+ err = writeAuthKeysFile(usr, filepath.Join(usr.HomeDir, ".ssh", "authorized_keys"), []byte(ks))
|
||||
}
|
||||
|
||||
+ if err != nil {
|
||||
+ return fmt.Errorf("failed to set SSH key: %v", err)
|
||||
+ }
|
||||
return nil
|
||||
}, "adding ssh keys to user %q", c.Name)
|
||||
}
|
||||
4
_service
4
_service
@ -1,7 +1,7 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="version">2.1.1</param>
|
||||
<param name="revision">v2.1.1</param>
|
||||
<param name="version">2.2.0</param>
|
||||
<param name="revision">v2.2.0</param>
|
||||
<param name="url">git://github.com/coreos/ignition.git</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">git://github.com/coreos/ignition.git</param>
|
||||
<param name="changesrevision">40c0b57b7606bd23210059c5554f151776a1d64b</param>
|
||||
<param name="changesrevision">fc98a80cb4184bfd1b7aff8d92d0047022850cf6</param>
|
||||
</service>
|
||||
</servicedata>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:00115c8a304affc7a294e04699d4dac13ca3554f78e2e75a64b09417c3833847
|
||||
size 818648
|
||||
3
ignition-2.2.0.tar.xz
Normal file
3
ignition-2.2.0.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:78a333420b496625f9397188652d5de03a13e100c32a75514ef06c16d5411987
|
||||
size 820980
|
||||
@ -1,3 +1,32 @@
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 24 12:58:48 UTC 2020 - Ignaz Forster <iforster@suse.com>
|
||||
|
||||
- Add 0001-Support-more-architectures.patch:
|
||||
Allow builing on i586 (and other architectures) again
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Mar 24 07:45:25 UTC 2020 - kukuk@suse.de
|
||||
|
||||
- Update to version 2.2.0:
|
||||
* news: add notes for 2.2.0
|
||||
* Fix ignition config for the instantiated unit test
|
||||
* Fix enabling systemd instantiated services
|
||||
* providers/qemu: support Ignition block device on s390x and ppc64le
|
||||
* blkid: Explicitly use C int variable for numParts
|
||||
* tests: don't panic after failing to run Ignition
|
||||
* platform: sort providers
|
||||
* ci: migrate to new coreos-ci project
|
||||
* OWNERS: add OWNERS file
|
||||
* Add Exoscale provider
|
||||
* docs: minor fixes to platforms page
|
||||
* ci: hook up to CoreOS CI
|
||||
* providers/vultr: Add Vultr provider
|
||||
* Throw error if SSH keys could not be written
|
||||
* stages/files: don't relabel /home and /root symlinks
|
||||
- Drop 0001-Throw-error-if-SSH-keys-could-not-be-written.patch
|
||||
- Added explicit Recommends for helper applications
|
||||
[boo#1167289]
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Jan 21 16:25:25 UTC 2020 - Ignaz Forster <iforster@suse.com>
|
||||
|
||||
|
||||
@ -17,16 +17,27 @@
|
||||
|
||||
|
||||
Name: ignition
|
||||
Version: 2.1.1
|
||||
Version: 2.2.0
|
||||
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-Throw-error-if-SSH-keys-could-not-be-written.patch
|
||||
Patch1: 0001-Support-more-architectures.patch
|
||||
Patch2: 0002-allow-multiple-mounts-of-same-device.patch
|
||||
Requires: dracut
|
||||
Recommends: /sbin/mkfs.btrfs
|
||||
Recommends: /sbin/mkfs.ext4
|
||||
Recommends: /sbin/mkfs.vfat
|
||||
Recommends: /sbin/mkfs.xfs
|
||||
Recommends: /sbin/mkswap
|
||||
Recommends: /sbin/udevadm
|
||||
Recommends: /usr/sbin/groupadd
|
||||
Recommends: /usr/sbin/sgdisk
|
||||
Recommends: /usr/sbin/useradd
|
||||
Recommends: /usr/sbin/usermod
|
||||
Suggests: /sbin/mdadm
|
||||
BuildRequires: dracut
|
||||
BuildRequires: libblkid-devel
|
||||
BuildRequires: golang(API) >= 1.12
|
||||
|
||||
Loading…
Reference in New Issue
Block a user