From e6d905f17a85e0eb6cdc6742ced050414511ed69 Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Wed, 4 Sep 2024 08:38:03 -0700 Subject: [PATCH] sync from upstream --- prepopulate.json | 48 ---------------------- prepopulate.yaml | 36 ---------------- shared/additional_and_filter_packages.conf | 5 +++ 3 files changed, 5 insertions(+), 84 deletions(-) diff --git a/prepopulate.json b/prepopulate.json index e73c78b..5a3bf7c 100644 --- a/prepopulate.json +++ b/prepopulate.json @@ -5456,9 +5456,6 @@ "sanlock-lib.aarch64", "sanlock.aarch64" ], - "satyr": [ - "satyr.aarch64" - ], "sbc": [ "libsbc.aarch64", "sbc.aarch64" @@ -6452,10 +6449,6 @@ "xml-commons-resolver": [ "xml-commons-resolver.noarch" ], - "xmlrpc-c": [ - "xmlrpc-c-client.aarch64", - "xmlrpc-c.aarch64" - ], "xmlsec1": [ "xmlsec1-nss.aarch64", "xmlsec1-openssl.aarch64", @@ -11934,9 +11927,6 @@ "sanlock-lib.ppc64le", "sanlock.ppc64le" ], - "satyr": [ - "satyr.ppc64le" - ], "sbc": [ "libsbc.ppc64le", "sbc.ppc64le" @@ -12905,10 +12895,6 @@ "xml-commons-resolver": [ "xml-commons-resolver.noarch" ], - "xmlrpc-c": [ - "xmlrpc-c-client.ppc64le", - "xmlrpc-c.ppc64le" - ], "xmlsec1": [ "xmlsec1-nss.ppc64le", "xmlsec1-openssl.ppc64le", @@ -18353,9 +18339,6 @@ "sanlock-lib.s390x", "sanlock.s390x" ], - "satyr": [ - "satyr.s390x" - ], "sbc": [ "libsbc.s390x", "sbc.s390x" @@ -19336,10 +19319,6 @@ "xml-commons-resolver": [ "xml-commons-resolver.noarch" ], - "xmlrpc-c": [ - "xmlrpc-c-client.s390x", - "xmlrpc-c.s390x" - ], "xmlsec1": [ "xmlsec1-nss.s390x", "xmlsec1-openssl.s390x", @@ -24970,9 +24949,6 @@ "sanlock-lib.x86_64", "sanlock.x86_64" ], - "satyr": [ - "satyr.x86_64" - ], "sbc": [ "libsbc.x86_64", "sbc.x86_64" @@ -25981,10 +25957,6 @@ "xml-commons-resolver": [ "xml-commons-resolver.noarch" ], - "xmlrpc-c": [ - "xmlrpc-c-client.x86_64", - "xmlrpc-c.x86_64" - ], "xmlsec1": [ "xmlsec1-nss.x86_64", "xmlsec1-openssl.x86_64", @@ -34058,11 +34030,6 @@ "xcb-util-wm": [ "xcb-util-wm-devel.aarch64" ], - "xmlrpc-c": [ - "xmlrpc-c-c++.aarch64", - "xmlrpc-c-client++.aarch64", - "xmlrpc-c-devel.aarch64" - ], "xmlsec1": [ "xmlsec1-devel.aarch64", "xmlsec1-gcrypt.aarch64", @@ -35847,11 +35814,6 @@ "xcb-util-wm": [ "xcb-util-wm-devel.ppc64le" ], - "xmlrpc-c": [ - "xmlrpc-c-c++.ppc64le", - "xmlrpc-c-client++.ppc64le", - "xmlrpc-c-devel.ppc64le" - ], "xmlsec1": [ "xmlsec1-devel.ppc64le", "xmlsec1-gcrypt.ppc64le", @@ -37623,11 +37585,6 @@ "xcb-util-wm": [ "xcb-util-wm-devel.s390x" ], - "xmlrpc-c": [ - "xmlrpc-c-c++.s390x", - "xmlrpc-c-client++.s390x", - "xmlrpc-c-devel.s390x" - ], "xmlsec1": [ "xmlsec1-devel.s390x", "xmlsec1-gcrypt.s390x", @@ -39477,11 +39434,6 @@ "xcb-util-wm": [ "xcb-util-wm-devel.x86_64" ], - "xmlrpc-c": [ - "xmlrpc-c-c++.x86_64", - "xmlrpc-c-client++.x86_64", - "xmlrpc-c-devel.x86_64" - ], "xmlsec1": [ "xmlsec1-devel.x86_64", "xmlsec1-gcrypt.x86_64", diff --git a/prepopulate.yaml b/prepopulate.yaml index b026e65..f02fd7c 100644 --- a/prepopulate.yaml +++ b/prepopulate.yaml @@ -4186,8 +4186,6 @@ AppStream: - python3-sanlock.aarch64 - sanlock-lib.aarch64 - sanlock.aarch64 - satyr: - - satyr.aarch64 sbc: - libsbc.aarch64 - sbc.aarch64 @@ -5012,9 +5010,6 @@ AppStream: - xml-commons-apis.noarch xml-commons-resolver: - xml-commons-resolver.noarch - xmlrpc-c: - - xmlrpc-c-client.aarch64 - - xmlrpc-c.aarch64 xmlsec1: - xmlsec1-nss.aarch64 - xmlsec1-openssl.aarch64 @@ -9212,8 +9207,6 @@ AppStream: - python3-sanlock.ppc64le - sanlock-lib.ppc64le - sanlock.ppc64le - satyr: - - satyr.ppc64le sbc: - libsbc.ppc64le - sbc.ppc64le @@ -10020,9 +10013,6 @@ AppStream: - xml-commons-apis.noarch xml-commons-resolver: - xml-commons-resolver.noarch - xmlrpc-c: - - xmlrpc-c-client.ppc64le - - xmlrpc-c.ppc64le xmlsec1: - xmlsec1-nss.ppc64le - xmlsec1-openssl.ppc64le @@ -14202,8 +14192,6 @@ AppStream: - python3-sanlock.s390x - sanlock-lib.s390x - sanlock.s390x - satyr: - - satyr.s390x sbc: - libsbc.s390x - sbc.s390x @@ -15018,9 +15006,6 @@ AppStream: - xml-commons-apis.noarch xml-commons-resolver: - xml-commons-resolver.noarch - xmlrpc-c: - - xmlrpc-c-client.s390x - - xmlrpc-c.s390x xmlsec1: - xmlsec1-nss.s390x - xmlsec1-openssl.s390x @@ -19341,8 +19326,6 @@ AppStream: - python3-sanlock.x86_64 - sanlock-lib.x86_64 - sanlock.x86_64 - satyr: - - satyr.x86_64 sbc: - libsbc.x86_64 - sbc.x86_64 @@ -20178,9 +20161,6 @@ AppStream: - xml-commons-apis.noarch xml-commons-resolver: - xml-commons-resolver.noarch - xmlrpc-c: - - xmlrpc-c-client.x86_64 - - xmlrpc-c.x86_64 xmlsec1: - xmlsec1-nss.x86_64 - xmlsec1-openssl.x86_64 @@ -26280,10 +26260,6 @@ CRB: - xcb-util-renderutil-devel.aarch64 xcb-util-wm: - xcb-util-wm-devel.aarch64 - xmlrpc-c: - - xmlrpc-c-c++.aarch64 - - xmlrpc-c-client++.aarch64 - - xmlrpc-c-devel.aarch64 xmlsec1: - xmlsec1-devel.aarch64 - xmlsec1-gcrypt.aarch64 @@ -27538,10 +27514,6 @@ CRB: - xcb-util-renderutil-devel.ppc64le xcb-util-wm: - xcb-util-wm-devel.ppc64le - xmlrpc-c: - - xmlrpc-c-c++.ppc64le - - xmlrpc-c-client++.ppc64le - - xmlrpc-c-devel.ppc64le xmlsec1: - xmlsec1-devel.ppc64le - xmlsec1-gcrypt.ppc64le @@ -28788,10 +28760,6 @@ CRB: - xcb-util-renderutil-devel.s390x xcb-util-wm: - xcb-util-wm-devel.s390x - xmlrpc-c: - - xmlrpc-c-c++.s390x - - xmlrpc-c-client++.s390x - - xmlrpc-c-devel.s390x xmlsec1: - xmlsec1-devel.s390x - xmlsec1-gcrypt.s390x @@ -30099,10 +30067,6 @@ CRB: - xcb-util-renderutil-devel.x86_64 xcb-util-wm: - xcb-util-wm-devel.x86_64 - xmlrpc-c: - - xmlrpc-c-c++.x86_64 - - xmlrpc-c-client++.x86_64 - - xmlrpc-c-devel.x86_64 xmlsec1: - xmlsec1-devel.x86_64 - xmlsec1-gcrypt.x86_64 diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf index edee40e..358020a 100644 --- a/shared/additional_and_filter_packages.conf +++ b/shared/additional_and_filter_packages.conf @@ -499,6 +499,11 @@ additional_packages = [ "langpacks-mni", #ENGCMP-4337 "langpacks-sat", #ENGCMP-4337 "dotnet9.0", #ENGCMP-4381 + "sequoia-sqv", #ENGCMP-4405 + "sequoia-sq", #ENGCMP-4410 + "yggdrasil", #ENGCMP-4382 + "yggdrasil-worker-package-manager", #ENGCMP-4383 + "python-tpm2-pytss", #ENGCMP-4395 ] }), ("^AppStream$", {