Skip to content

Commit 29e36e8

Browse files
committed
chore: update base to core22
Signed-off-by: rapour <reza.abbasalipour@canonical.com>
1 parent b20772b commit 29e36e8

File tree

1 file changed

+20
-6
lines changed

1 file changed

+20
-6
lines changed

snap/snapcraft.yaml

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ description: |-
1010
license: Apache-2.0
1111
grade: stable
1212
confinement: classic
13-
base: core20
13+
base: core22
1414
assumes: [snapd2.52]
1515
environment:
1616
REAL_PATH: $PATH
@@ -23,7 +23,9 @@ parts:
2323
plugin: nil
2424
build-snaps:
2525
- go/1.24/stable
26+
build-attributes: [enable-patchelf]
2627
build-packages:
28+
- sudo
2729
- autoconf
2830
- automake
2931
- autopoint
@@ -50,37 +52,43 @@ parts:
5052
k8s-dqlite:
5153
after: [build-deps]
5254
source: build-scripts/components/k8s-dqlite
55+
build-attributes: [enable-patchelf]
5356
plugin: nil
5457
override-build: $SNAPCRAFT_PROJECT_DIR/build-scripts/build-component.sh k8s-dqlite
5558

5659
etcd:
5760
after: [build-deps]
5861
plugin: nil
5962
source: build-scripts/components/etcd
63+
build-attributes: [enable-patchelf]
6064
override-build: $SNAPCRAFT_PROJECT_DIR/build-scripts/build-component.sh etcd
6165

6266
cni:
6367
after: [build-deps]
6468
plugin: nil
6569
source: build-scripts/components/cni
70+
build-attributes: [enable-patchelf]
6671
override-build: $SNAPCRAFT_PROJECT_DIR/build-scripts/build-component.sh cni
6772

6873
flannel-cni-plugin:
6974
after: [build-deps]
7075
plugin: nil
7176
source: build-scripts/components/flannel-cni-plugin
77+
build-attributes: [enable-patchelf]
7278
override-build: $SNAPCRAFT_PROJECT_DIR/build-scripts/build-component.sh flannel-cni-plugin
7379

7480
flanneld:
7581
after: [build-deps]
7682
plugin: nil
7783
source: build-scripts/components/flanneld
84+
build-attributes: [enable-patchelf]
7885
override-build: $SNAPCRAFT_PROJECT_DIR/build-scripts/build-component.sh flanneld
7986

8087
kubernetes:
8188
after: [build-deps]
8289
plugin: nil
8390
source: build-scripts/components/kubernetes
91+
build-attributes: [enable-patchelf]
8492
override-build: $SNAPCRAFT_PROJECT_DIR/build-scripts/build-component.sh kubernetes
8593

8694
kubernetes-version:
@@ -98,13 +106,15 @@ parts:
98106
after: [build-deps]
99107
plugin: autotools
100108
source: https://www.netfilter.org/pub/libmnl/libmnl-1.0.5.tar.bz2
109+
build-attributes: [enable-patchelf]
101110
prime:
102111
- -usr/local/include
103112

104113
libnftnl:
105114
after: [libmnl]
106115
plugin: autotools
107116
source: https://www.netfilter.org/projects/libnftnl/files/libnftnl-1.1.8.tar.bz2
117+
build-attributes: [enable-patchelf]
108118
build-environment:
109119
- LIBMNL_LIBS: $SNAPCRAFT_STAGE/usr/lib
110120
prime:
@@ -113,6 +123,7 @@ parts:
113123
iptables:
114124
after: [libnftnl]
115125
source: https://www.netfilter.org/projects/iptables/files/iptables-1.8.6.tar.bz2
126+
build-attributes: [enable-patchelf]
116127
plugin: autotools
117128
build-environment:
118129
- LIBMNL_LIBS: $SNAPCRAFT_STAGE/usr/lib
@@ -143,6 +154,7 @@ parts:
143154

144155
bash-utils:
145156
plugin: nil
157+
build-attributes: [enable-patchelf]
146158
stage-packages:
147159
- conntrack
148160
- coreutils
@@ -202,6 +214,7 @@ parts:
202214
after: [build-deps]
203215
plugin: nil
204216
source: build-scripts/components/cluster-agent
217+
build-attributes: [enable-patchelf]
205218
override-build: $SNAPCRAFT_PROJECT_DIR/build-scripts/build-component.sh cluster-agent
206219

207220
microk8s-addons:
@@ -262,32 +275,33 @@ parts:
262275

263276
python-runtime:
264277
after: [build-deps]
278+
build-attributes: [enable-patchelf]
265279
plugin: nil
266280
source: build-scripts/components/python
267281
override-build: |
268282
pip3 install -r requirements.txt
269283
build-packages:
270284
- python3-dev
271285
build-environment:
272-
- C_INCLUDE_PATH: /usr/include/python3.8
286+
- C_INCLUDE_PATH: /usr/include/python3.10
273287
stage-packages:
274288
- libpython3-stdlib
275-
- libpython3.8-stdlib
276-
- libpython3.8-minimal
289+
- libpython3.10-stdlib
290+
- libpython3.10-minimal
277291
- python3-pip
278292
- python3-setuptools
279293
- python3-wheel
280294
- python3-venv
281295
- python3-minimal
282296
- python3-distutils
283297
- python3-pkg-resources
284-
- python3.8-minimal
298+
- python3.10-minimal
285299
- python3-openssl
286300
- python3-requests
287301
- python3-click
288302
- python3-dateutil
289303
stage:
290-
- -usr/lib/python3.9
304+
- -usr/lib/python3.10
291305
- -usr/share/doc
292306
- -usr/share/lintian
293307
- -usr/share/man

0 commit comments

Comments
 (0)