Merge pull request #97 from hypriot/build-hypriotos-rpi-img

Rename to hypriotos-rpi-vX.X.X.img
hypriot · May 25, 2016 · f314c04 · f314c04
2 parents 7a88141 + 0bfbe7e
commit f314c04
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -14,8 +14,8 @@ deploy:
   api_key:
     secure: ldMoo+75b7ql+d/QcrICL9EpmqSt18Gtlb0Qfwb+xwxBcBmmnM7UpeOeU4K6KnPZ8fAOyfcm4XQLwJF40EUjspov8X7CY8gOxWHMRp6mAebUgbk3toZSjxxRy1BAd7bewG+dcv4ZuDU0802A6LG5dCBcrgZg9q4JhMYBOUzbR7+p7LNm4ZMMpNlV8MpCsZCg5A+rLJ8IxoCamQW2r/IwcMY+/aWjlvBN8FHD7HN4p5hD1qclB9tg5id+Ar2tlXPpVKE+xT4eoAGtFJV56JQ8zQ3dGst4lb3tMWUWAxUjmh2YNrf5yHMoaEV8NkcKP16HaYDdWSThhohf6D+7mDmxB1tYRlpMr0W5gLtDVZP+OEdGYS7cmwpl76dPO8LNtPkbh+k59QRofrxn41UdGKKovZiry3lPzaYnW54OTLJohYSIEo3W5c17XgNkRFSO40B1dhrwmLupk+UQcPIl6MQ4uorG1Wh5RpRnaEA6Z2kP3/E+WusqjH3+e8/Sr4S34hSHVpGq4rkUUDVskEGJ510uEiLEC26oKAXdTOClfQhOtf4rlOoIXkMZUMBDkT3xU6uOwEboqHNhwCTHOXOVG8mmr7VddeE7wJxJsnGDfJRbqO0Dm1K6f9mnavuFXQc5GnrXmBIvw4JlISnBf6124h36stUe3hqCqkNPZCZWQi2C2Zk=
   file:
-    - sd-card-rpi-${TRAVIS_TAG}.img.zip
-    - sd-card-rpi-${TRAVIS_TAG}.img.zip.sha256
+    - hypriotos-rpi-${TRAVIS_TAG}.img.zip
+    - hypriotos-rpi-${TRAVIS_TAG}.img.zip.sha256
   on:
     tags: true
     repo: hypriot/image-builder-rpi
diff --git a/Makefile b/Makefile
@@ -10,7 +10,7 @@ shell: build
 	docker run -ti --privileged -v $(shell pwd):/workspace -v /boot:/boot -v /lib/modules:/lib/modules -e TRAVIS_TAG -e VERSION image-builder-rpi bash
 
 test:
-	VERSION=dirty docker run --rm -ti --privileged -v $(shell pwd):/workspace -v /boot:/boot -v /lib/modules:/lib/modules -e TRAVIS_TAG -e VERSION image-builder-rpi bash -c "unzip /workspace/sd-card-rpi-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 TRAVIS_TAG -e VERSION image-builder-rpi bash -c "unzip /workspace/hypriotos-rpi-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-rpi bash -c 'shellcheck /workspace/builder/*.sh /workspace/builder/files/etc/firstboot.d/*'

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

diff --git a/builder/build.sh b/builder/build.sh
@@ -30,7 +30,7 @@ RAW_IMAGE_CHECKSUM="a242769dec546dbda335204d4e6bb4eb64685009d235a2a881605bdf4476
 
 # name of the sd-image we gonna create
 HYPRIOT_IMAGE_VERSION=${VERSION:="dirty"}
-HYPRIOT_IMAGE_NAME="sd-card-rpi-${HYPRIOT_IMAGE_VERSION}.img"
+HYPRIOT_IMAGE_NAME="hypriotos-rpi-${HYPRIOT_IMAGE_VERSION}.img"
 export HYPRIOT_IMAGE_VERSION
 
 # specific versions of kernel/firmware and docker tools

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-rpi-#{ENV['VERSION']}.img"
+  return "hypriotos-rpi-#{ENV['VERSION']}.img"
 end
 
 def run( cmd )