image/archive: set numeric owner by default

supakeen · achilleas-k · commit c2d62230ee7c · 2025-11-04T13:32:57.000Z
It is always a good idea to use numeric owner for the tar archive image
type. Let's do that.

Signed-off-by: Simon de Vlieger &lt;supakeen@redhat.com&gt;
diff --git a/pkg/image/archive.go b/pkg/image/archive.go
@@ -3,6 +3,7 @@ package image
 import (
 	"math/rand"
 
+	"github.com/osbuild/images/internal/common"
 	"github.com/osbuild/images/internal/environment"
 	"github.com/osbuild/images/pkg/artifact"
 	"github.com/osbuild/images/pkg/manifest"
@@ -39,6 +40,7 @@ func (img *Archive) InstantiateManifest(m *manifest.Manifest,
 	osPipeline.OSVersion = img.OSVersion
 
 	tarPipeline := manifest.NewTar(buildPipeline, osPipeline, "archive")
+	tarPipeline.NumericOwner = common.ToPtr(true)
 
 	compressionPipeline := GetCompressionPipeline(img.Compression, buildPipeline, tarPipeline)
 	compressionPipeline.SetFilename(img.filename)
diff --git a/pkg/manifest/tar.go b/pkg/manifest/tar.go
@@ -10,14 +10,15 @@ type Tar struct {
 	Base
 	filename string
 
-	Format      osbuild.TarArchiveFormat
-	Compression osbuild.TarArchiveCompression
-	RootNode    osbuild.TarRootNode
-	Paths       []string
-	ACLs        *bool
-	SELinux     *bool
-	Xattrs      *bool
-	Transform   string
+	Format       osbuild.TarArchiveFormat
+	Compression  osbuild.TarArchiveCompression
+	RootNode     osbuild.TarRootNode
+	Paths        []string
+	ACLs         *bool
+	SELinux      *bool
+	Xattrs       *bool
+	Transform    string
+	NumericOwner *bool
 
 	inputPipeline Pipeline
 }
@@ -55,15 +56,16 @@ func (p *Tar) serialize() (osbuild.Pipeline, error) {
 	}
 
 	tarOptions := &osbuild.TarStageOptions{
-		Filename:    p.Filename(),
-		Format:      p.Format,
-		Compression: p.Compression,
-		ACLs:        p.ACLs,
-		SELinux:     p.SELinux,
-		Xattrs:      p.Xattrs,
-		RootNode:    p.RootNode,
-		Paths:       p.Paths,
-		Transform:   p.Transform,
+		Filename:     p.Filename(),
+		Format:       p.Format,
+		Compression:  p.Compression,
+		ACLs:         p.ACLs,
+		SELinux:      p.SELinux,
+		Xattrs:       p.Xattrs,
+		RootNode:     p.RootNode,
+		Paths:        p.Paths,
+		Transform:    p.Transform,
+		NumericOwner: p.NumericOwner,
 	}
 	tarStage := osbuild.NewTarStage(tarOptions, p.inputPipeline.Name())
 	pipeline.AddStage(tarStage)
diff --git a/test/data/manifest-checksums/centos_10-aarch64-tar-jq_only b/test/data/manifest-checksums/centos_10-aarch64-tar-jq_only
@@ -1 +1 @@
-a8efafd615efea8bd2dabd1ffd4a79550fc6f365
+a41bdc128d3b5089da08beb0d9d9b8dba5d78914
diff --git a/test/data/manifest-checksums/centos_10-aarch64-wsl-jq_only b/test/data/manifest-checksums/centos_10-aarch64-wsl-jq_only
@@ -1 +1 @@
-0590d32c80008669ef39c2658ff2592e85e478f5
+506c0e916fa8314895f6f55d8b0236deb158bbc2
diff --git a/test/data/manifest-checksums/centos_10-ppc64le-tar-jq_only b/test/data/manifest-checksums/centos_10-ppc64le-tar-jq_only
@@ -1 +1 @@
-30b667f6e9e8ffabf6cc19f66860a064d943c515
+349b398d35a715246c784e7949e079f51cf59bb4
diff --git a/test/data/manifest-checksums/centos_10-s390x-tar-jq_only b/test/data/manifest-checksums/centos_10-s390x-tar-jq_only
@@ -1 +1 @@
-c0279a9351becca7d7a9933a6986a2ed04c88d53
+39340cb2cc7ac6eafdcc2f845cdb04a40da95793
diff --git a/test/data/manifest-checksums/centos_10-x86_64-tar-jq_only b/test/data/manifest-checksums/centos_10-x86_64-tar-jq_only
@@ -1 +1 @@
-68b2b131214aee92568e55ff24060b77d1c0c332
+0547e60a58279f1b0235668ab5939c899968d057
diff --git a/test/data/manifest-checksums/centos_10-x86_64-wsl-jq_only b/test/data/manifest-checksums/centos_10-x86_64-wsl-jq_only
@@ -1 +1 @@
-0bdaeb6d10cc5dae48558f0cf6ec5276eedbcc32
+e666296ad20dbcdff38b1098d199df0bb99a08bd
diff --git a/test/data/manifest-checksums/centos_9-aarch64-tar-jq_only b/test/data/manifest-checksums/centos_9-aarch64-tar-jq_only
@@ -1 +1 @@
-de8f79c73aa1baca85eb5c98b27e6abddc6d8750
+458034fb49f7ef008ba4913bb2d8b117d4c0e849
diff --git a/test/data/manifest-checksums/centos_9-aarch64-wsl-jq_only b/test/data/manifest-checksums/centos_9-aarch64-wsl-jq_only
@@ -1 +1 @@
-4c99e03588c4745221237d131c6758559099fb7c
+28ede0415c959564abc8fa9b90f53cb7b04a8398
diff --git a/test/data/manifest-checksums/centos_9-ppc64le-tar-jq_only b/test/data/manifest-checksums/centos_9-ppc64le-tar-jq_only
@@ -1 +1 @@
-7cf147954c599908330ab54ebc052cda61863bd6
+008843a120f6f53dd6964e01ae224e60b6bb60af
diff --git a/test/data/manifest-checksums/centos_9-s390x-tar-jq_only b/test/data/manifest-checksums/centos_9-s390x-tar-jq_only
@@ -1 +1 @@
-4aefecd47af84784e8fe23b7214a7f375986c3a0
+a39c5731f1c3d30c5847fb6eee3e733b7008e8a5
diff --git a/test/data/manifest-checksums/centos_9-x86_64-tar-jq_only b/test/data/manifest-checksums/centos_9-x86_64-tar-jq_only
@@ -1 +1 @@
-95f9e22ddbe212e734586e98d57eb8018cb243dc
+ce50bd00b2a642e2966a816862b36bdd4d727848
diff --git a/test/data/manifest-checksums/centos_9-x86_64-wsl-jq_only b/test/data/manifest-checksums/centos_9-x86_64-wsl-jq_only
@@ -1 +1 @@
-014804c6b04d67af6a3ff48eec32452fb1a7112c
+1410ab8b1eacea1cfeba3e124782fe23c978c94b
diff --git a/test/data/manifest-checksums/fedora_41-x86_64-wsl-empty b/test/data/manifest-checksums/fedora_41-x86_64-wsl-empty
@@ -1 +1 @@
-50a5bcdae6fd24483931641ea7fbff827f22a80b
+93b0f8e63e68120f75b04d17ed5b32408fc27352
diff --git a/test/data/manifest-checksums/fedora_42-x86_64-wsl-empty b/test/data/manifest-checksums/fedora_42-x86_64-wsl-empty
@@ -1 +1 @@
-a45dcfc43d7efe52e33d68d911b93d5b7c6b402e
+b3508d262bd7d0a4a93ad2121900c3e712d02364
diff --git a/test/data/manifest-checksums/fedora_43-x86_64-wsl-empty b/test/data/manifest-checksums/fedora_43-x86_64-wsl-empty
@@ -1 +1 @@
-928a593c8faaa4819f08ab9fe72eb6d11a638aa1
+e2fdf86894ed6ba7335f93231e6b0e090e70a44e
diff --git a/test/data/manifest-checksums/fedora_44-x86_64-wsl-empty b/test/data/manifest-checksums/fedora_44-x86_64-wsl-empty
@@ -1 +1 @@
-d1ec184e371263a5ac7521b2fce8101e9d7dd9a7
+8bdca08f7186bba0012f4e98b2406b24903dea09
diff --git a/test/data/manifest-checksums/rhel_10.0-aarch64-tar-jq_only b/test/data/manifest-checksums/rhel_10.0-aarch64-tar-jq_only
@@ -1 +1 @@
-235f622dc2e46f2d39cb503df0793220e80cd935
+53c16567e509db40567846ec10c062765af5ba01
diff --git a/test/data/manifest-checksums/rhel_10.0-aarch64-wsl-jq_only b/test/data/manifest-checksums/rhel_10.0-aarch64-wsl-jq_only
@@ -1 +1 @@
-a9d54b6debdd885cc2daaa41742c99c53d7745aa
+6de543314460461ea5dada93ee803551d6df64e2
diff --git a/test/data/manifest-checksums/rhel_10.0-ppc64le-tar-jq_only b/test/data/manifest-checksums/rhel_10.0-ppc64le-tar-jq_only
@@ -1 +1 @@
-0198a2e5d362a38e82ff3516f8c8ab34c3061007
+40c9e6708447ffdb5962dea192f915c1b4892912
diff --git a/test/data/manifest-checksums/rhel_10.0-s390x-tar-jq_only b/test/data/manifest-checksums/rhel_10.0-s390x-tar-jq_only
@@ -1 +1 @@
-0439ef6b7e3900b530e25624c972153525da3524
+b6f35f0fb0b78eda3008d63d922629c0dcd21465
diff --git a/test/data/manifest-checksums/rhel_10.0-x86_64-tar-jq_only b/test/data/manifest-checksums/rhel_10.0-x86_64-tar-jq_only
@@ -1 +1 @@
-13d1987c243cd04600e842b31a78acc1a784bcea
+db70d7973fcb7a369465baf22b260fca69e63d75
diff --git a/test/data/manifest-checksums/rhel_10.0-x86_64-wsl-jq_only b/test/data/manifest-checksums/rhel_10.0-x86_64-wsl-jq_only
@@ -1 +1 @@
-9aa5f8abae0b7822b1a672e119049207d4f1f1cf
+806f2ed7a1644ad197244a68d1b764633f292717
diff --git a/test/data/manifest-checksums/rhel_10.1-aarch64-tar-jq_only b/test/data/manifest-checksums/rhel_10.1-aarch64-tar-jq_only
@@ -1 +1 @@
-7dd457ddacd51e413b32d6c65fb66a748c5688b2
+406411d5839ab6b305961f4f985918ea97a1f6d5
diff --git a/test/data/manifest-checksums/rhel_10.1-aarch64-wsl-jq_only b/test/data/manifest-checksums/rhel_10.1-aarch64-wsl-jq_only
@@ -1 +1 @@
-e2eef21a5ddac433ee586ab8c66ad915c4870592
+1f53b00f0f3e40ca8d08d3223d1f2c7ba7ef8640
diff --git a/test/data/manifest-checksums/rhel_10.1-ppc64le-tar-jq_only b/test/data/manifest-checksums/rhel_10.1-ppc64le-tar-jq_only
@@ -1 +1 @@
-10ad1d9c3904a300c455c9b861fb7c5d53b405fa
+9b09530983c5db87e96292abdc79ea551905347d
diff --git a/test/data/manifest-checksums/rhel_10.1-s390x-tar-jq_only b/test/data/manifest-checksums/rhel_10.1-s390x-tar-jq_only
@@ -1 +1 @@
-76956d82678a1334e65e30107b78818e0760d300
+d17e65be634606e27e34772df9c28011ff5e6b51
diff --git a/test/data/manifest-checksums/rhel_10.1-x86_64-tar-jq_only b/test/data/manifest-checksums/rhel_10.1-x86_64-tar-jq_only
@@ -1 +1 @@
-a4ad37f16bc1d7491bb2272d56639651b8c729c5
+5ba0efa4d87a9d93a87a481d109357d7287bd4f0
diff --git a/test/data/manifest-checksums/rhel_10.1-x86_64-wsl-jq_only b/test/data/manifest-checksums/rhel_10.1-x86_64-wsl-jq_only
@@ -1 +1 @@
-5c03a3c786b95122e236e08a2a53e52950b2337e
+f94a161ab6d7f16f63c1c4f56aecef3dcb9df4e7
diff --git a/test/data/manifest-checksums/rhel_10.2-aarch64-tar-jq_only b/test/data/manifest-checksums/rhel_10.2-aarch64-tar-jq_only
@@ -1 +1 @@
-76107e2fbaada64e7a682a083ad373f3ef52ee88
+48b1c331232016f5246e282a004c31b8ed1e31f3
diff --git a/test/data/manifest-checksums/rhel_10.2-aarch64-wsl-jq_only b/test/data/manifest-checksums/rhel_10.2-aarch64-wsl-jq_only
@@ -1 +1 @@
-e4233e9da3fb682641c99567321df127b828554a
+92f23e58d94c6ebecf6a5203a555da6e0741e4a4
diff --git a/test/data/manifest-checksums/rhel_10.2-ppc64le-tar-jq_only b/test/data/manifest-checksums/rhel_10.2-ppc64le-tar-jq_only
@@ -1 +1 @@
-0add2138f5b34886495ba2ac07a93019f2f5487f
+82c006e504fd37abc80a42cc8bbe9513a821637f
diff --git a/test/data/manifest-checksums/rhel_10.2-s390x-tar-jq_only b/test/data/manifest-checksums/rhel_10.2-s390x-tar-jq_only
@@ -1 +1 @@
-aac8fd6e791dd3b6191d6a7cbb98f609f65be1d3
+d6f6f1fc7e8605a95a4fb6e19190bcd22121cf77
diff --git a/test/data/manifest-checksums/rhel_10.2-x86_64-tar-jq_only b/test/data/manifest-checksums/rhel_10.2-x86_64-tar-jq_only
@@ -1 +1 @@
-af29a7b20a8372cd57b1069247cbead58bd6314e
+8b981894adf98d63677f516639969f43f7afcf66
diff --git a/test/data/manifest-checksums/rhel_10.2-x86_64-wsl-jq_only b/test/data/manifest-checksums/rhel_10.2-x86_64-wsl-jq_only
@@ -1 +1 @@
-2f2749fcc4740d011055636721187103315db346
+3165b5e47469381a72b3c9cc70b3c128db629847
diff --git a/test/data/manifest-checksums/rhel_8.10-aarch64-tar-jq_only b/test/data/manifest-checksums/rhel_8.10-aarch64-tar-jq_only
@@ -1 +1 @@
-db207aadc554312d50ac112dd254472e9aa24f7f
+fd291955cf9f33313f9ab5cb7e74340d7801bc9c
diff --git a/test/data/manifest-checksums/rhel_8.10-aarch64-wsl-jq_only b/test/data/manifest-checksums/rhel_8.10-aarch64-wsl-jq_only
@@ -1 +1 @@
-afcf77f08aa6d706325bd7b92fc92de14abd8261
+a5b80dba816fcd732cd1675d047871a3355698eb
diff --git a/test/data/manifest-checksums/rhel_8.10-ppc64le-tar-jq_only b/test/data/manifest-checksums/rhel_8.10-ppc64le-tar-jq_only
@@ -1 +1 @@
-4cfc5cd34f2788d613f9432bb553615f9ae30168
+ed424d2c4a29c6570df7bb5e93365fdafaa09e54
diff --git a/test/data/manifest-checksums/rhel_8.10-s390x-tar-jq_only b/test/data/manifest-checksums/rhel_8.10-s390x-tar-jq_only
@@ -1 +1 @@
-ab0f3e59f44762d2d7a4d542b109236d1380ac68
+4b2ef8b3329f19a9fc4ee271cf239f34ab6a3e36
diff --git a/test/data/manifest-checksums/rhel_8.10-x86_64-tar-jq_only b/test/data/manifest-checksums/rhel_8.10-x86_64-tar-jq_only
@@ -1 +1 @@
-012db229ba834f19a32242153ec85306bdd6358b
+1fec07e3c3db8d44cefc3b0d226acbf30c4382b4
diff --git a/test/data/manifest-checksums/rhel_8.10-x86_64-wsl-jq_only b/test/data/manifest-checksums/rhel_8.10-x86_64-wsl-jq_only
@@ -1 +1 @@
-0f81809872a4c4034493f709da5a345ab83e3072
+fae8e4a0e847f96528af28a81a7d6fd82e133be4
diff --git a/test/data/manifest-checksums/rhel_8.4-aarch64-tar-jq_only b/test/data/manifest-checksums/rhel_8.4-aarch64-tar-jq_only
@@ -1 +1 @@
-2a287bb5641f5f329daf7142bc68d0d5bd98a697
+34416edc76b6ec7aa4fbb85089cdd75b38e4149b
diff --git a/test/data/manifest-checksums/rhel_8.4-aarch64-wsl-jq_only b/test/data/manifest-checksums/rhel_8.4-aarch64-wsl-jq_only
@@ -1 +1 @@
-c94e3ef89260308d8b9d8a023b0a6f7c5b6ebaf4
+56a1198e6631c5358e388cf425546c2b0b471db1
diff --git a/test/data/manifest-checksums/rhel_8.4-ppc64le-tar-jq_only b/test/data/manifest-checksums/rhel_8.4-ppc64le-tar-jq_only
@@ -1 +1 @@
-53be474173c552e7b8efe066a46a10607b4b9032
+6a960ca02be0094c3ec7ed665e5434e2dc2e08cc
diff --git a/test/data/manifest-checksums/rhel_8.4-s390x-tar-jq_only b/test/data/manifest-checksums/rhel_8.4-s390x-tar-jq_only
@@ -1 +1 @@
-7c13c49b33ac9b125b31e7aa81401d4b1ad9f366
+981e3a019e96fe74d959974fea791fd1afc078b4
diff --git a/test/data/manifest-checksums/rhel_8.4-x86_64-tar-jq_only b/test/data/manifest-checksums/rhel_8.4-x86_64-tar-jq_only
@@ -1 +1 @@
-2d367c92125c86522d7f52210dcaa9bfe1b17c95
+3ed642bc60e190a8d7ef31f8cc72469353e3ac1f
diff --git a/test/data/manifest-checksums/rhel_8.4-x86_64-wsl-jq_only b/test/data/manifest-checksums/rhel_8.4-x86_64-wsl-jq_only
@@ -1 +1 @@
-69cde000d250e430074fd0abd377191842be9030
+5cbb08f0181b211a62dc1ebdefd24f4165758044
diff --git a/test/data/manifest-checksums/rhel_8.6-aarch64-tar-jq_only b/test/data/manifest-checksums/rhel_8.6-aarch64-tar-jq_only
@@ -1 +1 @@
-b8cb3cec9b1d71020ab95fc1503de67dd0555b0d
+b3d16183ab392fdfb04a380e8dc68926fe135ae7
diff --git a/test/data/manifest-checksums/rhel_8.6-aarch64-wsl-jq_only b/test/data/manifest-checksums/rhel_8.6-aarch64-wsl-jq_only
@@ -1 +1 @@
-19b0f157341cc5d40afd20c70c83d6f35b79e263
+bafd65fb706bf739ed88bbbf3438355e0772ad9c
diff --git a/test/data/manifest-checksums/rhel_8.6-ppc64le-tar-jq_only b/test/data/manifest-checksums/rhel_8.6-ppc64le-tar-jq_only
@@ -1 +1 @@
-b9b9a489601a9f9e4a17e087d46eeec53b727dfe
+60232c4d40427cdc0ab5d8f67b2cf1d1794cfbe2
diff --git a/test/data/manifest-checksums/rhel_8.6-s390x-tar-jq_only b/test/data/manifest-checksums/rhel_8.6-s390x-tar-jq_only
@@ -1 +1 @@
-e642f1cc361b730b28024bce6f469bdf0b262ef2
+55a80d51e27079283de8ce56805c3d188ed10727
diff --git a/test/data/manifest-checksums/rhel_8.6-x86_64-tar-jq_only b/test/data/manifest-checksums/rhel_8.6-x86_64-tar-jq_only
@@ -1 +1 @@
-9458fd46a210022ab204f988f2855566a01acefc
+6e9a3c798aafaa655f3d13dad038d412e158121f
diff --git a/test/data/manifest-checksums/rhel_8.6-x86_64-wsl-jq_only b/test/data/manifest-checksums/rhel_8.6-x86_64-wsl-jq_only
@@ -1 +1 @@
-4080fee854a5e2a79072f60b028a2c99b843567d
+f408184c095c3e9882b5a5465032ba28c30cbfec
diff --git a/test/data/manifest-checksums/rhel_8.8-aarch64-tar-jq_only b/test/data/manifest-checksums/rhel_8.8-aarch64-tar-jq_only
@@ -1 +1 @@
-da4039ed1153478bccf40d588cc4b7fed861fd77
+a52a6e85b2982473ceccbf1e042bec480dbe0428
diff --git a/test/data/manifest-checksums/rhel_8.8-aarch64-wsl-jq_only b/test/data/manifest-checksums/rhel_8.8-aarch64-wsl-jq_only
@@ -1 +1 @@
-eb0e7cfab696c5907239260a5bc0f665032742a2
+b7197222521a60713c6f628bcad78353787a506e
diff --git a/test/data/manifest-checksums/rhel_8.8-ppc64le-tar-jq_only b/test/data/manifest-checksums/rhel_8.8-ppc64le-tar-jq_only
@@ -1 +1 @@
-949255b8a3a79d47e2e0d2e53c684ee84e2cecf6
+256003e7ae2b74dc2829192278ad55861acd9594
diff --git a/test/data/manifest-checksums/rhel_8.8-s390x-tar-jq_only b/test/data/manifest-checksums/rhel_8.8-s390x-tar-jq_only
@@ -1 +1 @@
-6807bfff7b57dcb19931fd56ac3b23b2a403cfef
+ff11955bb68cac3279e1de5166b40e23295b4bc3
diff --git a/test/data/manifest-checksums/rhel_8.8-x86_64-tar-jq_only b/test/data/manifest-checksums/rhel_8.8-x86_64-tar-jq_only
@@ -1 +1 @@
-ca9c53b636ebcd7a8c2cadfe992741464cceb245
+87a8d791fed34cdee8795fbbde6b807b7567060c
diff --git a/test/data/manifest-checksums/rhel_8.8-x86_64-wsl-jq_only b/test/data/manifest-checksums/rhel_8.8-x86_64-wsl-jq_only
@@ -1 +1 @@
-ff4235600c3c17b3b07683b6ec47d92da3d3af19
+8586c2693b8bf2f1f28154b4560dd904a5482320
diff --git a/test/data/manifest-checksums/rhel_9.0-aarch64-tar-jq_only b/test/data/manifest-checksums/rhel_9.0-aarch64-tar-jq_only
@@ -1 +1 @@
-8e51d057312e1daf052c44e9ab10e7cf47d840d8
+69ed08ac384ab5b2702c5d92600ac14a2ce9f414
diff --git a/test/data/manifest-checksums/rhel_9.0-aarch64-wsl-jq_only b/test/data/manifest-checksums/rhel_9.0-aarch64-wsl-jq_only
@@ -1 +1 @@
-ced1ee8d09843fc47e70cbeb333ad2b9ca84d247
+59d483f6d94b1ffff28173cb53e1f5381c5b531b
diff --git a/test/data/manifest-checksums/rhel_9.0-ppc64le-tar-jq_only b/test/data/manifest-checksums/rhel_9.0-ppc64le-tar-jq_only
@@ -1 +1 @@
-a7738820d0f000769d449275dfcdaf09ad712957
+5c46d007efecc97518543447e07415a4a2ddcce0
diff --git a/test/data/manifest-checksums/rhel_9.0-s390x-tar-jq_only b/test/data/manifest-checksums/rhel_9.0-s390x-tar-jq_only
@@ -1 +1 @@
-f289900568355e2ede31081734bdf0bfd3c46eb2
+2b7eec0e0d477974c6cc159a69008e9f43a395fe
diff --git a/test/data/manifest-checksums/rhel_9.0-x86_64-tar-jq_only b/test/data/manifest-checksums/rhel_9.0-x86_64-tar-jq_only
@@ -1 +1 @@
-1cd73a40a34ccbfcdaa4c4476700aad7167be05f
+f9c9957b8f05cbaddf37028ad6658047b3301232
diff --git a/test/data/manifest-checksums/rhel_9.0-x86_64-wsl-jq_only b/test/data/manifest-checksums/rhel_9.0-x86_64-wsl-jq_only
@@ -1 +1 @@
-1151d5505c7b50451631432dd81880bdc4065f74
+011fbae5e14fb5fc71343095b04102347f90a138
diff --git a/test/data/manifest-checksums/rhel_9.2-aarch64-tar-jq_only b/test/data/manifest-checksums/rhel_9.2-aarch64-tar-jq_only
@@ -1 +1 @@
-b48f9125c98cbfc855d4bd417095b7e8519b79d7
+64d75ac3045d78e99fd4b602948ea9fb9a85c516
diff --git a/test/data/manifest-checksums/rhel_9.2-aarch64-wsl-jq_only b/test/data/manifest-checksums/rhel_9.2-aarch64-wsl-jq_only
@@ -1 +1 @@
-6eab80b4e99ea50442a0b9e28fba9767d1c47ebf
+dffe08ee6003b0dc288e8496e2e56e962d12e5b2
diff --git a/test/data/manifest-checksums/rhel_9.2-ppc64le-tar-jq_only b/test/data/manifest-checksums/rhel_9.2-ppc64le-tar-jq_only
@@ -1 +1 @@
-c6b249a6684ccb3f682f9b0f96cf53f3fe399b58
+ae0d402f0a60862614ba1ade3728e2db21a73862
diff --git a/test/data/manifest-checksums/rhel_9.2-s390x-tar-jq_only b/test/data/manifest-checksums/rhel_9.2-s390x-tar-jq_only
@@ -1 +1 @@
-d2f3941830a09d83e1da1ea7218d48e06251d2c6
+2dddef7e79c17e4ec21b562734eed39b38ba0702
diff --git a/test/data/manifest-checksums/rhel_9.2-x86_64-tar-jq_only b/test/data/manifest-checksums/rhel_9.2-x86_64-tar-jq_only
@@ -1 +1 @@
-5ebbd87c8e023977a93d797c12578c8689819bde
+404e2677ff0a8df0bd1002217c77f4a42f172336
diff --git a/test/data/manifest-checksums/rhel_9.2-x86_64-wsl-jq_only b/test/data/manifest-checksums/rhel_9.2-x86_64-wsl-jq_only
@@ -1 +1 @@
-9fc1763f7dcd10a74eea15208e36835a0ab13393
+aa965fcd47a35791d88b395f7bd357737289e466
diff --git a/test/data/manifest-checksums/rhel_9.4-aarch64-tar-jq_only b/test/data/manifest-checksums/rhel_9.4-aarch64-tar-jq_only
@@ -1 +1 @@
-508e1650ecd1fca1dd1dffa4f9ff07ad709628c3
+5e8af5a2a27cd8f13305d82d94f1cc76330db58f
diff --git a/test/data/manifest-checksums/rhel_9.4-aarch64-wsl-jq_only b/test/data/manifest-checksums/rhel_9.4-aarch64-wsl-jq_only
@@ -1 +1 @@
-8593502d51e593b66416e5125e820e5a4d5676c7
+57635646d09e5cd96b9ccc88f90e0fe229fcc40b
diff --git a/test/data/manifest-checksums/rhel_9.4-ppc64le-tar-jq_only b/test/data/manifest-checksums/rhel_9.4-ppc64le-tar-jq_only
@@ -1 +1 @@
-a50199930ecd77694fe913bd6bc62d47a9c12f3d
+aa8752fc0e4447327990e7c1d9f4252dd64a89cd
diff --git a/test/data/manifest-checksums/rhel_9.4-s390x-tar-jq_only b/test/data/manifest-checksums/rhel_9.4-s390x-tar-jq_only
@@ -1 +1 @@
-b4df18e6efa5c0aa31a4160888bb2e6a3fb50744
+1a9341a4552c9b10dd12e0323514b4dbba535f4e
diff --git a/test/data/manifest-checksums/rhel_9.4-x86_64-tar-jq_only b/test/data/manifest-checksums/rhel_9.4-x86_64-tar-jq_only
@@ -1 +1 @@
-5f37294014a9b2c21803a569eb206c9de0f55187
+832272c4868478f9451bf4f36b966b6b531cb66a
diff --git a/test/data/manifest-checksums/rhel_9.4-x86_64-wsl-jq_only b/test/data/manifest-checksums/rhel_9.4-x86_64-wsl-jq_only
@@ -1 +1 @@
-287128e9d31825421c28ce4531c4602b36d26a07
+1eb66e86c415b96cb1e96222e3235c8b819f418e
diff --git a/test/data/manifest-checksums/rhel_9.6-aarch64-tar-jq_only b/test/data/manifest-checksums/rhel_9.6-aarch64-tar-jq_only
@@ -1 +1 @@
-d067eb554a69a668496537bab503518ab98863ee
+eb41a0d2909cff6aa72e323fa25e483ee0ec25dc
diff --git a/test/data/manifest-checksums/rhel_9.6-aarch64-wsl-jq_only b/test/data/manifest-checksums/rhel_9.6-aarch64-wsl-jq_only
@@ -1 +1 @@
-27703e92cc02967e7dc82330d6ced6f2e0feb36c
+2b49c0fc928cb04715700a7ddc8243537dbb2596
diff --git a/test/data/manifest-checksums/rhel_9.6-ppc64le-tar-jq_only b/test/data/manifest-checksums/rhel_9.6-ppc64le-tar-jq_only
@@ -1 +1 @@
-a197eeaa64778ebd40da5f56d766a9da358b6118
+f6a3748fd3c766a77e75d5c58a56bd10027ef859
diff --git a/test/data/manifest-checksums/rhel_9.6-s390x-tar-jq_only b/test/data/manifest-checksums/rhel_9.6-s390x-tar-jq_only
@@ -1 +1 @@
-033f981acc8c4a413ffee45befd58964c9f5039e
+2ea95ee439acc32d9765b6d86d9e8ecd074da0c3
diff --git a/test/data/manifest-checksums/rhel_9.6-x86_64-tar-jq_only b/test/data/manifest-checksums/rhel_9.6-x86_64-tar-jq_only
@@ -1 +1 @@
-b7f3abcc462ddd07bb6c7667ed74639f0001746c
+b0812bb5528de18299a53ac8862be4d64f0f66aa
diff --git a/test/data/manifest-checksums/rhel_9.6-x86_64-wsl-jq_only b/test/data/manifest-checksums/rhel_9.6-x86_64-wsl-jq_only
@@ -1 +1 @@
-78c69de5bd65fa9af38f09f2dea0362a6616dd29
+caa91494b3112764d25893fc7219a78046327739
diff --git a/test/data/manifest-checksums/rhel_9.7-aarch64-tar-jq_only b/test/data/manifest-checksums/rhel_9.7-aarch64-tar-jq_only
@@ -1 +1 @@
-0351842f95767c9facd1b6443b659c9ca48ffed5
+c5ac75d1f10267c80cf7b926fde36ccc4e428f9e
diff --git a/test/data/manifest-checksums/rhel_9.7-aarch64-wsl-jq_only b/test/data/manifest-checksums/rhel_9.7-aarch64-wsl-jq_only
@@ -1 +1 @@
-b9a311fd852c15051a0f9a56feecf9bc195ba781
+c8b81564c3bf018026452139bf8d33054e7c0a56
diff --git a/test/data/manifest-checksums/rhel_9.7-ppc64le-tar-jq_only b/test/data/manifest-checksums/rhel_9.7-ppc64le-tar-jq_only
@@ -1 +1 @@
-82eab144dd2d38453f63f5c75dffcbd79aeb5638
+4e856d084182db8f9028c6ce2b04a11e43033f5e
diff --git a/test/data/manifest-checksums/rhel_9.7-s390x-tar-jq_only b/test/data/manifest-checksums/rhel_9.7-s390x-tar-jq_only
@@ -1 +1 @@
-83272caa84e3a225e87911ad0b5f91b6f9005ba1
+d6d3029309801e7696d7f0e2f6e6da1b06a858b4
diff --git a/test/data/manifest-checksums/rhel_9.7-x86_64-tar-jq_only b/test/data/manifest-checksums/rhel_9.7-x86_64-tar-jq_only
@@ -1 +1 @@
-29d3957cb52ca1393c2b69603cc34db807ddb4ac
+f7e9bc567dee6b8011e600cbc0f4328e367c913a
diff --git a/test/data/manifest-checksums/rhel_9.7-x86_64-wsl-jq_only b/test/data/manifest-checksums/rhel_9.7-x86_64-wsl-jq_only
@@ -1 +1 @@
-2f925745eda489b20055b7b320351a550625b449
+61b7a67851022be64af9ba7065adfa123a15f653
diff --git a/test/data/manifest-checksums/rhel_9.8-aarch64-tar-jq_only b/test/data/manifest-checksums/rhel_9.8-aarch64-tar-jq_only
@@ -1 +1 @@
-d26f9d6044cfb6dd6bec27495fb6ecb554ec4295
+f86b6a226e73423b50fc516eb2789a06f508588b
diff --git a/test/data/manifest-checksums/rhel_9.8-aarch64-wsl-jq_only b/test/data/manifest-checksums/rhel_9.8-aarch64-wsl-jq_only
@@ -1 +1 @@
-f1e9f95ad2db30badeef881d0db52f8ed03bb85e
+4df30615dac0bbc7d082a2f791325f66feef855d
diff --git a/test/data/manifest-checksums/rhel_9.8-ppc64le-tar-jq_only b/test/data/manifest-checksums/rhel_9.8-ppc64le-tar-jq_only
@@ -1 +1 @@
-8f8b93175a5f37116a0a1a1c19aa7c4e011532fb
+a10696c26285910e27af5c35dec80442bebaba24
diff --git a/test/data/manifest-checksums/rhel_9.8-s390x-tar-jq_only b/test/data/manifest-checksums/rhel_9.8-s390x-tar-jq_only
@@ -1 +1 @@
-cbf384869d4f75e838aba3e0207daf57f69f9360
+535c91871f224bb805e67c16fb9481fe7898c0e7
diff --git a/test/data/manifest-checksums/rhel_9.8-x86_64-tar-jq_only b/test/data/manifest-checksums/rhel_9.8-x86_64-tar-jq_only
@@ -1 +1 @@
-49769f7acab7091fc84d83062848606660eb6fa2
+086e40da47e1ec1d545cbf4b9f414fcfb192d0c2
diff --git a/test/data/manifest-checksums/rhel_9.8-x86_64-wsl-jq_only b/test/data/manifest-checksums/rhel_9.8-x86_64-wsl-jq_only
@@ -1 +1 @@
-5d4a31be9999071546afdf0285e339728f643a72
+e93c12c953fce4d4715f312e74ec6a3c6b6e9819

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-a8efafd615efea8bd2dabd1ffd4a79550fc6f365`
	`1`	`+a41bdc128d3b5089da08beb0d9d9b8dba5d78914`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-0590d32c80008669ef39c2658ff2592e85e478f5`
	`1`	`+506c0e916fa8314895f6f55d8b0236deb158bbc2`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-30b667f6e9e8ffabf6cc19f66860a064d943c515`
	`1`	`+349b398d35a715246c784e7949e079f51cf59bb4`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-c0279a9351becca7d7a9933a6986a2ed04c88d53`
	`1`	`+39340cb2cc7ac6eafdcc2f845cdb04a40da95793`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-68b2b131214aee92568e55ff24060b77d1c0c332`
	`1`	`+0547e60a58279f1b0235668ab5939c899968d057`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-0bdaeb6d10cc5dae48558f0cf6ec5276eedbcc32`
	`1`	`+e666296ad20dbcdff38b1098d199df0bb99a08bd`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-de8f79c73aa1baca85eb5c98b27e6abddc6d8750`
	`1`	`+458034fb49f7ef008ba4913bb2d8b117d4c0e849`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-4c99e03588c4745221237d131c6758559099fb7c`
	`1`	`+28ede0415c959564abc8fa9b90f53cb7b04a8398`