Permalink
Browse files

Push the working version of the license code.

The great thing about git is that it is happy to push commits from a dirty
working directory.  The bad thing about git is that willingness means I can
push up the older, broken version of a script from before I actually tested
that it worked and not notice.

This moves the copy of the COPYING and LICENSE files to the appropriate part
of the build script, resulting in an end-to-end successful build, rather than
the nasty failure we got with the merged version.

Signed-off-by: Daniel Pittman <daniel@rimspace.net>
  • Loading branch information...
1 parent 2a4b7b1 commit 81af4d8108a8108476512353a3b3e79e8359d5b2 @slippycheeze slippycheeze committed Jan 8, 2013
Showing with 3 additions and 3 deletions.
  1. +3 −3 build-bundle-file.sh
View
@@ -448,6 +448,9 @@ echo ""
echo "This build is tagged as version [${gitversion}]"
echo "ISO_VERSION='${gitversion}'" > tmp-build-dir/build_dir/gitversion.sh
+# ensure the copyright and license content is added to the image
+cp COPYING LICENSE tmp-build-dir/build_dir/
+
# create a gzipped tarfile containing all of the files from the Razor-Microkernel
# project that we just copied over, along with the files that were downloaded from
# the network for the gems and TCL extensions; place this gzipped tarfile into
@@ -456,9 +459,6 @@ cd tmp-build-dir
echo "creating razor microkernel overlay tarball"
tar zc${TAR_V}f build_dir/dependencies/razor-microkernel-overlay.tar.gz usr etc opt tmp root
-# ensure the copyright and license content is added to the image
-cp COPYING LICENSE tmp-build-dir/build_dir/
-
# and create a gzipped tarfile containing the dependencies folder and the set
# of scripts that are used to build the ISO (so that all the user has to do is
# copy over this one file to a directory somewhere and unpack it and they will

0 comments on commit 81af4d8

Please sign in to comment.