Refactor the linux-dri config files so that linux-dri-x86 inherits from