Merge pull request #10 from mevatron/pr-rename-sd-image

Renamed image as specified in Issue #8
hypriot · Jun 4, 2016 · 03bfdc3 · 03bfdc3
2 parents c846509 + 1d923e2
commit 03bfdc3
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,7 +14,7 @@ deploy:
   api_key:
    secure: "kMrJOv7xDzwBm2RaJTuOrZdPNALIDCuIGwIFheTmNRGwBT+kVf0IYQxV6z2OJrV24FDqwaCcxRSXkPd9vMvB6Wsoi21HwJil3/cbo1gDX+BhXLXzBucuSrdFU2o7l7vrINgqLM7XBJr345qA6PZorp4mval0YGaCa5dL1vXc4R1+SKjXhwg8rkL177UVCqmvzEmQLfoPbfB1LubvGkbGG4MtpvJqyfTuSSfYd7OKk5Njogrsh75fp7tENzRBZITu9GMziuiSuwN0YkOAoE4ne//E09GyZKHgm6jDdqS7KRIpXH5ipCbmW5NT8GhEKqIPtmmucT8BIHTfhiztJ8TVkOKa4pSBfNtggp1TyfS6paP9P6XDargng5NSPCfQyYtT5T0h51f+Y21Cov2dGeFF/rTzXGQJmbK+LFUuqYKjV6Ww8KNTT7z2tpXBgf7Ho6W8rwNGTu/3y5Z2PZjqSVfR1M3AVTXmDBzOVDOtwW4bJIYc7H2fXLK9UZTUMdcMdpTg+4CHo70oPm6LoWAa1t13noCLAN3Q4NgLBo/BmPtqtkjO7Njhb9QscEqVOt9cs5/n5PfMYWpvEslPGeizSUMJvhNa/Pe3pQY4/tcN0R3a5VU7O4yVz0UCrRJpbUgRCLMaAKwtnHDHU4kO5dx83jxverR7dsK7VseKd6TKLbl1A/A="
   file:
-    - sd-card-odroid-xu4-${TRAVIS_TAG}.img.zip
+    - hypriotos-odroid-xu4-${TRAVIS_TAG}.img.zip
   on:
     tags: true
     repo: hypriot/image-builder-odroid-xu4
diff --git a/Makefile b/Makefile
@@ -13,7 +13,7 @@ testshell: build
 	docker run -ti --privileged -v $(shell pwd)/builder:/builder -v $(shell pwd):/workspace -v /boot:/boot -v /lib/modules:/lib/modules image-builder-odroid-xu4 bash
 
 test:
-	VERSION=dirty docker run --rm -ti --privileged -v $(shell pwd):/workspace -v /boot:/boot -v /lib/modules:/lib/modules -e VERSION image-builder-odroid-xu4 bash -c "unzip /workspace/sd-card-odroid-xu4-dirty.img.zip && rspec --format documentation --color /workspace/builder/test/*_spec.rb"
+	VERSION=dirty docker run --rm -ti --privileged -v $(shell pwd):/workspace -v /boot:/boot -v /lib/modules:/lib/modules -e VERSION image-builder-odroid-xu4 bash -c "unzip /workspace/hypriotos-odroid-xu4-dirty.img.zip && rspec --format documentation --color /workspace/builder/test/*_spec.rb"
 
 shellcheck: build
 	VERSION=dirty docker run --rm -ti -v $(shell pwd):/workspace image-builder-odroid-xu4 bash -c 'shellcheck /workspace/builder/*.sh /workspace/builder/files/etc/firstboot.d/*'

diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ eval $(docker-machine env image-builder-odroid-xu4)
 
 ### Build the SD card image
 
-From here you can just make the SD card image. The output will be written and compressed to `sd-card-odroid-xu4-dirty.img.zip`.
+From here you can just make the SD card image. The output will be written and compressed to `hypriotos-odroid-xu4-dirty.img.zip`.
 
 ```bash
 make sd-image
@@ -56,7 +56,7 @@ make test
 Now flash the SD card image and boot up a ODROID xu4. Run the [Serverspec](http://serverspec.org) integration tests in `builder/test-integration/` folder against your ODROID xu4. Set the environment variable `BOARD` to the IP address or host name of your running ODROID xu4.
 
 ```bash
-flash sd-card-odroid-xu4-dirty.img.zip
+flash hypriotos-odroid-xu4-dirty.img.zip
 BOARD=black-pearl.local make test-integration
 ```
 

diff --git a/builder/build.sh b/builder/build.sh
@@ -19,7 +19,7 @@ ROOTFS_TAR_PATH="$BUILD_RESULT_PATH/$ROOTFS_TAR"
 
 # device specific settings
 HYPRIOT_IMAGE_VERSION=${VERSION:="dirty"}
-HYPRIOT_IMAGE_NAME="sd-card-odroid-xu4-${HYPRIOT_IMAGE_VERSION}.img"
+HYPRIOT_IMAGE_NAME="hypriotos-odroid-xu4-${HYPRIOT_IMAGE_VERSION}.img"
 IMAGE_ROOTFS_PATH="/image-rootfs.tar.gz"
 QEMU_ARCH="arm"
 export HYPRIOT_IMAGE_VERSION

diff --git a/builder/test/spec_helper.rb b/builder/test/spec_helper.rb
@@ -2,7 +2,7 @@
 set :backend, :exec
 
 def image_path
-  return "sd-card-odroid-xu4-#{ENV['VERSION']}.img"
+  return "hypriotos-odroid-xu4-#{ENV['VERSION']}.img"
 end
 
 def run( cmd )