simp-rake-helpers 5.12.2 → 5.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4da7d0cf624209586f4a159cd06bf86cc61da199ddecc3d2730e53a267225316
-  data.tar.gz: 44fcb7049d7a6a39b433e88de24894db6817fc06620fddc6ac7f67d3481c6a42
+  metadata.gz: 33beb8e656840401f0fb3a07f7aee982fe3931d53b2e233f2e0024398fd03d6c
+  data.tar.gz: 81111ce62e4e8b3ca03a478d765e3944ee8b297af7b2ee1ef5e182e8bacf36f3
 SHA512:
-  metadata.gz: 6f4a80dd4864f3ade29b60932b83d87b8d2fd56384fd03bc5df9de9a03f70f54445333e3654b3d2225d67e0ffdc5f1f772c5a23908a0ea40378c648043c00fb2
-  data.tar.gz: 862aaaac472efde1959b314d66ddb254379be34f2ecbfa1f4715fc58882010fcfc14c5caf41a090947b2d3955b2c27eb146bec1b2236a817caebc95ada01f857
+  metadata.gz: 9589c0d228dc77b2e75a641f158ca878c56498566696039c71eca0c414078299c2a7c4951cf48d45e0388b9cb72a1615321381084a11837fbbc42259a65ea880
+  data.tar.gz: 4267702fa365999433e673f26ff0896ad9a088ea7ce7ae26fff38bbc4d9c37b1c6239956bc016644ea8b2aa3b10925989f44fbb178a3d611380eb79db4b5cc6e

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+### 5.12.3 / 2021-09-15
+- Handle multiple options for required applications in build:auto
+- Allow users to populate a `reposync` directory in the YUM build space that
+  will overwrite any target directories on the ISO.
+  - The SIMP tarball is unpacked after the copy so you always get the latest
+    built artifacts.
+  - Pruning will not occur if this technique is used since it is presumed that
+    you are overwriting the data with authoritative content.
+- Added a helpful tip about updating vermap.yaml
+- Fixed the call to repoclosure if on a system with DNF
+- Added support for EL8 to vermap.yaml
+
 ### 5.12.2 / 2021-06-22
 - Change to '-1' from '-0' as the default RPM release
 

data/lib/simp/rake/build/auto.rb

@@ -18,6 +18,8 @@ module Simp::Rake::Build
   class Auto < ::Rake::TaskLib
 
     # Commands that are required by some part of the rake stack
+    #
+    # Use an array for commands that may have multiple valid options
     BUILD_REQUIRED_COMMANDS = [
       'basename',
       'cat',
@@ -42,7 +44,7 @@ module Simp::Rake::Build
       'make',
       'mkdir',
       'mktemp',
-      'python',
+      ['python','python2','python3'],
       'readlink',
       'repoclosure',
       'rm',
@@ -62,7 +64,7 @@ module Simp::Rake::Build
       'wc',
       'which',
       'xargs',
-      'yum',
+      ['dnf','yum'],
       'yumdownloader'
     ]
 

data/lib/simp/rake/build/build.rb

@@ -204,7 +204,8 @@ module Simp::Rake::Build
 
             Dir.chdir(target_dir) do
               if File.exist?('packages.yaml')
-                known_package_hash = YAML::load_file('packages.yaml')
+                # The empty YAML file returns 'false'
+                known_package_hash = YAML::load_file('packages.yaml') || {}
               end
             end
 
@@ -276,7 +277,7 @@ module Simp::Rake::Build
                 pkg = downloaded_package_hash[pkg][:rpm_name]
               }.compact
 
-              if known_packages.empty? && downloaded_packages.empty?
+              if known_packages.empty? && downloaded_packages.empty? && Dir.glob('reposync/**/repomd.xml').empty?
                 fail <<-EOM
         Error: Could not find anything to do!
 

data/lib/simp/rake/build/iso.rb

@@ -120,6 +120,9 @@ module Simp::Rake::Build
             end
           end
 
+          reposync_location = File.join(@build_dir,'yum_data','reposync')
+          reposync_active = !Dir.glob(File.join(reposync_location, '**', 'repomd.xml')).empty?
+
           tarfiles = File.directory?(tarball) ?
             Dir.glob("#{tarball}/*.tar.gz") : [tarball]
           vermap = YAML::load_file( File.join( File.dirname(__FILE__), 'vermap.yaml'))
@@ -171,6 +174,7 @@ module Simp::Rake::Build
               unless Array(vermap[simpver.split('.').first]).include?(baseosver.split('.').first)
                 if verbose
                   warn("Could not find SIMP version mapping for #{simpver} for Base OS #{baseosver}")
+                  warn("Do you need to update vermap.yaml in the Gem?")
                 end
 
                 next
@@ -186,34 +190,53 @@ module Simp::Rake::Build
                 end
               end
 
-              # Prune unwanted packages
-              begin
-                system("tar --no-same-permissions -C #{dir} -xzf #{tball} *simp_pkglist.txt")
-              rescue
-                # Does not matter if the command fails
-              end
+              # If we've pulled in reposync directories, we expect them to
+              # completely overwrite the directory of the same name in the
+              # target ISO so no pruning is required
+              #
+              # Note: CASE MATTERS on the directory names
+              if reposync_active
+                repos_to_overwrite = Dir.glob(File.join(reposync_location, '*'))
+                  .delete_if{|x| !File.directory?(x)}
+                  .map{|x| File.basename(x)}
+
+                repos_to_overwrite.each do |repo|
+                  src = File.join(reposync_location, repo)
+                  target = File.join(dir, repo)
+
+                  rm_rf(target, :verbose => verbose) if File.directory?(target)
+                  cp_r(src, dir, :verbose => verbose)
+                end
+              else
+                # Prune unwanted packages
+                begin
+                  system("tar --no-same-permissions -C #{dir} -xzf #{tball} *simp_pkglist.txt")
+                rescue
+                  # Does not matter if the command fails
+                end
 
-              pkglist_file = ENV.fetch(
-                'SIMP_PKGLIST_FILE',
-                File.join(dir,"#{baseosver.split('.').first}-simp_pkglist.txt")
-              )
-
-              puts
-              puts '-'*80
-              puts "### Pruning packages not in file '#{pkglist_file}'"
-              puts
-              puts '   (override this with `SIMP_PKGLIST_FILE=<file>`)'
-              puts
-              puts '-'*80
-              puts
-
-              if (args.prune.casecmp("false") != 0) && File.exist?(pkglist_file)
-                exclude_pkgs = Array.new
-                File.read(pkglist_file).each_line do |line|
-                  next if line =~ /^(\s+|#.*)$/
-                  exclude_pkgs.push(line.chomp)
+                pkglist_file = ENV.fetch(
+                  'SIMP_PKGLIST_FILE',
+                  File.join(dir,"#{baseosver.split('.').first}-simp_pkglist.txt")
+                )
+
+                puts
+                puts '-'*80
+                puts "### Pruning packages not in file '#{pkglist_file}'"
+                puts
+                puts '   (override this with `SIMP_PKGLIST_FILE=<file>`)'
+                puts
+                puts '-'*80
+                puts
+
+                if (args.prune.casecmp("false") != 0) && File.exist?(pkglist_file)
+                  exclude_pkgs = Array.new
+                  File.read(pkglist_file).each_line do |line|
+                    next if line =~ /^(\s+|#.*)$/
+                    exclude_pkgs.push(line.chomp)
+                  end
+                  prune_packages(dir,['SIMP'],exclude_pkgs,mkrepo)
                 end
-                prune_packages(dir,['SIMP'],exclude_pkgs,mkrepo)
               end
 
               # Add the SIMP code
@@ -230,13 +253,14 @@ module Simp::Rake::Build
                   yum_dep_location = File.join(@build_dir,'yum_data',simp_dep_src,'packages')
                 end
 
+                yum_dep_rpms = Dir.glob(File.join(yum_dep_location,'*.rpm'))
+
                 unless File.directory?(yum_dep_location)
-                  fail("Could not find dependency directory at #{yum_dep_location}")
+                  fail("Could not find dependency directory at #{yum_dep_location}") unless reposync_active
                 end
 
-                yum_dep_rpms = Dir.glob(File.join(yum_dep_location,'*.rpm'))
                 if yum_dep_rpms.empty?
-                  fail("Could not find any dependency RPMs at #{yum_dep_location}")
+                  fail("Could not find any dependency RPMs at #{yum_dep_location}") unless reposync_active
                 end
 
                 # Add any one-off RPMs that you might want to add to your own build
@@ -261,7 +285,9 @@ module Simp::Rake::Build
                   cp(rpm,rpm_arch, :verbose => verbose)
                 end
 
-                fail("Could not find architecture '#{arch}' in the SIMP distribution") unless File.directory?(arch)
+                ln_s('noarch', arch, :verbose => verbose) if (!File.directory?(arch) && File.directory?('noarch'))
+                fail("Could not find architecture '#{arch}' in the SIMP distribution") unless (File.directory?(arch) || File.symlink?(arch))
+
                 # Get everything set up properly...
                 Dir.chdir(arch) do
                   Dir.glob('../*') do |rpm_dir|

data/lib/simp/rake/build/pkg.rb

@@ -606,23 +606,19 @@ protect=1
               mkdir_p('repos/lookaside')
               mkdir_p('repodata')
 
-              Dir.glob(args[:target_dir]).each do |base_dir|
-                Find.find(base_dir) do |path|
-                  if (path =~ /.*\.rpm$/) and (path !~ /.*.src\.rpm$/)
-                    sym_path = "repos/base/#{File.basename(path)}"
-                    ln_s(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
-                  end
-                end
+              Dir.glob(File.join(args[:target_dir], '**', '*.rpm'))
+                .delete_if{|x| x =~ /\.src\.rpm$/}
+                .each do |path|
+                  sym_path = "repos/base/#{File.basename(path)}"
+                  ln_s(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
               end
 
               if args[:aux_dir]
-                Dir.glob(args[:aux_dir]).each do |aux_dir|
-                  Find.find(aux_dir) do |path|
-                    if (path =~ /.*\.rpm$/) and (path !~ /.*.src\.rpm$/)
-                      sym_path = "repos/lookaside/#{File.basename(path)}"
-                      ln_s(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
-                    end
-                  end
+                Dir.glob(File.join(args[:aux_dir], '**', '*.rpm'))
+                  .delete_if{|x| x =~ /\.src\.rpm$/}
+                  .each do |path|
+                    sym_path = "repos/lookaside/#{File.basename(path)}"
+                    ln_s(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
                 end
               end
 
@@ -647,7 +643,11 @@ protect=1
                 file.write(ERB.new(yum_conf_template,nil,'-').result(binding))
               end
 
-              cmd = 'repoclosure -c repodata -n -t -r base -l lookaside -c yum.conf'
+              if which('dnf')
+                cmd = 'repoclosure -c base.conf --disablerepo=* --enablerepo=base'
+              else
+                cmd = 'repoclosure -c repodata -n -t -r base -l lookaside -c yum.conf'
+              end
 
               if ENV['SIMP_BUILD_verbose'] == 'yes'
                 puts

data/lib/simp/rake/build/vermap.yaml

@@ -1,5 +1,5 @@
 ---
-"6": ["6","7"]
+"6": ["6","7","8"]
 "5": "7"
 "4": "6"
 "2": "5"

data/lib/simp/rake/helpers/version.rb

@@ -2,5 +2,5 @@ module Simp; end
 module Simp::Rake; end
 
 class Simp::Rake::Helpers
-  VERSION = '5.12.2'
+  VERSION = '5.12.3'
 end

data/lib/simp/rake/helpers.rb

@@ -20,8 +20,8 @@ class Simp::Rake::Helpers
     invalid_commands = Array.new
 
     Array(required_commands).each do |command|
-      unless Facter::Core::Execution.which(command)
-        invalid_commands << command
+      unless Array(command).find { |x| Facter::Core::Execution.which(x) }
+        invalid_commands << Array(command).join(' or ')
       end
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: simp-rake-helpers
 version: !ruby/object:Gem::Version
-  version: 5.12.2
+  version: 5.12.3
 platform: ruby
 authors:
 - Chris Tessmer
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-28 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: simp-beaker-helpers