Simple Makefile target helper https://pagure.io/mkit

import-patches.sed 607B

123456789101112131415
  1. #
  2. # use this sed script to import patches back from repo
  3. # where mkit has been embedded
  4. #
  5. # 1. in the downstream repo, get patches using `git format-patch`,
  6. # 2. apply this script to all files generated,
  7. # 3. use `git am` to import patches back
  8. #
  9. /^\(--- a\|+++ b\|diff\)/ s:utils/mkit/include:src/include:g
  10. /^\(--- a\|+++ b\|diff\)/ s:utils/mkit/make:src/make.skel:g
  11. /^\(--- a\|+++ b\|diff\)/ s:utils/mkit/newstub:src/newstub:g
  12. /^\(--- a\|+++ b\|diff\)/ s:utils/mkit/mkit.mk:src/mkit.mk:g
  13. /^index / s:100755$:100644:
  14. /^.MKIT_VERSION=/ s:MKIT_VERSION=.*$:MKIT_VERSION=__MKIT_PROJ_VERSION__: