-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Signed-off-by: Thomas Parrott <[email protected]>
- Loading branch information
1 parent
2bbc777
commit 0eeb858
Showing
1 changed file
with
1 addition
and
14 deletions.
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -1488,7 +1488,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-commit: 7d4a9933f4618cfe6ec8d18e2e8f91816e5ddbba # LXD 5.21.2 | ||
source-commit: b4e4bd924798cc6ee1b9744873329cfe9790e5ed # Pre-LXD 5.21.3 | ||
source-type: git | ||
after: | ||
- lxc | ||
|
@@ -1545,19 +1545,6 @@ parts: | |
git config user.email "[email protected]" | ||
git config user.name "LXD snap builder" | ||
git cherry-pick -x eee1a0408d503b518523554969e5657ae2bd6e1f # lxd/instance/drivers/driver/common: Fix crash when device doesn't return run config when being live updated | ||
git cherry-pick -x 79b83bba26795d98e1cf37eb53242962e1d849a0 # lxd/apparmor/feature_check: add infastructure to check AppArmor features | ||
git cherry-pick -x bd2e4ed14e580eaea7d34fb72063ea1efdf04d84 # lxd/apparmor/instance_lxc: allow nosymfollow mount flag | ||
git cherry-pick -x 83d0d7bf4d952c76a7beb1ddad00d824c04d10ee # lxd/apparmor/instance_lxc: allow nosymfollow mount flag in more cases | ||
git cherry-pick -x d3f044ba23e9ef633e7c99e8c2468678a6a58e5a # lxd/storage/backend/lxd: Pass full snapshot name when validating import in CreateInstanceFromBackup | ||
git cherry-pick -x c0cfe64000c4b7c658347cf4b2833594ae0e6fc3 # lxd/instance/instance/utils: Don't allow snapshots named ".." in ValidName | ||
git cherry-pick -x 8415f4ada4800e547c7c8764f28d83e7b6cab6a0 # lxd/instance: if storage location is remote, make cluster self healing available, and vm can migrate when src member is offline also | ||
git cherry-pick -x c94652490e8bf302ff63e199ce9bbacc11a50a29 # lxd/apparmor/instance_lxc: allow procfs for unprivileged containers | ||
git cherry-pick -x 9365358d847fac1ce83329801f5b78374bb6726f # lxd/apparmor/instance_lxc: allow sysfs for unprivileged containers | ||
git cherry-pick -x c802b03b89a03a4bb697621993740fc2312b85d8 # lxd/storage/drivers/powerflex: Use the Net* response variables for pool stats | ||
git cherry-pick -x e796ed874b32493347de3d179565781798eea16f # lxd: Refresh the state on cluster put/join | ||
# Setup build environment | ||
export GOPATH="$(realpath ./.go)" | ||
export CGO_CFLAGS="-I${CRAFT_STAGE}/include/ -I${CRAFT_STAGE}/usr/local/include/" | ||
|