Skip to content
This repository
Browse code

Merge pull request #66 from daniel-pittman/feature/master/65-remove-u…

…nused-stomp-gem

The stomp gem was only used to support MCollective
  • Loading branch information...
commit 26a1a440c3716391ed51cb2209272d71f8cb51a8 2 parents 912a61d + 858c415
Daniel Pittman daniel-pittman authored

Showing 2 changed files with 13 additions and 49 deletions. Show diff stats Hide diff stats

  1. +13 48 build-bundle-file.sh
  2. +0 1  opt/gems/gem.list
61 build-bundle-file.sh
@@ -26,7 +26,6 @@ build an instance of the Razor Microkernel ISO.
26 26
27 27 OPTIONS:
28 28 -h, --help print usage for this command
29   - -r, --reuse-prev-dl reuse the downloads rather than downloading again
30 29 -b, --builtin-list=FILE file containing extensions to install as builtin
31 30 -m, --mirror-list=FILE file containing extensions to add to TCE mirror
32 31 -p, --build-prod-image build a production ISO (no openssh, no passwd)
@@ -58,7 +57,7 @@ read_config_file()
58 57 }
59 58
60 59 # options may be followed by one colon to indicate they have a required argument
61   -if ! options=$(getopt -o hrb:m:pdt:c:v -l help,reuse-prev-dl,builtin-list:,mirror-list:,build-prod-image,build-debug-image,tc-passwd:,config:,verbose -- "$@")
  60 +if ! options=$(getopt -o hb:m:pdt:c:v -l help,builtin-list:,mirror-list:,build-prod-image,build-debug-image,tc-passwd:,config:,verbose -- "$@")
62 61 then
63 62 usage
64 63 # something went wrong, getopt will put out an error message for us
@@ -81,7 +80,6 @@ BUNDLE_TYPE_SELECTED=0
81 80 while [ $# -gt 0 ]
82 81 do
83 82 case $1 in
84   - -r|--reuse-prev-dl) RE_USE_PREV_DL='yes';;
85 83 -b|--builtin-list) BUILTIN_LIST=`echo $2 | tr -d "'" | sed 's:^[=]\?\(.*\)$:\1:'`; shift;;
86 84 -m|--mirror-list) MIRROR_LIST=`echo $2 | tr -d "'" | sed 's:^[=]\?\(.*\)$:\1:'`; shift;;
87 85 -p|--build-prod-image)
@@ -153,8 +151,6 @@ fi
153 151 MIRROR_LIST="$MK_BUNDLE_MIRROR_LIST"
154 152 [ -z "$TC_PASSWD" -a -n "$MK_BUNDLE_TC_PASSWD" ] &&
155 153 TC_PASSWD="$MK_BUNDLE_TC_PASSWD"
156   -[ -z "$RE_USE_PREV_DL" -a -n "$MK_BUNDLE_RE_USE_PREV_DL" ] &&
157   - RE_USE_PREV_DL="$MK_BUNDLE_RE_USE_PREV_DL"
158 154 [ -z "$BUNDLE_TYPE" -a -n "$MK_BUNDLE_TYPE" ] &&
159 155 BUNDLE_TYPE="$MK_BUNDLE_TYPE"
160 156 [ -z "$TCL_MIRROR_URI" -a -n "$MK_BUNDLE_TCL_MIRROR_URI" ] &&
@@ -170,7 +166,6 @@ fi
170 166
171 167 # Set to default anything still not specified, for which there is a reasonable
172 168 # default-value
173   -[ -z "$RE_USE_PREV_DL" ] && RE_USE_PREV_DL='no'
174 169 [ -z "$BUNDLE_TYPE" ] && BUNDLE_TYPE='dev'
175 170 [ -z "$TCL_MIRROR_URI" ] && TCL_MIRROR_URI='http://distro.ibiblio.org/tinycorelinux/4.x/x86/tcz'
176 171 [ -z "$TCL_ISO_URL" ] && TCL_ISO_URL='http://distro.ibiblio.org/tinycorelinux/4.x/x86/release/Core-current.iso'
@@ -204,21 +199,9 @@ elif [[ ! -z $TC_PASSWD ]] && [ $BUNDLE_TYPE = 'prod' ]; then
204 199 printf " the specified password (${TC_PASSWD}) will be ignored\n"
205 200 fi
206 201
207   -# the '-r' or '--reuse-prev-dl' flags were not given, then make sure we're
208   -# starting with a clean (i.e. empty) build directory
209   -if [ $RE_USE_PREV_DL = 'no' ]
210   -then
211   - if [ ! -d tmp-build-dir ]; then
212   - # make a directory we can use to build our gzipped tarfile
213   - mkdir tmp-build-dir
214   - else
215   - # directory exists, so remove the contents
216   - rm -rf tmp-build-dir/*
217   - fi
218   -fi
219   -
220   -# create a folder to hold the gzipped tarfile that will contain all of
221   -# dependencies
  202 +# Make sure we're starting with a clean (i.e. empty) build directory to hold
  203 +# the gzipped tarfile that will contain all of dependencies
  204 +rm -rf tmp-build-dir
222 205 mkdir -p tmp-build-dir/build_dir/dependencies
223 206
224 207 # copy over the scripts that are needed to actually build the ISO into
@@ -272,14 +255,11 @@ cp rz_mk_gemrc.yaml tmp-build-dir/root/.gemrc
272 255 mkdir -p tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz
273 256 cp -p tmp/tinycorelinux/*.yaml tmp-build-dir/tmp/tinycorelinux
274 257 for file in `cat $MIRROR_LIST`; do
275   - if [ $RE_USE_PREV_DL = 'no' ] || [ ! -f tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz/$file ]
276   - then
277 258 wget $WGET_V -P tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz $TCL_MIRROR_URI/$file
278 259 wget $WGET_V -P tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz $TCL_MIRROR_URI/$file.md5.txt
279 260 wget $WGET_V -P tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz $TCL_MIRROR_URI/$file.info
280 261 wget $WGET_V -P tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz $TCL_MIRROR_URI/$file.list
281 262 wget $WGET_V -P tmp-build-dir/tmp/tinycorelinux/4.x/x86/tcz $TCL_MIRROR_URI/$file.dep
282   - fi
283 263 done
284 264
285 265 # download a set of extensions that will be installed during the Microkernel
@@ -291,34 +271,28 @@ mkdir -p tmp-build-dir/tmp/builtin/optional
291 271 rm tmp-build-dir/tmp/builtin/onboot.lst 2> /dev/null
292 272 for file in `cat $BUILTIN_LIST`; do
293 273 if [ $BUNDLE_TYPE != 'prod' ] || [ ! $file = 'openssh.tcz' ]; then
294   - if [ $RE_USE_PREV_DL = 'no' ] || [ ! -f tmp-build-dir/tmp/builtin/optional/$file ]
295   - then
296 274 wget $WGET_V -P tmp-build-dir/tmp/builtin/optional $TCL_MIRROR_URI/$file
297 275 wget $WGET_V -P tmp-build-dir/tmp/builtin/optional $TCL_MIRROR_URI/$file.md5.txt
298 276 wget $WGET_V -P tmp-build-dir/tmp/builtin/optional $TCL_MIRROR_URI/$file.dep
299   - fi
300   - echo $file >> tmp-build-dir/tmp/builtin/onboot.lst
  277 + echo $file >> tmp-build-dir/tmp/builtin/onboot.lst
301 278 elif [ $BUNDLE_TYPE = 'prod' ] && [ -f tmp-build-dir/tmp/builtin/optional/$file ]
302 279 then
303   - rm tmp-build-dir/tmp/builtin/optional/$file
304   - rm tmp-build-dir/tmp/builtin/optional/$file.md5.txt 2> /dev/null
305   - rm tmp-build-dir/tmp/builtin/optional/$file.dep 2> /dev/null
  280 + rm tmp-build-dir/tmp/builtin/optional/$file
  281 + rm tmp-build-dir/tmp/builtin/optional/$file.md5.txt 2> /dev/null
  282 + rm tmp-build-dir/tmp/builtin/optional/$file.dep 2> /dev/null
306 283 fi
307 284 done
308 285
309 286 # download the ruby-gems distribution (will be installed during the boot
310 287 # process prior to starting the Microkernel initialization process)
311 288 file=`echo $RUBY_GEMS_URL | awk -F/ '{print $NF}'`
312   -if [ $RE_USE_PREV_DL = 'no' ] || [ ! -f tmp-build-dir/opt/$file ]
313   -then
314   - wget $WGET_V -P tmp-build-dir/opt $RUBY_GEMS_URL
315   -fi
  289 +wget $WGET_V -P tmp-build-dir/opt $RUBY_GEMS_URL
316 290
317 291 # copy over a couple of initial configuration files that will be included in the
318 292 # /tmp and /etc directories of the Microkernel instance (the first two control the
319 293 # initial behavior of the Razor Microkernel Controller, the third disables automatic
320 294 # login of the tc user when the Microkernel finishes booting)
321   - cp -p tmp/first_checkin.yaml tmp-build-dir/tmp
  295 +cp -p tmp/first_checkin.yaml tmp-build-dir/tmp
322 296 if [ $BUNDLE_TYPE = 'debug' ]
323 297 then
324 298 # if we're building a "debug" bundle, then copy over a microkernel configuration
@@ -340,10 +314,7 @@ fi
340 314
341 315 # get a copy of the current Tiny Core Linux "Core" ISO
342 316 file=`echo $TCL_ISO_URL | awk -F/ '{print $NF}'`
343   -if [ $RE_USE_PREV_DL = 'no' ] || [ ! -f tmp-build-dir/build_dir/$file ]
344   -then
345   - wget $WGET_V -P tmp-build-dir/build_dir $TCL_ISO_URL
346   -fi
  317 +wget $WGET_V -P tmp-build-dir/build_dir $TCL_ISO_URL
347 318
348 319 # add a soft-link in what will become the /usr/local/sbin directory in the
349 320 # Microkernel ISO (this fixes an issue with where Facter expects to find
@@ -365,10 +336,7 @@ ln -s /usr/local/sbin/dmidecode tmp-build-dir/usr/sbin 2> /dev/null
365 336 # access to the Microkernel from the console)
366 337 cp -p additional-build-files/*.gz tmp-build-dir/build_dir/dependencies
367 338 file=`echo $OPEN_VM_TOOLS_URL | awk -F/ '{print $NF}'`
368   -if [ $RE_USE_PREV_DL = 'no' ] || [ ! -f tmp-build-dir/build_dir/dependencies/$file ]
369   -then
370   - wget $WGET_V -P tmp-build-dir/build_dir/dependencies $OPEN_VM_TOOLS_URL
371   -fi
  339 +wget $WGET_V -P tmp-build-dir/build_dir/dependencies $OPEN_VM_TOOLS_URL
372 340
373 341 # get the latest util-linux.tcz, then extract the two executables that
374 342 # we need from that file (using the unsquashfs command)
@@ -384,10 +352,7 @@ fi
384 352 # was felt that we should just install the bits that we need out of that
385 353 # particular TCE...
386 354 file='util-linux.tcz'
387   -if [ $RE_USE_PREV_DL = 'no' ] || [ ! -f tmp-build-dir/$file ]
388   -then
389   - wget $WGET_V -P tmp-build-dir $TCL_MIRROR_URI/$file
390   -fi
  355 +wget $WGET_V -P tmp-build-dir $TCL_MIRROR_URI/$file
391 356 unsquashfs -f -d tmp-build-dir tmp-build-dir/util-linux.tcz `cat additional-build-files/util-linux-exec.lst`
392 357
393 358 echo ""
1  opt/gems/gem.list
... ... @@ -1,4 +1,3 @@
1   -stomp
2 1 facter
3 2 json_pure >= 1.7.7
4 3 daemons

0 comments on commit 26a1a44

Please sign in to comment.
Something went wrong with that request. Please try again.