build-static: misc fixes needed for 1.25.4 generation#7189

openshift-merge-robot merged 1 commit intocri-o:maincri-o/cri-o:mainfrom

haircommander:binary-fixhaircommander/cri-o:binary-fixCopy head branch name to clipboard