f166a63ec1e3eafc48828c9b4fadda8f967aedf8  0005-util-Consolidate-common-macros.patch