Merge "Combine the common code for kernel building on deb/rpm"