Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch applying failed #1

Open
yan-kuan opened this issue Apr 11, 2022 · 0 comments
Open

Patch applying failed #1

yan-kuan opened this issue Apr 11, 2022 · 0 comments

Comments

@yan-kuan
Copy link

Dear @sonicyang ,

Thank for ur great work! I'm working on reproducing the experiment on qemu.
Just found a patch failed on buildroot_patches/0002-Add-wastedcores-profiler-and-sanity-checker.patch after 0001.

buildroot info

yan@am-002b67307289:~/dev/rt-experiments/buildroot$ git remote -v
origin  git://git.buildroot.net/buildroot (fetch)
origin  git://git.buildroot.net/buildroot (push)

yan@am-002b67307289:~/dev/rt-experiments/buildroot$ git log --pretty=oneline HEAD
a7eb052ff8ba9234b3f8dafc8cf3986f5b39428e (HEAD, tag: 2016.11) Update for 2016.11
a7eb052ff8ba9234b3f8dafc8cf3986f5b39428e (HEAD, tag: 2016.11) Update for 2016.11
a7eb052ff8ba9234b3f8dafc8cf3986f5b39428e (HEAD, tag: 2016.11) Update for 2016.11
30b4f9bae075931c7f2aa3b1efcca247829e264f sane-backends: disable static configuration
1816f875409de16b91d002fd383ade793c93f504 package/gcc: fix ICE on xtensa, 5.x and 6.x, PR target/78603

Process: git apply

yan@am-002b67307289:~/dev/rt-experiments/buildroot$ git apply  ../buildroot_patches/0001-Add-systemtap-package.patch -v
../buildroot_patches/0001-Add-systemtap-package.patch:59: trailing whitespace.
SYSTEMTAP_CONF_OPTS += 
Checking patch package/Config.in...
Checking patch package/systemtap/Config.in...
../buildroot_patches/0001-Add-systemtap-package.patch:40: new blank line at EOF.
+
Checking patch package/systemtap/systemtap.mk...
Applied patch package/Config.in cleanly.
Applied patch package/systemtap/Config.in cleanly.
Applied patch package/systemtap/systemtap.mk cleanly.
warning: 2 lines add whitespace errors.
yan@am-002b67307289:~/dev/rt-experiments/buildroot$ git apply --check ../buildroot_patches/0002-Add-wastedcores-profiler-and-sanity-checker.patch -v
Checking patch package/Config.in...
error: while searching for:

menu "wastedcores"
        source "package/systemtap/Config.in"
endmenu

menu "Flight Software"

error: patch failed: package/Config.in:1771
error: package/Config.in: patch does not apply
Checking patch package/wastedcores/Config.in...
Checking patch package/wastedcores/wastedcores.mk...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

1 participant