simp-rake-helpers 5.17.1 → 5.19.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/CHANGELOG.md +18 -0
- data/lib/simp/rake/build/auto.rb +2 -2
- data/lib/simp/rake/build/pkg.rb +6 -5
- data/lib/simp/rake/build/unpack.rb +18 -11
- data/lib/simp/rake/helpers/version.rb +1 -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: 712ebbbef14960ebc9864f75b77caf59b8729b7693a367e64ffe49275371cb28
|
4
|
+
data.tar.gz: 711c3270485ce9ff0f3466ab8303b012d68b6f55474e7009d9895587fb81321c
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f79902f1dd6719f03790d72cea4e4439d672eb1406e2006fd30c4739823cb20dcaa203fe129d7e64eca582861128aecc0590c9db7db53b778b29e07a386742e7
|
7
|
+
data.tar.gz: bdd2c8bb2c50f0a680ca2e9c41b9184f60525332ec83b2cf4516f67cea0e791ae7f9a36d980f499a1812142c1f6839a9d6285662f69269a48e00f739a8e3b989
|
data/CHANGELOG.md
CHANGED
@@ -1,3 +1,21 @@
|
|
1
|
+
### 5.19.0 /2023-03-20
|
2
|
+
- Added
|
3
|
+
- `pkg:single` will skip the `require_rebuild?` logic
|
4
|
+
when `SIMP_BUILD_PKG_require_rebuild=yes`
|
5
|
+
- Fixed
|
6
|
+
- It was impossible to build simp-doc if RPM was published to yum repos; can
|
7
|
+
now use `SIMP_BUILD_PKG_require_rebuild=yes`
|
8
|
+
|
9
|
+
|
10
|
+
### 5.18.0 /2023-02-27
|
11
|
+
- Added
|
12
|
+
- `SIMP_BUILD_reposync_only` now excludes RPMs and yum repos from the ISO
|
13
|
+
`unpack` task
|
14
|
+
- Fixed
|
15
|
+
- Change common repo name `base` to avoid repoclosure conflict warnings
|
16
|
+
- EL7 ISO unpack no longer interferes with reposync repos when
|
17
|
+
`SIMP_BUILD_reposync_only=yes`
|
18
|
+
|
1
19
|
### 5.17.1 /2022-11-11
|
2
20
|
- Fixed
|
3
21
|
- Fixed an edge case where the `SIMP` directory YUM metadata was not
|
data/lib/simp/rake/build/auto.rb
CHANGED
@@ -361,9 +361,9 @@ module Simp::Rake::Build
|
|
361
361
|
end
|
362
362
|
|
363
363
|
target_data['isos'].each do |iso|
|
364
|
-
puts "---- rake unpack[#{iso},#{do_merge},#{Dir.pwd},isoinfo,#{target_data['os_version']}]"
|
364
|
+
puts "---- rake unpack[#{iso},#{do_merge},#{Dir.pwd},isoinfo,#{target_data['os_version']}#{reposync_only}]"
|
365
365
|
Rake::Task['unpack'].reenable
|
366
|
-
Rake::Task['unpack'].invoke(iso,do_merge,Dir.pwd,'isoinfo',target_data['os_version'])
|
366
|
+
Rake::Task['unpack'].invoke(iso,do_merge,Dir.pwd,'isoinfo',target_data['os_version'],reposync_only)
|
367
367
|
end
|
368
368
|
else
|
369
369
|
puts
|
data/lib/simp/rake/build/pkg.rb
CHANGED
@@ -544,7 +544,7 @@ module Simp::Rake::Build
|
|
544
544
|
|
545
545
|
Finds all rpm files in the target dir and all of its subdirectories, then
|
546
546
|
reports which packages have unresolved dependencies. This needs to be run
|
547
|
-
after rake tasks tar:build and unpack if operating on the
|
547
|
+
after rake tasks tar:build and unpack if operating on the basetest SIMP repo.
|
548
548
|
* :target_dir - The directory to assess. Default #{@build_dir}/SIMP.
|
549
549
|
* :aux_dir - Auxillary repo glob to use when assessing. Default #{@build_dir}/Ext_*.
|
550
550
|
Defaults to ''(empty) if :target_dir is not the system default.
|
@@ -594,14 +594,14 @@ module Simp::Rake::Build
|
|
594
594
|
|
595
595
|
Dir.mktmpdir do |temp_pkg_dir|
|
596
596
|
Dir.chdir(temp_pkg_dir) do
|
597
|
-
mkdir_p('repos/
|
597
|
+
mkdir_p('repos/basetest')
|
598
598
|
mkdir_p('repos/lookaside')
|
599
599
|
mkdir_p('repodata')
|
600
600
|
|
601
601
|
Dir.glob(File.join(args[:target_dir], '**', '*.rpm'))
|
602
602
|
.delete_if{|x| x =~ /\.src\.rpm$/}
|
603
603
|
.each do |path|
|
604
|
-
sym_path = "repos/
|
604
|
+
sym_path = "repos/basetest/#{File.basename(path)}"
|
605
605
|
ln_sf(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
|
606
606
|
end
|
607
607
|
|
@@ -637,9 +637,9 @@ module Simp::Rake::Build
|
|
637
637
|
|
638
638
|
dnf_system = which('dnf')
|
639
639
|
if dnf_system
|
640
|
-
cmd = 'repoclosure -c
|
640
|
+
cmd = 'repoclosure -c basetest.conf --disablerepo=* --enablerepo=basetest'
|
641
641
|
else
|
642
|
-
cmd = 'repoclosure -c repodata -n -t -r
|
642
|
+
cmd = 'repoclosure -c repodata -n -t -r basetest -l lookaside -c yum.conf'
|
643
643
|
end
|
644
644
|
|
645
645
|
if ENV['SIMP_BUILD_verbose'] == 'yes'
|
@@ -754,6 +754,7 @@ module Simp::Rake::Build
|
|
754
754
|
check_git: false,
|
755
755
|
prefix: ''
|
756
756
|
})
|
757
|
+
return true if ENV['SIMP_BUILD_PKG_require_rebuild'] =~ /\A(yes|always)\Z/i
|
757
758
|
result = false
|
758
759
|
rpm_metadata = File.exist?(@rpm_dependency_file) ? YAML.load(File.read(@rpm_dependency_file)) : {}
|
759
760
|
dir_relpath = Pathname.new(dir).relative_path_from(Pathname.new(Dir.pwd)).to_path
|
@@ -28,23 +28,26 @@ module Simp::Rake::Build
|
|
28
28
|
* :isoinfo - The isoinfo executable to use to extract stuff from the ISO.
|
29
29
|
Defaults to 'isoinfo'.
|
30
30
|
* :version - optional override for the <version> number (e.g., '7.0' instead of '7')
|
31
|
+
* :exclude_repos - Don't unpack repos or packages when true
|
31
32
|
|
32
33
|
"
|
33
34
|
=end
|
34
|
-
task :unpack,[:iso_path, :merge, :targetdir, :isoinfo, :version] do |t,args|
|
35
|
+
task :unpack,[:iso_path, :merge, :targetdir, :isoinfo, :version, :exclude_repos] do |t,args|
|
35
36
|
args.with_defaults(
|
36
|
-
:iso_path
|
37
|
-
:isoinfo
|
38
|
-
:targetdir
|
39
|
-
:merge
|
40
|
-
:version
|
37
|
+
:iso_path => '',
|
38
|
+
:isoinfo => 'isoinfo',
|
39
|
+
:targetdir => Dir.pwd,
|
40
|
+
:merge => false,
|
41
|
+
:version => false,
|
42
|
+
:exclude_repos => false,
|
41
43
|
)
|
42
44
|
|
43
|
-
iso_path
|
44
|
-
iso_info
|
45
|
-
targetdir
|
46
|
-
merge
|
47
|
-
version
|
45
|
+
iso_path = args.iso_path
|
46
|
+
iso_info = which(args.isoinfo)
|
47
|
+
targetdir = args.targetdir
|
48
|
+
merge = args.merge
|
49
|
+
version = args.version
|
50
|
+
exclude_repos = args.exclude_repos
|
48
51
|
|
49
52
|
# Checking for valid arguments
|
50
53
|
File.exist?(args.iso_path) or
|
@@ -102,6 +105,10 @@ module Simp::Rake::Build
|
|
102
105
|
iso_toc.each do |iso_entry|
|
103
106
|
target = "#{out_dir}#{iso_entry}"
|
104
107
|
unless File.exist?(target)
|
108
|
+
if exclude_repos && target =~ %r{\.rpm$|repodata|repomd.xml}
|
109
|
+
puts " [exclude_repos] SKIPPING repo/package file: #{target}"
|
110
|
+
next
|
111
|
+
end
|
105
112
|
FileUtils.mkdir_p(File.dirname(target))
|
106
113
|
system("#{iso_info} -R -x #{iso_entry} -i #{iso_path} > #{target}")
|
107
114
|
end
|
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: simp-rake-helpers
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 5.
|
4
|
+
version: 5.19.0
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Chris Tessmer
|
@@ -9,7 +9,7 @@ authors:
|
|
9
9
|
autorequire:
|
10
10
|
bindir: bin
|
11
11
|
cert_chain: []
|
12
|
-
date: 2023-
|
12
|
+
date: 2023-03-27 00:00:00.000000000 Z
|
13
13
|
dependencies:
|
14
14
|
- !ruby/object:Gem::Dependency
|
15
15
|
name: simp-beaker-helpers
|