Skip to content

Commit 1d9e546

Browse files
authored
[code sync] Merge code from sonic-net/sonic-buildimage:202405 to 202405 (#1124)
```<br>* 0d9df54 - (HEAD -> 202405) Merge branch '202405' of https://github.com/sonic-net/sonic-buildimage into 202405 (2025-05-15) [Sonic Automation] * 5062309 - (head/202405) Fix package version conflict introduced by PR #15890 (#22598) (2025-05-14) [mssonicbld]<br>```
2 parents 693f27d + 0d9df54 commit 1d9e546

5 files changed

Lines changed: 1 addition & 16 deletions

File tree

build_debian.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -549,9 +549,6 @@ sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'docke
549549
# Install scapy
550550
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'scapy==2.4.4'
551551

552-
# The option --no-build-isolation can be removed when upgrading PyYAML to 6.0.1
553-
sudo https_proxy=$https_proxy LANG=C chroot $FILESYSTEM_ROOT pip3 install 'PyYAML==5.4.1' --no-build-isolation
554-
555552
## Note: keep pip installed for maintainance purpose
556553

557554
# Install GCC, needed for building/installing some Python packages

dockers/docker-config-engine-bullseye/Dockerfile.j2

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ RUN apt-get install -y \
2323
RUN pip3 install pyangbind==0.8.1
2424
RUN pip3 uninstall -y enum34
2525

26-
# Fix armhf build failure
27-
# The option --no-build-isolation can be removed when upgrading PyYAML to 6.0.1
28-
RUN pip3 install PyYAML==5.4.1 --no-build-isolation
29-
3026
# Install python-redis
3127
RUN pip3 install redis==4.5.4
3228

dockers/docker-config-engine-buster/Dockerfile.j2

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,6 @@ RUN apt-get install -y \
2323
RUN pip3 install pyangbind==0.8.1
2424
RUN pip3 uninstall -y enum34
2525

26-
# Fix armhf build failure
27-
# The option --no-build-isolation can be removed when upgrading PyYAML to 6.0.1
28-
RUN pip3 install PyYAML==5.4.1 --no-build-isolation
29-
3026
# Install python-redis
3127
RUN pip3 install redis==4.5.4
3228

sonic-slave-bullseye/Dockerfile.j2

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -581,8 +581,7 @@ RUN pip3 uninstall -y enum34
581581
RUN pip3 install j2cli==0.3.10
582582

583583
# For sonic-mgmt-framework
584-
# The option --no-build-isolation can be removed when upgrading PyYAML to 6.0.1
585-
RUN pip3 install "PyYAML==5.4.1" --no-build-isolation
584+
586585
{%- if CROSS_BUILD_ENVIRON != "y" %}
587586
RUN pip3 install "lxml==4.9.1"
588587
{%- endif %}

sonic-slave-buster/Dockerfile.j2

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -549,9 +549,6 @@ RUN pip3 install MarkupSafe==2.0.1
549549
RUN pip3 install Jinja2==3.0.3
550550
551551
# For sonic-mgmt-framework
552-
# The option --no-build-isolation can be removed when upgrading PyYAML to 6.0.1
553-
RUN pip2 install "PyYAML==5.4.1" --no-build-isolation
554-
RUN pip3 install "PyYAML==5.4.1" --no-build-isolation
555552
556553
{%- if CROSS_BUILD_ENVIRON != "y" %}
557554
RUN pip2 install "lxml==4.9.1"

0 commit comments

Comments
 (0)