matthew/sonic-buildimage
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix build issue in 202106 branch on dbus-python and meson. (#14635)

Browse Source 
Why I did it
dbus-python-1.3.2 uses latest meson to build.
latest meson v1.1.0 has some issues.

Work item tracking
Microsoft ADO (number only):
How I did it
How to verify it
This commit is contained in:
Liu Shilong 2023-04-14 19:23:32 +08:00 committed by GitHub
parent c82685ec78
commit c24de5e5e6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
files/build/versions/host-image/versions-py3
View File

@ -10,7 +10,7 @@ click==7.0
click-log==0.4.0 click-log==0.4.0
colorful==0.5.5 colorful==0.5.5
cryptography==40.0.1 cryptography==40.0.1
dbus-python==1.3.2 dbus-python==1.2.18
docker==5.0.3 docker==5.0.3
docker-image-py==0.1.12 docker-image-py==0.1.12
enlighten==1.11.2 enlighten==1.11.2
@ -59,4 +59,4 @@ watchdog==0.10.3
wcwidth==0.2.6 wcwidth==0.2.6
websocket-client==1.5.1 websocket-client==1.5.1
www-authenticate==0.9.2 www-authenticate==0.9.2
xmltodict==0.12.0 xmltodict==0.12.0

4
files/build_templates/sonic_debian_extension.j2
View File

@ -266,9 +266,7 @@ sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y -t
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install gir1.2-glib-2.0 libdbus-1-3 libgirepository-1.0-1 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y install gir1.2-glib-2.0 libdbus-1-3 libgirepository-1.0-1
sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y -t $IMAGE_DISTRO-backports install libsystemd0 sudo LANG=C DEBIAN_FRONTEND=noninteractive chroot $FILESYSTEM_ROOT apt-get -y -t $IMAGE_DISTRO-backports install libsystemd0
if [[ $CONFIGURED_ARCH == armhf ]]; then sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install dbus-python==1.2.18
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install dbus-python==1.2.18
fi
# Install SONiC host services package # Install SONiC host services package
SONIC_HOST_SERVICES_PY3_WHEEL_NAME=$(basename {{sonic_host_services_py3_wheel_path}}) SONIC_HOST_SERVICES_PY3_WHEEL_NAME=$(basename {{sonic_host_services_py3_wheel_path}})