Pin pip to version 24.2, and update disable-non-manylinux.patch (soni…

…c-net#19510)

* Update disable-non-manylinux.patch due to pip being updated to 24.1.2.

The code logic in this area has changed, resulting in patch conflicts.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

* Update the pinned version for pip to explicitly point to 24.1.2

This is needed because the patch file that has been updated can only be
applied to 24.1.2. However, the version pinning for 24.0 will mean that
PR checkers and the daily build will try to continue using 24.0, and
thus fail to apply the patch.

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

* Revert changes to version files, and pin pip to 24.2

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

---------

Signed-off-by: Saikrishna Arcot <sarcot@microsoft.com>

sonic-slave-bookworm/Dockerfile.j2

@@ -520,7 +520,7 @@ RUN eatmydata apt-get install -y golang-go \
  && ln -sf /usr/lib/go-1.19 /usr/local/go
 {%- endif %}
 
-RUN pip3 install --upgrade pip
+RUN pip3 install --upgrade pip==24.2
 RUN apt-get purge -y python3-pip
 
 {%- if CONFIGURED_ARCH == "armhf" %}

sonic-slave-bookworm/disable-non-manylinux.patch

@@ -1,10 +1,16 @@
+Disable any type of wheel besides manylinux wheels. This is to work around an issue where the architecture-specific
+wheel might be built with a newer glibc version than what is supported on the system.
+
+(This patch gets applied only on armhf.)
+
 --- a/tags.py	2022-07-12 00:07:22.710207780 +0000
 +++ b/tags.py	2022-07-12 00:07:13.185890659 +0000
-@@ -424,7 +424,6 @@
-     _, arch = linux.split("_", 1)
-     yield from _manylinux.platform_tags(linux, arch)
-     yield from _musllinux.platform_tags(arch)
--    yield linux
+@@ -498,8 +498,6 @@
+     archs = {"armv8l": ["armv8l", "armv7l"]}.get(arch, [arch])
+     yield from _manylinux.platform_tags(archs)
+     yield from _musllinux.platform_tags(archs)
+-    for arch in archs:
+-        yield f"linux_{arch}"
 
 
  def _generic_platforms() -> Iterator[str]:

sonic-slave-bullseye/Dockerfile.j2

@@ -521,7 +521,7 @@ RUN wget -O golang-go.deb 'https://sonicstorage.blob.core.windows.net/public/fip
  && rm golang-go.deb golang-src.deb
 {%- endif %}
 
-RUN pip3 install --upgrade pip
+RUN pip3 install --upgrade pip==24.2
 RUN apt-get purge -y python3-pip python3-yaml
 
 # For building Python packages

sonic-slave-bullseye/disable-non-manylinux.patch

@@ -1,10 +1,16 @@
+Disable any type of wheel besides manylinux wheels. This is to work around an issue where the architecture-specific
+wheel might be built with a newer glibc version than what is supported on the system.
+
+(This patch gets applied only on armhf.)
+
 --- a/tags.py	2022-07-12 00:07:22.710207780 +0000
 +++ b/tags.py	2022-07-12 00:07:13.185890659 +0000
-@@ -424,7 +424,6 @@
-     _, arch = linux.split("_", 1)
-     yield from _manylinux.platform_tags(linux, arch)
-     yield from _musllinux.platform_tags(arch)
--    yield linux
+@@ -498,8 +498,6 @@
+     archs = {"armv8l": ["armv8l", "armv7l"]}.get(arch, [arch])
+     yield from _manylinux.platform_tags(archs)
+     yield from _musllinux.platform_tags(archs)
+-    for arch in archs:
+-        yield f"linux_{arch}"
 
 
  def _generic_platforms() -> Iterator[str]: