simp-rake-helpers 2.0.2 → 2.1.0

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 CHANGED
@@ -1,15 +1,7 @@
1
1
  ---
2
- !binary "U0hBMQ==":
3
- metadata.gz: !binary |-
4
- NTg4Yzk3Zjk0ZWYzYzE3YzJiNTZhOTllNjQxZTUwZmIzYzllYThmZQ==
5
- data.tar.gz: !binary |-
6
- ZTk4MmFhODMyMjMwZjA0YjZjZTYyY2I0YTU4MTY0OTVmNWQyYzRmMQ==
2
+ SHA1:
3
+ metadata.gz: 0318aa8407685d0cc6d24564f78d0f1d5441ae00
4
+ data.tar.gz: 55cde5a0e8f6d301079cd482d1983012441517fb
7
5
  SHA512:
8
- metadata.gz: !binary |-
9
- N2VjNmRhZDFmM2NlODgyMWQ2OTQwMWU1MDg0NjZjNGMzNTA3ZjQyOTAzNWI5
10
- OTYwMTc2ZTQyNTczYjJmNWM0ZWIyMDg2YmJlYjU2ZmRlNjAzMzE4OGViZWE5
11
- YjU4MDg3NjU2OWNjMjQyOWRhYjliYjQzOThiZjIyNmM1MDYxZTA=
12
- data.tar.gz: !binary |-
13
- Nzc5NWVjZGE5OWVlMGY5ZTE3ZTc2MzQ5N2JiYWQzYTU2NjY3OWRmZmI3ODVk
14
- MjdhNDhhNDU4OTA4MTk1MjczMTBkNWE2N2U4NjI3Nzk1NTRhMWQwMjE0MmI1
15
- YzJkNGM4ZDMwNjE4MDIyODQyYjY1NWIwOThkZmIxZDI5YzAxZjg=
6
+ metadata.gz: 708e58e986a3116ae8792ec9a5ac666d8fe9b85a998b7a5e1a3a0482cb28f21a7a5ee6ba066dc5b3bfe6db3b1e9dcfd33c283cd4586505a6fb9be720ff7266bd
7
+ data.tar.gz: 44210df514558a96369bbb0bdd13a2cfcc6669d2b3b2e4501348d4c02299b864e19cfbc9be772ff9965ec4d9fa14324aef9ac4de788c7541c4daaa480648966c
@@ -1,3 +1,7 @@
1
+ ### 2.1.0 / 2016-04-15
2
+ * ISOs will now build with EFI mode enabled
3
+ * The pkglist file will be read from the tarball during build:auto
4
+
1
5
  ### 2.0.1 / 2016-04-05
2
6
  * Fix a bug where deps:checkout failed on unknown repos being present
3
7
 
data/README.md CHANGED
@@ -1,12 +1,12 @@
1
1
  # simp-rake-helpers
2
- [![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html) [![Build Status](https://travis-ci.org/simp/rubygem-simp-rake-helpers.svg?branch=master)](https://travis-ci.org/simp/rubygems-simp-rake-helpers)
2
+ [![License](http://img.shields.io/:license-apache-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0.html) [![Build Status](https://travis-ci.org/simp/rubygems-simp-rake-helpers.svg?branch=master)](https://travis-ci.org/simp/rubygems-simp-rake-helpers)
3
3
 
4
4
  #### Table of Contents
5
5
 
6
6
  1. [Overview](#overview)
7
7
  * [This gem is part of SIMP](#this-gem-is-part-of-simp)
8
8
  * [Features](#features)
9
- 2. [Setup - The basics of getting started with simp-rake-helpers](#setup)
9
+ 2. [Setup - The basics of getting started with iptables](#setup)
10
10
  * [Gemfile](#gemfile)
11
11
  3. [Usage - Configuration options and additional functionality](#usage)
12
12
  * [In a Puppet Module](#in-a-puppet-module)
@@ -26,10 +26,8 @@ This gem is part of (the build tooling for) the [System Integrity Management Pla
26
26
 
27
27
 
28
28
  ### Features
29
- * Provides rake tasks for Puppet modules:
30
- * supports multithreaded mock operations
31
- * RPM packaging and signing
32
- * Fully automatic ISO build
29
+ * supports multithreaded mock operations
30
+ * RPM packaging and signing
33
31
 
34
32
 
35
33
  ## Setup
@@ -122,7 +122,7 @@ module Simp::Rake::Build
122
122
 
123
123
  # check out subrepos
124
124
  # --------------------
125
- if do_checkout
125
+ if do_checkout && !tarball
126
126
  puts
127
127
  puts '='*80
128
128
  puts "## Checking out subrepositories"
@@ -172,18 +172,6 @@ module Simp::Rake::Build
172
172
  puts
173
173
  puts '-'*80
174
174
 
175
- ver=target_data['os_version'].split('.').first
176
- repo_pkglist_file = File.expand_path( "src/DVD/#{ver}-simp_pkglist.txt",
177
- repo_root_dir
178
- )
179
- if File.file? repo_pkglist_file
180
- puts "#### setting SIMP_PKGLIST_FILE=#{repo_pkglist_file}"
181
- ENV['SIMP_PKGLIST_FILE']=repo_pkglist_file
182
- else
183
- puts "#### WARNING: repo pkglist file not found:"
184
- puts " '#{repo_pkglist_file}'"
185
- puts
186
- end
187
175
  else
188
176
  puts
189
177
  puts '='*80
@@ -252,8 +252,33 @@ module Simp::Rake::Build
252
252
 
253
253
  # Do some sane chmod'ing and build ISO
254
254
  system("chmod -fR u+rwX,g+rX,o=g #{dir}")
255
- @simp_output_iso = "SIMP-#{simpver}-#{baseos}-#{baseosver}-#{arch}.iso"
256
- system("mkisofs -uid 0 -gid 0 -o #{@simp_output_iso} -b isolinux/isolinux.bin -c boot.cat -no-emul-boot -boot-load-size 4 -boot-info-table -r -m TRANS.TBL #{dir}")
255
+ simp_output_name = "SIMP-#{simpver}-#{baseos}-#{baseosver}-#{arch}"
256
+ @simp_output_iso = "#{simp_output_name}.iso"
257
+
258
+ mkisofs_cmd = [
259
+ 'mkisofs',
260
+ "-A SIMP-#{simpver}",
261
+ "-V SIMP-#{simpver}",
262
+ "-volset SIMP-#{simpver}",
263
+ '-uid 0',
264
+ '-gid 0',
265
+ '-J',
266
+ '-joliet-long',
267
+ '-r',
268
+ '-v',
269
+ '-T',
270
+ '-b isolinux/isolinux.bin',
271
+ '-c boot.cat',
272
+ '-boot-load-size 4',
273
+ '-boot-info-table',
274
+ '-no-emul-boot',
275
+ '-m TRANS.TBL',
276
+ '-x ./lost+found',
277
+ "-o #{@simp_output_iso}",
278
+ dir
279
+ ]
280
+
281
+ system(mkisofs_cmd.join(' '))
257
282
  end
258
283
  end # End of tarfiles loop
259
284
  end
@@ -2,5 +2,5 @@ module Simp; end
2
2
  module Simp::Rake; end
3
3
 
4
4
  class Simp::Rake::Helpers
5
- VERSION = '2.0.2'
5
+ VERSION = '2.1.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: 2.0.2
4
+ version: 2.1.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: 2016-04-15 00:00:00.000000000 Z
12
+ date: 2016-04-18 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: bundler
@@ -57,14 +57,14 @@ dependencies:
57
57
  name: puppet
58
58
  requirement: !ruby/object:Gem::Requirement
59
59
  requirements:
60
- - - ! '>='
60
+ - - '>='
61
61
  - !ruby/object:Gem::Version
62
62
  version: '3.0'
63
63
  type: :runtime
64
64
  prerelease: false
65
65
  version_requirements: !ruby/object:Gem::Requirement
66
66
  requirements:
67
- - - ! '>='
67
+ - - '>='
68
68
  - !ruby/object:Gem::Version
69
69
  version: '3.0'
70
70
  - !ruby/object:Gem::Dependency
@@ -183,14 +183,14 @@ dependencies:
183
183
  name: pager
184
184
  requirement: !ruby/object:Gem::Requirement
185
185
  requirements:
186
- - - ! '>='
186
+ - - '>='
187
187
  - !ruby/object:Gem::Version
188
188
  version: '0'
189
189
  type: :runtime
190
190
  prerelease: false
191
191
  version_requirements: !ruby/object:Gem::Requirement
192
192
  requirements:
193
- - - ! '>='
193
+ - - '>='
194
194
  - !ruby/object:Gem::Version
195
195
  version: '0'
196
196
  - !ruby/object:Gem::Dependency
@@ -242,7 +242,7 @@ dependencies:
242
242
  - - ~>
243
243
  - !ruby/object:Gem::Version
244
244
  version: '1.6'
245
- - - ! '>'
245
+ - - '>'
246
246
  - !ruby/object:Gem::Version
247
247
  version: 1.6.1
248
248
  type: :development
@@ -252,7 +252,7 @@ dependencies:
252
252
  - - ~>
253
253
  - !ruby/object:Gem::Version
254
254
  version: '1.6'
255
- - - ! '>'
255
+ - - '>'
256
256
  - !ruby/object:Gem::Version
257
257
  version: 1.6.1
258
258
  - !ruby/object:Gem::Dependency
@@ -353,9 +353,8 @@ dependencies:
353
353
  - - ~>
354
354
  - !ruby/object:Gem::Version
355
355
  version: '3.0'
356
- description: ! ' "simp-rake-helpers provides common methods for SIMP Rake Tasks"
357
-
358
- '
356
+ description: |2
357
+ "simp-rake-helpers provides common methods for SIMP Rake Tasks"
359
358
  email: simp@simp-project.org
360
359
  executables: []
361
360
  extensions: []
@@ -420,12 +419,12 @@ require_paths:
420
419
  - lib
421
420
  required_ruby_version: !ruby/object:Gem::Requirement
422
421
  requirements:
423
- - - ! '>='
422
+ - - '>='
424
423
  - !ruby/object:Gem::Version
425
424
  version: '0'
426
425
  required_rubygems_version: !ruby/object:Gem::Requirement
427
426
  requirements:
428
- - - ! '>='
427
+ - - '>='
429
428
  - !ruby/object:Gem::Version
430
429
  version: '0'
431
430
  requirements: []