From 95acf44f7ac196c603a3495c101da7e8b7dd2758 Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Thu, 12 Sep 2024 10:45:12 -0700 Subject: [PATCH 1/2] Applied fixes to unblock 3.0 fast-track builds. (Multiple cherry-picks.) (#10425) Co-authored-by: Andrew Phelps Co-authored-by: Chris Gunn (cherry picked from commit 92604b84c4ad48aa1797536fc87ddfb205a32946) --- .../manifests/package/pkggen_core_aarch64.txt | 14 ++++++++++++++ .../manifests/package/pkggen_core_x86_64.txt | 14 ++++++++++++++ .../manifests/package/toolchain_aarch64.txt | 9 +++++++++ .../manifests/package/toolchain_x86_64.txt | 9 +++++++++ 4 files changed, 46 insertions(+) diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 5fad4e2b805..450556d8d62 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -193,11 +193,19 @@ libsolv-0.7.28-1.azl3.aarch64.rpm libsolv-devel-0.7.28-1.azl3.aarch64.rpm libssh2-1.11.0-1.azl3.aarch64.rpm libssh2-devel-1.11.0-1.azl3.aarch64.rpm +<<<<<<< HEAD krb5-1.21.3-2.azl3.aarch64.rpm nghttp2-1.61.0-2.azl3.aarch64.rpm curl-8.8.0-2.azl3.aarch64.rpm curl-devel-8.8.0-2.azl3.aarch64.rpm curl-libs-8.8.0-2.azl3.aarch64.rpm +======= +krb5-1.21.3-1.azl3.aarch64.rpm +nghttp2-1.61.0-2.azl3.aarch64.rpm +curl-8.8.0-1.azl3.aarch64.rpm +curl-devel-8.8.0-1.azl3.aarch64.rpm +curl-libs-8.8.0-1.azl3.aarch64.rpm +>>>>>>> 92604b84c (Applied fixes to unblock 3.0 fast-track builds. (Multiple cherry-picks.) (#10425)) createrepo_c-1.0.3-1.azl3.aarch64.rpm libxml2-2.11.5-1.azl3.aarch64.rpm libxml2-devel-2.11.5-1.azl3.aarch64.rpm @@ -240,9 +248,15 @@ ca-certificates-base-3.0.0-7.azl3.noarch.rpm ca-certificates-3.0.0-7.azl3.noarch.rpm dwz-0.14-2.azl3.aarch64.rpm unzip-6.0-20.azl3.aarch64.rpm +<<<<<<< HEAD python3-3.12.3-3.azl3.aarch64.rpm python3-devel-3.12.3-3.azl3.aarch64.rpm python3-libs-3.12.3-3.azl3.aarch64.rpm +======= +python3-3.12.3-2.azl3.aarch64.rpm +python3-devel-3.12.3-2.azl3.aarch64.rpm +python3-libs-3.12.3-2.azl3.aarch64.rpm +>>>>>>> 92604b84c (Applied fixes to unblock 3.0 fast-track builds. (Multiple cherry-picks.) (#10425)) python3-setuptools-69.0.3-3.azl3.noarch.rpm python3-pygments-2.7.4-2.azl3.noarch.rpm which-2.21-8.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index a1aada0b2e5..700469d08a0 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -193,11 +193,19 @@ libsolv-0.7.28-1.azl3.x86_64.rpm libsolv-devel-0.7.28-1.azl3.x86_64.rpm libssh2-1.11.0-1.azl3.x86_64.rpm libssh2-devel-1.11.0-1.azl3.x86_64.rpm +<<<<<<< HEAD krb5-1.21.3-2.azl3.x86_64.rpm nghttp2-1.61.0-2.azl3.x86_64.rpm curl-8.8.0-2.azl3.x86_64.rpm curl-devel-8.8.0-2.azl3.x86_64.rpm curl-libs-8.8.0-2.azl3.x86_64.rpm +======= +krb5-1.21.3-1.azl3.x86_64.rpm +nghttp2-1.61.0-2.azl3.x86_64.rpm +curl-8.8.0-1.azl3.x86_64.rpm +curl-devel-8.8.0-1.azl3.x86_64.rpm +curl-libs-8.8.0-1.azl3.x86_64.rpm +>>>>>>> 92604b84c (Applied fixes to unblock 3.0 fast-track builds. (Multiple cherry-picks.) (#10425)) createrepo_c-1.0.3-1.azl3.x86_64.rpm libxml2-2.11.5-1.azl3.x86_64.rpm libxml2-devel-2.11.5-1.azl3.x86_64.rpm @@ -240,9 +248,15 @@ ca-certificates-base-3.0.0-7.azl3.noarch.rpm ca-certificates-3.0.0-7.azl3.noarch.rpm dwz-0.14-2.azl3.x86_64.rpm unzip-6.0-20.azl3.x86_64.rpm +<<<<<<< HEAD python3-3.12.3-3.azl3.x86_64.rpm python3-devel-3.12.3-3.azl3.x86_64.rpm python3-libs-3.12.3-3.azl3.x86_64.rpm +======= +python3-3.12.3-2.azl3.x86_64.rpm +python3-devel-3.12.3-2.azl3.x86_64.rpm +python3-libs-3.12.3-2.azl3.x86_64.rpm +>>>>>>> 92604b84c (Applied fixes to unblock 3.0 fast-track builds. (Multiple cherry-picks.) (#10425)) python3-setuptools-69.0.3-3.azl3.noarch.rpm python3-pygments-2.7.4-2.azl3.noarch.rpm which-2.21-8.azl3.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index db9355deb32..f20f29534b7 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -547,13 +547,22 @@ python3-magic-5.45-1.azl3.noarch.rpm python3-markupsafe-2.1.3-1.azl3.aarch64.rpm python3-newt-0.52.23-1.azl3.aarch64.rpm python3-packaging-23.2-3.azl3.noarch.rpm +<<<<<<< HEAD python3-pip-24.0-2.azl3.noarch.rpm +======= +python3-pip-24.0-1.azl3.noarch.rpm +>>>>>>> 92604b84c (Applied fixes to unblock 3.0 fast-track builds. (Multiple cherry-picks.) (#10425)) python3-pygments-2.7.4-2.azl3.noarch.rpm python3-rpm-4.18.2-1.azl3.aarch64.rpm python3-rpm-generators-14-11.azl3.noarch.rpm python3-setuptools-69.0.3-3.azl3.noarch.rpm +<<<<<<< HEAD python3-test-3.12.3-3.azl3.aarch64.rpm python3-tools-3.12.3-3.azl3.aarch64.rpm +======= +python3-test-3.12.3-2.azl3.aarch64.rpm +python3-tools-3.12.3-2.azl3.aarch64.rpm +>>>>>>> 92604b84c (Applied fixes to unblock 3.0 fast-track builds. (Multiple cherry-picks.) (#10425)) python3-wheel-0.43.0-1.azl3.noarch.rpm readline-8.2-1.azl3.aarch64.rpm readline-debuginfo-8.2-1.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index 200dc522edd..dfa10e115dd 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -553,13 +553,22 @@ python3-magic-5.45-1.azl3.noarch.rpm python3-markupsafe-2.1.3-1.azl3.x86_64.rpm python3-newt-0.52.23-1.azl3.x86_64.rpm python3-packaging-23.2-3.azl3.noarch.rpm +<<<<<<< HEAD python3-pip-24.0-2.azl3.noarch.rpm +======= +python3-pip-24.0-1.azl3.noarch.rpm +>>>>>>> 92604b84c (Applied fixes to unblock 3.0 fast-track builds. (Multiple cherry-picks.) (#10425)) python3-pygments-2.7.4-2.azl3.noarch.rpm python3-rpm-4.18.2-1.azl3.x86_64.rpm python3-rpm-generators-14-11.azl3.noarch.rpm python3-setuptools-69.0.3-3.azl3.noarch.rpm +<<<<<<< HEAD python3-test-3.12.3-3.azl3.x86_64.rpm python3-tools-3.12.3-3.azl3.x86_64.rpm +======= +python3-test-3.12.3-2.azl3.x86_64.rpm +python3-tools-3.12.3-2.azl3.x86_64.rpm +>>>>>>> 92604b84c (Applied fixes to unblock 3.0 fast-track builds. (Multiple cherry-picks.) (#10425)) python3-wheel-0.43.0-1.azl3.noarch.rpm readline-8.2-1.azl3.x86_64.rpm readline-debuginfo-8.2-1.azl3.x86_64.rpm From 586baef585e8af26e411835d5d2e543cbcc86a6f Mon Sep 17 00:00:00 2001 From: Pawel Winogrodzki Date: Thu, 12 Sep 2024 11:02:00 -0700 Subject: [PATCH 2/2] Resolving merge conflicts. --- .../manifests/package/pkggen_core_aarch64.txt | 14 -------------- .../manifests/package/pkggen_core_x86_64.txt | 14 -------------- .../manifests/package/toolchain_aarch64.txt | 9 --------- .../manifests/package/toolchain_x86_64.txt | 9 --------- 4 files changed, 46 deletions(-) diff --git a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt index 450556d8d62..5fad4e2b805 100644 --- a/toolkit/resources/manifests/package/pkggen_core_aarch64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_aarch64.txt @@ -193,19 +193,11 @@ libsolv-0.7.28-1.azl3.aarch64.rpm libsolv-devel-0.7.28-1.azl3.aarch64.rpm libssh2-1.11.0-1.azl3.aarch64.rpm libssh2-devel-1.11.0-1.azl3.aarch64.rpm -<<<<<<< HEAD krb5-1.21.3-2.azl3.aarch64.rpm nghttp2-1.61.0-2.azl3.aarch64.rpm curl-8.8.0-2.azl3.aarch64.rpm curl-devel-8.8.0-2.azl3.aarch64.rpm curl-libs-8.8.0-2.azl3.aarch64.rpm -======= -krb5-1.21.3-1.azl3.aarch64.rpm -nghttp2-1.61.0-2.azl3.aarch64.rpm -curl-8.8.0-1.azl3.aarch64.rpm -curl-devel-8.8.0-1.azl3.aarch64.rpm -curl-libs-8.8.0-1.azl3.aarch64.rpm ->>>>>>> 92604b84c (Applied fixes to unblock 3.0 fast-track builds. (Multiple cherry-picks.) (#10425)) createrepo_c-1.0.3-1.azl3.aarch64.rpm libxml2-2.11.5-1.azl3.aarch64.rpm libxml2-devel-2.11.5-1.azl3.aarch64.rpm @@ -248,15 +240,9 @@ ca-certificates-base-3.0.0-7.azl3.noarch.rpm ca-certificates-3.0.0-7.azl3.noarch.rpm dwz-0.14-2.azl3.aarch64.rpm unzip-6.0-20.azl3.aarch64.rpm -<<<<<<< HEAD python3-3.12.3-3.azl3.aarch64.rpm python3-devel-3.12.3-3.azl3.aarch64.rpm python3-libs-3.12.3-3.azl3.aarch64.rpm -======= -python3-3.12.3-2.azl3.aarch64.rpm -python3-devel-3.12.3-2.azl3.aarch64.rpm -python3-libs-3.12.3-2.azl3.aarch64.rpm ->>>>>>> 92604b84c (Applied fixes to unblock 3.0 fast-track builds. (Multiple cherry-picks.) (#10425)) python3-setuptools-69.0.3-3.azl3.noarch.rpm python3-pygments-2.7.4-2.azl3.noarch.rpm which-2.21-8.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt index 700469d08a0..a1aada0b2e5 100644 --- a/toolkit/resources/manifests/package/pkggen_core_x86_64.txt +++ b/toolkit/resources/manifests/package/pkggen_core_x86_64.txt @@ -193,19 +193,11 @@ libsolv-0.7.28-1.azl3.x86_64.rpm libsolv-devel-0.7.28-1.azl3.x86_64.rpm libssh2-1.11.0-1.azl3.x86_64.rpm libssh2-devel-1.11.0-1.azl3.x86_64.rpm -<<<<<<< HEAD krb5-1.21.3-2.azl3.x86_64.rpm nghttp2-1.61.0-2.azl3.x86_64.rpm curl-8.8.0-2.azl3.x86_64.rpm curl-devel-8.8.0-2.azl3.x86_64.rpm curl-libs-8.8.0-2.azl3.x86_64.rpm -======= -krb5-1.21.3-1.azl3.x86_64.rpm -nghttp2-1.61.0-2.azl3.x86_64.rpm -curl-8.8.0-1.azl3.x86_64.rpm -curl-devel-8.8.0-1.azl3.x86_64.rpm -curl-libs-8.8.0-1.azl3.x86_64.rpm ->>>>>>> 92604b84c (Applied fixes to unblock 3.0 fast-track builds. (Multiple cherry-picks.) (#10425)) createrepo_c-1.0.3-1.azl3.x86_64.rpm libxml2-2.11.5-1.azl3.x86_64.rpm libxml2-devel-2.11.5-1.azl3.x86_64.rpm @@ -248,15 +240,9 @@ ca-certificates-base-3.0.0-7.azl3.noarch.rpm ca-certificates-3.0.0-7.azl3.noarch.rpm dwz-0.14-2.azl3.x86_64.rpm unzip-6.0-20.azl3.x86_64.rpm -<<<<<<< HEAD python3-3.12.3-3.azl3.x86_64.rpm python3-devel-3.12.3-3.azl3.x86_64.rpm python3-libs-3.12.3-3.azl3.x86_64.rpm -======= -python3-3.12.3-2.azl3.x86_64.rpm -python3-devel-3.12.3-2.azl3.x86_64.rpm -python3-libs-3.12.3-2.azl3.x86_64.rpm ->>>>>>> 92604b84c (Applied fixes to unblock 3.0 fast-track builds. (Multiple cherry-picks.) (#10425)) python3-setuptools-69.0.3-3.azl3.noarch.rpm python3-pygments-2.7.4-2.azl3.noarch.rpm which-2.21-8.azl3.x86_64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_aarch64.txt b/toolkit/resources/manifests/package/toolchain_aarch64.txt index f20f29534b7..db9355deb32 100644 --- a/toolkit/resources/manifests/package/toolchain_aarch64.txt +++ b/toolkit/resources/manifests/package/toolchain_aarch64.txt @@ -547,22 +547,13 @@ python3-magic-5.45-1.azl3.noarch.rpm python3-markupsafe-2.1.3-1.azl3.aarch64.rpm python3-newt-0.52.23-1.azl3.aarch64.rpm python3-packaging-23.2-3.azl3.noarch.rpm -<<<<<<< HEAD python3-pip-24.0-2.azl3.noarch.rpm -======= -python3-pip-24.0-1.azl3.noarch.rpm ->>>>>>> 92604b84c (Applied fixes to unblock 3.0 fast-track builds. (Multiple cherry-picks.) (#10425)) python3-pygments-2.7.4-2.azl3.noarch.rpm python3-rpm-4.18.2-1.azl3.aarch64.rpm python3-rpm-generators-14-11.azl3.noarch.rpm python3-setuptools-69.0.3-3.azl3.noarch.rpm -<<<<<<< HEAD python3-test-3.12.3-3.azl3.aarch64.rpm python3-tools-3.12.3-3.azl3.aarch64.rpm -======= -python3-test-3.12.3-2.azl3.aarch64.rpm -python3-tools-3.12.3-2.azl3.aarch64.rpm ->>>>>>> 92604b84c (Applied fixes to unblock 3.0 fast-track builds. (Multiple cherry-picks.) (#10425)) python3-wheel-0.43.0-1.azl3.noarch.rpm readline-8.2-1.azl3.aarch64.rpm readline-debuginfo-8.2-1.azl3.aarch64.rpm diff --git a/toolkit/resources/manifests/package/toolchain_x86_64.txt b/toolkit/resources/manifests/package/toolchain_x86_64.txt index dfa10e115dd..200dc522edd 100644 --- a/toolkit/resources/manifests/package/toolchain_x86_64.txt +++ b/toolkit/resources/manifests/package/toolchain_x86_64.txt @@ -553,22 +553,13 @@ python3-magic-5.45-1.azl3.noarch.rpm python3-markupsafe-2.1.3-1.azl3.x86_64.rpm python3-newt-0.52.23-1.azl3.x86_64.rpm python3-packaging-23.2-3.azl3.noarch.rpm -<<<<<<< HEAD python3-pip-24.0-2.azl3.noarch.rpm -======= -python3-pip-24.0-1.azl3.noarch.rpm ->>>>>>> 92604b84c (Applied fixes to unblock 3.0 fast-track builds. (Multiple cherry-picks.) (#10425)) python3-pygments-2.7.4-2.azl3.noarch.rpm python3-rpm-4.18.2-1.azl3.x86_64.rpm python3-rpm-generators-14-11.azl3.noarch.rpm python3-setuptools-69.0.3-3.azl3.noarch.rpm -<<<<<<< HEAD python3-test-3.12.3-3.azl3.x86_64.rpm python3-tools-3.12.3-3.azl3.x86_64.rpm -======= -python3-test-3.12.3-2.azl3.x86_64.rpm -python3-tools-3.12.3-2.azl3.x86_64.rpm ->>>>>>> 92604b84c (Applied fixes to unblock 3.0 fast-track builds. (Multiple cherry-picks.) (#10425)) python3-wheel-0.43.0-1.azl3.noarch.rpm readline-8.2-1.azl3.x86_64.rpm readline-debuginfo-8.2-1.azl3.x86_64.rpm