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

Enable Linux/uClibc-ng toolchain build in CI #1574

Conversation

TommyMurphyTM1234
Copy link
Collaborator

See:

Notes:

  1. I don't think that I can test these changes locally so am creating the PR on the assumption that they will be sanity checked server side.
  2. While "ulibc" is used across riscv-gnu-toolchain to refer to this toolchain variant, it is actually uClibc-ng based and not based on the original uClibc.
  3. For this reason I have used "uclibc-ng" when naming the build tarball artifact but I don't know if the dash in this string will be in any way problematic or inconsistent with the existing naming convention?
  4. I may need to rebase this if/when other pending PRs that I have submitted today are merged.
  5. I am assuming that, like the Linux/musl toolchain variant. LLVM is also not an option for the uClibc-ng toolchain?
  6. As ever, I'm open to constructive feedback and comments. :-)

@cmuellner
Copy link
Collaborator

Thanks!

Unfortunately, this has conflicts that must be resolved (because of the merged musl/rv32 changes).

@TommyMurphyTM1234
Copy link
Collaborator Author

Thanks!

Unfortunately, this has conflicts that must be resolved (because of the merged musl/rv32 changes).

Hopefully addressed now?

@cmuellner
Copy link
Collaborator

I broke this again by merging another PR. Sorry for that!

@TommyMurphyTM1234
Copy link
Collaborator Author

I broke this again by merging another PR. Sorry for that!

Do you need me to do something to fix it?

@cmuellner
Copy link
Collaborator

Do you need me to do something to fix it?

It would be great if you could rebase and push again.
I don't think that I can push into a PR that is not mine.

@TommyMurphyTM1234
Copy link
Collaborator Author

Do you need me to do something to fix it?

It would be great if you could rebase and push again. I don't think that I can push into a PR that is not mine.

Sorry - can you point out what exactly is wrong because I can't see any conflicts?
I've resync'd the branch on my forker repo with the latest master here and there are no conflicts to resolve there either.
I'm not sure what I need to do.
Thanks.

@cmuellner
Copy link
Collaborator

Do you need me to do something to fix it?

It would be great if you could rebase and push again. I don't think that I can push into a PR that is not mine.

Sorry - can you point out what exactly is wrong because I can't see any conflicts? I've resync'd the branch on my forker repo with the latest master here and there are no conflicts to resolve there either. I'm not sure what I need to do. Thanks.

Github says, "This branch cannot be rebased due to conflicts," so I can't merge this PR.

Just fetch the latest changes, rebase your patch, and force-push to this PR.

@TommyMurphyTM1234
Copy link
Collaborator Author

Just fetch the latest changes, rebase your patch

I've done that but...

and force-push to this PR.

how exactly do I do this?
This did nothing...

git push --force
Everything up-to-date

Do I have to artificially make some change to cause stuff to be pushed and the PR updated?

@TommyMurphyTM1234
Copy link
Collaborator Author

Just fetch the latest changes, rebase your patch

I've done that but...

and force-push to this PR.

how exactly do I do this? This did nothing...

git push --force
Everything up-to-date

Do I have to artificially make some change to cause stuff to be pushed and the PR updated?

Sorry - I'm getting tied up in Git knots here because I'm not sure what I'm doing and can't make progress...
I might have to ditch this and just start again.

@TommyMurphyTM1234 TommyMurphyTM1234 deleted the enable-uclibc-ci branch October 10, 2024 21:40
@cmuellner
Copy link
Collaborator

I think this should do:

git fetch origin
git rebase origin/main
git push origin enable-uclibc-ci:enable-uclibc-ci

@TommyMurphyTM1234
Copy link
Collaborator Author

I think this should do:

git fetch origin
git rebase origin/main
git push origin enable-uclibc-ci:enable-uclibc-ci

I tried that but it ended up a mess and I had no idea what was going on.
I've created a new PR which will hopefully work.

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.

2 participants