0002-allow-multiple-mounts-of-same-device.patch

@@ -6,10 +6,10 @@ Upstream: Ticket opened [gh#coreos/ignition#890]
     e.g. to mount several subvolumes from a Btrfs device or bind mounting
     the device to multiple places, by also adding the path to the key.
 
-Index: ignition-2.20.0/config/v3_1/types/filesystem.go
+Index: ignition-2.16.2/config/v3_1/types/filesystem.go
 ===================================================================
---- ignition-2.20.0.orig/config/v3_1/types/filesystem.go
+--- ignition-2.16.2.orig/config/v3_1/types/filesystem.go
-+++ ignition-2.20.0/config/v3_1/types/filesystem.go
++++ ignition-2.16.2/config/v3_1/types/filesystem.go
 @@ -23,6 +23,9 @@ import (
  )
  
@@ -20,10 +20,10 @@ Index: ignition-2.20.0/config/v3_1/types/filesystem.go
  	return f.Device
  }
  
-Index: ignition-2.20.0/config/v3_2/types/filesystem.go
+Index: ignition-2.16.2/config/v3_2/types/filesystem.go
 ===================================================================
---- ignition-2.20.0.orig/config/v3_2/types/filesystem.go
+--- ignition-2.16.2.orig/config/v3_2/types/filesystem.go
-+++ ignition-2.20.0/config/v3_2/types/filesystem.go
++++ ignition-2.16.2/config/v3_2/types/filesystem.go
 @@ -23,6 +23,9 @@ import (
  )
  
@@ -34,10 +34,10 @@ Index: ignition-2.20.0/config/v3_2/types/filesystem.go
  	return f.Device
  }
  
-Index: ignition-2.20.0/config/v3_3/types/filesystem.go
+Index: ignition-2.16.2/config/v3_3/types/filesystem.go
 ===================================================================
---- ignition-2.20.0.orig/config/v3_3/types/filesystem.go
+--- ignition-2.16.2.orig/config/v3_3/types/filesystem.go
-+++ ignition-2.20.0/config/v3_3/types/filesystem.go
++++ ignition-2.16.2/config/v3_3/types/filesystem.go
 @@ -23,6 +23,9 @@ import (
  )
  
@@ -48,10 +48,10 @@ Index: ignition-2.20.0/config/v3_3/types/filesystem.go
  	return f.Device
  }
  
-Index: ignition-2.20.0/config/v3_4/types/filesystem.go
+Index: ignition-2.16.2/config/v3_4/types/filesystem.go
 ===================================================================
---- ignition-2.20.0.orig/config/v3_4/types/filesystem.go
+--- ignition-2.16.2.orig/config/v3_4/types/filesystem.go
-+++ ignition-2.20.0/config/v3_4/types/filesystem.go
++++ ignition-2.16.2/config/v3_4/types/filesystem.go
 @@ -23,6 +23,9 @@ import (
  )
  
@@ -62,24 +62,10 @@ Index: ignition-2.20.0/config/v3_4/types/filesystem.go
  	return f.Device
  }
  
-Index: ignition-2.20.0/config/v3_5/types/filesystem.go
+Index: ignition-2.16.2/config/v3_5_experimental/types/filesystem.go
 ===================================================================
---- ignition-2.20.0.orig/config/v3_5/types/filesystem.go
+--- ignition-2.16.2.orig/config/v3_5_experimental/types/filesystem.go
-+++ ignition-2.20.0/config/v3_5/types/filesystem.go
++++ ignition-2.16.2/config/v3_5_experimental/types/filesystem.go
-@@ -23,6 +23,9 @@ import (
- )
- 
- func (f Filesystem) Key() string {
-+ 	if (f.Path != nil) {
-+ 		return f.Device + *f.Path
-+ 	}
- 	return f.Device
- }
- 
-Index: ignition-2.20.0/config/v3_6_experimental/types/filesystem.go
-===================================================================
---- ignition-2.20.0.orig/config/v3_6_experimental/types/filesystem.go
-+++ ignition-2.20.0/config/v3_6_experimental/types/filesystem.go
 @@ -23,6 +23,9 @@ import (
  )
  

_service

@@ -1,7 +1,7 @@
 <services>
   <service name="tar_scm" mode="disabled">
-    <param name="version">2.20.0</param>
+    <param name="version">2.19.0</param>
-    <param name="revision">v2.20.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>

_servicedata

@@ -1,6 +1,6 @@
 <servicedata>
   <service name="tar_scm">
     <param name="url">https://github.com/coreos/ignition</param>
-    <param name="changesrevision">a204f429f13194ae379be9401d49e5241439660b</param>
+    <param name="changesrevision">09c99e0305adc1377b87964a39ad2d009aec9b12</param>
  </service>
 </servicedata>

ignition-2.20.0.tar.xz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a71ebbe8c836a1a2845d362512f28330c415509a800765f90b97066f042961e4
-size 2974712

ignition.changes

@@ -1,24 +1,3 @@
--------------------------------------------------------------------
-Thu Nov 07 19:58:35 UTC 2024 - iforster@suse.com
-
-- Update to version 2.20.0:
-  * Features
-    * Support partitioning disk with mounted partitions
-    * Support Proxmox VE
-    * Support gzipped Akamai user_data
-  * Changes
-    * The Dracut module now installs partx
-    * Mark the 3.5.0 config spec as stable
-    * No longer accept configs with version 3.5.0-experimental
-    * Create new 3.6.0-experimental config spec from 3.5.0
-  * Bug fixes
-    * Fix network race when phoning home on Equinix Metal
-    * Fix Akamai Ignition base64 decoding on padded payloads
-    * Fix Makefile GOARCH for loongarch64 (#1942)
-- Drop go build bugfix again, fixed upstream
-- Adapting 0002-allow-multiple-mounts-of-same-device.patch to new
-  3.6.0 spec
-
 -------------------------------------------------------------------
 Fri Aug 30 15:27:58 UTC 2024 - Dominique Leuenberger <dimstar@opensuse.org>
 

ignition.spec

@@ -17,7 +17,7 @@
 
 
 Name:           ignition
-Version:        2.20.0
+Version:        2.19.0
 Release:        0
 Summary:        First boot installer and configuration tool
 License:        Apache-2.0
@@ -94,6 +94,7 @@ cp %{SOURCE12} dracut/30ignition/ignition-kargs-helper.sh
 
 %build
 sed -i -e 's|go build -ldflags|go build -buildmode=pie -ldflags|g' 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