[OS-BUILD PATCH] Fix tarball creation logic