[OS-BUILD PATCHv3] genspec.sh: rebase the broken-out patches