two more fixes for building RISC-V stacks with a version suffix#140

boegel merged 2 commits intoEESSI:mainEESSI/software-layer-scripts:mainfrom

bedroge:another_riscv_fixbedroge/software-layer-scripts:another_riscv_fixCopy head branch name to clipboard