launchpad-reviewers team mailing list archive
-
launchpad-reviewers team
-
Mailing list archive
-
Message #30873
[Merge] ~lgp171188/lpci:fix-snapcraft-build-error-snapcraft-8.x into lpci:main
Guruprasad has proposed merging ~lgp171188/lpci:fix-snapcraft-build-error-snapcraft-8.x into lpci:main.
Commit message:
Fix the build error with snapcraft 8.x
snapcraft 8.x is built on core22 while 7.x was built on core20, which is
the same base used by lpci. Due to this change and possible bug in the
lpci snapcraft.yaml causing the build process to depend on the version
of python used by snapcraft, there was a conflict in the available vs expected
versions of pip. This is now fixed by moving the lpci's python site
customization script to run at the end of the build process so that it
only comes into effect in the actual snap instead of affecting the build
environment too.
LP: #2053109
Requested reviews:
Launchpad code reviewers (launchpad-reviewers)
Related bugs:
Bug #2053109 in lpci: "lpci snap build errors out with snapcraft 8.x"
https://bugs.launchpad.net/lpci/+bug/2053109
For more details, see:
https://code.launchpad.net/~lgp171188/lpci/+git/lpcraft/+merge/460479
--
Your team Launchpad code reviewers is requested to review the proposed merge of ~lgp171188/lpci:fix-snapcraft-build-error-snapcraft-8.x into lpci:main.
diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
index f400ef4..c299510 100644
--- a/snap/snapcraft.yaml
+++ b/snap/snapcraft.yaml
@@ -47,9 +47,6 @@ parts:
- python3-venv
- python3-wheel
- python3-dev
- override-build: |
- snapcraftctl build
- install -D -m 0755 $SNAPCRAFT_PROJECT_DIR/snap/local/sitecustomize.py $SNAPCRAFT_PART_INSTALL/usr/lib/python3.8/sitecustomize.py
lpci:
after: [python3]
@@ -81,6 +78,7 @@ parts:
snapcraftctl build
# python3 fixup symlink (snapcraft bug)
ln -sf ../usr/bin/python3.8 $SNAPCRAFT_PART_INSTALL/bin/python3
+ install -D -m 0755 $SNAPCRAFT_PROJECT_DIR/snap/local/sitecustomize.py $SNAPCRAFT_PART_INSTALL/usr/lib/python3.8/sitecustomize.py
organize:
# move things around so they're tidier
usr/lib/git-core: git/git-core