From c0c3f07bf212c49251979120aac2242972597e3b Mon Sep 17 00:00:00 2001 From: Louis Abel Date: Thu, 11 Jan 2024 10:57:24 -0700 Subject: [PATCH] sync from upstream --- shared/additional_and_filter_packages.conf | 2 ++ variants.xml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf index fad1975..ef7c658 100644 --- a/shared/additional_and_filter_packages.conf +++ b/shared/additional_and_filter_packages.conf @@ -94,6 +94,7 @@ additional_packages = [ "aspnetcore-runtime-8.0", #ENGCMP-3375 "aspnetcore-targeting-pack-7.0", #ENGCMP-2586 "aspnetcore-targeting-pack-8.0", #ENGCMP-3375 + "bootc", #ENGCMP-3622 "capstone", #ENGCMP-2591 "cepces", #ENGCMP-3552 "cockpit-ostree", #ENGCMP-3233 @@ -214,6 +215,7 @@ additional_packages = [ "keylime-selinux", #CS-1194 "keylime-tenant", #ENGCMP-2419 "keylime-verifier", #ENGCMP-2419 + "libadwaita", #ENGCMP-3651 "libasan8", #ENGCMP-2405 "libblkio", #ENGCMP-3149 "libgpiod", #ENGCMP-2433 diff --git a/variants.xml b/variants.xml index 208ca5e..b140ee2 100644 --- a/variants.xml +++ b/variants.xml @@ -156,7 +156,8 @@ nginx:1.22 nodejs:18 nodejs:20 - php:8.1 + php:8.1 + php:8.2 postgresql:15 postgresql:16 redis:7