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

Makefile: Don't run the setup commands inside bash #2024

Merged
merged 1 commit into from
Jul 20, 2020

Conversation

alistair23
Copy link
Contributor

Pull Request Overview

Instead of running the setup commands as part of bash -c * just have
Make call them from the shell.

This fixes a build failure seen at: tock/libtock-rs#210

Testing Strategy

Running the CI

TODO or Help Wanted

Documentation Updated

  • Updated the relevant files in /docs, or no updates are required.

Formatting

  • Ran make prepush.

jrvanwhy
jrvanwhy previously approved these changes Jul 14, 2020
hudson-ayers
hudson-ayers previously approved these changes Jul 15, 2020
Makefile Show resolved Hide resolved
Instead of running the setup commands as part of bash -c * just have
Make call them from the shell.

This fixes a build failure seen at: tock/libtock-rs#210

Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Copy link
Member

@ppannuto ppannuto left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

bors r+

@bors
Copy link
Contributor

bors bot commented Jul 20, 2020

This PR was included in a batch that successfully built, but then failed to merge into master (it was a non-fast-forward update). It will be automatically retried.

@bors bors bot merged commit 3218d5b into tock:master Jul 20, 2020
@alistair23 alistair23 deleted the alistair/Makefile-no-bash branch July 20, 2020 16:06
jrvanwhy added a commit to jrvanwhy/libtock-rs that referenced this pull request Aug 3, 2020
1. Update the `tock` submodule to a version that includes
   tock/tock#2024, which fixes the OpenTitan BootROM
   download code, as well as tock/tock#2038, which fixes
   a HiFive1 kernel bug.
2. Update the setup-qemu make target to track changes in Tock's makefile.
3. Point `test_runner` to the new QEMU location.
4. Disable the callback test. HiFive1 doesn't have a working timer driver. The
   callback test only worked before because of some other callback, which
   doesn't seem to occur with the new kernel.
jrvanwhy added a commit to jrvanwhy/libtock-rs that referenced this pull request Aug 3, 2020
1. Update the `tock` submodule to a version that includes
   tock/tock#2024, which fixes the OpenTitan BootROM
   download code, as well as tock/tock#2038, which fixes
   a HiFive1 kernel bug.
2. Update the setup-qemu make target to track changes in Tock's makefile.
3. Point `test_runner` to the new QEMU location.
4. Disable the callback test. HiFive1 doesn't have a working timer driver. The
   callback test only worked before because of some other callback, which
   doesn't seem to occur with the new kernel.
bors bot added a commit to tock/libtock-rs that referenced this pull request Aug 4, 2020
226: Fix the broken Travis CI: r=jrvanwhy a=jrvanwhy

1. Update the `tock` submodule to a version that includes
   tock/tock#2024, which fixes the OpenTitan BootROM
   download code, as well as tock/tock#2038, which fixes
   a HiFive1 kernel bug.
2. Disable the callback test. HiFive1 doesn't have a working timer driver. The
   callback test only worked before because of some other callback, which
   doesn't seem to occur with the new kernel.

Fixes #225 

Co-authored-by: Johnathan Van Why <jrvanwhy@google.com>
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

Successfully merging this pull request may close these issues.

4 participants