forked from canonical/lxd-pkg-snap
-
Notifications
You must be signed in to change notification settings - Fork 0
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
814a4cd
commit 6d58b93
Showing
1 changed file
with
1 addition
and
17 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 |
---|---|---|
|
@@ -1444,7 +1444,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: 5a492a3f0036c44d22c344505952e06ce517993a # LXD 6.1 | ||
source-commit: d1e60042366b1fcd25240b1f26769375b64a8ce5 # Pre LXD 6.2 | ||
source-type: git | ||
after: | ||
- lxc | ||
|
@@ -1501,22 +1501,6 @@ parts: | |
git config user.email "[email protected]" | ||
git config user.name "LXD snap builder" | ||
git cherry-pick -x 2f7c7cd501d9b1b84daeb4deb95b67ebe3de1193 # lxd/instance/exec: Only use keepalives on TCP sockets | ||
git cherry-pick -x 5b44f9a5d9218e60f75ce5abdc6705b11121d1b7 # gomod: Revert github.com/gorilla/websocket to v1.5.1 | ||
git cherry-pick -x 7e468c7cb5b59e67189d0b7141007303b5f74140 # lxd: Extract certificate add token metadata from remote member | ||
git cherry-pick -x af70982132866ffb9feb0f543b625abb238eb17a # lxd: Return an error if the client uses a trust password | ||
git cherry-pick -x b551f47dfdd8699772c7b8fd2cfb72fe439ad0c7 # lxd/certificates: Improve expiry validation checks in clusterMemberJoinTokenValid | ||
git cherry-pick -x 39f97587a2c30eb59ac78979d7b60e11dfd6132e # lxd/certificates: Improve validation in certificateTokenValid | ||
git cherry-pick -x cd43ad507584dc4971c9ce3c8b12167a93fb75b7 # lxd/instance/drivers/driver/common: Fix crash when device doesn't return run config when being live updated | ||
git cherry-pick -x 47180a352654bee9a994db714801813a59cfbb18 # lxd/apparmor/feature_check: add infastructure to check AppArmor features | ||
git cherry-pick -x b5a4a6540e793120b85a3b280003fce236e6a56f # lxd/apparmor/instance_lxc: allow nosymfollow mount flag | ||
git cherry-pick -x 86c3d515662068d825d23387623932bca96bc6aa # lxd/apparmor/instance_lxc: allow nosymfollow mount flag in more cases | ||
git cherry-pick -x 69bd88119f5dc990452c79699915b3dd86dad242 # lxd/storage/backend/lxd: Pass full snapshot name when validating import in CreateInstanceFromBackup | ||
git cherry-pick -x a35079f481c50adf7dfd571d2c815668f5f747a1 # lxd/instance/instance/utils: Don't allow snapshots named ".." in ValidName | ||
git cherry-pick -x fcdc78dda31b210f246e075aaf4bf507b07b68f5 # 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 7ab0a26428590a4d4689b90e8ab95b1523bcc8c5 # lxd/apparmor/instance_lxc: allow procfs for unprivileged containers | ||
git cherry-pick -x aebc412682916842c6be51ecff33c40d2d1fbb79 # lxd/apparmor/instance_lxc: allow sysfs for unprivileged containers | ||
# Setup build environment | ||
export GOPATH="$(realpath ./.go)" | ||
export CGO_CFLAGS="-I${CRAFT_STAGE}/include/ -I${CRAFT_STAGE}/usr/local/include/" | ||
|