trunk: switch to a per target patch

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>