Sync from SUSE:SLFO:Main ignition revision 96492562281c9b5defc0f3f163b0447f
This commit is contained in:
parent
53bf0ed7fa
commit
b98d47ba06
@ -1,28 +0,0 @@
|
||||
From: Fabian Vogt <fvogt@suse.de>
|
||||
Date: Mon, 21 Aug 2023 14:17:01 +0200
|
||||
Subject: [PATCH] dracut: Don't include the ignition module by default
|
||||
|
||||
Currently the module is automatically included in all initrds, hostonly or
|
||||
generic. Leave it to the distro provided module to pull it in explicitly.
|
||||
---
|
||||
diff --git a/dracut/30ignition/module-setup.sh b/dracut/30ignition/module-setup.sh
|
||||
index ad7e80fd..f431b7dc 100755
|
||||
--- a/dracut/30ignition/module-setup.sh
|
||||
+++ b/dracut/30ignition/module-setup.sh
|
||||
@@ -2,6 +2,13 @@
|
||||
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
|
||||
# ex: ts=8 sw=4 sts=4 et filetype=sh
|
||||
|
||||
+check() {
|
||||
+ # Only include this if another module requests it.
|
||||
+ # In our case it'll be the distro provided module with integration and customizations
|
||||
+ # (coreos-ignition/ignition-microos/...).
|
||||
+ return 255
|
||||
+}
|
||||
+
|
||||
depends() {
|
||||
echo qemu systemd url-lib network
|
||||
}
|
||||
--
|
||||
2.41.0
|
||||
|
||||
4
_service
4
_service
@ -1,7 +1,7 @@
|
||||
<services>
|
||||
<service name="tar_scm" mode="disabled">
|
||||
<param name="version">2.17.0</param>
|
||||
<param name="revision">v2.17.0</param>
|
||||
<param name="version">2.19.0</param>
|
||||
<param name="revision">v2.19.0</param>
|
||||
<param name="url">https://github.com/coreos/ignition</param>
|
||||
<param name="scm">git</param>
|
||||
<param name="changesgenerate">enable</param>
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
<servicedata>
|
||||
<service name="tar_scm">
|
||||
<param name="url">https://github.com/coreos/ignition</param>
|
||||
<param name="changesrevision">45e9d394a3e4f240e9d6745af0a83fa36179f510</param>
|
||||
<param name="changesrevision">09c99e0305adc1377b87964a39ad2d009aec9b12</param>
|
||||
</service>
|
||||
</servicedata>
|
||||
BIN
ignition-2.17.0.tar.xz
(Stored with Git LFS)
BIN
ignition-2.17.0.tar.xz
(Stored with Git LFS)
Binary file not shown.
BIN
ignition-2.19.0.tar.xz
(Stored with Git LFS)
Normal file
BIN
ignition-2.19.0.tar.xz
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -11,6 +11,13 @@ copy_file_if_exists() {
|
||||
fi
|
||||
}
|
||||
|
||||
# systemd v256 now runs the initrd with ProtectSystem=yes, which makes /usr
|
||||
# read-only. Just remount it rw until we have:
|
||||
# https://github.com/coreos/ignition/issues/1891
|
||||
if [ ! -w /usr ]; then
|
||||
mount -o rw,remount /usr
|
||||
fi
|
||||
|
||||
destination=/usr/lib/ignition
|
||||
mkdir -p $destination
|
||||
|
||||
|
||||
@ -1,3 +1,60 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Aug 30 15:27:58 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
|
||||
|
||||
- Drop "go clean" from the upstream build script: since we build in
|
||||
clean environments, we don't have caches. Additionally, the way
|
||||
it is used does not even work and reports:
|
||||
go: clean -cache cannot be used with package arguments
|
||||
The error was masked until GO 1.23, as the test wether go
|
||||
supported caching was checking for go 1.23 formatted output.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jul 29 12:01:10 UTC 2024 - Ignaz Forster <iforster@suse.com>
|
||||
|
||||
- Fix order of previous change - *first* remount rw, *then* create
|
||||
directory.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Thu Jul 25 13:11:44 UTC 2024 - Ignaz Forster <iforster@suse.com>
|
||||
|
||||
- Apply (temporary) upstream patch from fedora-coreos-config for
|
||||
compatibility with systemd 256.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Jun 10 14:24:04 UTC 2024 - iforster@suse.com
|
||||
|
||||
- Update to version 2.19.0:
|
||||
* Support LUKS encryption using IBM CEX secure keys on s390x
|
||||
* providers: add "akamai" provider
|
||||
- Adding %check section
|
||||
- Build scripts are executable by themselves now, remove explicit
|
||||
Bash call
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 08 11:49:12 UTC 2024 - iforster@suse.com
|
||||
|
||||
- Update to version 2.18.0:
|
||||
* NEWS: update 2.18.0
|
||||
* azure: retry HTTP requests on codes 404, 410, and 429
|
||||
* docs: add missing scaleway link
|
||||
* providers: add scaleway
|
||||
* resource/url: customize local address (port)
|
||||
* stages/files: filter out non-existent paths before relabeling
|
||||
* docs/release-notes: tweak dracut module change
|
||||
* Bump minimum Go version to 1.20
|
||||
* dracut: Don't include the ignition module by default
|
||||
* ci: cancel previous build on PR update
|
||||
* Sync repo templates ⚙
|
||||
* Update build(deps)
|
||||
- Remove because included in upstream now:
|
||||
0005-dracut-Don-t-include-the-ignition-module-by-default.patch
|
||||
- Increased required Go version
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 1 12:53:50 UTC 2024 - Fabian Vogt <fvogt@suse.com>
|
||||
|
||||
- module-setup.sh: Use $dracutsysrootdir
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Nov 24 13:20:31 UTC 2023 - iforster@suse.com
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package ignition
|
||||
#
|
||||
# Copyright (c) 2023 SUSE LLC
|
||||
# Copyright (c) 2024 SUSE LLC
|
||||
#
|
||||
# All modifications and additions to the file contributed by third parties
|
||||
# remain the property of their copyright owners, unless otherwise agreed
|
||||
@ -17,7 +17,7 @@
|
||||
|
||||
|
||||
Name: ignition
|
||||
Version: 2.17.0
|
||||
Version: 2.19.0
|
||||
Release: 0
|
||||
Summary: First boot installer and configuration tool
|
||||
License: Apache-2.0
|
||||
@ -43,13 +43,11 @@ Patch1: 0001-ignore-missing-qemu-blockdev.patch
|
||||
Patch2: 0002-allow-multiple-mounts-of-same-device.patch
|
||||
Patch3: 0003-Move-the-GPT-header-on-resized-disks.patch
|
||||
Patch4: 0004-Order-ignition-disks.service-before-systemd-fsck-roo.patch
|
||||
# https://github.com/coreos/ignition/pull/1698
|
||||
Patch5: 0005-dracut-Don-t-include-the-ignition-module-by-default.patch
|
||||
BuildRequires: dracut
|
||||
BuildRequires: libblkid-devel
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: update-bootloader-rpm-macros
|
||||
BuildRequires: golang(API) >= 1.19
|
||||
BuildRequires: golang(API) >= 1.20
|
||||
# combustion provides firstboot.target and ignition-kargs-helper calls combustion
|
||||
Requires: combustion >= 1.2
|
||||
Requires: dracut
|
||||
@ -96,7 +94,11 @@ cp %{SOURCE12} dracut/30ignition/ignition-kargs-helper.sh
|
||||
|
||||
%build
|
||||
sed -i -e 's|go build -ldflags|go build -buildmode=pie -ldflags|g' build
|
||||
env VERSION=%{version} GLDFLAGS='-X github.com/coreos/ignition/v2/internal/distro.selinuxRelabel=false -X github.com/coreos/ignition/v2/internal/distro.writeAuthorizedKeysFragment=false ' bash -x ./build
|
||||
sed -i -e '/go clean/d' build
|
||||
VERSION=%{version} GLDFLAGS='-X github.com/coreos/ignition/v2/internal/distro.selinuxRelabel=false -X github.com/coreos/ignition/v2/internal/distro.writeAuthorizedKeysFragment=false ' ./build
|
||||
|
||||
%check
|
||||
VERSION=%{version} ./build_blackbox_tests
|
||||
|
||||
%install
|
||||
make -o all install DESTDIR=%{buildroot}
|
||||
|
||||
@ -4,7 +4,7 @@
|
||||
|
||||
check() {
|
||||
# Omit if building for this already configured system
|
||||
if [[ $hostonly ]] && [ -e /etc/machine-id ]; then
|
||||
if [[ $hostonly ]] && [ -e "${dracutsysrootdir}/etc/machine-id" ]; then
|
||||
return 255
|
||||
fi
|
||||
return 0
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user