diff --git a/0001-fix-install-permissions.patch b/0001-fix-install-permissions.patch deleted file mode 100644 index 0a42adc..0000000 --- a/0001-fix-install-permissions.patch +++ /dev/null @@ -1,25 +0,0 @@ -commit 5c3b4221dafdc4b701495d85a5a563bd428fe5ec -Author: Ignaz Forster -Date: Mon Aug 10 23:47:43 2020 +0200 -References: (gh#coreos/ignition#1069) -Upstream: Submitted - - Install Dracut modules with correct permissions - -diff --git a/Makefile b/Makefile -index 932b9c7f..fac2218d 100644 ---- a/Makefile -+++ b/Makefile -@@ -18,9 +18,10 @@ all: - install: all - for x in dracut/*; do \ - bn=$$(basename $$x); \ -- install -D -t $(DESTDIR)/usr/lib/dracut/modules.d/$${bn} $$x/*; \ -+ install -m 0644 -D -t $(DESTDIR)/usr/lib/dracut/modules.d/$${bn} $$x/*; \ - done -- install -D -t $(DESTDIR)/usr/lib/systemd/system systemd/* -+ chmod a+x $(DESTDIR)/usr/lib/dracut/modules.d/*/*.sh $(DESTDIR)/usr/lib/dracut/modules.d/*/*-generator -+ install -m 0644 -D -t $(DESTDIR)/usr/lib/systemd/system systemd/* - install -m 0755 -D -t $(DESTDIR)/usr/lib/dracut/modules.d/30ignition bin/$(GOARCH)/ignition - install -m 0755 -D -t $(DESTDIR)/usr/bin bin/$(GOARCH)/ignition-validate - diff --git a/0002-allow-multiple-mounts-of-same-device.patch b/0002-allow-multiple-mounts-of-same-device.patch index b6232d3..13d491d 100644 --- a/0002-allow-multiple-mounts-of-same-device.patch +++ b/0002-allow-multiple-mounts-of-same-device.patch @@ -19,10 +19,23 @@ Index: ignition-2.3.0/config/v3_1/types/filesystem.go } func (f Filesystem) IgnoreDuplicates() map[string]struct{} { -Index: ignition-2.3.0/config/v3_2_experimental/types/filesystem.go +Index: ignition-2.3.0/config/v3_2/types/filesystem.go =================================================================== ---- ignition-2.3.0.orig/config/v3_2_experimental/types/filesystem.go -+++ ignition-2.3.0/config/v3_2_experimental/types/filesystem.go +--- ignition-2.3.0.orig/config/v3_2/types/filesystem.go ++++ ignition-2.3.0/config/v3_2/types/filesystem.go +@@ -23,7 +23,7 @@ import ( + ) + + func (f Filesystem) Key() string { +- return f.Device ++ return f.Device + *f.Path + } + + func (f Filesystem) IgnoreDuplicates() map[string]struct{} { +Index: ignition-2.3.0/config/v3_3_experimental/types/filesystem.go +=================================================================== +--- ignition-2.3.0.orig/config/v3_3_experimental/types/filesystem.go ++++ ignition-2.3.0/config/v3_3_experimental/types/filesystem.go @@ -23,7 +23,7 @@ import ( ) diff --git a/0003-fix-i386-build.patch b/0003-fix-i386-build.patch deleted file mode 100644 index f234736..0000000 --- a/0003-fix-i386-build.patch +++ /dev/null @@ -1,21 +0,0 @@ -commit f9196c3e0c7b03bedfedeb981987e976f3c59aea -Author: Ignaz Forster -Date: Mon Aug 10 15:33:18 2020 +0200 -References: (gh#coreos/ignition#1069) -Upstream: Submitted - - Add support for building on 32 bit x86 archticture - -diff --git a/Makefile b/Makefile -index 35b0deda..d80e0870 100644 ---- a/Makefile -+++ b/Makefile -@@ -6,6 +6,8 @@ ifeq ($(GOARCH),x86_64) - GOARCH=amd64 - else ifeq ($(GOARCH),aarch64) - GOARCH=arm64 -+else ifeq ($(patsubst i%86,386,$(GOARCH)),386) -+ GOARCH=386 - endif - - .PHONY: all diff --git a/_service b/_service index a1ec5f2..4142079 100644 --- a/_service +++ b/_service @@ -1,7 +1,7 @@ - 2.6.0 - v2.6.0 + 2.7.0 + v2.7.0 git://github.com/coreos/ignition.git git enable diff --git a/_servicedata b/_servicedata index 61c68e9..482fa89 100644 --- a/_servicedata +++ b/_servicedata @@ -1,6 +1,6 @@ git://github.com/coreos/ignition.git - ec53570394424f79bbdd47b33aea3ce6097d63cf + 60e47838ec6cda3326d32a1fe81dc5ebf7f6cf79 \ No newline at end of file diff --git a/ignition-2.6.0.tar.xz b/ignition-2.6.0.tar.xz deleted file mode 100644 index 8a60a2a..0000000 --- a/ignition-2.6.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:435a82bfb88f090efa1f95f37efcc9e882dbb8e1ceda951403dce3ae0bfa9717 -size 2243008 diff --git a/ignition-2.7.0.tar.xz b/ignition-2.7.0.tar.xz new file mode 100644 index 0000000..573354b --- /dev/null +++ b/ignition-2.7.0.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:743f00cc8a467f35067b5e598e8c257c608835c57216e74323c9b55487488123 +size 2264944 diff --git a/ignition-fix-arm32-installation.patch b/ignition-fix-arm32-installation.patch deleted file mode 100644 index c66e191..0000000 --- a/ignition-fix-arm32-installation.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- ignition-2.6.0/Makefile.orig 2020-08-18 10:36:22.791294210 +0000 -+++ ignition-2.6.0/Makefile 2020-08-18 10:39:07.126682387 +0000 -@@ -8,6 +8,8 @@ else ifeq ($(GOARCH),aarch64) - GOARCH=arm64 - else ifeq ($(patsubst i%86,386,$(GOARCH)),386) - GOARCH=386 -+else ifeq ($(patsubst armv%,arm,$(GOARCH)),arm) -+ GOARCH=arm - endif - - .PHONY: all diff --git a/ignition.changes b/ignition.changes index 99859ad..380defa 100644 --- a/ignition.changes +++ b/ignition.changes @@ -1,3 +1,76 @@ +------------------------------------------------------------------- +Mon Oct 19 15:39:37 UTC 2020 - iforster@suse.de + +- Update to version 2.7.0: + * news: add notes for 2.7.0 + * docs: stabilize spec + * gomod: bump go.opencensus.io to v0.22.5 + * docs: add section to spec stabilization for failing external tests + * news: fix error in 2.3.0 changelog + * tests: update for spec stabilization + * internal: update for new experimental spec + * config/v3_3_experimental: create new experimental package + * config/v3_2_experimental: mark stable + * interal/providers/*stack: drop timeout for config fetch + * internal/providers/*stack: exit early if all configs error out + * internal/providers/*stack: make ErrNotFound authoritative + * doc: add clevis custom documentation + * internal/exec/stages: add clevis custom support + * config: add custom options for clevis devices + * fetch-offline: immediately return ErrNeedNet on OpenStack + * ci: unfreeze kernel + * tests/*: add test for resizing an existing partition + * docs/*: add resize partition info + * stages/disks: support resizing an existing partition + * config: add resize to schema + * README: Minor changes for consistency + * test: Use alternative marker for testing ignition config examples + * docs: Convert and improve formatting for INI sections + * docs: Add spec ordering instructions for new stable releases + * docs: Add ToC for some long pages + * docs: Rename Migrating ... to Upgrading Configs + * docs: Fix link in Development page + * docs: Add specs reference page + * docs: Add index page inspired from README + * docs: Add Config Validation example from README + * docs: Add Jekyll front matter for existing pages + * docs: Add Jekyll and theme config + * internal: fix S3 region detection + * docs: Follow-up for doc->docs renaming + * docs: Rename doc to docs for GitHub Pages support + * docs/getting-started: tiny cleanups + * README: drop stray link target + * doc: drop references to Container Linux + * doc/development: drop section on running blackbox tests on CL + * doc: add gs url scheme for bare metal platform + * fetch: don't run if fetch-offline fetched a config + * doc: fix LUKS indentation for configuration-v3_2_experimental docs + * doc: Add shouldExist for users and groups + * engine: fix logging interactions with fetch-offline + * AzureStack: fix unfortunate typo of iso9660 + * *: add wipeVolume LUKS field + * types: Use "path" instead of "path/filepath" + * Add support for building 32 bit ARM version + * Install Dracut modules with correct permissions + * Add support for building 32 bit x86 version + * doc: add LUKS examples & operator notes + * internal/stages/disks: allow LUKS device re-use + * internal: use device aliases for LUKS + * tests: fix partition.number0 partition size specification + * blkid: drop some unsafe pointer casts + * blkid: fix invalid pointer cast in DumpDisk() + * {sgdisk,blkid}: use int64 for sector counts + * sgdisk: stop putting sector counts in MiB fields + * README: note that spec2x is unmaintained + * release-checklist: drop support for Ignition 0.x + * release-checklist: minor updates +- Remove upstreamed patches + * 0001-fix-install-permissions.patch + * 0003-fix-i386-build.patch + * ignition-fix-arm32-installation.patch +- Refreshed to match new Ignition spec + * 0002-allow-multiple-mounts-of-same-device.patch + ------------------------------------------------------------------- Fri Sep 18 06:33:02 UTC 2020 - Ignaz Forster diff --git a/ignition.spec b/ignition.spec index 0f533af..74ce78f 100644 --- a/ignition.spec +++ b/ignition.spec @@ -17,7 +17,7 @@ Name: ignition -Version: 2.6.0 +Version: 2.7.0 Release: 0 Summary: First boot installer and configuration tool License: Apache-2.0 @@ -36,10 +36,7 @@ Source9: ignition-enable-network.service Source10: ignition-enable-network.sh Source20: ignition-userconfig-timeout.conf Source21: ignition-userconfig-timeout-arm.conf -Patch1: 0001-fix-install-permissions.patch Patch2: 0002-allow-multiple-mounts-of-same-device.patch -Patch3: 0003-fix-i386-build.patch -Patch4: ignition-fix-arm32-installation.patch BuildRequires: dracut BuildRequires: libblkid-devel BuildRequires: systemd-rpm-macros @@ -85,10 +82,7 @@ which creates firstboot_happened after the first boot. %prep %setup -q -%patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 mkdir dracut/30ignition-microos grub systemd_suse chmod +x %{SOURCE3} %{SOURCE4} %{SOURCE8} @@ -153,7 +147,7 @@ fi %files %license LICENSE -%doc README.md README.SUSE doc +%doc README.md README.SUSE docs %{_prefix}/lib/dracut/modules.d/30ignition %{_prefix}/lib/dracut/modules.d/30ignition-microos %{_bindir}/ignition-validate