simp-rake-helpers 5.17.1 → 5.18.0

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 69328763ce3da7ff5f165deab2f21e0226c208527c3a8e42aba0f03f5aee020b
4
- data.tar.gz: c031ad61b232c3af0739ec461810c03550d7a474a08dee4d9834554fdc31cad6
3
+ metadata.gz: 8bede039acbe8803bdb21ded2b8d4f5bb15d24a9ada5900f63fa2e50fedc056d
4
+ data.tar.gz: 3eede0ceb383bd04e56536edfccd486b53df627f6dcba3d42cff9d9de2e87329
5
5
  SHA512:
6
- metadata.gz: 84a773be21f315aaf75ef208ca737a68ccf487136be2d902d03974fe5a17dddcd9077402319e0f7e8c892bb09183f02a46bf8584faae999407deaf25c7b6958f
7
- data.tar.gz: d856cacf3c0ee314160d079fc5c3be710d749605d2103610d41c1bb616a6ce5ae4f40371ce7ad5b131dd12269e912b3eca15837f12f1e728f93bed4d97e452d4
6
+ metadata.gz: 61ab773494b3fe92c79d68370599db3827df920ae8951e15f9bec5ce7593c98a706513b06aa1d7e8846ad8965a6207ac3959cb0ea61a6d7b69221d25b1a29cc6
7
+ data.tar.gz: 64e942f712672ec831cefc7681c4228e095e886a97716a43ca00884d9aaa3efba52df3fcde620d39d5a5407358b02f4ea602ecddec35d6c7ed21aaffc86bb60f
data/CHANGELOG.md CHANGED
@@ -1,3 +1,12 @@
1
+ ### 5.18.0 /2023-02-27
2
+ - Added
3
+ - `SIMP_BUILD_reposync_only` now excludes RPMs and yum repos from the ISO
4
+ `unpack` task
5
+ - Fixed
6
+ - Change common repo name `base` to avoid repoclosure conflict warnings
7
+ - EL7 ISO unpack no longer interferes with reposync repos when
8
+ `SIMP_BUILD_reposync_only=yes`
9
+
1
10
  ### 5.17.1 /2022-11-11
2
11
  - Fixed
3
12
  - Fixed an edge case where the `SIMP` directory YUM metadata was not
@@ -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
@@ -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 base SIMP repo.
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/base')
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/base/#{File.basename(path)}"
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 base.conf --disablerepo=* --enablerepo=base'
640
+ cmd = 'repoclosure -c basetest.conf --disablerepo=* --enablerepo=basetest'
641
641
  else
642
- cmd = 'repoclosure -c repodata -n -t -r base -l lookaside -c yum.conf'
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'
@@ -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 => 'isoinfo',
38
- :targetdir => Dir.pwd,
39
- :merge => false,
40
- :version => false,
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 = args.iso_path
44
- iso_info = which(args.isoinfo)
45
- targetdir = args.targetdir
46
- merge = args.merge
47
- version = args.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
@@ -2,5 +2,5 @@ module Simp; end
2
2
  module Simp::Rake; end
3
3
 
4
4
  class Simp::Rake::Helpers
5
- VERSION = '5.17.1'
5
+ VERSION = '5.18.0'
6
6
  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.17.1
4
+ version: 5.18.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-01-31 00:00:00.000000000 Z
12
+ date: 2023-03-07 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: simp-beaker-helpers