From db1f09c4a104bb6f2fa20c0f88a0b308168aa7f724aa90e90a7dd78f3ab55768 Mon Sep 17 00:00:00 2001 From: Ignaz Forster Date: Thu, 14 Mar 2024 15:46:54 +0000 Subject: [PATCH] =?UTF-8?q?-=20Update=20to=20version=202.18.0:=20=20=20*?= =?UTF-8?q?=20NEWS:=20update=202.18.0=20=20=20*=20azure:=20retry=20HTTP=20?= =?UTF-8?q?requests=20on=20codes=20404,=20410,=20and=20429=20=20=20*=20doc?= =?UTF-8?q?s:=20add=20missing=20scaleway=20link=20=20=20*=20providers:=20a?= =?UTF-8?q?dd=20scaleway=20=20=20*=20resource/url:=20customize=20local=20a?= =?UTF-8?q?ddress=20(port)=20=20=20*=20stages/files:=20filter=20out=20non-?= =?UTF-8?q?existent=20paths=20before=20relabeling=20=20=20*=20docs/release?= =?UTF-8?q?-notes:=20tweak=20dracut=20module=20change=20=20=20*=20Bump=20m?= =?UTF-8?q?inimum=20Go=20version=20to=201.20=20=20=20*=20dracut:=20Don't?= =?UTF-8?q?=20include=20the=20ignition=20module=20by=20default=20=20=20*?= =?UTF-8?q?=20ci:=20cancel=20previous=20build=20on=20PR=20update=20=20=20*?= =?UTF-8?q?=20Sync=20repo=20templates=20=E2=9A=99=20=20=20*=20Update=20bui?= =?UTF-8?q?ld(deps)=20-=20Remove=20because=20included=20in=20upstream=20no?= =?UTF-8?q?w:=20=20=200005-dracut-Don-t-include-the-ignition-module-by-def?= =?UTF-8?q?ault.patch=20-=20Increased=20required=20Go=20version?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OBS-URL: https://build.opensuse.org/package/show/devel:kubic:ignition/ignition?expand=0&rev=121 --- ...clude-the-ignition-module-by-default.patch | 28 ------------------- _service | 4 +-- _servicedata | 2 +- ignition-2.17.0.tar.xz | 3 -- ignition-2.18.0.tar.xz | 3 ++ ignition.changes | 20 +++++++++++++ ignition.spec | 6 ++-- 7 files changed, 28 insertions(+), 38 deletions(-) delete mode 100644 0005-dracut-Don-t-include-the-ignition-module-by-default.patch delete mode 100644 ignition-2.17.0.tar.xz create mode 100644 ignition-2.18.0.tar.xz diff --git a/0005-dracut-Don-t-include-the-ignition-module-by-default.patch b/0005-dracut-Don-t-include-the-ignition-module-by-default.patch deleted file mode 100644 index 4182ca5..0000000 --- a/0005-dracut-Don-t-include-the-ignition-module-by-default.patch +++ /dev/null @@ -1,28 +0,0 @@ -From: Fabian Vogt -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 - diff --git a/_service b/_service index 62d08d1..69a27a1 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 2.17.0 - v2.17.0 + 2.18.0 + v2.18.0 https://github.com/coreos/ignition git enable diff --git a/_servicedata b/_servicedata index 5f268cf..f50b5e2 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ https://github.com/coreos/ignition - 45e9d394a3e4f240e9d6745af0a83fa36179f510 + 0abc4078a1bb40077c3e094fc3d70a8dbcb7ec02 \ No newline at end of file diff --git a/ignition-2.17.0.tar.xz b/ignition-2.17.0.tar.xz deleted file mode 100644 index 920829d..0000000 --- a/ignition-2.17.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:d2dd7041134a71cb423049f15b85b9fa3008aab7910bd02369dc4bd69129edc9 -size 2631880 diff --git a/ignition-2.18.0.tar.xz b/ignition-2.18.0.tar.xz new file mode 100644 index 0000000..09db65f --- /dev/null +++ b/ignition-2.18.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:656123a37afb787df9ee751df1646e130d9f8f567a3cc6bbb41b06bde82496af +size 2952632 diff --git a/ignition.changes b/ignition.changes index 51903bf..b195aa8 100644 --- a/ignition.changes +++ b/ignition.changes @@ -1,3 +1,23 @@ +------------------------------------------------------------------- +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 diff --git a/ignition.spec b/ignition.spec index 30d3594..f170e58 100644 --- a/ignition.spec +++ b/ignition.spec @@ -17,7 +17,7 @@ Name: ignition -Version: 2.17.0 +Version: 2.18.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