Modify package to do complete 32bit / 64bit build for UEFI