From 67afde443fd9eb7b1c7cbb6de9daab5703a61f84 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Tue, 17 Sep 2024 20:02:03 -0700 Subject: [PATCH] sync from upstream --- prepopulate.json | 36 ---------------------- prepopulate.yaml | 24 --------------- shared/additional_and_filter_packages.conf | 15 +++++++++ 3 files changed, 15 insertions(+), 60 deletions(-) diff --git a/prepopulate.json b/prepopulate.json index 55c5fa9..3e33415 100644 --- a/prepopulate.json +++ b/prepopulate.json @@ -3327,9 +3327,6 @@ "ltrace": [ "ltrace.aarch64" ], - "lttng-ust": [ - "lttng-ust.aarch64" - ], "lua": [ "lua.aarch64" ], @@ -9809,9 +9806,6 @@ "ltrace": [ "ltrace.ppc64le" ], - "lttng-ust": [ - "lttng-ust.ppc64le" - ], "lua": [ "lua.ppc64le" ], @@ -16217,9 +16211,6 @@ "ltrace": [ "ltrace.s390x" ], - "lttng-ust": [ - "lttng-ust.s390x" - ], "lua": [ "lua.s390x" ], @@ -22776,9 +22767,6 @@ "ltrace": [ "ltrace.x86_64" ], - "lttng-ust": [ - "lttng-ust.x86_64" - ], "lua": [ "lua.x86_64" ], @@ -27171,9 +27159,6 @@ "openssl-libs.aarch64", "openssl.aarch64" ], - "openssl-pkcs11": [ - "openssl-pkcs11.aarch64" - ], "os-prober": [ "os-prober.aarch64" ], @@ -28745,9 +28730,6 @@ "openssl-libs.ppc64le", "openssl.ppc64le" ], - "openssl-pkcs11": [ - "openssl-pkcs11.ppc64le" - ], "os-prober": [ "os-prober.ppc64le" ], @@ -30288,9 +30270,6 @@ "openssl-ibmca": [ "openssl-ibmca.s390x" ], - "openssl-pkcs11": [ - "openssl-pkcs11.s390x" - ], "p11-kit": [ "p11-kit-trust.s390x", "p11-kit.s390x" @@ -31865,9 +31844,6 @@ "openssl-libs.x86_64", "openssl.x86_64" ], - "openssl-pkcs11": [ - "openssl-pkcs11.x86_64" - ], "os-prober": [ "os-prober.x86_64" ], @@ -33683,9 +33659,6 @@ "plexus-compiler": [ "plexus-compiler.noarch" ], - "plexus-containers": [ - "plexus-containers-container-default.noarch" - ], "plexus-io": [ "plexus-io.noarch" ], @@ -35464,9 +35437,6 @@ "plexus-compiler": [ "plexus-compiler.noarch" ], - "plexus-containers": [ - "plexus-containers-container-default.noarch" - ], "plexus-io": [ "plexus-io.noarch" ], @@ -37228,9 +37198,6 @@ "plexus-compiler": [ "plexus-compiler.noarch" ], - "plexus-containers": [ - "plexus-containers-container-default.noarch" - ], "plexus-io": [ "plexus-io.noarch" ], @@ -39068,9 +39035,6 @@ "plexus-compiler": [ "plexus-compiler.noarch" ], - "plexus-containers": [ - "plexus-containers-container-default.noarch" - ], "plexus-io": [ "plexus-io.noarch" ], diff --git a/prepopulate.yaml b/prepopulate.yaml index 56e1be4..d54bf6d 100644 --- a/prepopulate.yaml +++ b/prepopulate.yaml @@ -2577,8 +2577,6 @@ AppStream: - lshw-gui.aarch64 ltrace: - ltrace.aarch64 - lttng-ust: - - lttng-ust.aarch64 lua: - lua.aarch64 lua-posix: @@ -7610,8 +7608,6 @@ AppStream: - lshw-gui.ppc64le ltrace: - ltrace.ppc64le - lttng-ust: - - lttng-ust.ppc64le lua: - lua.ppc64le lua-posix: @@ -12587,8 +12583,6 @@ AppStream: - lshw-gui.s390x ltrace: - ltrace.s390x - lttng-ust: - - lttng-ust.s390x lua: - lua.s390x lua-posix: @@ -17683,8 +17677,6 @@ AppStream: - lshw-gui.x86_64 ltrace: - ltrace.x86_64 - lttng-ust: - - lttng-ust.x86_64 lua: - lua.x86_64 lua-posix: @@ -21108,8 +21100,6 @@ BaseOS: openssl: - openssl-libs.aarch64 - openssl.aarch64 - openssl-pkcs11: - - openssl-pkcs11.aarch64 os-prober: - os-prober.aarch64 p11-kit: @@ -22318,8 +22308,6 @@ BaseOS: openssl: - openssl-libs.ppc64le - openssl.ppc64le - openssl-pkcs11: - - openssl-pkcs11.ppc64le os-prober: - os-prober.ppc64le p11-kit: @@ -23506,8 +23494,6 @@ BaseOS: - openssl.s390x openssl-ibmca: - openssl-ibmca.s390x - openssl-pkcs11: - - openssl-pkcs11.s390x p11-kit: - p11-kit-trust.s390x - p11-kit.s390x @@ -24717,8 +24703,6 @@ BaseOS: openssl: - openssl-libs.x86_64 - openssl.x86_64 - openssl-pkcs11: - - openssl-pkcs11.x86_64 os-prober: - os-prober.x86_64 p11-kit: @@ -26016,8 +26000,6 @@ CRB: - plexus-build-api0.noarch plexus-compiler: - plexus-compiler.noarch - plexus-containers: - - plexus-containers-container-default.noarch plexus-io: - plexus-io.noarch plexus-languages: @@ -27268,8 +27250,6 @@ CRB: - plexus-build-api0.noarch plexus-compiler: - plexus-compiler.noarch - plexus-containers: - - plexus-containers-container-default.noarch plexus-io: - plexus-io.noarch plexus-languages: @@ -28509,8 +28489,6 @@ CRB: - plexus-build-api0.noarch plexus-compiler: - plexus-compiler.noarch - plexus-containers: - - plexus-containers-container-default.noarch plexus-io: - plexus-io.noarch plexus-languages: @@ -29810,8 +29788,6 @@ CRB: - plexus-build-api0.noarch plexus-compiler: - plexus-compiler.noarch - plexus-containers: - - plexus-containers-container-default.noarch plexus-io: - plexus-io.noarch plexus-languages: diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf index dc26ab9..12c0fde 100644 --- a/shared/additional_and_filter_packages.conf +++ b/shared/additional_and_filter_packages.conf @@ -96,6 +96,8 @@ additional_packages = [ "erofs-utils", #ENGCMP-4284 "erofs-fuse", #ENGCMP-4284 "fwupd-efi", #ENGCMP-4308 + "python3-libcpuid", #ENGCMP-4447 + "python3-dnf-plugin-pre-transaction-actions", #ENGCMP-4445 ] }), ("^BaseOS$", { @@ -502,6 +504,19 @@ additional_packages = [ "yggdrasil", #ENGCMP-4382 "yggdrasil-worker-package-manager", #ENGCMP-4383 "python-tpm2-pytss", #ENGCMP-4395 + "python-ifaddr", #ENGCMP-4449 + "aspnetcore-runtime-9.0", #ENGCMP-4413 + "aspnetcore-runtime-dbg-9.0", #ENGCMP-4413 + "aspnetcore-targeting-pack-9.0", #ENGCMP-4413 + "dotnet-apphost-pack-9.0", #ENGCMP-4413 + "dotnet-hostfxr-9.0", #ENGCMP-4413 + "dotnet-runtime-9.0", #ENGCMP-4413 + "dotnet-runtime-dbg-9.0", #ENGCMP-4413 + "dotnet-sdk-9.0", #ENGCMP-4413 + "dotnet-sdk-aot-9.0", #ENGCMP-4413 + "dotnet-sdk-dbg-9.0", #ENGCMP-4413 + "dotnet-targeting-pack-9.0", #ENGCMP-4413 + "dotnet-templates-9.0", #ENGCMP-4413 ] }), ("^AppStream$", {