Skip to content

Commit

Permalink
lxd: Pin to pre-6.1 release hash
Browse files Browse the repository at this point in the history
Signed-off-by: Thomas Parrott <[email protected]>
  • Loading branch information
tomponline committed Jul 8, 2024
1 parent 2014017 commit c983bfb
Showing 1 changed file with 1 addition and 13 deletions.
14 changes: 1 addition & 13 deletions snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1338,7 +1338,7 @@ parts:
source: https://github.com/canonical/lxd
# XXX: We often cherry-pick for candidate builds so don't do shallow clone
#source-depth: 1
source-tag: lxd-5.21.1
source-commit: 95e0c8efc0e624629a210bd315fd338559ac5f42 # pre-LXD 6.1
source-type: git
after:
- lxc
Expand Down Expand Up @@ -1395,18 +1395,6 @@ parts:
git config user.email "[email protected]"
git config user.name "LXD snap builder"
git cherry-pick -x ddfdeb3bfcd38e39121487180903a4316d1ba66b # UI: Add canonical.com domain to content security policy, so the ui can load data from images.lxd.canonical.com
git cherry-pick -x 2b5c27c595b347ec5cb05484934fd4c90c9ed316 # shared/simplestreams: Fix delta always using container rootfs as source
git cherry-pick -x a2394d8d03910e001933b1eb5e52a5e3dc9e5ca7 # lxd/instances: Don't start instances when evacuated
git cherry-pick -x 7fcceaf83ac4e8ba6603063f25c97710678650d7 # client: Fix permissions extension typo
git cherry-pick -x 616416879591c2305386f611a2a78a343db9d96e # lxd/storage/drivers/zfs: Fix refresh of VM volumes
git cherry-pick -x 6fee73a8cb39ac1f966491131db688d14d2ea89a # lxd/api/metrics: Don't repeatedly call instance.Project() in metricsGet
git cherry-pick -x 4179610fbbd6c5a21921992ab949a5675339f388 # lxd/api/metrics: Fix crash due to absent locking in metricsGet
git cherry-pick -x 81de9aaae166f204bd0901fbd0abb46582e87684 # lxd/api/metrics: Avoid repeated calls to wg.Add in metricsGet
git cherry-pick -x 5ddbe0849827421669ec6633bc5d1bb5a8e8d7cc # lxd/config/default: Add images to DefaultRemotes
git cherry-pick -x cc890c8c4a39e9b52f69fc66640fbffdc2ab2e9f # lxd/device/device_utils_disk: fix diskAddRootUserNSEntry to add root mapping only if it's required
git cherry-pick -x 4080e9f406b67ec255706562dab36708947840e1 # doc: pin version of myst-parser
# Setup build environment
export GOPATH="$(realpath ./.go)"
export CGO_CFLAGS="-I${CRAFT_STAGE}/include/ -I${CRAFT_STAGE}/usr/local/include/"
Expand Down

0 comments on commit c983bfb

Please sign in to comment.