Skip to content
This repository has been archived by the owner on Jan 6, 2023. It is now read-only.

Use correct image name on Windows flashall.bat #29

Merged
merged 1 commit into from
Apr 22, 2016

Conversation

jlaako
Copy link
Contributor

@jlaako jlaako commented Apr 21, 2016

The Windows flashall.bat was unmaintained and had old image name. Modify
the flashall.bat to accept image name as argument and also modify the
flashall.bat when producing toflash-tarball.

Fixes: ostroproject/ostro-os#62

Signed-off-by: Jussi Laako [email protected]

@@ -107,6 +107,7 @@ IMAGE_CMD_toflash () {

# update image name inside flashall.sh
sed -e "s/^IMAGE_NAME=.\+$/IMAGE_NAME=\"${IMAGE_BASENAME}\"/" -i ${WORKDIR}/toFlash/flashall.sh
sed -e "s/^IMAGE_NAME=.\+$/IMAGE_NAME=${IMAGE_BASENAME}/" -i ${WORKDIR}/toFlash/flashall.bat
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^set IMAGE_NAME perhaps?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yes, should be

sed -e "s/^set IMAGE_NAME=.\+$/set IMAGE_NAME=${IMAGE_BASENAME}/" -i ${WORKDIR}/toFlash/flashall.bat

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK thanks, stupid copy-paste error. I'll fix it and test this on Windows once the builds finishes.

@okartau
Copy link

okartau commented Apr 21, 2016

edison build (build job #1147) of 1st CI cycle of this PR did fail with permissions msg and that was my fault, sorry for trouble. A new worker-21 that I was adding, went online too early. I am not retriggering yet, based on comments this may get some more changes.

@jlaako jlaako force-pushed the edison-updates branch 2 times, most recently from 0c357f0 to c82e514 Compare April 21, 2016 13:46
The Windows flashall.bat was unmaintained and had old image name. Modify
the flashall.bat to accept image name as argument and also modify the
flashall.bat when producing toflash-tarball.

Fixes: ostro-os issue ostroproject#62

Signed-off-by: Jussi Laako <[email protected]>
@jlaako
Copy link
Contributor Author

jlaako commented Apr 22, 2016

@mythi @kad OK now to merge?

@kad
Copy link
Contributor

kad commented Apr 22, 2016

looks good to me 👍

@mythi
Copy link
Contributor

mythi commented Apr 22, 2016

+1

@jlaako jlaako merged commit bc01661 into ostroproject:master Apr 22, 2016
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants