[release-1.27] build-static: misc fixes needed for 1.25.4 generation#7198

openshift-merge-robot merged 1 commit intocri-o:release-1.27cri-o/cri-o:release-1.27from

openshift-cherrypick-robot:cherry-pick-7189-to-release-1.27openshift-cherrypick-robot/cri-o:cherry-pick-7189-to-release-1.27Copy head branch name to clipboard