Refactor package structure #277
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
Might be useful: https://python.tutorialink.com/run-makefile-on-pip-install/ |
This reverts commit 811b164.
for more information, see https://pre-commit.ci
|
Haven't tested it, but perhaps you can thankfully also edit diff --git c/linien/server/linien_install_requirements.sh i/linien/server/linien_install_requirements.sh
index dee6fa6..056d167 100644
--- c/linien/server/linien_install_requirements.sh
+++ i/linien/server/linien_install_requirements.sh
@@ -19,19 +19,7 @@ mkdir linien
echo 'installing pyrp3...'
# install pyrp3
-cd /tmp/linien
-git clone https://github.com/linien-org/pyrp3.git
-cd pyrp3
-python3 setup.py install
-
-echo 'building monitor...'
-# build monitor shared library
-cd monitor
-make
-cp libmonitor.so /usr/lib/
-
-cd /tmp
-rm -R /tmp/linien
+pip install pyrp3
# https://github.com/RedPitaya/RedPitaya/issues/205
echo 'building ethernet blinking fix'
@@ -40,4 +28,4 @@ cd mdio-tool
cmake .
make
rm -f /usr/bin/mdio-tool
-mv mdio-tool /usr/bin
\ No newline at end of file
+mv mdio-tool /usr/bin |
|
This is already incorporated into both the master branch: no more need to to call this at all in However, I just relalized that in the develop branch there was still a merge conflict present. Thank you for bringing that to my attention :) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.