[packaging] fix up packaging to make it build, take 2