Skip to content

patch.py: don't apply striplevel to git am command

[email protected] openembedded-core 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v2 Latest posting 2/21 patch 1 replyIn review
  2. v2 posting 1/21 patch 0 repliesSuperseded

Patches in v2 posting 2/2 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/1patch.py: don't apply striplevel to git am commandmeta-selftest/recipes-test/llvm/files/0001-Test-new-file.patch meta-selftest/recipes-test/llvm/llvm_%.bbappend meta/lib/oe/patch.py +1 more+38 -10 replies

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v2 yet.

Read the v2 thread

Cover letter [PATCH v2 0/1] patch.py: don't apply striplevel to git am command

I thought I had sent this out a month ago, but I can't find it in patchwork, so I'm resending. This is an updated patch that addresses feedback on v1, and should hopefully be more clear.

I've dropped the change to 'git apply' since that wasn't behaving as I originally thought, then I added a selftest on llvm that demonstrates the issue I'm trying to resolve. Without the change in patch.py included here, the selftest that I'm proposing will fail.

One might argue, "Well, if you change the default PATCHTOOL, you could also just change your patch SRC_URIs and drop the striplevel parameter." While that may be true, the same failure can also be demonstrated using devtool on llvm without modifying PATCHTOOL at all, since by default devtool also uses GitApplyTree. So if you don't consider "modifying a recipe's PATCHTOOL without also modify its SRC_URI patches" to be a valid workflow, devtool is another common workflow where this behavior could be encountered.

Hope that helps,
Kyle

Kyle Russell (1):
patch.py: don't apply striplevel to git am command

 .../llvm/files/0001-Test-new-file.patch        | 17 +++++++++++++++++
 .../recipes-test/llvm/llvm_%.bbappend          |  2 ++
 meta/lib/oe/patch.py                           |  2 +-
 meta/lib/oeqa/selftest/cases/bbtests.py        | 18 ++++++++++++++++++
 4 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 meta-selftest/recipes-test/llvm/files/0001-Test-new-file.patch
 create mode 100644 meta-selftest/recipes-test/llvm/llvm_%.bbappend
Signature · 1 line
2.17.1