snap: prepare override scripts to allow rebuilding #2223
Merged
Conversation
This file contains 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
This projects snapcraft.yaml does not allow for easy rebuilding given the use of linking and patching to make ctypes work properly and the required patches to PyYAML. Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
kyrofa
suggested changes
Aug 23, 2018
snap/snapcraft.yaml
Outdated
| @@ -54,9 +54,15 @@ parts: | |||
| snapcraftctl build | |||
| TRIPLET_PATH="$SNAPCRAFT_PART_INSTALL/usr/lib/$(gcc -print-multiarch)" | |||
| LIBSODIUM=$(readlink -n $TRIPLET_PATH/libsodium.so.18) | |||
| # Remove so the link can be recreated on re-builds | |||
| [ -f "$TRIPLET_PATH/libsodium.so" ] && rm "$TRIPLET_PATH/libsodium.so" | |||
There was a problem hiding this comment.
Just rm -f "$TRIPLET_PATH/libsodium.so" is simpler and results in the same thing.
snap/snapcraft.yaml
Outdated
| patch -d $SNAPCRAFT_PART_INSTALL/lib/python3.5/site-packages -p1 < $SNAPCRAFT_STAGE/pyyaml-support-high-codepoints.diff | ||
| patch $SNAPCRAFT_PART_INSTALL/usr/lib/python3.5/ctypes/__init__.py $SNAPCRAFT_STAGE/ctypes_init.diff | ||
| # These checks are ugly but allow us to rebuild. | ||
| [ -f $SNAPCRAFT_PART_INSTALL/lib/python3.5/site-packages/yaml/emitter.py.orig ] && mv $SNAPCRAFT_PART_INSTALL/lib/python3.5/site-packages/yaml/emitter.py.orig $SNAPCRAFT_PART_INSTALL/lib/python3.5/site-packages/yaml/emitter.py |
There was a problem hiding this comment.
I see no stage or prime filter to remove these, nor do I see logic in override-prime to remove them-- probably best not to ship .orig files in the snap, no?
There was a problem hiding this comment.
I thought it would be rather harmless, but sure.
Codecov Report
@@ Coverage Diff @@
## master #2223 +/- ##
==========================================
- Coverage 91.09% 90.66% -0.44%
==========================================
Files 211 212 +1
Lines 13466 13453 -13
Branches 2008 2000 -8
==========================================
- Hits 12267 12197 -70
- Misses 816 861 +45
- Partials 383 395 +12
Continue to review full report at Codecov.
|
kyrofa
approved these changes
Aug 24, 2018
| patch -b "$PYTHON_PACKAGE_PATH/ctypes/__init__.py" patches/ctypes_init.diff | ||
| patch -b -d "$SITE_PACKAGES_PATH/" -p1 < patches/pyyaml-support-high-codepoints.diff | ||
|
|
||
| # Save patches to allow rebuilding |
There was a problem hiding this comment.
Clever, took me a second to figure out what you were doing here.
xnox
pushed a commit
to xnox/snapcraft
that referenced
this pull request
Jul 3, 2020
This projects snapcraft.yaml does not allow for easy rebuilding given the use of linking and patching to make ctypes work properly and the required patches to PyYAML. LP: #1789206 Signed-off-by: Sergio Schvezov <sergio.schvezov@canonical.com>
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.
This projects snapcraft.yaml does not allow for easy rebuilding
given the use of linking and patching to make ctypes work properly
and the required patches to PyYAML.
Signed-off-by: Sergio Schvezov sergio.schvezov@canonical.com
./runtests.sh static?./runtests.sh tests/unit?