Skip to content

Commit

Permalink
Update help to reflect version 21.08
Browse files Browse the repository at this point in the history
Skip manifest date 21.06 in some versions due to a known bug
  • Loading branch information
carlesfernandez committed Aug 24, 2021
1 parent 866ee42 commit 421436f
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 6 deletions.
12 changes: 7 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -62,9 +62,11 @@ Usage:
Options:
version Geniux version: rocko, sumo, thud, warrior, zeus, dunfell, gatesgarth, hardknott. Default: dunfell
Check available branches at https://github.com/carlesfernandez/meta-gnss-sdr
manifest Geniux version manifest: 21.02, 21.06, ..., latest. Default: latest
manifest Geniux version manifest: 21.02, 21.08, ..., latest. Default: latest
Dated manifests available at https://github.com/carlesfernandez/oe-gnss-sdr-manifest/tags
machine Specify your (list of) MACHINE here. By default, zedboard-zynq7 and raspberrypi3 are built.
If more than one, surround it with quotes, e.g.: "raspberrypi4-64 intel-corei7-64"

--image-only / -i (optional) Build the Docker the image but do not execute the container.

Environment variables that affect behavior:
Expand Down Expand Up @@ -107,11 +109,11 @@ Examples of usage:
$ ./geniux-builder.sh thud
```
- Build Geniux release `thud`, with manifest date `20.09`, for machines
- Build Geniux release `thud`, with manifest date `21.08`, for machines
`zedboard-zynq7` and `raspberrypi3`:
```
$ ./geniux-builder.sh thud 20.09
$ ./geniux-builder.sh thud 21.08
```
- Build Geniux release `warrior`, with manifest date `latest`, only for machine
Expand All @@ -121,11 +123,11 @@ Examples of usage:
$ ./geniux-builder.sh warrior latest zedboard-zynq7
```
- Build Geniux release `warrior`, with manifest date `20.09`, only for machine
- Build Geniux release `warrior`, with manifest date `21.08`, only for machine
`raspberrypi3`:
```
$ ./geniux-builder.sh warrior 20.09 raspberrypi3
$ ./geniux-builder.sh warrior 21.08 raspberrypi3
```
- Build Geniux release `rocko`, with manifest date `latest`, for machines
Expand Down
13 changes: 12 additions & 1 deletion geniux-builder.sh
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,10 @@ display_usage() {
echo -e "Options:"
echo -e " version Geniux version: rocko, sumo, thud, warrior, zeus, dunfell, gatesgarth, hardknott. Default: dunfell"
echo -e " Check available branches at https://github.com/carlesfernandez/meta-gnss-sdr"
echo -e " manifest Geniux version manifest: 21.02, 21.06, ..., latest. Default: latest"
echo -e " manifest Geniux version manifest: 21.02, 21.08, ..., latest. Default: latest"
echo -e " Dated manifests available at https://github.com/carlesfernandez/oe-gnss-sdr-manifest/tags"
echo -e " machine Specify your (list of) MACHINE here. By default, zedboard-zynq7 and raspberrypi3 are built."
echo -e " If more than one, surround it with quotes, e.g.: \"raspberrypi4-64 intel-corei7-64\""
echo -e " --image-only / -i (optional) Build the Docker image but do not execute the container.\n"
echo -e "Environment variables that affect behavior:"
echo -e " GENIUX_MIRROR_PATH Base path to local mirror. Only used if set."
Expand Down Expand Up @@ -74,6 +75,16 @@ fi
GENIUX_VERSION=${1:-dunfell}
GENIUX_MANIFEST_DATE=${2:-latest}

# Workaround for known bugs
if [[ $GENIUX_MANIFEST_DATE == "21.06" ]]
then
if [[ $GENIUX_VERSION == "zeus" || $GENIUX_VERSION == "dunfell" || $GENIUX_VERSION == "gatesgarth" || $GENIUX_VERSION == "hardknott" ]]
then
echo -e "\033[1m\033[35mWARNING: Version $GENIUX_VERSION-$GENIUX_MANIFEST_DATE has a known bug. Bumping to 21.08.\033[0m\n"
GENIUX_MANIFEST_DATE="21.08"
fi
fi

MIRROR_PATH=$GENIUX_MIRROR_PATH
STORE_PATH=$GENIUX_STORE_PATH

Expand Down

0 comments on commit 421436f

Please sign in to comment.