omnibus 9.0.23 → 9.0.24
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/lib/omnibus/packagers/ips.rb +4 -1
- data/lib/omnibus/version.rb +1 -1
- data/resources/ips/doc-transform.erb +3 -0
- data/spec/unit/packagers/ips_spec.rb +3 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 065db2a80c8d5fde76cb572c23d13316eaf5a54a1e39dc6dfb1078f50a3addca
|
|
4
|
+
data.tar.gz: c76a0a6fdad8901fad830da4a2dceac66fe3d08ca23024bede57cd489a4cb115
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 426485f17ad21b7682a4987f6b4fe045a5a25ac989b6ca06dd2b1a3bf8022136b6bb807b2538e2f08cb47c41b676a046edb7036d2d31c0ef9b7c6ddbffc9f637
|
|
7
|
+
data.tar.gz: ca0e935c55dfe8b0104ddfe75365126b2a204fa176167af664c01b96bbaf95aed6e1610f5cc99bf7c587240f99c1084ff87a0d1629e57e3bce538d3273cd7919
|
|
@@ -292,7 +292,10 @@ module Omnibus
|
|
|
292
292
|
shellout!("pkgdepend generate -md #{source_dir} #{pkg_manifest_file}.2 | pkgfmt > #{pkg_manifest_file}.3")
|
|
293
293
|
shellout!("pkgmogrify -DARCH=`uname -p` #{pkg_manifest_file}.3 #{transform_file} | pkgfmt > #{pkg_manifest_file}.4")
|
|
294
294
|
shellout!("pkgdepend resolve -m #{pkg_manifest_file}.4")
|
|
295
|
-
|
|
295
|
+
# extra step added to truncate bash and other version requirements that may cause conflicts on
|
|
296
|
+
# Solaris patch versions slightly older than the OS that the build is running on.
|
|
297
|
+
shellout!("pkgmogrify -DARCH=`uname -p` #{pkg_manifest_file}.4.res #{transform_file} | pkgfmt > #{pkg_manifest_file}.4.res-transformed")
|
|
298
|
+
shellout!("pkgmogrify #{pkg_manifest_file}.4.res-transformed #{versionlock_file} > #{pkg_manifest_file}.5.res")
|
|
296
299
|
end
|
|
297
300
|
|
|
298
301
|
#
|
data/lib/omnibus/version.rb
CHANGED
|
@@ -1,4 +1,7 @@
|
|
|
1
1
|
<transform dir path=<%= pathdir %>$ -> edit group bin sys>
|
|
2
|
+
<transform dir path=<%= pathdir %>$ -> edit group bin sys>
|
|
3
|
+
<transform depend fmri=pkg:/shell -> edit fmri '@.+' ''>
|
|
4
|
+
<transform depend fmri=pkg:/system -> edit fmri '@.+' ''>
|
|
2
5
|
<transform file depend -> edit pkg.debug.depend.file ruby env>
|
|
3
6
|
<transform file depend -> edit pkg.debug.depend.file make env>
|
|
4
7
|
<transform file depend -> edit pkg.debug.depend.file perl env>
|
|
@@ -246,7 +246,9 @@ module Omnibus
|
|
|
246
246
|
expect(subject).to receive(:shellout!)
|
|
247
247
|
.with("pkgdepend resolve -m #{staging_dir}/project.p5m.4")
|
|
248
248
|
expect(subject).to receive(:shellout!)
|
|
249
|
-
.with("pkgmogrify #{staging_dir}/project.p5m.4.res #{staging_dir}/
|
|
249
|
+
.with("pkgmogrify -DARCH=`uname -p` #{staging_dir}/project.p5m.4.res #{staging_dir}/doc-transform | pkgfmt > #{staging_dir}/project.p5m.4.res-transformed")
|
|
250
|
+
expect(subject).to receive(:shellout!)
|
|
251
|
+
.with("pkgmogrify #{staging_dir}/project.p5m.4.res-transformed #{staging_dir}/version-lock > #{staging_dir}/project.p5m.5.res")
|
|
250
252
|
subject.generate_pkg_deps
|
|
251
253
|
end
|
|
252
254
|
end
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: omnibus
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 9.0.
|
|
4
|
+
version: 9.0.24
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Chef Software, Inc.
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2024-01-16 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: aws-sdk-s3
|