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

Libuhd bugfixes #21552

Closed
wants to merge 2 commits into from
Closed

Conversation

chrisjohgorman
Copy link
Contributor

  • There was a small section of code commented out because I couldn't get it to build. A
    simple cast fixes this. Now we can use pthread_setname_np to set thread names.

  • Use cygpath.exe to set a proper path for the _DEFAULT_INSTALL_PATH for uhd_images_downloader

  • Move uhd_images_downlader.py and usrp2_card_burner.py to ${MINGW_PREFIX}/bin and change
    their names to uhd_images_downloader and usrp_card_burner respectively. The reflects the
    contents of /usr/bin in the arch package.

  • Re enable @ognevny 's fix to -DUHD_PYTHON_DIR that was deleted in error by my first push.

- There was a small section of code commented out because I couldn't get it to build. A
  simple cast fixes this. Now we can use pthread_setname_np to set thread names.

- Use cygpath.exe to set a proper path for the _DEFAULT_INSTALL_PATH for uhd_images_downloader

- Move uhd_images_downlader.py and usrp2_card_burner.py to ${MINGW_PREFIX}/bin and change
  their names to uhd_images_downloader and usrp_card_burner respectively. The reflects the
  contents of /usr/bin in the arch package.
@chrisjohgorman chrisjohgorman marked this pull request as draft August 1, 2024 20:45
@chrisjohgorman chrisjohgorman marked this pull request as ready for review August 1, 2024 22:09
@ognevny
Copy link
Collaborator

ognevny commented Aug 2, 2024

it's better to rebase your branch and squash the PR into one commit

@chrisjohgorman
Copy link
Contributor Author

@ognevny I'm sorry to say my git skills are not the greatest. I have made a mistake with the rebase and squash, that seemed so simple. I ran rebase -i $HEAD~2 for the two commits, but then couldn't get it pushed. I will delete the branch and start over.

@ognevny
Copy link
Collaborator

ognevny commented Aug 2, 2024

first, you ran git rebase master. you should have master branch up-to-date with upstream's master. then you should resolve conflicts, run git add . and git rebase --continue. after all you can commit it, then run git push --force-with-lease. squashing is easier, run git reset --soft HEAD@n, where n is number of commits, then git add .and commit. pushing also withgit push --force-with-lease`

that's how I do the thing

@chrisjohgorman
Copy link
Contributor Author

chrisjohgorman commented Aug 2, 2024 via email

@chrisjohgorman
Copy link
Contributor Author

@ognevny, I have created a state with git that I can't figure my way out of. So I will delete my branch and start over. Thank you for your attempted assistance.

@ognevny
Copy link
Collaborator

ognevny commented Aug 2, 2024

rustc dev guide has a section about rebases: https://rustc-dev-guide.rust-lang.org/git.html#rebasing-and-conflicts

@chrisjohgorman
Copy link
Contributor Author

chrisjohgorman commented Aug 2, 2024 via email

@chrisjohgorman chrisjohgorman deleted the libuhd-bugfixes branch August 2, 2024 10:22
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