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.

Sign up for GitHub

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

Jump to bottom

Work/hotfix build fix #4309

Merged
merged 2 commits into from
Aug 7, 2023
Merged

Work/hotfix build fix #4309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b698c55
packaging: fix build for armhf, ppc64el and riscv64
sergiusens Aug 7, 2023
2480838
snap: enable building using current remote-build
sergiusens Aug 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions constraints.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
cython<3
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ python-dateutil==2.8.2
python-debian==0.1.49
pytz==2023.3
pyxdg==0.28
PyYAML==6.0
PyYAML==6.0.1
raven==6.10.0
requests==2.30.0
requests-toolbelt==1.0.0
Expand Down
0 patches/ctypes_init.diff → snap/local/patches/python/ctypes_init.diff
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion tools/snapcraft-override-build.sh → ...local/scripts/snapcraft-override-build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ PYTHON_PACKAGE_PATH="${SNAPCRAFT_PART_INSTALL}/usr/lib/python3.8/"

# Apply patches
echo "Patching ctypes..."
patch -s -b "${PYTHON_PACKAGE_PATH}/ctypes/__init__.py" "${SNAPCRAFT_PROJECT_DIR}/patches/ctypes_init.diff"
patch -s -b "${PYTHON_PACKAGE_PATH}/ctypes/__init__.py" "${SNAPCRAFT_PROJECT_DIR}/snap/local/patches/python/ctypes_init.diff"

# Save patches to allow rebuilding
mkdir -p patched/ctypes
Expand Down
4 changes: 3 additions & 1 deletion snap/snapcraft.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ parts:
# Remove so the link can be recreated on re-builds
rm -f "$TRIPLET_PATH/libsodium.so"
ln -s "$LIBSODIUM" "$TRIPLET_PATH/libsodium.so"
$SNAPCRAFT_PROJECT_DIR/tools/snapcraft-override-build.sh
$SNAPCRAFT_PROJECT_DIR/snap/local/scripts/snapcraft-override-build.sh

snapcraft:
source: .
Expand All @@ -128,6 +128,8 @@ parts:
- setuptools<66 # Limited to < 66 because we need `pkg_resources` and because `python-apt` doesn't build with the latest.
requirements:
- requirements.txt
constraints:
- constraints.txt
organize:
# Put snapcraftctl into its own directory that can be included in the PATH
# without including other binaries.
Expand Down
Loading