simp-rake-helpers 5.12.4 → 5.12.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d79c389d3f40c038b0ba81fe8351e4f71b256bd1eaeeef52eb0af07239ec793b
-  data.tar.gz: 1025900b3bbfa941429f228c7952bf79ccfec9a0b388a5a8fcfaf670b3c6f590
+  metadata.gz: af430b5f3668ec96a8f12d66b7210e176083e9377ccfefd06fa92050ee56f77a
+  data.tar.gz: 423871d8e7f99d01d6065809ea1cfea2b76abae47b84add3197b982d042b3de3
 SHA512:
-  metadata.gz: 9c2e9f763a211891553cde62a1963f9fd603f1ce9bfed11b828b36206fe5ec73e1b55f7d1f570c5d1df79cdc00c534d57cc8df24cd205e4cabe946895e820d47
-  data.tar.gz: 818c69dcf5bab3bba5516539852abc856973f97275bc186d46ef268c2878d6a4e0542d179a47fd3ed6e48266ff819fc7c70127953694f92b6b7c1b5c03377e98
+  metadata.gz: 9424b979c1f67e6fba2ecedb6c8229e111c017a987f69ee7c9eea7db60d715b23530c91bd8baf01d44e11f0e1b16c73d016c13905c87e7f5540b7c5b072ab7bd
+  data.tar.gz: 9c43ca061b10e4241695b108af43a27c20e06f430d1cdaf349cd15e68333ee5f389e7f74427e9ab495cfc3f52df4786bf576ce99d00e66356c24db4b5d6694f0

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+### 5.12.5 / 2021-10-07
+- Fixed a bug where `build:auto` failed when building the SIMP ISO for EL7,
+  because the code attempted to move a directory onto itself.
+- Ensured GPG keys in simp-gpgkeys are available in the DVD overlay tar file
+
 ### 5.12.4 / 2021-10-05
 - Ensure that the DIST qualifier is added to all built RPMs
 - Use the new SimpRepos directory layout when building an ISO using externally

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

@@ -190,6 +190,7 @@ module Simp::Rake::Build
                 end
               end
 
+
               repo_target_dir = dir
 
               # If we've pulled in reposync directories, we expect them to
@@ -256,7 +257,14 @@ module Simp::Rake::Build
 
               # Pop the SIMP directory from the tarball into the correct spot
               # FIXME: This is a hack
-              FileUtils.mv("#{dir}/SIMP", repo_target_dir) if File.directory?("#{dir}/SIMP")
+              unless dir == repo_target_dir
+                simpdir = File.join(dir,'SIMP')
+
+                if File.directory?(simpdir)
+                   cp_r(simpdir, repo_target_dir, :verbose => verbose)
+                   rm_rf(simpdir, :verbose => verbose)
+                end
+              end
 
               Dir.chdir("#{repo_target_dir}/SIMP") do
                 # Add the SIMP Dependencies
@@ -301,8 +309,10 @@ module Simp::Rake::Build
                   cp(rpm,rpm_arch, :verbose => verbose)
                 end
 
-                unless reposync_active
-                  ln_s('noarch', arch, :verbose => verbose) if (!File.directory?(arch) && File.directory?('noarch'))
+                if reposync_active
+                    fail("Error: Could not run createrepo in #{Dir.pwd}") unless system(%(#{mkrepo} .))
+                else
+                  ln_sf('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...
@@ -320,6 +330,40 @@ module Simp::Rake::Build
                         ln_sf(source_rpm,link_target, :verbose => verbose)
                       end
                     end
+
+                    fail("Error: Could not run createrepo in #{Dir.pwd}") unless system(%(#{mkrepo} .))
+                  end
+                end
+              end
+
+              ### Munge the Repos
+
+              # Create an Updates directory that is properly populated
+              updates_readme = <<~README
+                This directory houses updates to NON-MODULAR RPMs.
+
+                DO NOT put modular RPMs in this directory or you will break your
+                system updates!
+                README
+
+              updates_dir = File.join(dir, 'Updates')
+              mkdir_p(updates_dir)
+
+              Dir.chdir(updates_dir) do
+                File.open('README','w'){|fh| fh.puts(updates_readme) }
+
+                repos = Dir.glob(File.join('..','**','repodata'))
+                modular_repos = Dir.glob(File.join('..','**','repodata','*-modules.*'))
+                non_modular_repos = repos.select{|x| modular_repos.grep(%r{^#{Regexp.escape(x)}}).empty? }
+                non_modular_repos.map!{|x| File.split(x).first}
+                non_modular_repos.delete_if{|x| x.match(%r{/SimpRepos|/SIMP}) }
+                non_modular_repos.each do |non_modular_repo|
+                  Dir.glob(File.join(non_modular_repo, '**', '*.rpm')).each do |rpm|
+                    # when non_modular_repo is '..', can still find RPMs we need
+                    # to exclude
+                    next if rpm.match(%r{/SimpRepos|/SIMP})
+
+                    ln_sf(rpm, '.', :verbose => verbose)
                   end
                 end
 

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

@@ -610,7 +610,7 @@ protect=1
                 .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)
+                  ln_sf(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
               end
 
               if args[:aux_dir]
@@ -618,7 +618,7 @@ protect=1
                   .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)
+                    ln_sf(path,sym_path, :verbose => @verbose) unless File.exists?(sym_path)
                 end
               end
 

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

@@ -126,10 +126,16 @@ module Simp::Rake::Build
 
             Simp::RPM.copy_wo_vcs(@dvd_src,".",base_dir)
 
-            # Copy in the GPG Public Keys
+            # Copy in the GPG Public Keys from @build_dir
             mkdir_p("#{destdir}/GPGKEYS")
             ln(Dir.glob("#{@build_dir}/GPGKEYS/RPM-GPG-KEY*"), "#{destdir}/GPGKEYS", { :force => true })
 
+            # Copy in the GPG Public Keys packaged by simp-gpgkeys
+            simp_gpgkeys = File.join(@src_dir, 'assets', 'gpgkeys', 'GPGKEYS')
+            if Dir.exist?(simp_gpgkeys)
+              ln(Dir.glob("#{simp_gpgkeys}/RPM-GPG-KEY*"), "#{destdir}/GPGKEYS", { :force => true })
+            end
+
             # Copy in the auto-build RPMs
             Dir.chdir("#{@build_dir}/SIMP/RPMS") do
               Dir.glob('*').each do |type|

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.4'
+  VERSION = '5.12.5'
 end

metadata

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